gentoo resync : 16.09.2020

96 files changed, 1707 insertions, 142 deletions

diff --git a/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild b/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild
index 9751760d13b8..1a17ff0dc9bd 100644
--- a/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild
+++ b/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.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=5
@@ -35,7 +35,8 @@ src_prepare() {
 		"${FILESDIR}"/${P}-gcc4.patch \
 		"${FILESDIR}"/${P}-asneeded.patch \
 		"${FILESDIR}"/${P}-missing-include.patch \
-		"${FILESDIR}"/${P}-gl_init.patch
+		"${FILESDIR}"/${P}-gl_init.patch \
+		"${FILESDIR}"/${P}-Options_Options.patch
 
 	eautoreconf
 }
diff --git a/x11-misc/3ddesktop/3ddesktop-0.2.9-r2.ebuild b/x11-misc/3ddesktop/3ddesktop-0.2.9-r2.ebuild
new file mode 100644
index 000000000000..199878c516f1
--- /dev/null
+++ b/x11-misc/3ddesktop/3ddesktop-0.2.9-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="OpenGL virtual desktop switching"
+HOMEPAGE="https://sourceforge.net/projects/desk3d/"
+SRC_URI="mirror://sourceforge/desk3d/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	>=media-libs/freetype-2
+	media-libs/freeglut
+	media-libs/imlib2[X]
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXxf86vm
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+DOCS=( AUTHORS TODO ChangeLog README README.windowmanagers )
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc4.patch
+	"${FILESDIR}"/${P}-asneeded.patch
+	"${FILESDIR}"/${P}-missing-include.patch
+	"${FILESDIR}"/${P}-gl_init.patch
+	"${FILESDIR}"/${P}-Options_Options.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+pkg_postinst() {
+	echo
+	elog "This ebuild installed a configuration file called /etc/3ddesktop.conf"
+	elog "The default configuration makes a screenshot of the virtual desktops"
+	elog "every X seconds. This is non-optimal behavior."
+	elog
+	elog "To enable a more intelligent way of updating the virtual desktops,"
+	elog "execute the following:"
+	elog
+	elog "  echo \"AutoAcquire 0\" >> /etc/3ddesktop.conf"
+	elog
+	elog "This will cause 3ddesktop to update the virtual desktop snapshots"
+	elog "only when a 3d desktop switch is required."
+}
diff --git a/x11-misc/3ddesktop/Manifest b/x11-misc/3ddesktop/Manifest
index b387673ce609..b01051a06b6e 100644
--- a/x11-misc/3ddesktop/Manifest
+++ b/x11-misc/3ddesktop/Manifest
@@ -1,7 +1,9 @@
+AUX 3ddesktop-0.2.9-Options_Options.patch 139 BLAKE2B f22f6569c315ac117a90175ac2553f86d1fa8a464287f7051d01b89d33b17ee9af0f0b0882dce4fbede701a30068f604d8a4f8dde1d5d77c71901ad944fd35b8 SHA512 7e75b8f9dad67cd566084698e6d27ec68a6c18d18094bc03a4bca54289c7d3f221bec619c4c8fa6b3fa746f9d5118f4f5fcac2bb0964166a242bb781131e09ed
 AUX 3ddesktop-0.2.9-asneeded.patch 269 BLAKE2B e4a1f38ffe52aeddc6c007f9b6a59e2c1bfbba1781b5ebe08ece4d5c2dc8e86f7b45867aab3622d4033d110cf3712e4814abfad0e221d6f311ca1f4dfb27c73b SHA512 bc0fa8247f122c5ec2504c23211730d3274008bd5583b61da2a65b7176cf7de9301f40f51b961b013566c8f30d5ef50f0a81620d14abe2017e0ea9ba7fe279d4
 AUX 3ddesktop-0.2.9-gcc4.patch 371 BLAKE2B 1932eda1b8881af868df28855b5ef9a6d6bb98ed5dff60b2101ded37f5900118f1e09b58f7ab965ddbae1fe5cbaa766cd82bc882f848d2892d7bfd9d20d61d72 SHA512 7752d9596db58ff779389a70fcabe9cfe99af454a5c9dc36239988c1fa14755d15b51fb225fe6510bbc681f815887c7f3294d27ac4e50c2b2aab29f54c7788d1
 AUX 3ddesktop-0.2.9-gl_init.patch 526 BLAKE2B 0a03e6e04fccc4f2f534ce893ccfe1fdbc12af45029636a45a489405b31f18ccde44d03b91ed7df896b60a143ba24a588119d003fb3094b15227200340dfaf1c SHA512 2f7ffdf022ec2eeb1b06933e09922de6856bfc4a4ee0fdb0a4ec2ba2623a8a50a0adaaa87cfec9f90ad24a1436051fdbcf340664f6458be26f119c4d05d4ce7e
 AUX 3ddesktop-0.2.9-missing-include.patch 189 BLAKE2B 7f03939469403fb175a998846707cf8b16fce8300ac4ecf764fbf9e91f647d8af882ddf5eec2e4c6f4420c719f43719c5c7c654f81a57a2f55e2091827c77cc7 SHA512 6ba19f2a760de39a38ad774b9a932d1fa1bca1193707bef5e269c16353df9b8a25cf6d6d3e39e2d3b354125f266a6bf553695b8a9f8475ee3ad247b3e60a4fde
 DIST 3ddesktop-0.2.9.tar.gz 182278 BLAKE2B fb963a8bbfcea97da13cbc28890d74ac9d29655e298d76a485ceed5b67ac3557a8e731988e30d5a3009b774d66f8bfb270b0464ed6ffdf27070797ca8440d3d9 SHA512 87de83561bc1614e4dde623197b04e482e04ad363ba88adf4e4e9950a942a5725d2a7199406949981c1a4aeba5d71fb9a1693f99aefa21ed7b83e083bb902686
-EBUILD 3ddesktop-0.2.9-r1.ebuild 1359 BLAKE2B 50e780748cadd67bba16f589fea32f3a63cfb5ca66821273b84006031a3c7bb23e137dd89b425486738e3fcd049043270d86bd7c69b4ac44a1355e889a6179d8 SHA512 63e1b416fc25c76b972cf17bfa943ef964239a57c3dcad8e3d26067e2b00843b9a99c13fd5a80c97297206bf97cc942bd10b90c035b473786cc7a5c9f3b878e2
+EBUILD 3ddesktop-0.2.9-r1.ebuild 1401 BLAKE2B 29e9e0c14af1052ffa1e1168ebf29bc62b9441f7a5d627dbd6676a7131b76e1ac0a5a9b86ef2ff20a2d9863ef0e430cc2641e145f8d2c720506c8c22a6d3c5d1 SHA512 973c111336337d85b2172be8af48e0f7348a538f6ece36e2c58aad29960ffa8bf800c51ac8d5c28021b630b8db2b929ab677d6535b0c0a7ffda082ef148a7226
+EBUILD 3ddesktop-0.2.9-r2.ebuild 1404 BLAKE2B 738008785514fd7b83f14ef18b308a949d189bef344129fa147b8c62d14c5725dcf209f272ba4041481050fe0d0da235bf22c28c00ef1f4cdd1624cd9b195ed0 SHA512 34f1990f5e99465e7bb7e7d1f4dc60a7dae904cf0385dc06637dc1f15d1d0c681fdc98fb3b40de8b9903a0675935dadf02b72cc45aba464a72256fbbf8f03df7
 MISC metadata.xml 624 BLAKE2B 84edac86cf43f84b298a8c2e74734f38abad81331971a1e343794f2fbc6111b74f3868bc5b489702cc09133d2408fb0c618b731296dcf4ec0b07f491cdcb1842 SHA512 d59884e855a755ca70d9800007b2c73d32f6607bda8bb9f56c12b0008e5f2bcd58f77580da039db6a1c4f43458922b0e7324c0459c8e8eb2fca8634f054a95b3
diff --git a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-Options_Options.patch b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-Options_Options.patch
new file mode 100644
index 000000000000..00e8b8c1ee53
--- /dev/null
+++ b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-Options_Options.patch
@@ -0,0 +1,11 @@
+--- a/config.cpp
++++ b/config.cpp
+@@ -64,7 +64,7 @@
+ }
+ 
+ 
+-Options::Options(char *n = NULL) 
++Options::Options(char *n) 
+ {
+ 
+     if (n)
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 62e58eeb9a85..950568e50353 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/appmenu-gtk-module/Manifest b/x11-misc/appmenu-gtk-module/Manifest
index a57c11d4fe10..a3ad8d5d1dd2 100644
--- a/x11-misc/appmenu-gtk-module/Manifest
+++ b/x11-misc/appmenu-gtk-module/Manifest
@@ -1,4 +1,4 @@
 AUX appmenu-gtk-module 239 BLAKE2B c5f055154136c6ba862ce9f74edf898fd9baa5b699fe149fd29b125bd42cee94174e7f8f8bf7a40ee63e880f38a161a652e45c171dae399e8cd2b76e4a94e2f5 SHA512 daf70376ebcd1b67eec093c8b905b6d085d4206958573ce7aa8709c053928a78a7b8d06b6fdba9a221731d89e3fe6720394d1e8cee208adfaaf298825a9cc04e
 DIST appmenu-gtk-module-0.7.3.tar.xz 48460 BLAKE2B b7008aa618e643a95445aad25bc19eed5b887810891318a891f088284f8f128e6392671226742a8b0c70699a9455739ee61ed56aec32129532ba53dc69809913 SHA512 d7df7e3cea3ccb66d013b23ae8796b8cbb0e0787f37f54078715c4863797c28d44ff38d7ac965b6eb0fd5cb327c1a4b891c74c66ba95b9b9a06e2c06ba5b2ad8
-EBUILD appmenu-gtk-module-0.7.3-r1.ebuild 1039 BLAKE2B 4dd6de022a98fe803165b37cdefc57f0caa6635152649170f2777fa11f93989a658887622944868bc6e743f52bbf01745cc20f74e06a578cf7c19a0553970cd2 SHA512 89b195e2ce0621295b25ca367f1ce92800cefca437ccf7af29974fc501406743c75110798bc1a9d3a817322a189e40fbd502dbab3207a13ea4785f4d75b302c1
+EBUILD appmenu-gtk-module-0.7.3-r1.ebuild 1046 BLAKE2B dc95ebf4b4d8feb94c117fc9a641ae7010b27f6999453b109f58050d5316ddbf6d17736ea67211d3423eb12ee21e91f6453a08f9c936bfbf0ba0a42051ffe952 SHA512 521b4bb47e885f218facd0138541f63b536d82da46dd4523991c11fabe8ae295988f6d4576c34e83bfa67b207e82e2a011b9a256317543f32ea6e3c51735f234
 MISC metadata.xml 330 BLAKE2B cfc9f4f9873b63df5ed997fa0fb659fd5c15205a53b727a963c125cc31cb071ccd7fcdd524939ed10b8dd6fadf4c4cc304ed3c4be852fc1e29feb0918efb698e SHA512 aa5bbe760f05a3c67365ddfa2f0c9d52636bd645075ac0ca2a96124e1127557b20d12162fe2c44b4cd77cf6106c5803da3d25b36a4dc9bb21bc1842e0da71b24
diff --git a/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.3-r1.ebuild b/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.3-r1.ebuild
index ce784a6457b5..f78bf20a50b0 100644
--- a/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.3-r1.ebuild
+++ b/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/vala-panel-project/vala-panel-appmenu/uploads/570a2d
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/barrier/Manifest b/x11-misc/barrier/Manifest
index 6726ab72af7b..146fd4702651 100644
--- a/x11-misc/barrier/Manifest
+++ b/x11-misc/barrier/Manifest
@@ -1,5 +1,5 @@
 AUX barrier-2.3.3-gtest.patch 3981 BLAKE2B f9a91a9b090ae4210d005db307d31930f7d2939f17e1c2bdbdbcd26b22743054f2d35c57c3e55ac6b6212e2d2274bcecad015c2afe8db909bfd4c030f976ae65 SHA512 82d78f658af279c8f2ec48cfa1dcec2cd6104d605b1157adeead73623fd0f7459141eb696619e71ea78ab1f7872369c78ef1ceeb9f90e7e7bed4b2a57aac5cca
 AUX barrier-2.3.3-tests.patch 4951 BLAKE2B 66996d3d9297bf0b188350154a380e522a0ddade4b1693fb62be6acbd624f327527b281cc3611b25b3cae0d084dc6af0eaae0e8487696c4b2589f76382381a4f SHA512 dcde430f1c0e1a4d65a4ed6afad1501f4ec6e448d0a56eeeadb46732fb8149fc7e74b5245e583ca8d4552ecca75dd59cabb9ba4ad549c8fda55e2178ede1ffed
 DIST barrier-2.3.3.tar.gz 5465909 BLAKE2B 3f881526f53113e48f1ea2e1592ebf2e932a8296fcba331243678963945001e7700dddc3bf8957f85285aec02c3d3700d31786cef291862a9b21780ee9e96cd6 SHA512 1ac945ce090d5bbdae7bab7d4ca802cc2d54c1644a12088203b240e38078d32d3b30ae2f764ba27d66c9d709e430b0eb1b4576314d99dd6177d8b88d19b89777
-EBUILD barrier-2.3.3.ebuild 1610 BLAKE2B cae50a8a315968c45ebe3a71da8fc66b3809b06e9f77fdf4f2e780804731ccb118cf4d85c9188edfa78b200bc07135d654fcead9f3e69860677af1b35d9e39d2 SHA512 46cd279a5c2bc53ac629b68605b9af845285e79da7308394e9932ff1ff1253c9d982b6bb529d4e1f57bb598dd1aad26069a5e6712bb9960e3c7eb788e8739ab8
+EBUILD barrier-2.3.3.ebuild 1615 BLAKE2B 38a84d572cf3427a3b9c8bad95f27f6cf55853c1557f6f04c5af12b29316653074a5522cfabbf6691536df0d2875a4ad278843dbb8bd00ea781ced22b7db2996 SHA512 d09695d6b437a63d3c20b927b237488340dd0d09a377cf2de9714b4cce9cc9e391f82a69e0988f33c5a69a1a1eac8bca40914115fd30b8ec78d884d6f280df68
 MISC metadata.xml 329 BLAKE2B bbddf11c798d648935ee56a6ee9cbf7a73d30f13a880264ed07db3b7710eb7329166838b4e1adbb157b699805c2d891bdfae2799c7bb1b6ea3419b97438a49de SHA512 84462a8601400583e7570ecfca9fac2539eb9be9c097ebeead8cfc42e2be95c61369934a0e1d9252e3ed8fa181f64116a3cc0228da27340f6c29bdf5b4133883
diff --git a/x11-misc/barrier/barrier-2.3.3.ebuild b/x11-misc/barrier/barrier-2.3.3.ebuild
index 502083619611..6825e6d91efb 100644
--- a/x11-misc/barrier/barrier-2.3.3.ebuild
+++ b/x11-misc/barrier/barrier-2.3.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/debauchee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="gui libressl test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-misc/bbacpi/Manifest b/x11-misc/bbacpi/Manifest
index f0526b21c119..378aafc6043d 100644
--- a/x11-misc/bbacpi/Manifest
+++ b/x11-misc/bbacpi/Manifest
@@ -2,4 +2,4 @@ AUX bbacpi-0.1.5-noextraquals.diff 236 BLAKE2B f377855349233b381b31a2fb1cd9423c0
 AUX bbacpi-0.1.5-overflows.diff 4015 BLAKE2B ae2cfd751d1627a1e9a689313a99ad98458dd380d6ede08acd5591a951f17fd593ecae6290e43440718ed649dc50563373ebe6a59925873ff2a0e26bbe8c332c SHA512 62679f7be9c702f6fe61fbcc448951761f5a62a05ff93a99e94e6fa79389b059ab4f95b588c0cd4c561d3a22e00257dd89c45c2aa3fabad8570333cfa36ebb7e
 DIST bbacpi-0.1.5.tar.gz 241565 BLAKE2B a2eb6fc59ed7110ccfeda93a58c832a75fbac9abfe9b692e221c3571a99898c67e22cf47667f935ff94ad1d7ee98dba80c330ab0d4bb737ca44bdd890191b360 SHA512 4491bf0352a376ada9006f3306c377d5c8b6fafcad8d214f64f8a3cd52e1e8b8d02b084888d58d8a1389a624631f6fc3b6f98aa33cd89b06e1ccd0802b5a540a
 EBUILD bbacpi-0.1.5-r3.ebuild 754 BLAKE2B 7dfb4fb6403b92e3a4c91410ad52b82f27d3a0bbc2cb5ec7fb1e3d8eb3415195e3666f3c2b701d54c1fd6599925f6a3dfa7b3c4585072e5c218337b47472617c SHA512 0f83c66ea1139d52b489043ac0b803cba0560a58ee0fe71bbbae70f7e23132bd04012604d299a862de04e1c4781535ea8925352c212d2782a92760ece0b63018
-MISC metadata.xml 438 BLAKE2B 8912ae25aaea381136f53b22f3e85df7ceea0f33148dd057e2b525be7e69cc52889a8d0cc4ce1e432b0a362bf66278c5726a388ec77c0fb1bc471e847c46c54b SHA512 b88162948bb8b4cb5b05ac45d8c72b80f11d05165a033137a1e99f5fc37dfad189d6619321959a540d01943efa1112fa5173bd267bbcab2529a52b497363eff5
+MISC metadata.xml 352 BLAKE2B 588ae23b221fd7a73dd680ae26c9ee0d8b647b36fff58ee7b805218d4a737357ce79b41e07efa5963aa0807724512f5fa162df9a37a3a7b745066a8bc524b18a SHA512 a9c2d3a65c1e94c28d44176ab6db358149ad6e6753d3a2c50a6cf492649acc0515a765ded10aefdcf5b80ca10012cb35cda27d6570233c27976fa36a97b4143e
diff --git a/x11-misc/bbacpi/metadata.xml b/x11-misc/bbacpi/metadata.xml
index 5c53ec9ef9bf..99def0fbff52 100644
--- a/x11-misc/bbacpi/metadata.xml
+++ b/x11-misc/bbacpi/metadata.xml
@@ -5,9 +5,6 @@
 		<email>desktop-misc@gentoo.org</email>
 		<name>Gentoo Desktop Miscellaneous Project</name>
 	</maintainer>
-	<longdescription lang="en">
-Utility for viewing ACPI data via X11
-</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">bbacpi</remote-id>
 	</upstream>
diff --git a/x11-misc/bbcd/Manifest b/x11-misc/bbcd/Manifest
index 460530b2a1e0..c83a534aca33 100644
--- a/x11-misc/bbcd/Manifest
+++ b/x11-misc/bbcd/Manifest
@@ -3,4 +3,4 @@ AUX bbcd-0.3.1-gcc4.3.patch 254 BLAKE2B 7ace4e13e7423fd0e54801b9ef5738545068ff47
 AUX bbcd-0.3.1_0.3.1a.diff 1794 BLAKE2B 233815b158b32e738e2849f9bd475cf5c3eabbcff30685c7aa1ac460dca466a4d4c38b6aaba054e39929d845cfeecd37201640e1693cf7707d45e8bb149df240 SHA512 422ae54b3e18e3d9dfaa4adc28e8d0285d127cb28a175fce2772ef4d3577755e95c43bdd15e1000469da64dd9b6693cb2f11d92c5d261266cc791b9671cdfd82
 DIST bbcd-0.3.1.tar.gz 74853 BLAKE2B 446f295b7716548f9a6ded07ee10323483bdac460d53b9308bd6dd22483e8c664a24bfd9848caeca730801d3273de3000bd771e925a9fd334a2c009453f773b3 SHA512 817c41e8989d28fed45b3a797ffac193ce2060bae7d8793253a8f2812945b0f72e2f14ecd607329f769fc07773b678ca507a84c7f3b214fb5ac4afd62d77de7f
 EBUILD bbcd-0.3.1-r2.ebuild 573 BLAKE2B 5794106d9f28ec57aef179f24cd9b4d9dd39ae4f7a777cb684d9c682b2a3052d6fdeae9c0334bcaaaa50b0f2f8c7382f9ad94b5fa76cdc4a78eabd501ca00de5 SHA512 55c82f321fe06fe12912b18530d92be9a878ef39f6db012639434a20f447ddd6e8102c241bb2c4fa04272de27a5af801dede14421e85b1d163faa737ef83e42c
-MISC metadata.xml 241 BLAKE2B 2b2407917254b37340fffac1ea444e78f5c08385c14f1f86b4f99418bf1d8349838210059f95adbbf50d6af65d1931b40a8ca9aece34cef06c799b7200983e7b SHA512 fa9ab655c8afc6023086bbfbda56113653deee76679bff4f0edad7e86412a4dea3c943209426bee532ad0dfe0b5967aeefb121a8f45cc2f091fc79d429d7b71d
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-misc/bbcd/metadata.xml b/x11-misc/bbcd/metadata.xml
index abca1b86fad6..6f49eba8f496 100644
--- a/x11-misc/bbcd/metadata.xml
+++ b/x11-misc/bbcd/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
-<longdescription>
-  Basic CD Player app for Blackbox.
-  </longdescription>
 </pkgmetadata>
diff --git a/x11-misc/bbdate/Manifest b/x11-misc/bbdate/Manifest
index 9bc36c7d4600..2c67120d4a44 100644
--- a/x11-misc/bbdate/Manifest
+++ b/x11-misc/bbdate/Manifest
@@ -1,4 +1,4 @@
 AUX bbdate-0.2.4-as-needed.patch 619 BLAKE2B 61672a67abade794501141c897f602c9d1bf865d56aa822383f84eda68db04c53b5bd60d0faa6947abc88f903ecf61f6bf526de0203c310e4d69683c234e87d2 SHA512 eb533f3802c64a557ebd791dc93e42f62eff0808ca49c07244396b4fc6ee22b59b7f75091b1e0f60403e0e1d1945a0e42953da071213a389c4a6f61447c3db10
 DIST bbdate-0.2.4.tar.gz 60644 BLAKE2B f8e55a9c4c041abb6ce8155c46653034f1d1380d3e65851b80898a93fab6b988db6c9e3b20663f4e1fd6cd6427ff0738cb1ca35766a47c7805c171e36ae31ab9 SHA512 90c51249a6ad0b90aea640b1f94cee4e9feb3ca46e4407ab3be645f92a32e7c3f1879c58a236c487dd7bfb24aae1f6a03da0a535c9218fbcbcdbd1e6f043d041
 EBUILD bbdate-0.2.4-r2.ebuild 924 BLAKE2B 68e37a0c40f097d521596d0fd6983401fd8a989f83ba56a67ea822db7561411fd7a5bb1277940b0ecab00bfe5a700a8fb572c28375fe8883eec15b6af116c13b SHA512 4073a3b8a159f61265f3a17685a8f3965cbf5dcb1fdeb6e7e2624272e73d838d6f64dd0bc5549ce9cef24dbb998708edb5c198e2ce388646e4dae2e3ec72fac7
-MISC metadata.xml 309 BLAKE2B d09efeb368e3d2d88b9a68da9e3b24ecae3408ba9fb458e77ff856fdfd0c9d4faf70b8756fdaf7238ebb2ac326d6af9d46ccd6217fdcb69f87161752be0960d3 SHA512 ee8557b2406913cb007554644e1b510229de4aa8428af35dce200754dbbb5ea8d2bd3e3f044b039cb403d894d713ae76eca87e224bff6be093ea4473a8979c07
+MISC metadata.xml 244 BLAKE2B 305658f1d641748d0b5e690502c2faaec6d9b528928a8458885e4a1a77ad1e3fec1a213053705e48f7af4f05ed1b7bcf2a8980897725c611d4b21e3f4a2a56c6 SHA512 6457c097a5d90b25ae3c2004bb9a791c1befcc7e2cbf50acd7094d0939410db1947398e3c3355e38dd00803cbec4a123b2c9b7e44a0a6bdef0b8d411404609a5
diff --git a/x11-misc/bbdate/metadata.xml b/x11-misc/bbdate/metadata.xml
index 492eb679996f..c76c034df38c 100644
--- a/x11-misc/bbdate/metadata.xml
+++ b/x11-misc/bbdate/metadata.xml
@@ -2,7 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription>A data display for Blackbox.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">bbtools</remote-id>
 	</upstream>
diff --git a/x11-misc/bbkeys/Manifest b/x11-misc/bbkeys/Manifest
index 057896a24fcc..84e62d012662 100644
--- a/x11-misc/bbkeys/Manifest
+++ b/x11-misc/bbkeys/Manifest
@@ -1,3 +1,3 @@
 DIST bbkeys-0.9.1.tar.gz 226941 BLAKE2B 43a946210f25679dfe7d5a383fbd3f938ae71b19a635a288590b958fc47f3588c690a1e901b44fdb1b31eb1a8ee7252ceeee85b5d012585b261de61cc0f012ab SHA512 c8643d51dbb8f080cf70149d545f33160d15f00a0c3cefdd6d3856dfdee224ff3f63fce0988669036249c75f70878be63711a697dfaa45d4357d2141a28b13bd
 EBUILD bbkeys-0.9.1-r1.ebuild 602 BLAKE2B 8d032d2bee58ad01f326f34383803f5c379713ff83cc543bf2bc2e3290cf896b700ebe4787c6180c625c6dd21f2ad493afb8383a82f08cc76f835fba225e232a SHA512 6acad4c8b8e3e219561db3e6b3b4ee8a30e9555d3d029b9b930eb81a73fb631672a7257b3fed6c2b1427f89b72c104c9e9a48b8bfc5d3bbedd81b485bbaba52c
-MISC metadata.xml 318 BLAKE2B 21dea9539e3c3d2449806722447884e705f11482ef597b931d3d0ed513fe25045cd72905e885e98b4ca096e7a7b412e8ebe8fabfb432a889e7bbc6eee3d4415c SHA512 346baeec555112d1e81cdfb8304d0b9efb91ef1f507d12c52a2ab68cb9d82a3f873922b57ce40ba4f247b28c831ddb420647303e09ddbae82b4e561282532005
+MISC metadata.xml 248 BLAKE2B da2d42e81f9b99c01054cacc4a3986b508e8bc044936ad045508057bd5fd7b2ee4452ea478129f70b75d226e9b83abd95981bf64082f50495661a694576e4c11 SHA512 e797a6ea600d257a6610af5a314842aadbb1f89a1a9652616306e6b7b8b0e94b28ca815684f126cc4d2ea5da4080be7b4fb9123883a1c18ca1e64589d1b7d30e
diff --git a/x11-misc/bbkeys/metadata.xml b/x11-misc/bbkeys/metadata.xml
index ca343e66c75c..8c1cd95c03af 100644
--- a/x11-misc/bbkeys/metadata.xml
+++ b/x11-misc/bbkeys/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
-  <longdescription>
-  A keygrabber for Blackbox.
-  </longdescription>
   <upstream>
     <remote-id type="sourceforge">bbkeys</remote-id>
   </upstream>
diff --git a/x11-misc/bblaunch/Manifest b/x11-misc/bblaunch/Manifest
index 920c19921592..ba4ecabacb0b 100644
--- a/x11-misc/bblaunch/Manifest
+++ b/x11-misc/bblaunch/Manifest
@@ -1,4 +1,4 @@
 AUX bblaunch-0.0.3.patch 311 BLAKE2B a26747862849f6fa59693da243ed70c0572adf4dde1599092739643673433030bb13d0df821f99105d3607ef855987615331838fffdf379bdc0aa6b9b9f3834c SHA512 649a16bff8ece92b6540635085efcace7135114272fafe2ee63e957091bdb258b08131e46fc57402c9cbf8956c94ef9844ed2536b86524fdf7b8ef0f21abf43d
 DIST bblaunch-0.0.3.tar.gz 31719 BLAKE2B c356156a33ac96d364b0c33f9878ce84265b41b6611a3fc1648b6746e33ef367ce81c319aaf584b85a5b7a6fac8d24de44ac015b5bd5bfae8def9181748812d5 SHA512 8814021a802705970b947078e3af040d0ad0b63a859dcefe7b5adaeac392446d1556d7200631e0cd872473f821d21b0ba50c0173f193f3614ffcd438fbb9f224
 EBUILD bblaunch-0.0.3.ebuild 384 BLAKE2B 99d6ea0c4c2955ef942d47257414d760991f1dae392d534533aa63c661783f5f01a4d721418359e6ccde70040c068cb9a430c4fcfc51a54b2dce09f65c0fab4f SHA512 62ef672ab7af6a2bb308100b6f84372d6835067663d454e2c4b665041d3e0231b2a18b5089233cc44f6362e8baa04481570338d9d597744daf86ab08e99a2ff2
-MISC metadata.xml 333 BLAKE2B e360f1384989b577e1917624909d18b3e9d08fddd978e3ee0901063b7fad33640b89a4044de9ff9b45c08c514f4e5a5d19e0fb0a3f04f90fce56bb2a4aa26cdb SHA512 f617b6293996687d7df4fa5c9e676995531732ab13c91d57e82b15e91fb2023890c5ea1f917d659c005eed59ac37da0713e9b73bcfbbdb5d8822076121c7b8eb
+MISC metadata.xml 252 BLAKE2B 850d06ddcece0b917887c2d9651cf2d1c1c3f1d812a97accf4ea371c3eee354bd7e693e52cc5a8c9bb7e9fde0ab2b7c00fae23e1d215936fde41c9c8b0d90cb6 SHA512 a001bd87a8128dbe3a50e7697649e4e714886ee0c647b934193ff88bf7c2b666941a6cd44c4ed86fe9b1157cfde3b46a138bec61280b8a941ded06fd4d9cc7e2
diff --git a/x11-misc/bblaunch/metadata.xml b/x11-misc/bblaunch/metadata.xml
index 374dfd611686..d6a74662c866 100644
--- a/x11-misc/bblaunch/metadata.xml
+++ b/x11-misc/bblaunch/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
-  <longdescription>
-  An application launcher for Blackbox.
-  </longdescription>
   <upstream>
     <remote-id type="sourceforge">blackboxwm</remote-id>
   </upstream>
diff --git a/x11-misc/bbmail/Manifest b/x11-misc/bbmail/Manifest
index eb8e85d40746..02c8a136c75a 100644
--- a/x11-misc/bbmail/Manifest
+++ b/x11-misc/bbmail/Manifest
@@ -3,4 +3,4 @@ AUX bbmail-0.9.3-gcc4.4.patch 2776 BLAKE2B b65b33d0f6d841a58e7032460deb85a57f1fb
 AUX bbmail-0.9.3-shebang.patch 276 BLAKE2B e6d685f91e5faf598cb9df8494b305de986b8d493b3b1edf1cd053b672f625c121b84ee908dff296161e63cfe4c010ab3f6df86c7e3cff187e588d4f3bea6d55 SHA512 3d84c579f461e97f542a1e21fe365c4fa86731dd9af0e4cdfcbe9bfa83c8b0e10f3a18b67515e35046f218c3b704838115d4695b84c8f2b879a90c89d97d8752
 DIST bbmail-0.9.3.tar.gz 186433 BLAKE2B 9fa31bc3495fc9f4c0fddbf38645c7fd8a3c50ebf364cf487d8d4e01e160e34151e741472f86c2edfa26869f7077051919456c00ba566815346d66edb161c0c5 SHA512 2c0e22092e08d247edf170e22054b6d108ebf84d3f606ab8e9f1af28154bf4bff26828b5ca55622563eb2cb468d88046d5859b79c0f272895c8785becd69c860
 EBUILD bbmail-0.9.3-r1.ebuild 669 BLAKE2B 5ad0e00b8fe4ffaea3d327570734d3392e3bd334d46aef6a860c0a3a1b8366badf770f4bb92a6fb1ff48d9fd18275a08720feabff3da55fb82b10f570c1f146c SHA512 d9f2c3dc93cf51246346ff2cca19549c9d89821e30ee541c05c3696ccb26531be0d4b4c36c349480fd5a6f96d81c6efd442f9341267f06015cbe291f62cf43d2
-MISC metadata.xml 324 BLAKE2B 04cbb4f74c577a1a780d1a11507a6e9ba64f23b0f12ed887e68fb27afdfc42ff57f21e3c8173344fa64145e8f3f92e29da34a790fad4a1c8fa6ca508b958d13f SHA512 a22b46d17d0c950a42a5fa84a7e8fbae3530f4f9f9a14be3a016284254e5cc35026863843fb165e408130e9a3adc66083e44be9aa239b9f02eefb9098824ba3e
+MISC metadata.xml 249 BLAKE2B 097cf8c3cd6fecd1d5e3cc95c7f068a264627ee206fed022ed0c63d77bd73df391f73d72dabee52949c05c1d42f0eda0e522bc3810df705753244c8f61501237 SHA512 60c02b88515840b89bb38725165287ba4d860cef64adca036804cc49c0cd5eee3dd7cf47345506bd30862be76de12e67feabbfd271b7ddcdb5462eedb8371e7b
diff --git a/x11-misc/bbmail/metadata.xml b/x11-misc/bbmail/metadata.xml
index 9c0a7fefd168..3b768b78a593 100644
--- a/x11-misc/bbmail/metadata.xml
+++ b/x11-misc/bbmail/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
-  <longdescription>
-  Mail notification for Blackbox.
-  </longdescription>
   <upstream>
     <remote-id type="sourceforge">bbtools</remote-id>
   </upstream>
diff --git a/x11-misc/bbpager/Manifest b/x11-misc/bbpager/Manifest
index a255bc9ecebb..5c501745566a 100644
--- a/x11-misc/bbpager/Manifest
+++ b/x11-misc/bbpager/Manifest
@@ -2,4 +2,4 @@ AUX bbpager-0.4.7-as-needed.patch 2695 BLAKE2B 024405437506c3185a1256bc6ff7b1155
 AUX bbpager-0.4.7-gcc43.patch 1031 BLAKE2B cfc58c4cbb983fb139c051ac26029031cbbe2508f707c3b0464e953c156c02db6690c4923ff8c049e8545a9999ca49abddb8d641bf08c8be3d3fdf19033d19c6 SHA512 41ec95853663e89b356cd781719675fbc49a6d117886dcfc85c202fe1fe73d23151fb313c9694f946055ceca9f222e05b36a6b5a981672c6a832ddcf906109ef
 DIST bbpager-0.4.7.tar.gz 170575 BLAKE2B b8c7b8259f1c1e15ac0d8fafb908a8e84598bb44111a35aacf511346fad9f611fdb0e750a2c8412c86f5a4fb8ee5b99f3b0f3e2166cd309a5bc22de0999f06a0 SHA512 33202efd4d55639ab4c5f9fe54b9b0a6e4d32dd822119fb5517d5d2231922962d6985b51d7fa84dc3eb909ddea05033965a3882cda2dc10193aae2f873da1869
 EBUILD bbpager-0.4.7-r1.ebuild 676 BLAKE2B fff46339d9551ebfc68e4126c4af2b2e12ef8e08810f186809626dedd9f0d8ad8b9e8fece194ecde024765c42e8c8c8b51549d4e43db82706a0557ca81eb6276 SHA512 d8d93b4d02c4961aa43e70cbca3f005dc9908ba5c15b88743a01c2adc46d6cfb038f74a752c601c5f9b22b521f3a31edd02625dfb1425cb544c9ca79b0f7a4a1
-MISC metadata.xml 327 BLAKE2B 2cc9b23ab91634035c99b0c815b653f36f88f536e7dae754d3ccbcef2e6751964ddfdda0b924fb85a4ba41ccef13e407681c94cb3ec3932bb996147e876b8c71 SHA512 2ffa2d598b532967cbfba44f3e285f10cc7a49029e61bb6fd06d2eebd2330d2eae075a3bbc509aa72c56ec95bf976e50e8c94a51e0167ceded1db92039beacad
+MISC metadata.xml 249 BLAKE2B 097cf8c3cd6fecd1d5e3cc95c7f068a264627ee206fed022ed0c63d77bd73df391f73d72dabee52949c05c1d42f0eda0e522bc3810df705753244c8f61501237 SHA512 60c02b88515840b89bb38725165287ba4d860cef64adca036804cc49c0cd5eee3dd7cf47345506bd30862be76de12e67feabbfd271b7ddcdb5462eedb8371e7b
diff --git a/x11-misc/bbpager/metadata.xml b/x11-misc/bbpager/metadata.xml
index ea5d7acd3406..3b768b78a593 100644
--- a/x11-misc/bbpager/metadata.xml
+++ b/x11-misc/bbpager/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
-  <longdescription>
-  An understated pager for Blackbox.
-  </longdescription>
   <upstream>
     <remote-id type="sourceforge">bbtools</remote-id>
   </upstream>
diff --git a/x11-misc/bbppp/Manifest b/x11-misc/bbppp/Manifest
index 9ef0a4947ebe..185c3d05f1c3 100644
--- a/x11-misc/bbppp/Manifest
+++ b/x11-misc/bbppp/Manifest
@@ -3,4 +3,4 @@ AUX bbppp-0.2.5-overflows.patch 453 BLAKE2B 45dcee17e6d725b3ba2e2197a75139d5b8dd
 AUX bbppp-asneeded.patch 1062 BLAKE2B 73be09e58f573c58e2cc0afe2c316e737af0ac4a0308975f955002a3b70bb1fd68641725b62a68ca6fc7e8d8a6a1fc23446a5a7bb5b3d19721ac73ceff996091 SHA512 892a7f18ce55c099b86fbb129eee9a0750852d5f152d0619a3e79bf70f9e9a1524c52d9aec53bbb0b65999bd6248cc4eee4b341f5ad0d8f636a7dfacb3fef993
 DIST bbppp-0.2.5.tar.gz 83421 BLAKE2B 3fe18ce71617b792f9430b2bbe123af78b498be9a663fc782246550ed936b81278d27f06b9b454bc47ff6db193fa2a949e97f0fd970532399c3f0b0f335beda1 SHA512 55d1e4d1a2c97ac5a5d34a48cd877891d8d6acf32083d7bfa90e4941cfbc18a91d056a0ec6b7a96182f72be440f6609caf3bc82c9071c6d0bcfbe95577f04930
 EBUILD bbppp-0.2.5-r1.ebuild 1015 BLAKE2B aaf3d1fc51511463cf22c3dfd405997ddb4f0169156bfc8f647ae34aaf4491df960f177300bd838c44cd598ee2974afdddf29d641c93b820134dd060cf5804c8 SHA512 d5fa3b2042fb1a6e202c58aaefc3b4ac20394c243a4c8e54d382a44de9901483113d860aa8b3789c538d4a77ee518f662873a04d6abe4696504426ca7f3713fa
-MISC metadata.xml 329 BLAKE2B 314294a4fe076008891426b44fdcd92a5fd0b8f04aeb0240fda6f52f7e4a09300b2d46efa23f7f910559089611139d2262c60e588354081b2af97a7aceae2b32 SHA512 1b2b0c0055b4f8f44734697036fe3b470d8a60bba3de1972e7a8e6e21083a9a36356d9afa1e661ccbbbb686b5db6d3c8a57dd4dbba11217eee28010af18b82cc
+MISC metadata.xml 249 BLAKE2B 097cf8c3cd6fecd1d5e3cc95c7f068a264627ee206fed022ed0c63d77bd73df391f73d72dabee52949c05c1d42f0eda0e522bc3810df705753244c8f61501237 SHA512 60c02b88515840b89bb38725165287ba4d860cef64adca036804cc49c0cd5eee3dd7cf47345506bd30862be76de12e67feabbfd271b7ddcdb5462eedb8371e7b
diff --git a/x11-misc/bbppp/metadata.xml b/x11-misc/bbppp/metadata.xml
index bc7abb1beac9..3b768b78a593 100644
--- a/x11-misc/bbppp/metadata.xml
+++ b/x11-misc/bbppp/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
-  <longdescription>
-  A PPP frontend/monitor for Blackbox.
-  </longdescription>
   <upstream>
     <remote-id type="sourceforge">bbtools</remote-id>
   </upstream>
diff --git a/x11-misc/bbtime/Manifest b/x11-misc/bbtime/Manifest
index e96950252b6a..70df8edbc50f 100644
--- a/x11-misc/bbtime/Manifest
+++ b/x11-misc/bbtime/Manifest
@@ -1,4 +1,4 @@
 AUX bbtime-0.1.5-asneeded.patch 1082 BLAKE2B da63c4f38d1e6accbfcc071df4d26773f8e62609978d10ae53d95d7ec94b1d3cc8d46f3841a7910d753ed9cf1bf216c81082e0184981e336c3573592371ffe66 SHA512 23fa8c215f936d1a2235469780f3518c64a8333c5314a7273c6d1c824eab1162144be7fdea24511beee405142f146c6f947239220c521056ea041c0f3cb28494
 DIST bbtime-0.1.5.tar.gz 68842 BLAKE2B 33b66fd284d97d2e6780b29293ac6e67ef69ee2273362fffb7435d4a3fcdd2b33ec89ec3e6389676a9a603a34590a3912103fcbfd69ac663cfff5f091ba1a1cc SHA512 a27966e3a35b2e59b440547680daeecf46bd50ed4fab52e5c50fdea32a307da4a78e4c19e493f72e2f58d806cec74098312d549e8610214e227b99fd4074e669
 EBUILD bbtime-0.1.5-r1.ebuild 841 BLAKE2B dfdd927b77693ad9a089773d58a10ab308458fee361762b4e94c557a6784dda89bfccf04a88b318aa70428df7f6905c0881d2ed2d7084169ccd5666abe331c97 SHA512 b3f0608dd3c14b805371fade2422516844eba9cc339b31d2be23292661f6c6d23a77313abd6c8dac82b5b1fb0b2f9e5b6d06b0fa54edd606c85731c822f8f29a
-MISC metadata.xml 309 BLAKE2B 37a902f1677404549d39b6d6c771d3757078e4a45bb40d623057c0804f9bb4dd9240f17f6b6becc678f6b9e7af2b175d12847fc56511fde97c7c8b85c279fb7c SHA512 7650eeea3eda0519f8045ba584d9e7d409ac3e8e07d44faca27ace597ceae3f8f32cce20ee7b4163acb710807556f706915ccc0e78360f9d19d5342c6438b7ef
+MISC metadata.xml 244 BLAKE2B 305658f1d641748d0b5e690502c2faaec6d9b528928a8458885e4a1a77ad1e3fec1a213053705e48f7af4f05ed1b7bcf2a8980897725c611d4b21e3f4a2a56c6 SHA512 6457c097a5d90b25ae3c2004bb9a791c1befcc7e2cbf50acd7094d0939410db1947398e3c3355e38dd00803cbec4a123b2c9b7e44a0a6bdef0b8d411404609a5
diff --git a/x11-misc/bbtime/metadata.xml b/x11-misc/bbtime/metadata.xml
index 0970bb5e6587..c76c034df38c 100644
--- a/x11-misc/bbtime/metadata.xml
+++ b/x11-misc/bbtime/metadata.xml
@@ -2,7 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription>A time monitor for Blackbox.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">bbtools</remote-id>
 	</upstream>
diff --git a/x11-misc/bbweather/Manifest b/x11-misc/bbweather/Manifest
index 97de68325bb8..d7cfe84eb65c 100644
--- a/x11-misc/bbweather/Manifest
+++ b/x11-misc/bbweather/Manifest
@@ -1,4 +1,4 @@
 AUX bbweather-asneeded.patch 1107 BLAKE2B ce0f6ec1dc6cb740c37b200dbb92af8e5c9f0219010d7c2b0da1f189089e9e2cd250aeb0bc86b2cecdc7dd386366f0f978f926de3cb3d5a5ff27b2d61e8b01cb SHA512 872b6bfe7020ecef20eb9180535561f3ac6d2d8f1db67cd3ff82bbf3e1a4abbb27ed864dd88af88fa32ec73850a7d0a599ed29e3cf430499c5924288936efc8c
 DIST bbweather-0.6.3.tar.bz2 80631 BLAKE2B e95913c0a95043ca9620beb470d2684540bac95f010e6f75256a1f8758bdd359f303a1117680cd256a25fdac06b24bb4d47707568c4f19a67b3cc9f3c0a5ef7e SHA512 e5bd4febf119c0f81a64fb5ff4cf3b526a84e8fd26005ff04c6297f9b50963d2d710227469f9a1cf2d1c51f3524a2bce544a07c70ca4e5beff64c954768468a6
 EBUILD bbweather-0.6.3-r2.ebuild 1097 BLAKE2B 773b218061f3ca6955e67e6f68d622826f6ffa44a269c14c64d755896b11278f161e643345c233f8b0b6f18fbf1ab356d2e23dbd4ccee4bd47a35a12fafba9e6 SHA512 5d67e22372e3f4c68e381eb08c706805aca5375fa2c8f519111f4a5272ccfc3176608ea1afc2facb5ca8b0fcdd965d1a9d75910583665c9ab2a2c3751bc2d869
-MISC metadata.xml 235 BLAKE2B 98da1c6c200d6499159312f849450787965bb58e754b40a6ab0d91ad58b03962d995be60011407372bf089ffa12a8c79c753e62b07680bb52a0ab3868f0d0498 SHA512 f520eb76104c5ac22c816c755cc7772547ba7030326fef24077090c8d01f602839df77838373247f5f8ce5f94b6043c2a5f6a629991f265d802db39352765063
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-misc/bbweather/metadata.xml b/x11-misc/bbweather/metadata.xml
index bdb57f8b3d53..6f49eba8f496 100644
--- a/x11-misc/bbweather/metadata.xml
+++ b/x11-misc/bbweather/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
-<longdescription>
-	Weather monitor for Blackbox.
-	</longdescription>
 </pkgmetadata>
diff --git a/x11-misc/cairo-clock/Manifest b/x11-misc/cairo-clock/Manifest
index 6302b29a7761..504279a59409 100644
--- a/x11-misc/cairo-clock/Manifest
+++ b/x11-misc/cairo-clock/Manifest
@@ -1,5 +1,6 @@
 AUX cairo-clock-0.3.4-desktop.patch 599 BLAKE2B 093c409f14c171246dba3f6ac7a39066af78271c3ec5b96f205d573f49cd1a40966509403f0cdfdff0e25a473fd116be18150cf4071996a6cb47f56d567a006e SHA512 f0dcf4dc5baed7969f7515bda571a6f40f8ed8a365c665d0553c73b0224c47c64626f37ccf3a543db88d4b3f494247c86a761bd2b68b8c33f581fe26867c3577
 AUX cairo-clock-0.3.4-linker.patch 617 BLAKE2B 1f7c5de0cb985da7f404754bf522f677ac6122761b4cc69fdd47684c1734080e16f0074cc4408c3291b2369b997f38603cb756a06b0bbd311dd1a697e7556dfc SHA512 7a5f4235fbde60a932e26fc8ad60dce20f2f64ee53a1ecc3ebc7437225432d7256d2edd6d7b2a10cff31fefd6a94329b7516ba4e6202aa4c8b6f857ea19e9a64
 DIST cairo-clock-0.3.4.tar.gz 832968 BLAKE2B 93d4acb621af05176cb19041872aeb0da563c3dc37a660c8b761a31f6bab2809d23b04bfbce88e904427430a5b80337b28a04ff1f20ae94759fd3a507a1c9cad SHA512 b26c3005d4e2b22dcaf6967b8892630f5fd44e366b7482f374ea6215ca8863cf1b3f489fe2279eab73dfd4aaed1793d753e84fe4c929d105a6e97cde6da6b628
-EBUILD cairo-clock-0.3.4-r1.ebuild 708 BLAKE2B 53c9e674cc6cf01ae511a225ab0b47c42d3cd8dce4eb259f683fb7d3927f7a98216bec4bfc49b83bdf0004a33178cdb5739063aafcac2b03aad99d7685bb2cc1 SHA512 9c650f2d923568fbc34509826fd23370646b936f97fa14f97c3c9327556c707386884d438a8017f594228d2c45ec8a79c0d170701d5ffe24ab2daf571da1c5fd
+EBUILD cairo-clock-0.3.4-r1.ebuild 702 BLAKE2B 992e6a9934c213c22a9ae605ff15d5bf581d025d9ebaac8ffae77e73321db9eeb0df9f3341b9e9482495678da4d48fd9f10f8f5393565dd6a5c0224121a51fc8 SHA512 80a18e5f6319e60a5e977e162be90c32f93c3c83a0071dfe933a181e55db072aa7f2facc206b08c82d216f9f09dd6c557efddce8fa1c54a6b800d4166e90a9c9
+EBUILD cairo-clock-0.3.4-r2.ebuild 793 BLAKE2B d53d216d8b07ddd3948d1c59745298791f705169650ae1a306422a7b56920b31c613e8fd12e784ceb647d81289dded943da8a1c939971014bb66b96026a9256e SHA512 39212452d53d8faac82c2f306538e8e667d21ef540a270d1b5ade6ac8d9aee9562400af397b596fa279e56b5eecec3dc688a0274b90f2ef026666a140b7b639f
 MISC metadata.xml 355 BLAKE2B 5e1068bc4b2d05c9c2f228b1117cf74043e75692749c37d6304bb13b77fbc15472926e2c3f6fc374bf6b9b637c6920c61ec3697b8fbe94441adece973b065b47 SHA512 8d3c73cf909e4efbec6a89e44cb80dd5e6d13d0c15b4c5de5661ed5db8a6b775d6196cddfe4a53a63564578da7bf10bfec0638aa8afe884c836cf2c85da10641
diff --git a/x11-misc/cairo-clock/cairo-clock-0.3.4-r1.ebuild b/x11-misc/cairo-clock/cairo-clock-0.3.4-r1.ebuild
index 3cc8a83d4971..2f6adc645265 100644
--- a/x11-misc/cairo-clock/cairo-clock-0.3.4-r1.ebuild
+++ b/x11-misc/cairo-clock/cairo-clock-0.3.4-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-
 inherit autotools
 
 DESCRIPTION="An analog clock displaying the system-time"
@@ -12,19 +11,21 @@ SRC_URI="http://macslow.thepimp.net/projects/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
-IUSE=""
 
-RDEPEND=">=dev-libs/glib-2.8
+RDEPEND="
+	>=dev-libs/glib-2.8
 	>=gnome-base/libglade-2.6
 	>=gnome-base/librsvg-2.14
 	>=x11-libs/cairo-1.2
 	>=x11-libs/gtk+-2.10:2
-	>=x11-libs/pango-1.10"
-DEPEND="${DEPEND}
+	>=x11-libs/pango-1.10
+"
+DEPEND="
+	${RDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig
-	sys-devel/gettext"
-
+	sys-devel/gettext
+"
 PATCHES=(
 	"${FILESDIR}"/${P}-desktop.patch
 	"${FILESDIR}"/${P}-linker.patch
diff --git a/x11-misc/cairo-clock/cairo-clock-0.3.4-r2.ebuild b/x11-misc/cairo-clock/cairo-clock-0.3.4-r2.ebuild
new file mode 100644
index 000000000000..675a9bf64b02
--- /dev/null
+++ b/x11-misc/cairo-clock/cairo-clock-0.3.4-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="An analog clock displaying the system-time"
+HOMEPAGE="https://launchpad.net/cairo-clock"
+SRC_URI="http://macslow.thepimp.net/projects/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.8
+	>=gnome-base/libglade-2.6
+	>=gnome-base/librsvg-2.14
+	>=x11-libs/cairo-1.2
+	>=x11-libs/gtk+-2.10:2
+	>=x11-libs/pango-1.10
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-desktop.patch
+	"${FILESDIR}"/${P}-linker.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	gzip -d "${ED}"/usr/share/man/man1/cairo-clock.1.gz || die
+}
diff --git a/x11-misc/dclock/Manifest b/x11-misc/dclock/Manifest
index 77813f4d3e3c..24ee60331497 100644
--- a/x11-misc/dclock/Manifest
+++ b/x11-misc/dclock/Manifest
@@ -1,5 +1,7 @@
 AUX dclock-2.2.2_p4-include.patch 208 BLAKE2B 36fbc6fc69aa0f181631bc8c9646daa74f9f055821434623c860e68106b794a0e5285fddf23facf04dbe5ef10a4d67927cc51fad2cba25c9e31054b4d22dc159 SHA512 13ba3f68b18396a6c85f3354a42ea1aab204cb8b3753261117eb17b1bbc2f449cc44c6d70ebfee708863986c294e9c7134348e23c14a14cf4074705ec0bfc39b
+DIST dclock_2.2.2-12.debian.tar.xz 16112 BLAKE2B 3da6a75834791cbba71d84c8d46d65b18db6a9aa97a085d984b598c8db41fe507965390568377a9167823d0b3856165e58115aa74b05da35fd6432b44ea877e9 SHA512 c6c468a378e421fb9ef2c6e84db991644888f8d2d9afe220142ea26914423387d3aed335b43fa69b38501c3d713d5540bb2efc2e52dd0db1fa1cd3d9c00c1531
 DIST dclock_2.2.2-9.debian.tar.xz 15260 BLAKE2B dab41f4fe79d2ce6ef4effb466c3923c77a94bfaf4b6ca1dde5bd9b92e0d9ff9a5d89dd9b569f831e107bb62de691e24661609b61af84d1a64958de34304f9be SHA512 025d1d228930adb6e2b13226188b6c3d37aef59786f23826f301c7b22dabba5cfc24f76347fe2f199c239daea968cd043293bd60524110235855cb77c9e4d1f0
 DIST dclock_2.2.2.orig.tar.gz 63583 BLAKE2B b1208439e3a689ff1e00cbdbfa7e3a559b7ec7705ab0834cf350d1ba1e3dcd01d4746e90999f6215cfa9e101a4bd8cf42ff324a307c792028479077152b5414b SHA512 c43ba031fd0d9ba2bc7e8fe9becc73591bfc47cd4ca931df03fa55207cfb148e24e5d702a7de5af8b67e188c561eae2fb7da14162f6a982d0abbb3251c32372c
+EBUILD dclock-2.2.2_p12.ebuild 1348 BLAKE2B 4bd8d31c1c779aa0a639ae7f34e3b0c911d89b1a9398fa3d904764919968f2f866a0ea18a4f05b4c9f2bba0ec900a3faf202bb07025e9748c1d73bf47ab3304d SHA512 79c56eb76b42930b29cf76f08e580b50c151b6af0e70295940a32a795e90638764ea27fc76db0acf5de98496331a5d1016febbaebfddba84a34239f8cf484be6
 EBUILD dclock-2.2.2_p9.ebuild 1308 BLAKE2B 9a1ee50a0e05741ef300d13ec264101e6da76a0ed97d2049e37f66d3eda6f3a7238aa6581d434859dacffdbf016c1055fc0570980888ce4d6e415d27f8c09952 SHA512 cfc3a68312f6273ddcbe1d61dd8c5d890674b68b2f9ba6c1ef0bcfa1cab8cbf789252e8d9a2c120079710c7c5903b45c2842c6a45a0f48e97ab6d61906e4ddfe
 MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
diff --git a/x11-misc/dclock/dclock-2.2.2_p12.ebuild b/x11-misc/dclock/dclock-2.2.2_p12.ebuild
new file mode 100644
index 000000000000..23c19ae370cf
--- /dev/null
+++ b/x11-misc/dclock/dclock-2.2.2_p12.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Digital clock for the X window system"
+HOMEPAGE="https://packages.qa.debian.org/d/dclock.html"
+SRC_URI="
+	mirror://debian/pool/main/d/${PN}/${PN}_${PV/_p*/}.orig.tar.gz
+	mirror://debian/pool/main/d/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="xft"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+	xft? (
+		media-libs/freetype
+		x11-libs/libXft
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	app-text/rman
+	x11-misc/imake
+	xft? ( virtual/pkgconfig )
+"
+S=${WORKDIR}/${P/_p*/}
+PATCHES=(
+	"${WORKDIR}"/debian/patches
+)
+
+src_prepare() {
+	default
+	sed -i -e '/CDEBUGFLAGS/d' Imakefile || die
+}
+
+src_configure() {
+	if use xft; then
+		append-cppflags \
+			-DXFT_SUPPORT \
+			$( $(tc-getPKG_CONFIG) --cflags freetype2 )
+	else
+		append-cppflags -UXFT_SUPPORT
+		sed -i -e '/EXTRA_LIBRARIES/s|^|#|g' Imakefile || die
+	fi
+
+	xmkmf || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		CPPFLAGS="${CPPFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}"
+}
+
+src_install() {
+	default
+	emake DESTDIR="${D}" install.man
+
+	insinto /usr/share/sounds
+	doins sounds/*
+
+	insinto /usr/share/X11/app-defaults
+	newins Dclock.ad DClock
+}
diff --git a/x11-misc/devilspie2/Manifest b/x11-misc/devilspie2/Manifest
index 5b8b4331ce95..83469e2e1fe8 100644
--- a/x11-misc/devilspie2/Manifest
+++ b/x11-misc/devilspie2/Manifest
@@ -1,3 +1,5 @@
 DIST devilspie2_0.42-src.tar.gz 48663 BLAKE2B a2340f64191ba31d554aaab8c1ce74ba2252ac4f1524446c88eb674d9bc49225298eaa64c9df649410cb8a07993e891491f7d885af0d917810143ecdb8916bbc SHA512 796b95ded542a76343ffcff25d7838ee3bc25f37d9a02d06785a71aeb7c0da3ef05279f9b88216124c5c9c64754fde59973445a954b0f446f5b4ebe6a25f3055
+DIST devilspie2_0.43-src.tar.gz 48666 BLAKE2B 3657693547f1dbdfe8542f123601f228086261855dc8e99997cea76ef586b744aacb260222000300dbe34d3030646044fc046e94c2285e6386995853ceaaffda SHA512 0f44f3991e31f68a2d38eac32ea6fe4275a56e8b5e9439490d1e819fd69b5455ede565aa2b09b70c20ac852c465ac2c05c339ae1e5c1b7824685c46a28871abd
 EBUILD devilspie2-0.42.ebuild 1133 BLAKE2B a24c2b54cd596f8a38bb78fe0225b7824e08d8ff9116d2e0a7e358ad5e9197313e73cd249aa4e78dcf8ee247b16d1ac3818424d416cdc68ca1c6691b34d43c4b SHA512 a052da3fe67d8d099e6c5ed338aa5a3ecd177aef9d58bc7b570f61c4ae9c6df97ec16ee537080f0c142c0e7e48a269a96e412bbe63dbb0a467502a75c0288b54
+EBUILD devilspie2-0.43.ebuild 951 BLAKE2B 020e7b99cb9e1f5e20d1a0f2562b950fca68067866a517cd8dbb25d5a3f380d3fde3e2274fce55df74acf2590405fe907f312194fcded5131caef76d54e5cbca SHA512 81da566022c75df100ab2a1f7c59d5671a7c21950bcac922165133867dc27926ca2f8fc0aefa040100d8ca521284039d582a7c5e1b9fc2d37e4478c9d0808472
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/devilspie2/devilspie2-0.43.ebuild b/x11-misc/devilspie2/devilspie2-0.43.ebuild
new file mode 100644
index 000000000000..20368879deeb
--- /dev/null
+++ b/x11-misc/devilspie2/devilspie2-0.43.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PLOCALES="fi fr it ja nl pt_BR ru sv"
+inherit flag-o-matic toolchain-funcs l10n
+
+DESCRIPTION="Devilspie like window matching utility, using LUA for scripting"
+HOMEPAGE="https://www.nongnu.org/devilspie2/"
+SRC_URI="https://download.savannah.gnu.org/releases/devilspie2/devilspie2_${PV}-src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-lang/lua-5.1.5:0
+	>=dev-libs/glib-2.32.4:2
+	>=x11-libs/gtk+-3.4.4:3
+	>=x11-libs/libwnck-3.4.4:3
+	x11-libs/libX11
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+DEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_compile() {
+	emake CC=$(tc-getCC) PREFIX="/usr" LANGUAGES="$(l10n_get_locales)"
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" LANGUAGES="$(l10n_get_locales)" install
+
+	dodoc AUTHORS ChangeLog README README.translators TODO VERSION
+	doman devilspie2.1
+}
diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 074e820b3249..2fea117f48a4 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -4,8 +4,10 @@ AUX dmenu-4.9-gentoo.patch 759 BLAKE2B 965ebf79e580466fd98c3621d4d3b0cb9ea961a9f
 DIST dmenu-4.6.tar.gz 15057 BLAKE2B 87469e86400fc5d99c6c62666f6903c2dee6221739a52aab0facd4e417b1ddc88b138440b62e410d8230e7dec89ace1c684348eaab223fc7027eda0b6712e495 SHA512 e54fd10c0b1274eb90173aea442f0bfc496f4dda861a36d94f939e1fd835594f9aa12f3d0f90043d64e519d919b9a5273ab65012230ac022f727ee6bb64862e3
 DIST dmenu-4.8.tar.gz 15658 BLAKE2B 8e027905a3c32d0db20f22ac911bcd69c39d00b2c426c1fa79a9b6253c13223ddc79413b9f8ecf38f3258aada3d7c4a91535fb930a5d2a9fb239f398a6b6af07 SHA512 fa2700018cfb912a21f867ef3ca771a58a25c2cb8e1fb37acef046bb15d8d8b92dcc5bfce486befae0f143495d0283910988e181a9eb143be3bb1b5be9738d77
 DIST dmenu-4.9.tar.gz 15972 BLAKE2B 56ba03a3dfd24e2fb0f45feaaaac53e441b63a0d72adbc36499a97e2eab7c524da2088e3a15c6599c513bb35a6a049663b97220e671e03bd577baaaf711f228a SHA512 c2779209fe012de8ca1cdd72923da6d594f4a8368c85c3c0e0afd4ae489a95fe0e6f05a947d115b6b389aa7170ab14c2c645a2031353b0a08f38327ab461fe65
+DIST dmenu-5.0.tar.gz 16028 BLAKE2B 9f161e3d44d5cb80e3996db81e28cdf7f143d310ec2660c837df167d8426645dde09d4f5a0c71d4be73f80f76615a32c20dd3d7f30a23506993215c89fe40844 SHA512 2b6a7cdf5aefc5e7ca7a4944883c3c16ee6f5005d2a96b61482d4899ad395f9cb8926907681d88b9df3e1188cf421dad4cc17e343b752f6cb8b161d33384b3f3
 EBUILD dmenu-4.6.ebuild 1258 BLAKE2B c3883bd914b23d2d2da1b10a7ab17c99a869e17599954a1abe2b780cc1aa88855055473d8866c5f8f52d65cbd8e866288719ead3222db5ac9fbb90c403ae5e38 SHA512 b930ff6c535abbb65cca483cbe1412bd46e31fab64fe3427c773720f87c742f42872c8b2a7327ebe5c78ca1d63df9329cd0ca889157f1f1edc3ce28d4c478cdb
 EBUILD dmenu-4.8.ebuild 1327 BLAKE2B 8c582b520297c9565731de782807988eb92e52458bb7e22a0c426846e7247d42d23b99732b0759995e0477221ae19382b9f4cbb73c6c84b24047f5ca407ecc8e SHA512 32168e95e0dea54adc7e7efa2cad776b637cd3b5cb6bf610d2df68abba3b0b48f841fb96fa19ffcfbf495a9c9b1fc5dcb4b3929ecac0909aeb84d9d7b49702d9
 EBUILD dmenu-4.9.ebuild 1414 BLAKE2B 25a16db270e58b5e68f2630a370bb95451d873dcec7fa7d3af21040d44713d68ba8c02188b5c530ef3e39fb29464fd1c9f206a6ea8915666633215f179dc61e2 SHA512 be96af4189cbe5b9ea489869995ae362abec9439f4d1c0577840ff18862d0c1c6fd9f526f2543d3bbbe756f61582b2a6449f2d891ba5d8cf8b9ace81df7fafe3
+EBUILD dmenu-5.0.ebuild 1414 BLAKE2B 4e712800e3749d3c3cf8eab605d995667b3ff46aff7f696b4387911aa0bf31e31a4ca8bad2156591e2d3007950f592122b8ef57f0eb840d084903293569a7b98 SHA512 0bfc3218a7c653bc104680ca46cec18db8554b71327864493e57693eac2f69979b31a3ceacd71e31a0c2e9ef4e5a7fd88765ff9186435328e83af74e9c2174a3
 EBUILD dmenu-9999.ebuild 1375 BLAKE2B 35a86f3d75697c2c2cdf2c7298103dcf0a97dec40b11432ebe571f3d0df3deee399035ea5a59ea2af5deddd768e5e7825e75ad02a32836153cf0b401aabe25aa SHA512 670b62a9a32187a0ec812c4d0069f9020e5711f46aad32fc8671b290a7e986ed544c04020b5706cef980801aa5265fe9091ece0db6e40aedf0cf9ae6f519ede8
 MISC metadata.xml 361 BLAKE2B 40b663e4c351f9f6696f958b5a3006a3c18782dc2a4931584e566e2cdc2ea118f1fcef6a1ea7ad60724687e6f35bc1b25bc63351c6ffac03844ba0fb977576c8 SHA512 0be9c5e4fa1f72b02220088179c79f53e07928ee2890f78a24659e47961470d12ed7b8fe56b78ac4b493a2f42ebd491a8ebff405b013e7b7943de74892eed476
diff --git a/x11-misc/dmenu/dmenu-5.0.ebuild b/x11-misc/dmenu/dmenu-5.0.ebuild
new file mode 100644
index 000000000000..49610645344e
--- /dev/null
+++ b/x11-misc/dmenu/dmenu-5.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit savedconfig toolchain-funcs
+
+DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System"
+HOMEPAGE="https://tools.suckless.org/dmenu/"
+SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="xinerama"
+
+RDEPEND="
+	media-libs/fontconfig
+	x11-libs/libX11
+	x11-libs/libXft
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.9-gentoo.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's|^	@|	|g' \
+		-e '/^	echo/d' \
+		Makefile || die
+
+	restore_config config.h
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) \
+		"FREETYPEINC=$( $(tc-getPKG_CONFIG) --cflags x11 fontconfig xft 2>/dev/null )" \
+		"FREETYPELIBS=$( $(tc-getPKG_CONFIG) --libs x11 fontconfig xft 2>/dev/null )" \
+		"X11INC=$( $(tc-getPKG_CONFIG) --cflags x11 2>/dev/null )" \
+		"X11LIB=$( $(tc-getPKG_CONFIG) --libs x11 2>/dev/null )" \
+		"XINERAMAFLAGS=$(
+			usex xinerama "-DXINERAMA $(
+				$(tc-getPKG_CONFIG) --cflags xinerama 2>/dev/null
+			)" ''
+		)" \
+		"XINERAMALIBS=$(
+			usex xinerama "$( $(tc-getPKG_CONFIG) --libs xinerama 2>/dev/null)" ''
+		)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+
+	save_config config.h
+}
diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest
index e65049a0bcfe..7cb390411ddd 100644
--- a/x11-misc/dunst/Manifest
+++ b/x11-misc/dunst/Manifest
@@ -1,4 +1,6 @@
 DIST dunst-1.4.1.tar.gz 160124 BLAKE2B d618b3bffc8f4518f58d28e108a8aadf1ff71164f581632bc198b3d0a81f6efa0fff73513fa5d46ec4a7058bb1beb8d8a51cb01e4621c76f8d3f8653cc6e2270 SHA512 43667898e123ef0dea59e2ca55a76686785906e44b453b2a86bdf361045b3f6b751a2e81fa9f562127f80bf47f8c9248960c37f8365dbbe409d72ddc3deb34fb
+DIST dunst-1.5.0.tar.gz 169272 BLAKE2B 63c33e62f61aefec67e5420d5afe41808cf8b377c0decde92781ef541315c955b715aa78c6e1a2288b916cabf7830d5621366d53731d477e3c4a6a60349f4c8b SHA512 2057dc530adce1dac89f12f4ca55e9186d378ccc2b406e0fa20d43bc69f671dc303b608a4fea781ab1193bd2e159dcbdecf3baf50e27ac9b0f164965b5824c85
 EBUILD dunst-1.4.1.ebuild 1042 BLAKE2B 80f0cab6a7592ed4da0bdee6a8d595f0910567357e3eaf808d279264fc40d1be9d5bd028fff0ac568c9a083e35b5bd461f8d1cd8bb4301926da8fb052668cade SHA512 1fa787b051a4fb4472da55f44bf8d7ddd0175becb13423d7af68468b4e4706dda2be7995443c658cdf65d7561801886bdf8a7a359c623edb61ca671e7d394bab
-EBUILD dunst-9999.ebuild 1004 BLAKE2B 9c23de018abea492fe34e01d6522fdeec73c66ff129e8e635e9578216184334584fa140a6ec2949ecb60d9aeec159b18c32e51c314d0b93ef8fd49a10c0cdebd SHA512 3ac50ec734b720110e4ffe0f7ee6519eadbc8a0cb04dc67aec7a79260ddef27d15821853f1121b13c0af6b51274818dc7dcf93afe8651fea64529d2543e1f459
+EBUILD dunst-1.5.0.ebuild 951 BLAKE2B 92ce2b3a4e3b66fa84184f3a80847d9ae4d6d4fcef3fb83ec9353828132702a51653cba91b322725490ed8d554b3e0854015b0cb089181db03a5490ce893a055 SHA512 85c7b4acb808207ede30e9f28047861a295c377c3311dbd1112a5fc01c61b415ccd966e88ef501dd14f6c6d73d802f47a1af60d19bae3d3c0b8c1fd7013bd45e
+EBUILD dunst-9999.ebuild 914 BLAKE2B 4803027c90298c1d6de77808f93ff1d8ba0907cad80ca1a189f544b63dc01bf5cfce7682fed17110e0aa3c30371294b02a7fde43f02f27a53ff495de69edf8fa SHA512 4bbd28c9dd0c3877c7f3d204b23bc311973d73f806caa111bfcc9542edd1573e6c6e1192b63cb9f53566b8b102623a13f050efe97a84147351da84f69227ceaf
 MISC metadata.xml 448 BLAKE2B 088d419b835ebdb800e07ae00892d0c01bef6f862d72ac3976d58202e532870c1c0f8e96ea292c95e9579bda48b5c81952f954afee300e250a21167af639bf7e SHA512 4269d385c94e1dcfcd89f9ba95486da2a7feea2370fe1cef33051a3886e8c7612911bca2da15fa049d6692994c8c342e308fdfa2645a5f576ad93080e8d54d73
diff --git a/x11-misc/dunst/dunst-1.5.0.ebuild b/x11-misc/dunst/dunst-1.5.0.ebuild
new file mode 100644
index 000000000000..2e108755ce51
--- /dev/null
+++ b/x11-misc/dunst/dunst-1.5.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Customizable and lightweight notification-daemon"
+HOMEPAGE="https://dunst-project.org/ https://github.com/dunst-project/dunst"
+SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND="
+	dev-libs/glib:2
+	sys-apps/dbus
+	x11-libs/cairo[X,glib]
+	x11-libs/gdk-pixbuf
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libnotify
+	x11-libs/pango[X]
+"
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i -e "/^CFLAGS/ { s:-g::;s:-O.:: }" config.mk || die
+
+	default
+}
+
+src_configure() {
+	tc-export CC PKG_CONFIG
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install
+
+	dodoc AUTHORS CHANGELOG.md README.md RELEASE_NOTES
+}
diff --git a/x11-misc/dunst/dunst-9999.ebuild b/x11-misc/dunst/dunst-9999.ebuild
index e756b3ec1f81..f341b6af6627 100644
--- a/x11-misc/dunst/dunst-9999.ebuild
+++ b/x11-misc/dunst/dunst-9999.ebuild
@@ -11,9 +11,8 @@ EGIT_REPO_URI="https://github.com/${PN}-project/${PN}"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE="dunstify"
 
-CDEPEND="
+DEPEND="
 	dev-libs/glib:2
 	sys-apps/dbus
 	x11-libs/cairo[X,glib]
@@ -22,15 +21,16 @@ CDEPEND="
 	x11-libs/libXScrnSaver
 	x11-libs/libXinerama
 	x11-libs/libXrandr
+	x11-libs/libnotify
 	x11-libs/pango[X]
-	dunstify? ( x11-libs/libnotify )
 "
-DEPEND="
-	${CDEPEND}
+BDEPEND="
 	dev-lang/perl
 	virtual/pkgconfig
 "
-RDEPEND="${CDEPEND}"
+RDEPEND="
+	${DEPEND}
+"
 
 src_prepare() {
 	sed -i -e "/^CFLAGS/ { s:-g::;s:-O.:: }" config.mk || die
@@ -38,16 +38,13 @@ src_prepare() {
 	default
 }
 
-src_compile() {
-	tc-export CC
-	emake
-	use dunstify && emake dunstify
+src_configure() {
+	tc-export CC PKG_CONFIG
+	default
 }
 
 src_install() {
 	emake DESTDIR="${D}" PREFIX="/usr" install
 
-	use dunstify && dobin dunstify
-
 	dodoc AUTHORS CHANGELOG.md README.md RELEASE_NOTES
 }
diff --git a/x11-misc/e16-keyedit/Manifest b/x11-misc/e16-keyedit/Manifest
index 1ef126475ed1..8e17f96ccb6a 100644
--- a/x11-misc/e16-keyedit/Manifest
+++ b/x11-misc/e16-keyedit/Manifest
@@ -1,3 +1,3 @@
 DIST e16-keyedit-0.9.tar.xz 80588 BLAKE2B 2c8a1ac4ae0e2b3b741408637997e1054ca2d5121b6cc27622de0896d8dd30d65b92458592f2e8c3f02ddfbb2ab336631168dbe6840127533f0d9da3bf7973c1 SHA512 77e8db879a2a790c0e08d0527bd613f443fdc433bfb50a95d8201008702282c407c68f41f0d2457704b887b2cebede1326bb40aba18f717207443a9e41d87b9e
 EBUILD e16-keyedit-0.9.ebuild 594 BLAKE2B c8a2bad824a1b4b9411f0c414ae41d4da4cf08aea176cb38c11211ba36d78b57bef52a123ae9f0e1110a4e04ccb87a78d20e672bccf888bc4a16c612c092aaa3 SHA512 255b79482b5a0eb7ee658594779ad0db124a65faa0458d99292518ffc511aea96e64b8266fb42ec2998b268a28bc491a893a91178801e42260b7eef4c3898fef
-MISC metadata.xml 599 BLAKE2B 40dc34bf6cd611b701e82eeeef492776be75e3993cc56462f0a9e48c1d575909ac73e7cb7afe22b61bbf4693bc4d3a02e0ddfddde31b262b01521f92f7262adf SHA512 829da6655f2568f77ff866a7b306e18b201fc34fff8511f2185afc2409ffd9cce3a6bbd1fa952f18dc923c9614b970cc987a6e7cb3da92c1e8c3da1a43bcb934
+MISC metadata.xml 465 BLAKE2B f983a879c4101714337207b40441c52ca45a4404447a990a2467f0f476877eff94753f962af13f6abee3c577c992c1596dac32fa1dc88600b4063661a670ef5c SHA512 aa1d6a75ce600700fefbd3f6797635292eea67c58464834929653487028ec4ada5ec7c9b9532d2a7173230bc53177caca14243b06f9a21438063abe283ea3217
diff --git a/x11-misc/e16-keyedit/metadata.xml b/x11-misc/e16-keyedit/metadata.xml
index 3f0fe746899d..76d2ee7b579e 100644
--- a/x11-misc/e16-keyedit/metadata.xml
+++ b/x11-misc/e16-keyedit/metadata.xml
@@ -11,7 +11,4 @@
   <upstream>
     <remote-id type="sourceforge">enlightenment</remote-id>
   </upstream>
-  <longdescription>
-    e16-keyedit provides a graphical interface for managing keybindings in Enlightenment E16
-  </longdescription>
 </pkgmetadata>
diff --git a/x11-misc/evolvotron/Manifest b/x11-misc/evolvotron/Manifest
index ea809a5c9308..781429a0144f 100644
--- a/x11-misc/evolvotron/Manifest
+++ b/x11-misc/evolvotron/Manifest
@@ -1,3 +1,4 @@
 DIST evolvotron-0.7.1.tar.gz 179516 BLAKE2B b73c813fdf134e0e4c7882e06a12bc06acfb6dcdf4a38043c4c30027bf00da10df85d6877abdbd8ca6393496038ba9fa0c32a16b0f37dd14d72cc63c00a17d1c SHA512 74f48dc0881a82d999ccc910df026da80fcc46a906fe2fbb8edbae50a1fa42a3379087f00dd21fd9e5d69cee7c6fc745b80f8703b1af1ebc3a1cdb52ffbe16e9
-EBUILD evolvotron-0.7.1.ebuild 915 BLAKE2B 796e1d56e5d036c21432a325260bb467a00c8c921a912c9ce6fa1361c9e19f8b653612405c381b69022bfc87df3ea36c0fbc168aed0f00aa6cc92896e5a95be0 SHA512 b313b4b261973140839382dc561fe62811797a031c35bdc45cc025beded0f99ffc46f09adf87de111a0e4b27ecda33ca518b8b9a0a117cb3b47c292670704a9e
+EBUILD evolvotron-0.7.1-r1.ebuild 880 BLAKE2B b22113e22bf41363133673ae7c29e11a74adb1df6c20e7a008a574216db96049e653a1cdc815816063fafc7e24bfbb64d9091aa08d50501dc8a5ea6973d60b51 SHA512 a63a10863fc0b0d501000674cc18a477c9b5da5afc46bbd85c58d38db2de4a5269280e79b9676d5a9c4643a8e0686811713605d04320d8a3293001ec9ffd8b11
+EBUILD evolvotron-0.7.1.ebuild 932 BLAKE2B c4d20a71a4ca313e7fb8550aa89c6abd4d151cf5d27e4d704fcd9cf6a42f542b3b7b749006893ed5dad8f181c6c2102f5232be199d3f1f88d958a2c21b977f02 SHA512 1a47ee7de6fecee8922509898eb752b969cf29200fc74d133d53720c9c519031bdce0ef63d5ad2a99c82868598fb64145bd0dff8d8791b0080b76f6eccb92bf2
 MISC metadata.xml 356 BLAKE2B bcffe50af78659801374955b8bb13970760d0d565c89a210d2ee98059078df0bbd5634e95f2cbc9e922e8b29f21cacb7b6339b6004ac4619b21706b7da85be14 SHA512 7cea09fe7cfe3d43572ab13f83921cd252cb4a12bfc9fb4e2629cbd96c90a07fef8613090514ad562ee112960f88bdcbbe18daa185470780bd714e95aa6bfb47
diff --git a/x11-misc/evolvotron/evolvotron-0.7.1-r1.ebuild b/x11-misc/evolvotron/evolvotron-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..c8f3df726e12
--- /dev/null
+++ b/x11-misc/evolvotron/evolvotron-0.7.1-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qmake-utils
+
+DESCRIPTION="Generative art image evolver"
+HOMEPAGE="
+	https://sourceforge.net/projects/evolvotron/
+"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}"
+
+DOCS=(
+	BUGS NEWS README TODO USAGE
+)
+HTML_DOCS=(
+	evolvotron.html
+)
+S=${WORKDIR}/${PN}
+
+src_configure() {
+	eqmake5 main.pro
+}
+
+src_compile() {
+	local etsubdir
+	for etsubdir in \
+		libfunction libevolvotron evolvotron evolvotron_render evolvotron_mutate
+		do
+		emake sub-${etsubdir}
+	done
+}
+
+src_install() {
+	local bin
+	for bin in ${PN}{,_mutate,_render}; do
+		dobin ${bin}/${bin}
+	done
+	doman man/man1/*
+	einstalldocs
+}
diff --git a/x11-misc/evolvotron/evolvotron-0.7.1.ebuild b/x11-misc/evolvotron/evolvotron-0.7.1.ebuild
index dd964488f2e3..62f289f61def 100644
--- a/x11-misc/evolvotron/evolvotron-0.7.1.ebuild
+++ b/x11-misc/evolvotron/evolvotron-0.7.1.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
@@ -19,6 +19,7 @@ RDEPEND="
 	dev-libs/boost:=
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 "
 DEPEND="${RDEPEND}"
diff --git a/x11-misc/hsetroot/Manifest b/x11-misc/hsetroot/Manifest
index e4e8d359165b..68d6f69f482f 100644
--- a/x11-misc/hsetroot/Manifest
+++ b/x11-misc/hsetroot/Manifest
@@ -1,7 +1,10 @@
 AUX hsetroot-1.0.2-underlinking.patch 500 BLAKE2B 62758446bca47b8e8ff8b58d3e370a1e51ccc6e22c5936d3baca522eb4eb13881649c447c8310a0e03cc03d934e83f75067f841175e4c1edc766396cf54f0bb5 SHA512 b36eca913e9477b8282351ce739a76c088a64707d0028518a3b2cb3c3050c8d7f722243437cdb55109fd8dcdd56e74c13bf67039aaf4a2cc75372f14e1ce09d6
+AUX hsetroot-1.0.5-XOpenDisplay.patch 346 BLAKE2B 975ebe306ce78411912d676b8334b31c47e3b96a8551a93c0cabd84b9782bbfd1c8e87cc6e1a49c7fcbbf3b8e33b69e69fa7a3cf0e1cf105bb90e4b038707a65 SHA512 2e6b9666e2a79a4dc65e1393018d79848e72b73290bd65bb8316ceaef741ae835385190b0e3592fd9175c68c402c504a679a22cebf8b8684c759787c49d70173
 DIST hsetroot-1.0.2.tar.gz 125535 BLAKE2B 351c022e11e3d82118db451eb6d64ff765018a09fe1ac9cc3b437f7a351d575fca66619fde9671d297b346af7c7f265442d18115388d984554bf1f9af9fbe82d SHA512 51788a6b579b82368ef5e11255ff56e2db978a02f7ad752ba64ec33c56ae5f27c1f0ef3452725d1c7bdb9d97b8a3a5b64422031c9c75a7279c407b8772d5edc3
+DIST hsetroot-1.0.5.tar.gz 12878 BLAKE2B 54e80f00d140a83a950d98663db6555a00ac770bd85826b17d8293e3af27cba2a45c2da5e4c185ca90c6adc35bbf2ccdaa3722d015b31654d5e35f4e65a61366 SHA512 b43f7cd75886e72cb6134446d383d7d9a684c818f2d8a0f829670c8dfca5eaaa1eb6c25f30dda41f3483609b25e8a44a3a3cb3a969bba7f77a9b9df712fa2167
 DIST hsetroot_1.0.2-5.debian.tar.xz 4384 BLAKE2B 5ea72b6017a90bdf36030334c021cef1000ca29370f359f2596feea69365ebe5bd6b58286b109ca63a16dc953aea1f873ee4a7eadd50432655093d2dd7e6249d SHA512 5f1dbb00daebf6b8c9db77a51dbc463ea92b4564e0d7a2dac1ea9c316dd2e2126fb8c6454f4d1eddfd19533297e29651444987a7eacb7c0080e26c14383c827d
 DIST hsetroot_1.0.2.orig.tar.gz 125621 BLAKE2B 932acda46653d2211c528008dad14c8877b0b6ace0888da19e1316af58a39b0cde0464f5dd058b752d7d95dd6d69deefc254a0a445e37077c4b177ddedf74809 SHA512 cac98cc602fd8825dbfce27d289dc4ba47805c99c78de804e95c539e83ffae6984601a535cdb90658536a007a5f17c71e27e4c31af562ade6610f11f0d0d2ca5
 EBUILD hsetroot-1.0.2.ebuild 741 BLAKE2B ef440b29711e148c34e1f067d7269005afd3ab326c470c9f181d06719c699092219c93737e0f13b2dad111544169f3b6bf280a81b0fb2ba925f934a54d62ea84 SHA512 d46a6a728b029768ff522fbc39067c8f267bd5f27228ef944c82aca9102c5901c56390d2554b709b21e3a007d7ab5f5eb25e860209abd84159e91eaa307acd47
 EBUILD hsetroot-1.0.2_p5.ebuild 975 BLAKE2B afbd38010572cefa7f952d823e90e7e51b826992ef755885c597c1565022a1367793a138e146afbfd62944282cb6fda8f77dc1a532a20d34e47489727fb15539 SHA512 d479998a4d0fbf213aef85fa806fb60dd73f4a6aefad21c887025e08019752886262922c88ccbc5828e0bc06c878720dd2d99ce5d7bbb274564df209b2964ad4
+EBUILD hsetroot-1.0.5.ebuild 1156 BLAKE2B a0623f8e1a2b1ffedaaaca8ed84c9827163ae93990bf1464335a600010124de156240e15dc7b31b3b523026bba4c22aeae2f2b558346c44780c2d6f894f08cd2 SHA512 2132975b975ea54942e3a892483db1de9237603ead8b4230b746b5f25c6b380785bd149f21251b5cb6096f1ca8d7ee0c8d2d493ea2602d36e91934160135a81b
 MISC metadata.xml 1187 BLAKE2B 68310d07fff41e0af94b70fe62f253de23b966e0689bb33ffb699b6cea3e06cebb137556e9c8d871dd92a261e4db979ac590de0233e86862c3dc2c545c6e63f1 SHA512 30bd381778a254be23fc5b4554b42cd846229ba6c67914fa173c8d429f2ffd3f7a9de5497d5205cf0e1a455d2d0bdfe1a368352d0e25bcb2a173f7b7b76bc3c8
diff --git a/x11-misc/hsetroot/files/hsetroot-1.0.5-XOpenDisplay.patch b/x11-misc/hsetroot/files/hsetroot-1.0.5-XOpenDisplay.patch
new file mode 100644
index 000000000000..0585072538f2
--- /dev/null
+++ b/x11-misc/hsetroot/files/hsetroot-1.0.5-XOpenDisplay.patch
@@ -0,0 +1,15 @@
+--- a/hsr-outputs.c
++++ b/hsr-outputs.c
+@@ -47,7 +47,11 @@
+ int
+ main(int argc, char **argv)
+ {
+-	Display *display = XOpenDisplay(NULL);
++	Display *display;
++	if (!(display = XOpenDisplay(NULL))) {
++		fprintf(stderr, "Cannot open X display!\n");
++		exit(123);
++	}
+ 
+ 	enum Format format = TEXT;
+ 	void (*print)(XineramaScreenInfo*) = print_text;
diff --git a/x11-misc/hsetroot/hsetroot-1.0.5.ebuild b/x11-misc/hsetroot/hsetroot-1.0.5.ebuild
new file mode 100644
index 000000000000..cde4912ca941
--- /dev/null
+++ b/x11-misc/hsetroot/hsetroot-1.0.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Tool which allows you to compose wallpapers ('root pixmaps') for X"
+HOMEPAGE="https://github.com/himdel/hsetroot/"
+SRC_URI="
+	https://github.com/himdel/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="
+	>=media-libs/imlib2-1.0.6.2003[X]
+	x11-libs/libX11
+	x11-libs/libXinerama
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+DOCS="AUTHORS ChangeLog NEWS README"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.5-XOpenDisplay.patch
+)
+
+src_compile() {
+	# Avoid the Makefile that replaced autotools
+	tc-export CC PKG_CONFIG
+	local tgt hsr_comp_args
+	for tgt in ${PN} hsr-outputs; do
+		hsr_comp_args=(
+			${CFLAGS}
+			$("${PKG_CONFIG}" --cflags x11 imlib2 xinerama)
+			${LDFLAGS}
+			${tgt}.c
+			$("${PKG_CONFIG}" --libs x11 imlib2 xinerama)
+			-o ${tgt}
+		)
+		echo ${hsr_comp_args[@]}
+		"${CC}" ${hsr_comp_args[@]} || die
+	done
+
+}
+
+src_install() {
+	dobin ${PN} hsr-outputs
+	dodoc README.md
+}
diff --git a/x11-misc/ipager/Manifest b/x11-misc/ipager/Manifest
index dfbfe77f240b..40bbbdaf4a92 100644
--- a/x11-misc/ipager/Manifest
+++ b/x11-misc/ipager/Manifest
@@ -4,4 +4,4 @@ AUX ipager-1.1.0-scons_flags.patch 901 BLAKE2B 1a1cd9687ae348426080df1c2fc6fbafc
 AUX ipager-1.1.0-scons_imlib2.patch 663 BLAKE2B 26422f0cc26eda7afdce9363c9a171935755d58d923d62a61f4257c32d9376aac4a49d09015b0d470c090b0c25ac73a4140f21efe3accb5b73662ab4863d0d6c SHA512 1b4e0196189ec64b48c4c841d03f3a3e3c516ffd86f432d536e7bea51ade407fe430342d5d690d00b46cc7b727c7d12441f55416f7eea6dc933fb07a2ce16e14
 DIST ipager-1.1.0.tar.gz 30499 BLAKE2B 75644cbc2e6cca9af82589c7dbed4f0244870ec104cc8df9d294a6efe52f7dd19da2e5f0008cbeb72fbfe56f33acc6b921038faf00082c478f6a5c208f3fc09b SHA512 34f2982b4378e8de7479803d205c2d9157b71863278382c91d0c3daaee57352f2f6678fa338f34dc9e6bd70081e5f0bc03634632a7b6ab20a507b6fad3c2e5e3
 EBUILD ipager-1.1.0-r1.ebuild 1099 BLAKE2B 652cdeb8da8101fb4be4e2b7f34df2b255254c63e7061514f4c021fd074d559a06c1804f021ee787e2996dcd720915317c92fd6bc9974af88f7401a5a3c94d38 SHA512 e35156736ef0c5f913da3104f1f6a8788d0c153040914c019ba604e152c648a2fb0441ca1c48ac491a7fdc8202be987ebc2a563ec6923674d9ca495c0d94e236
-MISC metadata.xml 283 BLAKE2B ed3e72d70b7ccd16f96f67b3e682d94ccc7372fd674f5153cc44952d4626b795248d84520b106f9ab707a17d0a0b9872eb22bd1b1ffb90b95b08e2d9dfea21f3 SHA512 9c5545699a3fdfd7cf47f22ee7988ebc7c4cd1c25b73dc64e44be3f2e45fb55c06b56634fc9d788a70defbde12b991f357ff7a9da1d644f2596e76c44eb9d555
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/x11-misc/ipager/metadata.xml b/x11-misc/ipager/metadata.xml
index 20682188b90e..7a38bb900964 100644
--- a/x11-misc/ipager/metadata.xml
+++ b/x11-misc/ipager/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		A themeable desktop pager for fluxbox and other window managers.
-	</longdescription>
 </pkgmetadata>
diff --git a/x11-misc/macopix/Manifest b/x11-misc/macopix/Manifest
index 004f264833e8..70051d5f3507 100644
--- a/x11-misc/macopix/Manifest
+++ b/x11-misc/macopix/Manifest
@@ -1,5 +1,10 @@
 AUX macopix-1.7.4-windres.patch 1842 BLAKE2B 78f1ea6f8ce906c65437dcfbfec777c7c565d00fcc21619b9d71f24295297c9bfdc9bb02f8bd5ca576eb0f5d6b23b1fede712e9615c5e0658ed4368a1105d19f SHA512 02980ad64f1711d744e17d9d906349b729661f00b290218f3b03284c40181d57056174ff9eab1a53a6367d497e7d8ab519076c22995bc0261c9ab6f526a45881
+AUX macopix-3.4.0-CVE-2015-8614.patch 3701 BLAKE2B 261c5214910d76a8eaf85180aed9bc2ee8a5a4ccf24f011b4211aa2326cff3d2ed1a5aed473cac710f6abfe59737fc05549397d944038ef1cbcd7e0f7ae02119 SHA512 0ea37c298b97edb4fc600e6d86d13ba50849843f20995dc3ac62708eefade7f46397992a9c39d475dab0b39a5928f769b7f862636123dca489541a1cc8704381
+AUX macopix-3.4.0-Werror.patch 387 BLAKE2B 0f79e3cd3de0994289cf9b7ff42a849ed70e57c815cdf716892001740e5a5f6b7e335267c388329454aff6f6a62a1bc7d619c6fe7119e796a100e97565ea75fa SHA512 855be914f3e463904261bbef8b48fa35e83d213acb9c787112b1fd6a80b7f13f4bf842bc0617099bcbfae5fff05c69653adfd36e886f6d739c8106a75e78df99
+AUX macopix-3.4.0-fno-common.patch 8807 BLAKE2B b21a6ee329d43b7bec0f86303f5cc2cd49b5731792645053a97be3ee8c56ece1993dac6ab9c727a7528ffa82ab99ff669f553aae2d517fc23c7eaff0c64facb0 SHA512 92866d617ec37bd9ca9214faf199046b561bf91abda2247ffd8cc7f4cb3547ef5e7ebad90c26b32bbe5984c6b51396fa5a2dbce19ce5689b0af1a5dfebaf0cc0
+AUX macopix-3.4.0-windres.patch 271 BLAKE2B 8bec698d590413b88412b7eedc6bead1849affe54ad6e67f7b80cdce57909bb64b9aba1ca8b3629d179260b93d9094a64fbbe77ead4e9b5883f5920253749788 SHA512 c3d5b80325f18f22e14434561ef26e798b639d5a35a52d718fa5bfa408aa9c77069b979b63b23d3e7594e93fd60da6e93dab77585959ab603ca23468e216d1a4
 DIST macopix-1.7.4.tar.bz2 725481 BLAKE2B 1712dba8efe53fa78077d77faf7a84654bb87c72b6d9067484ce8b54da448326543082e2a245fbe1b61c824084744f51c0de321076a0e23586514c694840a040 SHA512 6010f98ecd3aad4325e81f037589cc4e79d857d513687f5243adb6ef3768ace5cddf4f5cdce977a75a4dc769b52bb541bdeefe92cdc012471de950ee81592db7
+DIST macopix-3.4.0.tar.gz 2854634 BLAKE2B 95ecb17588562a86db7e2c7b8c0832ebaea5b56e2c80814c365058954ce2655ac91f0109b1b0db4f7b8c1a98fde7162ee6c23fe3b2187cbeb22681714df2a595 SHA512 99b9dbbc7ca0cb3fa9c1881800e019ccae1c6439f300f479625a5b4877a0578b4a68b131ecbc0adc4a4393a867fd0ac9df7b52adaf2057f14142d1ddaf54fd53
 DIST macopix-mascot-HxB-euc-ja-0.30.tar.gz 803473 BLAKE2B 943f30f19bf2108a7e412ca0404f8c47324fc2e9bac5c13c9fcf35d6a4c9944f25afee3754898e6449f46247572c35a42cbe9f7c1b123f3e9e00fc0f33a0a260 SHA512 8897bd6d30fe3372e91d00add2a1af5d7fd7384ce7668aa9b21952d5be863d04c63af8bb98846c59f54a87af3b60acbd008f6c62b68a22038f29a07e7ba19333
 DIST macopix-mascot-comic_party-euc-ja-1.02.tar.gz 20656 BLAKE2B d2a7022cad1856dcebc7594acad449d4de1909ab7f33788b69c562c2d376427d91e993b2c4300a968566d7fed8d3a7e6f7596ef3adcc7897ed6a1c8fd3bb5815 SHA512 b71a586faef6b878c150e7e8e412c70d8d08919736695108efe2f119aaa01347befcaf222990fbaba10daa57120645e5c77b5534df0e4224feddbaa15c80ecf2
 DIST macopix-mascot-cosmos-euc-ja-1.02.tar.gz 329269 BLAKE2B 87d2357778f6e5d91232054dca16abc71224c1837a7a66569c8891d0720e0ffb2e9ab8745c76f44d0c8827a89afc412d703a1e66e2e46b3c8d7e49940d8c7880 SHA512 05b126b872c7ddf7dfe5b6fdd9654b8f97f6e005d8fa8ad30277a379c333cb0defaad43f9165db4712fc7e4d755fdddd34dce49a99f89c56f4dc951340fc7b1b
@@ -12,4 +17,5 @@ DIST macopix-mascot-triangle_heart-euc-ja-1.02.tar.gz 310099 BLAKE2B f52f2ad14cd
 DIST macopix-mascot-tsukihime-euc-ja-1.02.tar.gz 616138 BLAKE2B 8616fb0f3b8e4b72c6576dfada3794dc3e387d250e3a6f64eb2b290ef793f62c43f20ef9c03d2b309f4fd3860ce828a562f28ec37ca55ce8e2831315ccbd8a63 SHA512 226a175846a1f81a5aeedab6d7b85e38903d3b85a88a4a2c9a91365ba8a149a9ee54d6174bf8c4595cbe6542d3afcebd440a4185402c2139310664059515a2c5
 EBUILD macopix-1.7.4-r1.ebuild 1813 BLAKE2B 91da4479a1a1385166ad0553b27610061e100486dd23b54dbfcdf97543aa6e180282b2f8283cbef50b3567308e9a1a3d5f611b104e46b3614083959cdcef0e97 SHA512 0d5f63840612f49787422e1a670b840db03f381d38cb686873a0bbd8e6cc86f2525b5dc826f4d003c769c03ec801920d389684fc7fa37838d78ddb4a2155f809
 EBUILD macopix-1.7.4-r2.ebuild 1794 BLAKE2B 77e5701b7376e7dd6bdca55bb0428091ccfee074db21885b1768c192f54056462afe11bafd88d6883c7c83d1b655d11b9ce1a6b20699a0b40d250de5ecf1794b SHA512 570bbe33da66bbd83c7d8292dde3033cd89c45482e4b2bffc6dedb12d1b2fc5aadf2f2eead9d1dfb4ca3f6cf1f0bfada9efa15eaeeabfbb444c7ed199b980301
+EBUILD macopix-3.4.0.ebuild 1876 BLAKE2B 15f98c786f0d25315b442ae83158b1447ed532bf41d6719d75a44004cdb5f16f3552f5230ff87146c49ae8c0b0cd953086ef6ac266119d0cc4a4a5353bfbb324 SHA512 6a5ec9ba297e604638c5b6b8c206f850052d33142cfd33e2791e8bbcc177b12378d7e426ab8c329509a2a5842dc6da48b135e981d2c3d8769b2911c0a11a0640
 MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-misc/macopix/files/macopix-3.4.0-CVE-2015-8614.patch b/x11-misc/macopix/files/macopix-3.4.0-CVE-2015-8614.patch
new file mode 100644
index 000000000000..9bd9d9ecbd96
--- /dev/null
+++ b/x11-misc/macopix/files/macopix-3.4.0-CVE-2015-8614.patch
@@ -0,0 +1,143 @@
+From c3bbb22f131ea6e273d4921bd60c73e78a13e00b Mon Sep 17 00:00:00 2001
+From: "Ying-Chun Liu (PaulLiu)" <paulliu@debian.org>
+Date: Sat, 8 Aug 2020 03:45:19 +0800
+Subject: [PATCH] src/codeconv.c: Fix CVE-2015-8614
+
+This code comes from the latest claws-mail upstream which fixes
+the security issue.
+
+Signed-off-by: Ying-Chun Liu (PaulLiu) <paulliu@debian.org>
+---
+ src/codeconv.c | 74 ++++++++++++++++++++++++++++++++------------------
+ 1 file changed, 48 insertions(+), 26 deletions(-)
+
+diff --git a/src/codeconv.c b/src/codeconv.c
+index 254843e..0efbc13 100644
+--- a/src/codeconv.c
++++ b/src/codeconv.c
+@@ -128,10 +128,14 @@ typedef enum
+ void conv_jistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf)
+ {
+ 	const guchar *in = inbuf;
+-	guchar *out = outbuf;
++	gchar *out = outbuf;
+ 	JISState state = JIS_ASCII;
+ 
+-	while (*in != '\0') {
++	/*
++	 * Loop outputs up to 3 bytes in each pass (aux kanji) and we
++	 * need 1 byte to terminate the output
++	 */
++	while (*in != '\0' && (out - outbuf) < outlen - 4) {
+ 		if (*in == ESC) {
+ 			in++;
+ 			if (*in == '$') {
+@@ -192,6 +196,7 @@ void conv_jistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf)
+ 	}
+ 
+ 	*out = '\0';
++	return ;
+ }
+ 
+ #define JIS_HWDAKUTEN		0x5e
+@@ -263,10 +268,15 @@ static gint conv_jis_hantozen(guchar *outbuf, guchar jis_code, guchar sound_sym)
+ void conv_euctojis(gchar *outbuf, gint outlen, const gchar *inbuf)
+ {
+ 	const guchar *in = inbuf;
+-	guchar *out = outbuf;
++	gchar *out = outbuf;
+ 	JISState state = JIS_ASCII;
+ 
+-	while (*in != '\0') {
++	/*
++	 * Loop outputs up to 6 bytes in each pass (aux shift + aux
++	 * kanji) and we need up to 4 bytes to terminate the output
++	 * (ASCII shift + null)
++	 */
++	while (*in != '\0' && (out - outbuf) < outlen - 10) {
+ 		if (isascii(*in)) {
+ 			K_OUT();
+ 			*out++ = *in++;
+@@ -286,26 +296,32 @@ void conv_euctojis(gchar *outbuf, gint outlen, const gchar *inbuf)
+ 			}
+ 		} else if (iseuchwkana1(*in)) {
+ 			if (iseuchwkana2(*(in + 1))) {
+-			  guchar jis_ch[2];
+-			  gint len;
+-			  
+-			  if (iseuchwkana1(*(in + 2)) &&
+-			      iseuchwkana2(*(in + 3)))
+-			    len = conv_jis_hantozen
+-			      (jis_ch,
+-			       *(in + 1), *(in + 3));
+-			  else
+-			    len = conv_jis_hantozen
+-			      (jis_ch,
+-			       *(in + 1), '\0');
+-			  if (len == 0)
+-			    in += 2;
+-			  else {
+-			    K_IN();
+-			    in += len * 2;
+-			    *out++ = jis_ch[0];
+-			    *out++ = jis_ch[1];
+-			  }
++				if (0) {
++					HW_IN();
++					in++;
++					*out++ = *in++ & 0x7f;
++				} else {
++					guchar jis_ch[2];
++					gint len;
++
++					if (iseuchwkana1(*(in + 2)) &&
++					    iseuchwkana2(*(in + 3)))
++						len = conv_jis_hantozen
++							(jis_ch,
++							 *(in + 1), *(in + 3));
++					else
++						len = conv_jis_hantozen
++							(jis_ch,
++							 *(in + 1), '\0');
++					if (len == 0)
++						in += 2;
++					else {
++						K_IN();
++						in += len * 2;
++						*out++ = jis_ch[0];
++						*out++ = jis_ch[1];
++					}
++				}
+ 			} else {
+ 				K_OUT();
+ 				in++;
+@@ -340,14 +356,19 @@ void conv_euctojis(gchar *outbuf, gint outlen, const gchar *inbuf)
+ 
+ 	K_OUT();
+ 	*out = '\0';
++	return ;
+ }
+ 
+ void conv_sjistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf)
+ {
+ 	const guchar *in = inbuf;
+-	guchar *out = outbuf;
++	gchar *out = outbuf;
+ 
+-	while (*in != '\0') {
++	/*
++	 * Loop outputs up to 2 bytes in each pass and we need 1 byte
++	 * to terminate the output
++	 */
++	while (*in != '\0' && (out - outbuf) < outlen - 3) {
+ 		if (isascii(*in)) {
+ 			*out++ = *in++;
+ 		} else if (issjiskanji1(*in)) {
+@@ -386,6 +407,7 @@ void conv_sjistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf)
+ 	}
+ 
+ 	*out = '\0';
++	return ;
+ }
+ 
+ void conv_anytoeuc(gchar *outbuf, gint outlen, const gchar *inbuf)
diff --git a/x11-misc/macopix/files/macopix-3.4.0-Werror.patch b/x11-misc/macopix/files/macopix-3.4.0-Werror.patch
new file mode 100644
index 000000000000..e3f84dba8e37
--- /dev/null
+++ b/x11-misc/macopix/files/macopix-3.4.0-Werror.patch
@@ -0,0 +1,11 @@
+--- a/m4/visibility.m4
++++ b/m4/visibility.m4
+@@ -32,7 +32,7 @@
+     AC_MSG_CHECKING([whether the -Werror option is usable])
+     AC_CACHE_VAL([gl_cv_cc_vis_werror], [
+       gl_save_CFLAGS="$CFLAGS"
+-      CFLAGS="$CFLAGS -Werror"
++      CFLAGS="$CFLAGS -Werror -setthisupforfailure"
+       AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM([[]], [[]])],
+         [gl_cv_cc_vis_werror=yes],
diff --git a/x11-misc/macopix/files/macopix-3.4.0-fno-common.patch b/x11-misc/macopix/files/macopix-3.4.0-fno-common.patch
new file mode 100644
index 000000000000..745997046461
--- /dev/null
+++ b/x11-misc/macopix/files/macopix-3.4.0-fno-common.patch
@@ -0,0 +1,357 @@
+From f29175b892026dbc4a8ad321e426f22e0a09b248 Mon Sep 17 00:00:00 2001
+From: "Ying-Chun Liu (PaulLiu)" <paulliu@debian.org>
+Date: Sat, 8 Aug 2020 03:48:43 +0800
+Subject: [PATCH] Porting to gcc 10
+
+GCC will reject multiple definitions of global variables starting
+from gcc-10. We need to move the definitions to a real object file.
+And in headers we only extern it.
+
+Signed-off-by: Ying-Chun Liu (PaulLiu) <paulliu@debian.org>
+---
+ src/main.c |  42 ++++++++++++++++++
+ src/main.h | 123 +++++++++++++++++++++++++++++++----------------------
+ 2 files changed, 113 insertions(+), 52 deletions(-)
+
+diff --git a/src/main.c b/src/main.c
+index 7944618..ce187a1 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -35,6 +35,48 @@
+ // *** GLOBAL ARGUMENT ***
+ 
+ gboolean FlagInstalledMenu;
++enum MENU_EXT_t MENU_EXT;
++enum MaCoPiXFolder_t MaCoPiXFolder;
++enum ClockMode_t ClockMode;
++enum HomePos_t HomePos;
++enum MoveMode_t MoveMode;
++#ifdef USE_OSX
++enum MAC_LAYER_MODE_t MAC_LAYER_MODE;
++#endif
++enum FFPos_t FFPos;
++enum AutoBar_t AutoBar;
++enum PosBalloon_t PosBalloon;
++enum TypBalloon_t TypBalloon;
++enum DuetAnimeMode_t DuetAnimeMode;
++enum TypInterpolate_t TypInterpolate;
++enum ClockType_t ClockType;
++enum MenuSelect_t MenuSelect;
++enum GuiFontConf_t GuiFontConf;
++enum GuiColorConf_t GuiColorConf;
++enum SetReleaseData_t SetReleaseData;
++enum MailStatus0_t MailStatus0;
++enum MailPixPos_t MailPixPos;
++enum MailStatus_t MailStatus;
++enum SignalAction_t SignalAction;
++enum ConsMode_t ConsMode;
++enum ScanMenuDir_t ScanMenuDir;
++enum CompositeFlag_t CompositeFlag;
++#ifdef USE_GTK3
++GdkPixbuf *pixbuf_main, *pixbuf_clk, *pixbuf_bal;
++#ifdef USE_WIN32
++GdkPixbuf *pixbuf_sdw;
++#endif
++#else  // USE_GTK3
++GdkPixmap *pixmap_main, *pixmap_clk, *pixmap_bal;
++#ifdef USE_WIN32
++GdkPixmap *pixmap_sdw;
++#endif
++#endif // USE_GTK3
++gint window_x, window_y;
++gboolean supports_alpha;
++gboolean flag_balloon;
++
++pid_t http_pid;
+ 
+ // Prototype of functions in this file
+ #ifdef USE_GTK3
+diff --git a/src/main.h b/src/main.h
+index 496815e..42577a6 100644
+--- a/src/main.h
++++ b/src/main.h
+@@ -217,10 +217,11 @@
+ #define MENU_EXTRACT_GTAR_COMMAND "tar -zxf %s -C %s "
+ 
+ // MENU
+-enum{ MENU_MENU,
++enum MENU_EXT_t { MENU_MENU,
+ 	MENU_LHA,
+ 	MENU_TAR
+-	}MENU_EXT;
++};
++extern enum MENU_EXT_t MENU_EXT;
+ 
+ 
+ // ²èÁü¥Õ¥¡¥¤¥ëÍѳÈÄ¥»Ò
+@@ -252,11 +253,12 @@ enum{ MENU_MENU,
+ #define SOUNDDIR "sound" G_DIR_SEPARATOR_S
+ 
+ // Folder
+-enum{ FOLDER_DEFAULT,
++enum MaCoPiXFolder_t { FOLDER_DEFAULT,
+ 	FOLDER_PIX,
+ 	FOLDER_SOUND,
+ 	FOLDER_CURRENT
+-	}MaCoPiXFolder;
++};
++extern enum MaCoPiXFolder_t MaCoPiXFolder;
+ 
+ // ¸Ä¿ÍÍÑ¥»¡¼¥Ö¥Õ¥¡¥¤¥ë
+ //  (USER_DIRÃæ¤ËºîÀ® : ¥Þ¥¹¥³¥Ã¥ÈÈó°Í¸¥Ñ¥é¥á¡¼¥¿¤òÊݸ)
+@@ -292,10 +294,11 @@ enum{ FOLDER_DEFAULT,
+ 
+ 
+ // CLOCK_MODE
+-enum{ CLOCK_NO,
++enum ClockMode_t { CLOCK_NO,
+       CLOCK_PIXMAP,
+       CLOCK_PANEL
+-}ClockMode;
++};
++extern enum ClockMode_t ClockMode;
+ 
+ //ANIME
+ #define MAX_PIXMAP   64
+@@ -330,47 +333,54 @@ enum{ CLOCK_NO,
+ #define ROOTOFF_Y (-10)
+ 
+ // Home Position Mode
+-enum{ HOMEPOS_NEVER, HOMEPOS_VANISH, HOMEPOS_BAR } HomePos;
++enum HomePos_t { HOMEPOS_NEVER, HOMEPOS_VANISH, HOMEPOS_BAR };
++extern enum HomePos_t HomePos;
+ 
+ // Titlebar Offset for Focus Follow
+ enum{ FF_BAR_ABS, FF_BAR_REL };
+ 
+ 
+ // MOVE mode
+-enum{
++enum MoveMode_t {
+   MOVE_FIX,
+   MOVE_FOCUS
+-}MoveMode;
++};
++extern enum MoveMode_t MoveMode;
+ 
+ #ifdef USE_OSX
+-enum {
++enum MAC_LAYER_MODE_t {
+      MAC_LAYER_DEFAULT,
+      MAC_LAYER_TOP,
+      NUM_MAC_LAYER
+-}MAC_LAYER_MODE;
++};
++extern enum MAC_LAYER_MODE_t MAC_LAYER_MODE;
+ #endif
+ 
+ // Focus Follow ´ð½à°ÌÃÖ
+-enum{ FF_SIDE_LEFT, FF_SIDE_RIGHT } FFPos;
++enum FFPos_t { FF_SIDE_LEFT, FF_SIDE_RIGHT };
++extern enum FFPos_t FFPos;
+ 
+ // Focus Autobar ¥¿¥¤¥È¥ë¥Ð¡¼»»½ÐË¡
+-enum{ AUTOBAR_MANUAL, AUTOBAR_ORDINAL, AUTOBAR_COMPIZ } AutoBar;
++enum AutoBar_t { AUTOBAR_MANUAL, AUTOBAR_ORDINAL, AUTOBAR_COMPIZ };
++extern enum AutoBar_t AutoBar;
+ 
+ 
+ // Balloon Position
+-enum{
++enum PosBalloon_t{
+   BAL_POS_LEFT,
+     BAL_POS_RIGHT
+-    } PosBalloon;
++    };
++extern enum PosBalloon_t PosBalloon;
+ 
+ // Balloon Mode
+-enum{BALLOON_NORMAL,
++enum TypBalloon_t {BALLOON_NORMAL,
+        BALLOON_MAIL,
+        BALLOON_POPERROR,
+        BALLOON_SOCKMSG,
+        BALLOON_DUET,
+        BALLOON_SYS
+-       } TypBalloon;
++       };
++extern enum TypBalloon_t TypBalloon;
+ 
+ // BiffÍÑ Balloon¤Î¼«Á³¾ÃÌÇ¥³¥Þ¿ô
+ #define BALLOON_EXPIRE    150
+@@ -394,39 +404,41 @@ typedef enum {
+ #define DEF_DUET_DELAY    20
+ 
+ // Duet Anime mode
+-enum{
++enum DuetAnimeMode_t {
+   DUET_CLICK,
+     DUET_RANDOM
+-    }DuetAnimeMode;
+-
++    };
++extern enum DuetAnimeMode_t DuetAnimeMode;
+ 
+ // Interpolation Style for Magnification
+-enum{	 MAG_IP_NEAREST,
++enum TypInterpolate_t {	 MAG_IP_NEAREST,
+ 	 MAG_IP_TILES,
+ 	 MAG_IP_BILINEAR,
+ 	 MAG_IP_HYPER
+-	   } TypInterpolate;
+-
++	   };
++extern enum TypInterpolate_t TypInterpolate;
+ 
+ //Clock ¥¿¥¤¥×
+-enum{ CLOCK_TYPE_24S, 
++enum ClockType_t { CLOCK_TYPE_24S, 
+ 	CLOCK_TYPE_24M, 
+ 	CLOCK_TYPE_12S, 
+-	CLOCK_TYPE_12M } ClockType;
+-
++	CLOCK_TYPE_12M };
++extern enum ClockType_t ClockType;
+ 
+ // Font size ratio for AM/PM sign
+ #define CLOCK_AMPM_RATIO 0.6
+ 
+ // Install mode
+-enum{   MENU_SELECT, 
++enum MenuSelect_t {   MENU_SELECT, 
+ 	MENU_INSTALL_USER,
+ 	MENU_INSTALL_COMMON,
+ 	START_MENU_SELECT,
+ 	START_MENU_INSTALL_USER,
+ 	START_MENU_INSTALL_COMMON,
+ 	NUM_INSTALL_MODE
+- } MenuSelect;
++ };
++extern enum MenuSelect_t MenuSelect;
++
+ 
+ //DEFAULT Alpha
+ #define DEF_ALPHA_MAIN 100
+@@ -542,14 +554,15 @@ static GdkColor color_lred=   {0, 0xFFFF, 0xBBBB, 0xBBBB};
+ 
+ 
+ // for Callback of Configuration Dialog
+-enum{CONF_FONT_CLK,	   
++enum GuiFontConf_t {CONF_FONT_CLK,	   
+        CONF_FONT_BAL,	   
+        CONF_DEF_FONT_CLK,
+        CONF_DEF_FONT_BAL,
+        INIT_DEF_FONT_CLK,
+-       INIT_DEF_FONT_BAL} GuiFontConf;
++       INIT_DEF_FONT_BAL};
++extern enum GuiFontConf_t GuiFontConf;
+ 
+-enum{CONF_COLOR_CLK,
++enum GuiColorConf_t {CONF_COLOR_CLK,
+      CONF_COLOR_CLKBG,
+      CONF_COLOR_CLKBD,
+      CONF_COLOR_CLKSD,
+@@ -568,19 +581,21 @@ enum{CONF_COLOR_CLK,
+      CONF_COLOR_FS_BG0,
+      CONF_COLOR_FS_BG1,
+      NUM_CONF_COLOR
+-} GuiColorConf;
+-
+-enum{ SET_RELEASE_BALLOON, SET_RELEASE_CLOCK } SetReleaseData;
+-
++};
++extern enum GuiColorConf_t GuiColorConf;
+ 
++enum SetReleaseData_t { SET_RELEASE_BALLOON, SET_RELEASE_CLOCK };
++extern enum SetReleaseData_t SetReleaseData;
+ 
+ // Setting for BIFF
+ #define DEF_MAIL_INTERVAL 60
+ 
+ 
+-enum{ MAIL_NO, MAIL_LOCAL, MAIL_POP3, MAIL_APOP, MAIL_QMAIL, MAIL_PROCMAIL } MailStatus0;
++enum MailStatus0_t { MAIL_NO, MAIL_LOCAL, MAIL_POP3, MAIL_APOP, MAIL_QMAIL, MAIL_PROCMAIL };
++extern enum MailStatus0_t MailStatus0;
+ 
+-enum{ MAIL_PIX_LEFT, MAIL_PIX_RIGHT } MailPixPos;
++enum MailPixPos_t { MAIL_PIX_LEFT, MAIL_PIX_RIGHT };
++extern enum MailPixPos_t MailPixPos;
+ 
+ #undef POP_DEBUG  /* pop3 debugging mode */
+ 
+@@ -609,7 +624,8 @@ enum{ MAIL_PIX_LEFT, MAIL_PIX_RIGHT } MailPixPos;
+ #define BIFF_TOOLTIPS   TRUE
+ 
+ 
+-enum{ NO_MAIL, OLD_MAIL, NEW_MAIL, KEEP_NEW_MAIL } MailStatus;
++enum MailStatus_t { NO_MAIL, OLD_MAIL, NEW_MAIL, KEEP_NEW_MAIL };
++extern enum MailStatus_t MailStatus;
+ 
+ // mail status; array subscripts
+ 
+@@ -637,14 +653,17 @@ enum{ NO_MAIL, OLD_MAIL, NEW_MAIL, KEEP_NEW_MAIL } MailStatus;
+ 
+ 
+ // »þÊóÍÑÀßÄê
+-enum{ SIGACT_NO, SIGACT_CLICK, SIGACT_CHANGE } SignalAction;
++enum SignalAction_t { SIGACT_NO, SIGACT_CLICK, SIGACT_CHANGE };
++extern enum SignalAction_t SignalAction;
+ 
+ 
+ // Consistency Check
+-enum{ CONS_MANUAL, CONS_AUTOOW, CONS_IGNORE } ConsMode;
++enum ConsMode_t { CONS_MANUAL, CONS_AUTOOW, CONS_IGNORE };
++extern enum ConsMode_t ConsMode;
+ 
+ // ¥á¥Ë¥å¡¼¤Î¾ì½ê
+-enum{ SMENU_DIR_COMMON, SMENU_DIR_USER } ScanMenuDir;
++enum ScanMenuDir_t { SMENU_DIR_COMMON, SMENU_DIR_USER };
++extern enum ScanMenuDir_t ScanMenuDir;
+ 
+ 
+ typedef enum {
+@@ -661,11 +680,11 @@ typedef enum {
+ 
+ 
+ // COMPOSITE_FLAG
+-enum{ COMPOSITE_FALSE,
++enum CompositeFlag_t { COMPOSITE_FALSE,
+       COMPOSITE_TRUE,
+       COMPOSITE_UNKNOWN
+-}CompositeFlag;
+-
++};
++extern enum CompositeFlag_t CompositeFlag;
+ 
+ 
+ 
+@@ -1137,21 +1156,21 @@ typedef struct{
+ 
+ ///////////   Global Arguments   //////////
+ #ifdef USE_GTK3
+-GdkPixbuf *pixbuf_main, *pixbuf_clk, *pixbuf_bal;
++extern GdkPixbuf *pixbuf_main, *pixbuf_clk, *pixbuf_bal;
+ #ifdef USE_WIN32
+-GdkPixbuf *pixbuf_sdw;
++extern GdkPixbuf *pixbuf_sdw;
+ #endif
+ #else  // USE_GTK3
+-GdkPixmap *pixmap_main, *pixmap_clk, *pixmap_bal;
++extern GdkPixmap *pixmap_main, *pixmap_clk, *pixmap_bal;
+ #ifdef USE_WIN32
+-GdkPixmap *pixmap_sdw;
++extern GdkPixmap *pixmap_sdw;
+ #endif
+ #endif // USE_GTK3
+-gint window_x, window_y;
+-gboolean supports_alpha;
+-gboolean flag_balloon;
++extern gint window_x, window_y;
++extern gboolean supports_alpha;
++extern gboolean flag_balloon;
+ 
+-pid_t http_pid;
++extern pid_t http_pid;
+ 
+ 
+ ///////////   Proto types   //////////
diff --git a/x11-misc/macopix/files/macopix-3.4.0-windres.patch b/x11-misc/macopix/files/macopix-3.4.0-windres.patch
new file mode 100644
index 000000000000..39d509bcd355
--- /dev/null
+++ b/x11-misc/macopix/files/macopix-3.4.0-windres.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -57,7 +57,7 @@
+ AC_PROG_YACC
+ AM_PROG_LIBTOOL
+ 
+-AC_CHECK_PROG(WINDRES, windres, windres)
++AC_CHECK_PROG(WINDRES, windres-does-not-exist, windres)
+ AM_CONDITIONAL(HAVE_WINDRES, test x"$WINDRES" != x)
+ 
+ # Checks for header files.
diff --git a/x11-misc/macopix/macopix-3.4.0.ebuild b/x11-misc/macopix/macopix-3.4.0.ebuild
new file mode 100644
index 000000000000..4765b8dbb419
--- /dev/null
+++ b/x11-misc/macopix/macopix-3.4.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="MaCoPiX (Mascot Constructive Pilot for X) is a desktop mascot application"
+HOMEPAGE="http://rosegray.sakura.ne.jp/macopix/index-e.html"
+
+BASE_URI="http://rosegray.sakura.ne.jp/macopix"
+SRC_URI="${BASE_URI}/${P}.tar.gz"
+
+# NOTE: These mascots are not redistributable on commercial CD-ROM.
+# The author granted to use them under Gentoo Linux.
+MACOPIX_MASCOTS="
+	macopix-mascot-HxB-euc-ja-0.30
+	macopix-mascot-marimite-euc-ja-2.20
+	macopix-mascot-cosmos-euc-ja-1.02
+	macopix-mascot-mizuiro-euc-ja-1.02
+	macopix-mascot-pia2-euc-ja-1.02
+	macopix-mascot-tsukihime-euc-ja-1.02
+	macopix-mascot-triangle_heart-euc-ja-1.02
+	macopix-mascot-comic_party-euc-ja-1.02
+	macopix-mascot-kanon-euc-ja-1.02
+	macopix-mascot-one-euc-ja-1.02
+"
+
+for i in ${MACOPIX_MASCOTS} ; do
+	SRC_URI+=" ${BASE_URI}/${i}.tar.gz"
+done
+
+# program itself is GPL-2, and mascots are free-noncomm
+LICENSE="GPL-2 free-noncomm"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gnutls nls"
+
+RDEPEND="
+	dev-libs/glib:2
+	media-libs/libpng:0=
+	sys-devel/gettext
+	gnutls? ( net-libs/gnutls )
+	!gnutls? ( dev-libs/openssl:0= )
+	x11-libs/gtk+:3
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4.0-CVE-2015-8614.patch
+	"${FILESDIR}"/${PN}-3.4.0-Werror.patch
+	"${FILESDIR}"/${PN}-3.4.0-fno-common.patch
+	"${FILESDIR}"/${PN}-3.4.0-windres.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with gnutls)
+}
+
+src_install() {
+	default
+
+	dodoc AUTHORS ChangeLog* NEWS *README*
+
+	# install mascots
+	for d in ${MACOPIX_MASCOTS} ; do
+		einfo "Installing ${d}..."
+		cd "${WORKDIR}/${d}" || die
+		insinto /usr/share/"${PN}"
+		doins *.mcpx *.menu
+		insinto /usr/share/"${PN}"/pixmap
+		doins *.png
+		docinto "${d}"
+		dodoc README.jp
+	done
+}
diff --git a/x11-misc/obmenu-generator/Manifest b/x11-misc/obmenu-generator/Manifest
index 184eb982372f..852ae8e471b1 100644
--- a/x11-misc/obmenu-generator/Manifest
+++ b/x11-misc/obmenu-generator/Manifest
@@ -1,3 +1,3 @@
 DIST obmenu-generator-0.88.tar.gz 20569 BLAKE2B 0b17a3d379f6a92e08dd1f2e6d943e4d30f669c11847ad1354f44c41e8d3714b174fe6194a4b952664e9cc8408080ba236871b83e9f2498f5d337bc6498e92ec SHA512 650915562792b20cb39175cf2e7d11141eba24e3345cb54e5400a18f324f6fdacc4008d57d091a3ee64a36ebcf4548d0c8328e6a2dbc62613c7001b97e10332a
-EBUILD obmenu-generator-0.88.ebuild 803 BLAKE2B d5820e0ebad344ab6fab057998f1d49c4cd34cddb3185652c7fe53d54722770544963f5e805199572ef19b0f905cd0b6dabf23fe4e9059cdd48f802fd938c8c1 SHA512 eeea5f32515a83c28c2e707db14b82f71b54decf37d9f002f41dbb5e42cd187f0ec590929c67cfa71d3c67477f1beedebe6a9cd8fc412fa8566d6cd376c4d02e
+EBUILD obmenu-generator-0.88.ebuild 807 BLAKE2B 2dcd051b572e98e85e2912f95909e68c653f2856807ca6dd31c56bba494e21a65857c7e4f54637e5d2d199bc0f3c8c55846204999944d38dcd3b69c6c3dd3067 SHA512 b077f1281213801439ae787e8a3a83f9e6a0067bb615d6709cc1229e47f58c61b133b9e3f5ff8b62e9abcfcdc9a7cee56145e4ed79cb8cff6f5989787ad7dffc
 MISC metadata.xml 445 BLAKE2B 6f47ae8ef7c079b03a0e8769bcf6ea35b0743dfb8f94f7ee99eba54f0dd1e66ac12a1d9198ffa246601965d02a0260ef667c4b48bac243fa1c82afe0e094be1d SHA512 8cf342329f67576b238d72043cc6485628f78874ee2a0ec54c0cba8e99ed5eeb0348c75396f035c82f6d3dbb501e338d090cca8bacd0a9c8ac969cf9e4de9d67
diff --git a/x11-misc/obmenu-generator/obmenu-generator-0.88.ebuild b/x11-misc/obmenu-generator/obmenu-generator-0.88.ebuild
index d00c2b742b88..8a36e7f9249a 100644
--- a/x11-misc/obmenu-generator/obmenu-generator-0.88.ebuild
+++ b/x11-misc/obmenu-generator/obmenu-generator-0.88.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils
+inherit optfeature
 
 DESCRIPTION="A fast pipe/static menu generator for the Openbox Window Manager"
 HOMEPAGE="https://github.com/trizen/obmenu-generator"
diff --git a/x11-misc/pcmanfm-qt/Manifest b/x11-misc/pcmanfm-qt/Manifest
index 05a68c861f05..c9aa98c848b4 100644
--- a/x11-misc/pcmanfm-qt/Manifest
+++ b/x11-misc/pcmanfm-qt/Manifest
@@ -1,3 +1,3 @@
 DIST pcmanfm-qt-0.15.1.tar.xz 257832 BLAKE2B 78c8f5723b529b7f8a00870f017818183a498d8a1f68f8f24ab756eeda9b35d8d998b42d87f78e4a8fb6725bf3e812dca74bc1464f285a6a984dae1996b43f46 SHA512 db0d3cc683b5c94cabab5a8c68b3ae8bf5938735b34989a420692e933bb54d53ebb15da9af4a59039bfd101de0cc00c521c08207e81bfad9d80315e2d94bc559
-EBUILD pcmanfm-qt-0.15.1.ebuild 1094 BLAKE2B 5802b2a5d48d26162381649b5cce5b27c39d058f0d118774cb40df60943b7ad9884603b4686f98e887fa1ac55669ada6854559aa86f60af03cc53a9638952777 SHA512 750af0234415a19364512c36d7aebe844cccb6f8108123ba22f6d7673490b981ad6dbac608fb609f57921c5b06c4681c2e99f948dfa3a0eee9d4bc91eec7ed84
+EBUILD pcmanfm-qt-0.15.1.ebuild 1098 BLAKE2B a775a49e89656b9a857aa2095d3f770ff31a1df5591e6e69f0eb2308723449ec3e3dc7bba053fbab8074d63b1a821f3dfe1b8d1df0a869c6c9b58e3526d3295f SHA512 360c8d2adbfa632a5803ab2c1d00324a5b157322e64b4efaa050d6e51aed33fe355c7b81775731c7b4278397ea1e94eea8f5193577ac0f64804604f914e0ac2c
 MISC metadata.xml 316 BLAKE2B 1dc58d42a91390bd5c19ee7dccf75687a2b612f7af9569f4f3a731e8eec49eba2e244c1ced6107ed51cdd377f8d026cf6589a49c3314c60d38f58a68d7e82415 SHA512 910454c7d138693e0020b922b7b32749fdb70bb6057f4f16c7d72e3385cf278ce0dbddb0d75e57a90d5cdc14b10c0bad740d77c085d2f8d14b25b100b594a597
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.15.1.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.15.1.ebuild
index ab092edeac77..f5972ef58337 100644
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.15.1.ebuild
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.15.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake eutils xdg-utils
+inherit cmake optfeature xdg-utils
 
 DESCRIPTION="Qt GUI Tabbed Filemanager"
 HOMEPAGE="https://lxqt.github.io/"
diff --git a/x11-misc/primus/Manifest b/x11-misc/primus/Manifest
index 2eec8ba86b75..a1524470a483 100644
--- a/x11-misc/primus/Manifest
+++ b/x11-misc/primus/Manifest
@@ -1,5 +1,6 @@
 AUX primus-0.2-libglvnd-workaround.patch 662 BLAKE2B c2a4af4171487405ca08248c162e7ea38cdf7af0ee32636f19f867741794d18dfbd66490163c7eb38de975f5adf29b69dabb47ec8c6196a5d36781e25be58c24 SHA512 529d62808a488237b0730aee9e83448d0d9910f4b3b1f707012724a571a3a94362d5e19f8f347b94f999ee3c4b7ff9260113718bc8a4d7450264579de8ee7fff
+AUX primus-0.2-respect-ldflags.patch 733 BLAKE2B fae740396454d1051f3e4b5714e281edf9cab2b11144cbf5af2edfb6010c1e5adeb501a64289d7093105cfd039928e06c13246c845fc6dabf0a4b23b921a1f1a SHA512 d15fbebb12c5f9d299fcb9b7bf8004e2933d7739b754fc2de45cf13232938000ec187369eee28be85ea4502844b67b991f3c49b7ed31c0036e2da974e72e3248
 DIST primus-0.2.tar.gz 26248 BLAKE2B 5e7822e66f3abadc442c30792c03dc731814a084ca2911b9e0333efda1fdfd36ce3c31be612426ae3747d7be0575aca2e7562054ba4ae719812cf800ffc04ff5 SHA512 4108f4e721c9cd8f8dc592a41706230b29bbcfcb8ba49e61d1f07f715c81304471e0d00407bc59a314568b3b42e19f0962ba1dbb8ef1996fe0d4ac13af2e3d2b
-EBUILD primus-0.2-r1.ebuild 1576 BLAKE2B 377050ecf80c04894149a9b69ddd8cf51fbb0b080cdcd7cc389d98d81be3a57ec947c1f93d4047c9f6f10f1f21b59af2a54cae679d9773d6497fa8d4de09d41b SHA512 151ec75b8bdc6a673e85d977c771ba0758155027c591129ae86e2c828f6d0e6aa6f2b4c1483153dfc324d9a4eacc478a2a3dda1b8d7009b579c73976751e8a36
+EBUILD primus-0.2-r2.ebuild 1625 BLAKE2B e18eaa7725803456bfbe131a1fca8b74134b3ac9ec79bba11d6d0c7137a311ceade22c5ce309f07d9213942d47d5dbc5c055ffd29b05d752f7ef6dc7a024c74c SHA512 8796ca9ca8a8ab7937266cec1b37bd83d4ab6233fc6507a6820b359e6e672bb187b22fac685ee99c546015e82c998df2e0350485ccc0af79d9340044969dba3a
 EBUILD primus-0.2.ebuild 919 BLAKE2B b1eb99e7e0b18b69e24a7ade73729228b6829a36da518539072bb7919dd54c338c0c9bedcf8a69a557563bcc85e7a61d716ad851e2ae084ebf767c8fa0827635 SHA512 9c967343163ac52b2ef9e5e061b8ca6be8d3cb0b7be1e51ad0a913c8fd9953ee486fa70a697b41814440d5739eebf39f3d6b84f09d2c3cdbc4082a75ee7debe3
 MISC metadata.xml 423 BLAKE2B b55ae11da7b5968ec0b88042f4180c690d818c28690824eaf0511890dd747d64d0bd12510c2389e067e5ad190d295c27ed6a6e8ca43b8fd1abffbc22a3581096 SHA512 7d9a32f2d32a8973f17679e8658ebf461c7c88ba028f85209629767c097f66c4bfd0e3e1c9fd80d7a6b88bd4d6ccc52bd56a5650a61a68f6259278b172aab72d
diff --git a/x11-misc/primus/files/primus-0.2-respect-ldflags.patch b/x11-misc/primus/files/primus-0.2-respect-ldflags.patch
new file mode 100644
index 000000000000..5d9804517437
--- /dev/null
+++ b/x11-misc/primus/files/primus-0.2-respect-ldflags.patch
@@ -0,0 +1,19 @@
+From b4663367d16190cf57b632cd59425b1b8b43f2f3 Mon Sep 17 00:00:00 2001
+From: Vincent Cheng <vcheng@debian.org>
+Date: Sat, 25 Jul 2015 21:10:10 -0700
+Subject: [PATCH] build with LDFLAGS defined by environment
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index ab37e6e..a83e465 100644
+--- a/Makefile
++++ b/Makefile
+@@ -30,4 +30,4 @@ CXXFLAGS += -DPRIMUS_libGLd='"$(PRIMUS_libGLd)"'
+ 
+ $(LIBDIR)/libGL.so.1: libglfork.cpp
+ 	mkdir -p $(LIBDIR)
+-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -fvisibility=hidden -fPIC -shared -Wl,-Bsymbolic -o $@ $< -lX11 -lpthread -lrt
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -fvisibility=hidden -fPIC -shared -Wl,-Bsymbolic -o $@ $< $(LDFLAGS) -lX11 -lpthread -lrt
diff --git a/x11-misc/primus/primus-0.2-r1.ebuild b/x11-misc/primus/primus-0.2-r2.ebuild
index b17cd30fb649..a25dcfebb0f8 100644
--- a/x11-misc/primus/primus-0.2-r1.ebuild
+++ b/x11-misc/primus/primus-0.2-r2.ebuild
@@ -21,7 +21,10 @@ RDEPEND="
 "
 DEPEND="virtual/opengl"
 
-PATCHES=( "${FILESDIR}/primus-0.2-libglvnd-workaround.patch" )
+PATCHES=(
+	"${FILESDIR}/primus-0.2-libglvnd-workaround.patch"
+	"${FILESDIR}/primus-0.2-respect-ldflags.patch"
+)
 
 src_prepare() {
 	default
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
index 0fc954916855..e013a98d6192 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1,3 +1,3 @@
-DIST py3status-3.28.tar.gz 403839 BLAKE2B bc41418d38d8a5d55e2af67c4b68993db69bfa40d5f047fc47bf3e5cda28f56b808b8687ab5081c666398660b837f8c944138094112457eaa0c230cd1f1fa28e SHA512 19447a8afeeb39371551337fbfa62b6cd8b1cb8a4188b2bc18d1a7ec849126d3e8f46fb2cf4cefa2960ed38ff09a0cad7233bfe5711bba5efaeed7cd5da6207c
-EBUILD py3status-3.28.ebuild 723 BLAKE2B b62005954af6e13387b48634c04e8cb52ad6d57281cf3e03032f8841d7735db691d228a2a5e81def59e5c6d3eeb6f1d2958e9f78de81c6a965ed383e067c286b SHA512 a96d6985c55f73fae78a542620c6d2f6914f71d1584580a4f9ebc932d2640d6276ec376d463a9abdbbd94847bb6549750603123b9b6fc30f19dbbb7358d05249
-MISC metadata.xml 742 BLAKE2B fb30bc364ed1b07670aaff51142a99a185c06b7f20661e3ed9cab9b3a21040fcbc15db807102af9c580a6c80071267c6883fe4d5a152c109e14f9d03e213f2ec SHA512 2a30e73f6450a2227574cda7f1f0d10a6eaa6f5919fac21c51578e025efe02a831582237013648b66b1061241c51f6598ac6f0c31e6edc9d05a4d5be8417f2de
+DIST py3status-3.30.tar.gz 407251 BLAKE2B 6dc65cf3eb5ca2e182e6d27cb4f3a210e839b0c45caa7ced8683bad7ec60c53992bab10f9cd6c8577525cdeb12cd1196afe1a15f413ea58f08eb17b20f7fc6cc SHA512 f3b72a85f3cd2257ac4c94fa246a0440f4b229c42ef0140062b9f50ea7dbf4ac741648d196729d8c1ea1454c1db2c57ea0ba6999e2141b7a09c9c4c31e488440
+EBUILD py3status-3.30.ebuild 723 BLAKE2B b62005954af6e13387b48634c04e8cb52ad6d57281cf3e03032f8841d7735db691d228a2a5e81def59e5c6d3eeb6f1d2958e9f78de81c6a965ed383e067c286b SHA512 a96d6985c55f73fae78a542620c6d2f6914f71d1584580a4f9ebc932d2640d6276ec376d463a9abdbbd94847bb6549750603123b9b6fc30f19dbbb7358d05249
+MISC metadata.xml 628 BLAKE2B 649225c124569c38af8f27f617f3aa8761189acce95a76c54725a987c0124daf55723faae315161736b13a3032887d6036328ba46b48851a25f4c67cc3efc095 SHA512 220b5202a46611f41e8c814e90e079db6796b44144e05803c70b04414cc05417cf264d8fa288102e14e94a4995f000efdd19d36e51cbe17524242ac5f1318668
diff --git a/x11-misc/py3status/metadata.xml b/x11-misc/py3status/metadata.xml
index d823cd0df908..29c98f85e343 100644
--- a/x11-misc/py3status/metadata.xml
+++ b/x11-misc/py3status/metadata.xml
@@ -5,9 +5,6 @@
 		<email>ultrabug@gentoo.org</email>
 		<name>Alexys Jacob</name>
 	</maintainer>
-	<longdescription lang="en">
-		py3status is an extensible i3status wrapper written in python.
-	</longdescription>
 	<upstream>
 		<remote-id type="pypi">py3status</remote-id>
 		<remote-id type="github">ultrabug/py3status</remote-id>
diff --git a/x11-misc/py3status/py3status-3.28.ebuild b/x11-misc/py3status/py3status-3.30.ebuild
index f08967d407b9..f08967d407b9 100644
--- a/x11-misc/py3status/py3status-3.28.ebuild
+++ b/x11-misc/py3status/py3status-3.30.ebuild
diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
index 6e382ccfc7f0..29c4fc43ba3e 100644
--- a/x11-misc/rofi/Manifest
+++ b/x11-misc/rofi/Manifest
@@ -1,6 +1,8 @@
 AUX rofi-0.15.12-Werror.patch 437 BLAKE2B 6f230755bb2bcf5c91c354d4d2afec1c9e78a39eb80a871f8c0e21268302dc7baf5bfa13c9d1fe0c832ce008649764896c9ddab6dff1cd66c2c6d933e08e227a SHA512 b26d190bdaccca3cf761599a6e3f938a8f9106c9ee395c5f0bf3e58f5c151674621e66ad61891ec4e764424e42f315caa352761923d5c3b45ca326850e369ad9
 AUX rofi-1.5.0-gtk-settings-test.patch 322 BLAKE2B 652e0c20262bc18abadc8e540d4b9374fe412a97ff6b82b545ec4f050e087b8982b4e16ebf9553c71e5b6c145e8a3b8b469b1b107def04f443c01c57efe9e947 SHA512 75431eac4c6eac56716a6e2ec0ca4f5fd88aa38761b758b58c5f8c3f3fd6eb4a111af9c74b2d7c14fc3e66cbc7f361b2b3bc8658cfb31fb827e01cf19a58df67
 DIST rofi-1.5.4.tar.gz 535259 BLAKE2B 8560dfee631c66a6f2178c0af6926ef317ed6d2cfe3ae46264e5b1ce429113ce810e4fed4c86a81acbbd51c85ad2593f40a39d982d7da0aa8ccc55537cadd2bb SHA512 181dedb0905bfab76f7ad313d299f4c80ee4efb11a2c6345b16044b7fb3f54bc7e304ee9352e562932e55108e328e5f6bd2c1d7fd9bcdec3d8022c2dc4f8d394
+DIST rofi-1.6.0.tar.gz 558808 BLAKE2B 45849f71becd3ab69b85dae64af34ad42199c20976304b89b013405f1d7fbbfa8fdf7d3ac4c26563cc2f5924fad64d45da1ba7dcad8857fb127eaf4b40c08824 SHA512 a993b0d49681eae4bc4aa84277f6daf1467e53bc40fa43e97ccf3f834763a3c9a1ed8b5d1d628158febc9e8b339be3fb745ae5b4e1d86e9f84b7af4b6a30ea23
 EBUILD rofi-1.5.4-r1.ebuild 1081 BLAKE2B 57e62dbf8e19448372d23438ffea0840144651434e6235798bc558be24d785d03d0e2143cab08b83abb39d3308446f42c46706f9aaa9edb690da1a9a7055a078 SHA512 456f687515cf00aa7826111d393056aea01159aacc88a408d66d5aef493a154ea9c823b57cd6b73ee593c0776d6f6e3d5a2ce94ccd7e97f523514d175778b236
+EBUILD rofi-1.6.0.ebuild 1127 BLAKE2B c279ac1a739c9dd30bbc1a87856e4f3b4e787a20f3f857d805a7775b2a7b363fb1a59d6f7fd7e8ab2ae904f57a8d98ed0d17201876426015ce2bd0de68ee0516 SHA512 c0cd9be17f855fcc119fd58e614aee41d1ab9b368de322f903652360bfa1ba7a166f47d2c3d09a655dec32edfbeafb5f85e0e1ae2484986524c982f3d6a6bc1a
 EBUILD rofi-99999.ebuild 1042 BLAKE2B 0c684ffbeef5366d83b4689a2e8ab9f27072e82d936985fe1a7d128a65cc8b3edcf6a42b09e85866496b280143af8d5f4ece9d8db452bdf1eae020a93302d10c SHA512 1a08b9ded70d742ef6fe5c9250291a6ff74b1efcb767594c4546bb5f7217d1c50cc04d259a55834b12d3c91b3262d82edfcd5c2ffb5ded4ac8718e54a3ea27a1
-MISC metadata.xml 495 BLAKE2B 0a6c59c1d1db2ae103cf8165f39dfda9beb4dad681379f6f6bed7cf3f0a44f06e9cbd77457dfea4bcb0c42e3df8c6e2c7c83ea4a9185e1a4131db214d26058cd SHA512 afcce018b90e20d190e8da510c57b27b92508a40972fc5e573c185561dd0daa3ce3fd57c689c2ec65902087aaec7d1273ed151abdc5c6be76706f694c1c9510f
+MISC metadata.xml 546 BLAKE2B 2e5e62bcddea3c68e3f6bfc4826ea58c40f4312284cb412f29a47aabf8b062a9ec4ab7dcdaa2c86ceb4707d39e156daa4d0ca1e8bb1cd491a3eeed6070af8dac SHA512 129184ce9a703b8fa8880c1e06c68a58bbdeaa0b170128bf334fcd979fad4dd926562da816a269e7afa3f2cf1b96c648db2c676900ba88c667abe6c907c8eb7f
diff --git a/x11-misc/rofi/metadata.xml b/x11-misc/rofi/metadata.xml
index d9dc616fbbc3..55134acf088d 100644
--- a/x11-misc/rofi/metadata.xml
+++ b/x11-misc/rofi/metadata.xml
@@ -2,16 +2,17 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
-	<email>jer@gentoo.org</email>
+<email>jer@gentoo.org</email>
 </maintainer>
 <maintainer type="project">
-	<email>desktop-misc@gentoo.org</email>
-	<name>Gentoo Desktop Miscellaneous Project</name>
+<email>desktop-misc@gentoo.org</email>
+<name>Gentoo Desktop Miscellaneous Project</name>
 </maintainer>
 <use>
-	<flag name="windowmode">Enable normal window mode</flag>
+<flag name="drun">Enable desktop file run dialog</flag>
+<flag name="windowmode">Enable normal window mode</flag>
 </use>
 <upstream>
-	<remote-id type="github">DaveDavenport/rofi</remote-id>
+<remote-id type="github">DaveDavenport/rofi</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/x11-misc/rofi/rofi-1.6.0.ebuild b/x11-misc/rofi/rofi-1.6.0.ebuild
new file mode 100644
index 000000000000..2eed2dccd62c
--- /dev/null
+++ b/x11-misc/rofi/rofi-1.6.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools toolchain-funcs
+
+DESCRIPTION="A window switcher, run dialog and dmenu replacement"
+HOMEPAGE="https://github.com/davatorium/rofi"
+SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+drun test +windowmode"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/glib:2
+	gnome-base/librsvg:2
+	media-libs/freetype
+	virtual/jpeg
+	x11-libs/cairo[X,xcb(+)]
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libxcb
+	x11-libs/libxkbcommon[X]
+	x11-libs/pango[X]
+	x11-libs/startup-notification
+	x11-libs/xcb-util
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-xrm
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	test? ( >=dev-libs/check-0.11 )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.15.12-Werror.patch
+	"${FILESDIR}"/${PN}-1.5.0-gtk-settings-test.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+
+	econf \
+		$(use_enable drun) \
+		$(use_enable test check) \
+		$(use_enable windowmode)
+}
diff --git a/x11-misc/shutter/Manifest b/x11-misc/shutter/Manifest
index 4e230bbf2b46..555df655b226 100644
--- a/x11-misc/shutter/Manifest
+++ b/x11-misc/shutter/Manifest
@@ -1,3 +1,3 @@
 DIST shutter-0.94.3_p20200621.tar.gz 2571420 BLAKE2B 0567d03d1b511f3bbe889ad6dda3bfa347dc69d96c7ab89368e6e97925d8d4cccb378ee0da179a65a482e6d22117aaff390088e7cac5d695edd3b8fee7c6a396 SHA512 3426b1cc475356cbcbcaba89e59e904907d61ceafb96b7d7994ff3d9a1fcb1f8151099a2361cd8de63b16fe02c1246f0cb50fb7166d666bc502f18e6fdda6d5f
-EBUILD shutter-0.94.3_p20200621.ebuild 2342 BLAKE2B 0676ea8c19807cae8ddc3b3a66621ff7abfc884ed7ee0a69771e5b4f201e6ead0854a8ff1d977b7fb3539c66c23c1d5e28c257cf07517ccc4a9edbff28686141 SHA512 9999f8f578e5fee77105b424488fe9d7b85ef1a4c3a83d809f86225a9b1e6950ab8bd461d870a1a714bc67782ee685405c2607f43ea2ca7da67c17b5b090901a
+EBUILD shutter-0.94.3_p20200621.ebuild 2346 BLAKE2B 009de3fcbc7d2e119dfa4c4963d64e9552598637936389a7856a2977b3e326aac21bb12cbd217374937461240e94721cdb93ac61596298d4c2c2bdea0b04c691 SHA512 98cb52549fad1150d6c9d30fb45bb657c108be1c0206d64fd70ff643ac1f87082c7f3a020aae62da94623ab28c6e4386d04f42afa33161e8dc83b3bf96eb71e2
 MISC metadata.xml 373 BLAKE2B 1b254f3b91e248b37f243d85ca48527e68be76849f668d1918e57a454e1e9da0f899ea36805138e4c18164d91c44b6aaf6a75a46deb5b42af2aa2e1b17a679bf SHA512 9c42f1f7eea609dbd75eba9e5adf78b9f4f69a5966ad54de04cf355672357fe83f1a4f5d140d1701523d96279ca9c8c095dd796bf135a57339ef4d6939be615e
diff --git a/x11-misc/shutter/shutter-0.94.3_p20200621.ebuild b/x11-misc/shutter/shutter-0.94.3_p20200621.ebuild
index b29843d0ea8a..b50087351ae5 100644
--- a/x11-misc/shutter/shutter-0.94.3_p20200621.ebuild
+++ b/x11-misc/shutter/shutter-0.94.3_p20200621.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop eutils xdg-utils
+inherit desktop optfeature xdg-utils
 
 DESCRIPTION="Feature-rich screenshot program"
 HOMEPAGE="https://shutter-project.org/"
diff --git a/x11-misc/sux/Manifest b/x11-misc/sux/Manifest
index ea69a8a9b273..23494e2c6cf3 100644
--- a/x11-misc/sux/Manifest
+++ b/x11-misc/sux/Manifest
@@ -1,6 +1,7 @@
 AUX sux-1.0-dash.patch 279 BLAKE2B c878e89af286f239beefd8f7a2deb9c7783b410c291bacffeb855d781c7ca8efaed639c44bbad273fe310a7cdeb43a34d91200840b2a4bd4c2ecefaded5914bc SHA512 e8a0f44b1fa04fddedc6ea617c03da2c5c2ac5ea98b5fc60a8fbbed47c669b2cd8fc31e19d969f22f374c08ee80f5f108882eba0ca0ef64d69fe2339cdde8133
-AUX sux-1.0-r1.patch 1695 BLAKE2B 0ad2d5b021aed37904871904e135ef416a5c102557621ee158dbac946890b1e24263b5bb238e02816b96cf0d061d80aa03c78f9862804dc0b5c1bd1fdce251a4 SHA512 10e6b34aa1eb26bb51e33534a9c6c32ffb72c8b4eab86aec13087d915f49eda0bd6d6b6ec393ec8a1ec2f170f7fe00557019a235a10ae08f3d15f5a3c105f26f
-AUX sux-X11R6.patch 810 BLAKE2B f9844e65997e4c75dc9d5b41f9733b72bb072db13169d62f6986b28c89a027c8a91766cf4a03785f80b1d28cbeb22943ccb4ea3f9b5d2fa29c6cb171df8a6316 SHA512 5f34860c054c0eca0e7d2626cac3ff449c52310993628b756cebb96d589c9acb7b6fc726cb303d97f17233362bf7ed8c68fb836be529ef05aa1a7d9de71256a5
+AUX sux-1.0-xauth-and-home.patch 1677 BLAKE2B 873b36cfb2688ec0f5c78b78eecea08891011291f92df0c12f35d3a3b8b2fdb8dc50e4899237e384bd9929a245b4ca7c72013fc1e76417eb76601f261ec5e105 SHA512 8d04b827027a262caa00bc24c3d93f23f6ebde645564136ca9aafeda862b782a96427a1b1d616245392aaf314c64e537d4b4772efef19d3de414021343e230c8
 DIST sux 9403 BLAKE2B 26df0f3759b4f4f70479d1532459e3e04da05098045bed7b1066a89f6c636a1200f28866c7ba251d54c24d621b658686889f2306ed797719dfb95a55fb7b3430 SHA512 cf1afb736299e349a14837f89f0feb6a5beb1af35be8e6baef74d03e7278a9d9c331d2759ec21e5cf8b43197734f96464b82ff5904968428bc43a45d2ad0c598
-EBUILD sux-1.0-r4.ebuild 607 BLAKE2B 17fc68fd609ec84200526c36a3760960dec3ba69f90fbf5a7b30f5197b3f3c0f91afc1da96cf03d3ddb78049c327cf8fa69af10b7ba3055f13a32ec23d02a075 SHA512 d6c1c433067e71e4d823745c21a0392fce3dedabb6257f16bb0d8b5ca1d74809a0c4945b10e679cbaf5da1c9b73a5168b50cb316c782bb4dd1aa9b81a7e75209
+DIST sux-1.0.1.tar.gz 10614 BLAKE2B f22005a76194ff483ec24ad6ca1d92190fa9f2dbeabb96ad0343b06658b2bc2498e502e167e67df9ed335c74120b443e3daa31530aa18c615416d8464d758a5c SHA512 f121f70daa9e341ae636361675b1c73e3bb5c3f2301b93b32155c79175b3639d307b8fb0b63fbd51d98b6f3ae6c4530c0991343e86f95192a523a9a08a6048f3
+EBUILD sux-1.0-r4.ebuild 588 BLAKE2B cf275e279487c1340f0a291e44085a65229b21207a049bc05308e7bb5d60e604d9f6397cae1f0445ff3220593c1d6d6fc9cc15b4c45e931a1e1f036fcd590228 SHA512 d15931eaf95ffe014ea87d5b348dc7d0c4fd03b16a9bed22a7365b5a967c559ee8e7ad370f3513e529d4f8eca4e8485816e8a98b7d90e161e496e1264df506a5
+EBUILD sux-1.0.1.ebuild 587 BLAKE2B 7e604e215641c1c8609bfb33297bd6a844f3a3c5c72e7e246c60cc251cdce155815107b5967e54ae20ec669943a2d6cf2b76e69caec3ca19199b6822fadbe292 SHA512 ba8e51ce68903dab21e73a6dff13cd1678f99aa536748e7e12875632d80744ebc258a33e5f0be8dd6c0e680f328e70de97d1dc8e79abe2114bc420500d501da4
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-misc/sux/files/sux-1.0-r1.patch b/x11-misc/sux/files/sux-1.0-xauth-and-home.patch
index 5be78fd7b7d2..09bcf3826af3 100644
--- a/x11-misc/sux/files/sux-1.0-r1.patch
+++ b/x11-misc/sux/files/sux-1.0-xauth-and-home.patch
@@ -13,11 +13,11 @@
    # cookie, e.g. an MIT cookie, and there's still a stale XDM cookie hanging 
    # around.
 -  export TERM="xauth -q remove $DISPLAY 2>/dev/null;"
-+  export TERM="/usr/X11R6/bin/xauth -q remove $DISPLAY 2>/dev/null;"
++  export TERM="/usr/bin/xauth -q remove $DISPLAY 2>/dev/null;"
    if [ -n "$sux_unix_display" ]
    then
 -    TERM="$TERM xauth -q remove $sux_unix_display;"
-+    TERM="$TERM /usr/X11R6/bin/xauth -q remove $sux_unix_display;"
++    TERM="$TERM /usr/bin/xauth -q remove $sux_unix_display;"
    fi
  
    # Note that there may be more than one cookie to transfer, hence 
@@ -26,11 +26,11 @@
      if [ $sux_i -eq 9 ]
      then
 -      TERM="$TERM | xauth nmerge - ;"
-+      TERM="$TERM | /usr/X11R6/bin/xauth nmerge - ;"
++      TERM="$TERM | /usr/bin/xauth nmerge - ;"
        sux_i=0
      fi
    done
-@@ -316,12 +316,12 @@
+@@ -316,12 +315,12 @@
  # wouldn't have the proper access rights anyway...
  unset XAUTHORITY
  
@@ -44,7 +44,7 @@
    if [ -z "$sux_home" ]
    then
      echo "WARNING: --preserve-environment has been set, but no good value was found for XAUTHORITY, expect trouble" >&2
-@@ -334,4 +334,4 @@
+@@ -334,4 +333,4 @@
  ##
  # Execute su
  exec su $sux_su_opts -c "$sux_xauth_cmd \
diff --git a/x11-misc/sux/files/sux-X11R6.patch b/x11-misc/sux/files/sux-X11R6.patch
deleted file mode 100644
index 6b345a646965..000000000000
--- a/x11-misc/sux/files/sux-X11R6.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/sux
-+++ b/sux
-@@ -229,10 +229,10 @@
-   # Remove the old cookies. They may cause trouble if we transfer only one 
-   # cookie, e.g. an MIT cookie, and there's still a stale XDM cookie hanging 
-   # around.
--  export TERM="/usr/X11R6/bin/xauth -q remove $DISPLAY 2>/dev/null;"
-+  export TERM="/usr/bin/xauth -q remove $DISPLAY 2>/dev/null;"
-   if [ -n "$sux_unix_display" ]
-   then
--    TERM="$TERM /usr/X11R6/bin/xauth -q remove $sux_unix_display;"
-+    TERM="$TERM /usr/bin/xauth -q remove $sux_unix_display;"
-   fi
- 
-   # Note that there may be more than one cookie to transfer, hence 
-@@ -249,7 +249,7 @@
-     sux_i=`expr $sux_i + 1`
-     if [ $sux_i -eq 9 ]
-     then
--      TERM="$TERM | /usr/X11R6/bin/xauth nmerge - ;"
-+      TERM="$TERM | /usr/bin/xauth nmerge - ;"
-       sux_i=0
-     fi
-   done
diff --git a/x11-misc/sux/sux-1.0-r4.ebuild b/x11-misc/sux/sux-1.0-r4.ebuild
index a9b3f0087aa0..1acd867a81cd 100644
--- a/x11-misc/sux/sux-1.0-r4.ebuild
+++ b/x11-misc/sux/sux-1.0-r4.ebuild
@@ -23,8 +23,7 @@ src_unpack() {
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}"/${P}-r1.patch \
-		"${FILESDIR}"/${PN}-X11R6.patch \
+		"${FILESDIR}"/${PN}-1.0-xauth-and-home.patch \
 		"${FILESDIR}"/${P}-dash.patch
 }
 
diff --git a/x11-misc/sux/sux-1.0.1.ebuild b/x11-misc/sux/sux-1.0.1.ebuild
new file mode 100644
index 000000000000..8619606a8840
--- /dev/null
+++ b/x11-misc/sux/sux-1.0.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="\"su\" wrapper which transfers X credentials"
+HOMEPAGE="http://fgouget.free.fr/sux/sux-readme.shtml"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+
+RDEPEND="x11-apps/xauth"
+DEPEND="${RDEPEND}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0-xauth-and-home.patch
+)
+
+
+src_install() {
+	dobin ${PN}{,term}
+	dodoc TODO
+	newdoc debian/changelog Debian.changelog
+	doman debian/${PN}{,term}.1
+}
diff --git a/x11-misc/svkbd/Manifest b/x11-misc/svkbd/Manifest
new file mode 100644
index 000000000000..b694f1dacf19
--- /dev/null
+++ b/x11-misc/svkbd/Manifest
@@ -0,0 +1,3 @@
+DIST svkbd-0.2.tar.gz 19470 BLAKE2B 3b97cfe37439474a31f382f86706b47effab82a1ef5ba0a278e0e7241b304b2cd096c01d88a60fc8ed2c25fb4c019b3fbe18645378b4508f339e69739381f22f SHA512 320f212c21163bd143e468bc541f79bc290e695704db1f7912112b07e673b6cde9766768c1e153a88962a8385ff9ac6cb78c2da5ca8ffb1b57be5eac26d46553
+EBUILD svkbd-0.2.ebuild 870 BLAKE2B 87e2cbf849bd5a8b2ed5a3c77e7303486747e475f87541cbb5990685b6f1be4250de473cc50210ab97d15496d90baf7f685455b28ef06ba36f45b6f0fbb31fb2 SHA512 5659c665a88fe7ea5aa72cc81470516e3ba3b3322cd36597a1a520ead73d5e7f794500643fb7491b3fb603a237af0af9787dd0f58795ec858faf0ed250169de3
+MISC metadata.xml 220 BLAKE2B 11299b6e9582bb55f5decff226d1917da6e8d665c1ff3f95a035963a51f1ab529c28963908fda5a64b9ba0e0b608b354a36d605ef5826cf1698937316c8b4932 SHA512 8e96ee3f78ee96ef4b61c89b6c82a43f03d0a96dcd3af136fbabd1cd2635a27d98d9ffdbe9a87d9fda9b0feca21c7d223cdbd89d35b1a096e7fe3655a9621607
diff --git a/x11-misc/svkbd/metadata.xml b/x11-misc/svkbd/metadata.xml
new file mode 100644
index 000000000000..cfab5bb7c8da
--- /dev/null
+++ b/x11-misc/svkbd/metadata.xml
@@ -0,0 +1,7 @@
+<?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>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-misc/svkbd/svkbd-0.2.ebuild b/x11-misc/svkbd/svkbd-0.2.ebuild
new file mode 100644
index 000000000000..a6f135c3de90
--- /dev/null
+++ b/x11-misc/svkbd/svkbd-0.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit savedconfig toolchain-funcs
+
+DESCRIPTION="Simple Virtual Keyboard"
+HOMEPAGE="https://tools.suckless.org/x/svkbd/"
+SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libXtst
+"
+DEPEND="
+	${DEPEND}
+	x11-base/xorg-proto
+"
+
+src_prepare() {
+	default
+
+	restore_config config.def.h
+
+	sed -i -e 's|pkg-config|$(PKG_CONFIG)|g' Makefile || die
+}
+
+src_compile() {
+	for i in layout*.h; do
+		i=${i/layout.}; i=${i/.h}
+		emake \
+			CC="$(tc-getCC)" \
+			PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+			LAYOUT=${i}
+	done
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+
+	doman ${PN}.1
+
+	save_config config.def.h
+}
diff --git a/x11-misc/xautolock/Manifest b/x11-misc/xautolock/Manifest
index d167f417047a..290738fc6712 100644
--- a/x11-misc/xautolock/Manifest
+++ b/x11-misc/xautolock/Manifest
@@ -3,8 +3,10 @@ DIST xautolock-2.2.tgz 35288 BLAKE2B 0cd709470002d7a6852a41a56e9f6b540405e172f30
 DIST xautolock_2.2-5.1.debian.tar.xz 5828 BLAKE2B 6a664d30b993986e70af853c037738da0576ca5ee3a0452329d4dffd3132899d1099b5bcc5bbf68ab688240b388396335b0d5227b140a74deca313112d0088cd SHA512 315f27518b89fa6633e3ce157423cd271f3db3b797fc59febc35aa8b33379bd6eda55ac9c7ccdf996c2d9d50bb6bef3b15add84b39236ace425740238de77e59
 DIST xautolock_2.2-5.2.debian.tar.xz 6216 BLAKE2B bda8c7a084e8975d268d626cc5aa02c87c7e6b0ae92351375f298cde4fabd8e48a0578c7c4bf32a280e2ecf13d82b7dcd73a874863616c0f9812ea98ffbe27e8 SHA512 807c9c7da51b16ed3a6600732f8d3b606d2f6c628238df0e6d975ea176ddce3d0e321779b19662f693ed1811b288ddae1b45228c0939e0728c122c1a2e556391
 DIST xautolock_2.2-6.debian.tar.xz 6376 BLAKE2B a7ef40b0fedd21146e359b85b7245695d9395a54aac568800b80a89fb13a08616fe771997d8b9e155c49f8218447022fcb2b256802156ee5f66d923e394a53ba SHA512 c5d350ae2e123e63564e9145de3a7a180b47cca745262cc4f935ced83e0fe2450d68fcbd0c3de3f4566e6650b3d6183b4491f5a2d0caed838221d2bc0b9e1613
+DIST xautolock_2.2-7.debian.tar.xz 7976 BLAKE2B d56687d0eee58e513eae152f2d6d30496346935a05410759eb116eb9fb19c3073db10f1393ab26ae5a63436693b82557b01c0dc18be75af4ee04de8a783bc618 SHA512 5cc0cce408466a57fc99d701199b6a1b3545d9faae86e2474450263a07fbe9920dc89cc3ac14bd8a00274e7e80768be3e360e81ad7378bcdbe34ada23958745a
 EBUILD xautolock-2.2_p5_p1-r1.ebuild 1276 BLAKE2B 085548a8d13cb2f19faa216864409a49a4cd46205a9dc0455977432ae3f8ff6fa3c9fef222853acfce3a6ba410a0d2d8a91e0f5cd67c445c29e73c980fe508e2 SHA512 8b842594fc91dc669d78d65cb091ec91c45e9172c94686d9e2c072b81d3024a1859d2cb03fb555872360969de15b91897c4fd27059f68ffa5930c12059f1b527
 EBUILD xautolock-2.2_p5_p1.ebuild 1411 BLAKE2B 50ba51c716e15d20309d3be25f030f21310b0d85e61e921e59e377806ee7d08d4fe56fbeea40044304bff1fb753052ffe6f1c0768f9c1623e5d67fc5f983e54f SHA512 9c09ce4bce65235afa3f44fa01eee830639131d6741b8d258f34844ae29c2d5e5be167377c92e419e0f0ecd5efcbfa2238f9d1fe4512d4253e624880235cf930
 EBUILD xautolock-2.2_p5_p2.ebuild 1038 BLAKE2B b58e78b0a320e36511e2b10fc8d86ab8f8018ebcfeb922646f99ae708ae67022cc9d84a6004f8385630899ed78034cf99a72901edcb9ad668ddb5efb35c7c76a SHA512 fcefc00b8d5f38a52af61ed3efc067409ac8f63fdf6f2fe21ddad43f907449d5bd6ab010cc1df542cd28b269d0b9a7005e6f21819f159bcd509c97ea33871de3
 EBUILD xautolock-2.2_p6.ebuild 1103 BLAKE2B 3c426d434e0c799d0b20414270343d08a0065129d7de9dd0f921a378fe2ade5b9e8f6f946949782aa327fb7a2681e67e9c0161abb6d339ad8a2e0409680b2147 SHA512 d5f7a06d84452ef25341f07733c9073cb4704ae5eec0019b9ec185be763137aba18dac8a1dd0fbece5b24a090b25dc75997e689ed76e6d031fee579db5deccff
+EBUILD xautolock-2.2_p7.ebuild 1103 BLAKE2B 3c426d434e0c799d0b20414270343d08a0065129d7de9dd0f921a378fe2ade5b9e8f6f946949782aa327fb7a2681e67e9c0161abb6d339ad8a2e0409680b2147 SHA512 d5f7a06d84452ef25341f07733c9073cb4704ae5eec0019b9ec185be763137aba18dac8a1dd0fbece5b24a090b25dc75997e689ed76e6d031fee579db5deccff
 MISC metadata.xml 637 BLAKE2B d1b4ecdd6eda1ba1db1550aa7187e1cd90b6093fd257600b4b3506ffb560946ceefe52bedd4364c0506be586daeebbdb1467197047db7a72f23aee9f41680e64 SHA512 62dcaa38a5e6ed4b9f020379fedb6d59f87628ea036b74acb73f600b89d0eab640548c18b104306df3d56c055ce39adbadf49683eaa46ece7ca26c79539c32d9
diff --git a/x11-misc/xautolock/xautolock-2.2_p7.ebuild b/x11-misc/xautolock/xautolock-2.2_p7.ebuild
new file mode 100644
index 000000000000..1abba4868157
--- /dev/null
+++ b/x11-misc/xautolock/xautolock-2.2_p7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="An automatic X screen-locker/screen-saver"
+HOMEPAGE="http://www.ibiblio.org/pub/Linux/X11/screensavers/"
+
+DEB_REVISION="$(ver_cut 4)"
+SRC_URI="
+	http://www.ibiblio.org/pub/Linux/X11/screensavers/${P/_p*/}.tgz
+	mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}-${DEB_REVISION}.debian.tar.xz
+"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+	x11-libs/libXScrnSaver
+"
+DEPEND="
+	${RDEPEND}
+	app-text/rman
+	x11-base/xorg-proto
+	x11-misc/imake
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2_p5_p1-waitpid.patch
+)
+S=${WORKDIR}/${P/_p*}
+
+src_prepare() {
+	mv "${WORKDIR}"/debian/patches/14-do-not-use-union-wait-type.patch{,.skip} || die
+	eapply "${WORKDIR}"/debian/patches/*.patch
+	default
+}
+
+src_configure() {
+	xmkmf || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin xautolock
+	newman xautolock.man xautolock.1
+	dodoc Changelog Readme Todo
+}
diff --git a/x11-misc/xfishtank/Manifest b/x11-misc/xfishtank/Manifest
index 85141c4a68d4..c9e6947e30ed 100644
--- a/x11-misc/xfishtank/Manifest
+++ b/x11-misc/xfishtank/Manifest
@@ -1,4 +1,6 @@
-AUX xfishtank-2.1-implicits.patch 1446 BLAKE2B 6da3d446e7855cf26a84ed143dd4b63ab45fc2d9205f1a64cdec5c23fab1700e64800474b7a3066019fe055e2b4a2ee95dae0fea4494a261c6e8e7d905fbc10e SHA512 9c04b8bc38f629a7590500c24a2e22c8c7ffae77f9eb55a174ea8eac75ce90ae762baa3ff550a55b1afd6788d8dcba6eb0b0ef6a70382b6da78936bc747065f0
+AUX xfishtank-2.1-implicits.patch 1306 BLAKE2B fc02cbba3a86316fd660c1e6436f191a4f1ad22fad9e63958d2f4550796c759560c2d6073d3350518db4b35c3d10ae4c0caa0e0acfde4735dcfe22fba5029cc9 SHA512 a67297947eeb3ec2b2db59bbab0e802bfab80c4aed90b2db29a06333aee12074b039b91a0daac0eaa51b2c5f52e7a67a3b0bd84aff9fbf3d56fb3c4b03c1c7bb
 DIST xfishtank-2.1tp.tar.gz 187513 BLAKE2B e2acec91ef52776bee82ea1b4df347b7fe509377687e74422d6dff81d7fce8a4009e4d0f45327a8401e4ae9782440d9f6478d1dd501c6e4e7d595d94b2d40b1a SHA512 641efa1104685d94589c2d9d365108308cb1b0dd238dbba6dc333c5922bda371536c0e26a63645351ac245a18f2386e4c47b4a1fc2a7f4b0400d37db846976a1
+DIST xfishtank-2.5.tar.gz 153464 BLAKE2B 0bb3121b84c3d08ea2251a70f9ad569e90fe6299ad3ee4942ec83d80483fcf4db0b0079161c28ff63461597f76b0d0532a65c1bde8aa821ff6bc92be189843f2 SHA512 1bfe16737bdbc2b7cf74abb98408bf632d8881f15753005424f84eba4afca756b07fa7ad424df800ee3f3e46e033b8f60142877bcd9a7e4e806e318ee283721f
 EBUILD xfishtank-2.1-r2.ebuild 723 BLAKE2B 2b7ed6c8a590f24229ba01f491c4297bc029d2268ec906f07e683d45304b8fd0741e949ec90fc754f7dd90deea90d1f0fe761c239c1fe144cefa7b30f86b3bd9 SHA512 35e2c231645b79c5172bd41922686a14b1e38a7647dfbf5e6a56196ca93bc5c94d85262d44478e7356fba7507cd0f10a359b4f10b99be8bd40a555e8d223db48
+EBUILD xfishtank-2.5.ebuild 708 BLAKE2B b5c84977e35a762fb2cdfd9eb56c3fc44e0bf89257fd46003fc1e1534c3592d516afeea7fe6e1a0a79656dffb98e032bd128edac41511c1fd5540957c8c9b5d8 SHA512 c2735ce248942ea289c32b601dc3d5f3914761ef71e8c2fe3a6cb87f3462c98751700154a49a144705370db7e1aaedd2436e18de477f0c5ef457fdc7aab03c5e
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xfishtank/files/xfishtank-2.1-implicits.patch b/x11-misc/xfishtank/files/xfishtank-2.1-implicits.patch
index 0a4a03503246..b00118631bee 100644
--- a/x11-misc/xfishtank/files/xfishtank-2.1-implicits.patch
+++ b/x11-misc/xfishtank/files/xfishtank-2.1-implicits.patch
@@ -1,5 +1,5 @@
---- xfishtank-2.1tp/read.c
-+++ xfishtank-2.1tp/read.c
+--- a/read.c
++++ b/read.c
 @@ -1,5 +1,7 @@
  #include <X11/Xlib.h>
  #include <stdio.h>
@@ -8,16 +8,16 @@
  #include "compact.h"
  #include "medcut.h"
  
---- xfishtank-2.1tp/medcut.c
-+++ xfishtank-2.1tp/medcut.c
+--- a/medcut.c
++++ b/medcut.c
 @@ -1,4 +1,5 @@
  #include <stdio.h>
 +#include <stdlib.h>
  #include "medcut.h"
  
  #define RED     0
---- xfishtank-2.1tp/xfish.c
-+++ xfishtank-2.1tp/xfish.c
+--- a/xfish.c
++++ b/xfish.c
 @@ -46,6 +46,9 @@
  #endif
  
@@ -51,8 +51,8 @@
      timeout.tv_sec = seconds;
      timeout.tv_usec = (seconds - timeout.tv_sec) * 1000000.0;
      select(0, &fds, &fds, &fds, &timeout);
---- xfishtank-2.1tp/makeh.c
-+++ xfishtank-2.1tp/makeh.c
+--- a/makeh.c
++++ b/makeh.c
 @@ -1,6 +1,6 @@
 -
 +#include <stdlib.h>
@@ -62,8 +62,8 @@
  main()
  {
  	FILE *fp;
---- xfishtank-2.1tp/gifread.c
-+++ xfishtank-2.1tp/gifread.c
+--- a/gifread.c
++++ b/gifread.c
 @@ -56,6 +56,8 @@
  
  #include <X11/Xlib.h>
diff --git a/x11-misc/xfishtank/xfishtank-2.5.ebuild b/x11-misc/xfishtank/xfishtank-2.5.ebuild
new file mode 100644
index 000000000000..c98482c9096f
--- /dev/null
+++ b/x11-misc/xfishtank/xfishtank-2.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Turns your root window into an aquarium"
+HOMEPAGE="https://jim.rees.org/computers/xfishtank.html"
+SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux"
+
+RDEPEND="
+	media-libs/imlib2[X]
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	x11-misc/imake
+"
+S=${WORKDIR}/${PN}
+
+src_configure() {
+	xmkmf || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}" \
+		${PN}
+}
diff --git a/x11-misc/xfractint/Manifest b/x11-misc/xfractint/Manifest
index 2fa64f796619..58cb19aeec19 100644
--- a/x11-misc/xfractint/Manifest
+++ b/x11-misc/xfractint/Manifest
@@ -4,5 +4,5 @@ AUX xfractint.envd 63 BLAKE2B 1622655f8b51034a4f3e7c9d7b11fd7628a33b30a17df15b6a
 DIST xfractint-20.04p14.tar.gz 1336285 BLAKE2B 946c34551acf131845f1ecf17d4fe82214535627e8ea68d704efcff4b93c525d82f004bde8ae1bac11df8c82caa3bcff4778b2f8dfed1bdb494ba036e62256c5 SHA512 7d13c719f4f4b0680455b9b7f86644928d8145606973d208e5bf0d26b4f7b04ddbf8d2080ea35c872b21e079f1a116f3ef94e9acb36a45d43c16403c473e2acd
 DIST xfractint-20.04p16.tar.gz 1356976 BLAKE2B 2cb05021c76d9761bf7020a2b9a0fbf7d682a620d931b7841ce75780c1a3aabb6bbbd1b2e378fba3e96b2cfdaf845ff9cdafcf3219ee756fe7d128a19b342132 SHA512 6696daf21c2927d87f58f7d7136c5d51bd8c60d78e901d537f1ef38f27b70c42a590b05c663363c49a8cb30d7013a969813e7bbe4a97f49b9c286497b440bdf1
 EBUILD xfractint-20.04_p14.ebuild 1046 BLAKE2B 41ae48fe45aeef7169d01d2ae52f5484655ec45ba8f7a284466b6cbacb96bff08322fe4c4f0669dbb888221866d6947f81b50c56a6f98175b3970db0e5930db3 SHA512 bbb5ecc9db4ef63e664aa99a7d6ab242ad74c3f0ae57d3e52efd7bf7232fbe9bef8b6aff43393cb3e5ff25e711950effc86c817da9d6b69e513a908d1cc343cb
-EBUILD xfractint-20.04_p16.ebuild 674 BLAKE2B 5bc294cf5552f866946a09c04b0ed7a79a904d74f10d75ebd05037ff571e2a77891d0de40dc93c3b8058c890dee15574d77cf12fae99b6665e000f23477882e8 SHA512 da8ee28b77377eed848c4b23b37d547b1b499905cd1fa46547d472fb3a40c6d8e84eedb406bea1c427645559495fe58f7cc6d595ca4b8656408739fb0100a378
+EBUILD xfractint-20.04_p16.ebuild 672 BLAKE2B 74f8934a09b6de29d961d240f07130923f881bef6acb23b37c344810b6d463a4b60ceeb47d5f3a5e482f542866451259a814769a007b9595327fd00ea5a5e868 SHA512 2015996be5d109eb6cafd9c64f3e5dbde8057be1bbcca104e4636a187e72e328c43766a037f07b822c214ca1ed573c1ab0d7aece95f15e618ecfad7d7c886948
 MISC metadata.xml 366 BLAKE2B 5cfc7ce6a7f5e6d02ad5f78d0e9d177c346b498b679f5623cf7d2321021a3d0289fe30c1b2360cec5903409627898de04fec3d2a7c26ea875f8e891685158549 SHA512 d602f03153bd9f03c962a47d7b10c829e2bdbde64cb5e67bfb4fb7c8755eb87784139ae1e1b287d6dd5c99d2f7a96f7c04f67fede847095116385db7cced5f2e
diff --git a/x11-misc/xfractint/xfractint-20.04_p16.ebuild b/x11-misc/xfractint/xfractint-20.04_p16.ebuild
index 0e98bb543fd8..191369ee591a 100644
--- a/x11-misc/xfractint/xfractint-20.04_p16.ebuild
+++ b/x11-misc/xfractint/xfractint-20.04_p16.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="free-noncomm HPND public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index 79e77ff08f86..36f19f72f94b 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -7,9 +7,11 @@ DIST xlockmore-5.62.tar.xz 1943836 BLAKE2B 6ce9b9ad709881a50eba0e32ae1e7524414a5
 DIST xlockmore-5.63.tar.xz 1944624 BLAKE2B 8ee27c5cc88a7088705b7a017563698fa4bf99418bf3237594a1237547fa1eb9d5274327672f33344e97d2333eca71f95e51f760f0548abef06f8006a97c55c0 SHA512 0b067ced9afe0c5498f0b1e19bf163b0363bbb4bc2bc2007c1c0416328cdc2d528d664b122ef68322c38f2bcc37a15665b31ee6e8ce2369bad9e50528b93a047
 DIST xlockmore-5.64.tar.xz 1944496 BLAKE2B 1b2c0337950bcf7ba094012c70c6c8578523b81a6af6dd68a0373425f87d7da28a770a8f7453019cc1527501a417390f013f43b3da2ddfc7d44380c512f9b4c9 SHA512 4946e8e9f895c0433c09e1cd639389d26020a764d62b08b329ce5d9e5de4bb6438f024639b2068c94f21cb0ebb5a6f94dffff6f606c6c3e2372a5102768e7f39
 DIST xlockmore-5.65.tar.xz 1945636 BLAKE2B d026975551e8ceafdcc7b8d8b6e404634f329d8d1f65e153b51798981103a023479dd58f2485c774aaf58f5928ea28a9f409c733ccfc75f98b65302e7e478ac5 SHA512 ecbf7e5c087843265eb4a537b3fe06a0d86d5f67d88c45137b6a7f4f5b30522d44fb87b5628cd9e042f90af129863fd3a4c2b5e2305df2dc3dfd867a03469ad8
+DIST xlockmore-5.66ALPHA00.tar.xz 1944644 BLAKE2B 0b52cc3a5cb77645174084eec3e81838e96a4b5e849955e9090efabb62cb38f477ae3a23664b4dc27bb8b79af62d946b4702244bc3b601ede7097f60de6b0fbd SHA512 7216fc3b034c382ab02d06e22a9e572e3602e4745b2a055a8ee51f6a4c014776ea27b665fe7638719303b9bea3f957a27e1da47e15d5de44c3717136dae82ee2
 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.ebuild 2337 BLAKE2B 73ba42d7fc570be8efda9ce39f50174fdfb2ff653f64b4ac5ede455d737c7d248d5a128cee3433eb00bd8973a3dc525a212bd5bac6f92474034b0ec7c2a2cb46 SHA512 e1996a03cc088f2e07fd077fb4c5209607d3ea288935ed6469356af6edff47739a99fac2dec4d8d98583591167ff81f9d7da1bf60418ff47c6046c667af76f07
 EBUILD xlockmore-5.65.ebuild 2337 BLAKE2B 73ba42d7fc570be8efda9ce39f50174fdfb2ff653f64b4ac5ede455d737c7d248d5a128cee3433eb00bd8973a3dc525a212bd5bac6f92474034b0ec7c2a2cb46 SHA512 e1996a03cc088f2e07fd077fb4c5209607d3ea288935ed6469356af6edff47739a99fac2dec4d8d98583591167ff81f9d7da1bf60418ff47c6046c667af76f07
+EBUILD xlockmore-5.66_alpha00.ebuild 2480 BLAKE2B db28c6af68b0fa419e001dc54dec91d6f5856c5cf2159c1764809f0780fee5a6155a06438880e4a20d2c457332295a7d0830c0e5792bd43f321d901c90b07eef SHA512 4e4bc7c9867f24c9066371c2838ce9e960394717a72fa9b532f4b98ee0e7ad40bd1902669cc1f76c3a5f16742d1b283d5cd0d0722ad6eda30c09aba7efb87b7b
 MISC metadata.xml 446 BLAKE2B d638ac6f12a203ae9ada10ae4c33e3a3d9901e350b6e6925c50078d66b29343cae42a67f84d5334182c1e816bddb05d062eb7b7e47c9125b273db118c4de573b SHA512 c8fafb010e63c39beeee5b53ad37354d19e98ac4cf33f29606b0af379811a0738c9c70d1fb7c31a5673d4a6365fb658a6a8bf49135b748bea9069a690ce543ed
diff --git a/x11-misc/xlockmore/xlockmore-5.66_alpha00.ebuild b/x11-misc/xlockmore/xlockmore-5.66_alpha00.ebuild
new file mode 100644
index 000000000000..5fcdba0ea0d5
--- /dev/null
+++ b/x11-misc/xlockmore/xlockmore-5.66_alpha00.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic pam
+
+DESCRIPTION="Just another screensaver application for X"
+HOMEPAGE="https://www.sillycycle.com/xlockmore.html"
+SRC_URI="
+	https://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
+	https://www.sillycycle.com/xlock/recent-releases/${P/_alpha/ALPHA}.tar.xz
+"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
+
+REQUIRED_USE="
+	|| ( crypt pam )
+	pam? ( !xlockrc )
+	xlockrc? ( !pam )
+"
+RDEPEND="
+	gtk? ( x11-libs/gtk+:2 )
+	imagemagick? ( media-gfx/imagemagick:= )
+	motif? ( >=x11-libs/motif-2.3:0 )
+	nas? ( media-libs/nas )
+	opengl? (
+		virtual/opengl
+		virtual/glu
+		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
+	)
+	pam? ( sys-libs/pam )
+	truetype? ( media-libs/freetype:2 )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+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}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/XLOCKLIBPATHS="-L/d' \
+		-e '/XMLOCKLIBPATHS="-L/d' \
+		-e 's|/lib|'"${EPREFIX}/$(get_libdir)"/'|g' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+
+	if use opengl && use truetype; then
+			myconf=( --with-ftgl )
+			append-cppflags -DFTGL213
+		else
+			myconf=( --without-ftgl )
+	fi
+
+	myconf+=(
+		$(use_enable pam)
+		$(use_enable xlockrc)
+		$(use_enable vtlock)
+		$(use_with crypt)
+		$(use_with debug editres)
+		$(use_with gtk gtk2)
+		$(use_with imagemagick magick)
+		$(use_with motif)
+		$(use_with nas)
+		$(use_with opengl mesa)
+		$(use_with opengl)
+		$(use_with truetype freetype)
+		$(use_with truetype ttf)
+		$(use_with xinerama)
+		--disable-mb
+		--enable-appdefaultdir=/usr/share/X11/app-defaults
+		--enable-syslog
+		--enable-vtlock
+		--without-esound
+		--without-gtk
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
+	default
+
+	pamd_mimic_system xlock auth
+
+	if use pam; then
+		fperms 755 /usr/bin/xlock
+	else
+		fperms 4755 /usr/bin/xlock
+	fi
+
+	docinto html
+	dodoc docs/xlock.html
+}
diff --git a/x11-misc/xsensors/Manifest b/x11-misc/xsensors/Manifest
index 9cdbf4fd2fcc..250a5f509600 100644
--- a/x11-misc/xsensors/Manifest
+++ b/x11-misc/xsensors/Manifest
@@ -1,4 +1,8 @@
 AUX xsensors-0.70-gtk220.patch 1566 BLAKE2B a36a31d4a7810d77d5ee3d451936a111204570863c253d7a6afdd7d058b87ea58efa494a048f32b29cb152b30025a1f23d5bad18d0a14ee481ee909f373b692a SHA512 24196915ebde6264a5ec364539ede4827459a87e675dff3e187a556d4adb24ee0efb41db49fe2ae0c94e5ab467eb3caff205df28d30c15c8bca9f78641324199
+AUX xsensors-0.80-Werror.patch 470 BLAKE2B 6754c97e1182c696acd47a101b27889e6efec3e45448d7b19802ba0f2e0fcce35df26dfc517a10ee631bbe36f3ef948cfccb98f102085ca97981e8c61a779131 SHA512 b069009cb470ac224d74669fb8b92dbaa090d18e780eb820599cb413da89fae1f271b831900de15bbe5c209f6b667ab5dd3b9868e14dafa278b1d3319380ddad
+AUX xsensors-0.80-gtk220.patch 1205 BLAKE2B ae7b2d77ae0083ec60971f2b56b5d0a67ed6ac0f5c76dada91ce9f3a6e53eda026292d2c33b8a636966fb11f3c13a1ac5b150ec60e25a38d460499d43c2805e0 SHA512 3d1a8b9042df478b2af69a94f7682aca15826ae8464396e16372aabb1674b9e483c83d19e6f2412baaebc4811a80a2fd5a8cf78575969dceae1bc20e5fa8eb10
 DIST xsensors-0.70.tar.gz 115430 BLAKE2B af18fa723a9e6b84df62d0ea0397d7b30ab800816b84449f91357aa75d99944796ae8164171bd217118dd93ef713d286fe435354614baef7947f3f851b368df9 SHA512 34f038b192f3cecb2e7587e19c4837b795a2705e6d0e9ea2bd3ead6d3259a1dded364fcfc70fa5e37d64f32c879e1dd9c6e43dcf32fa9aeb73ee5cc49bf290a4
+DIST xsensors-0.80.tar.gz 214763 BLAKE2B 7be4c0ef0f59e7c8c8b32b7e132acb906c9ab64e6e0f63a3316691eef8dd2f8b659d4e40d2213cf580cc4874bcba2fefad4f6a759bf349e18ebef12a99c91128 SHA512 e1ac7107b978bf9b392b0ecb13e49f49c8efebb228a9c6781a519b128f467d0346d35632646f20a036fdc34ea3ee86440c7be5a3285d922f8afbf051e9cfdcc8
 EBUILD xsensors-0.70-r1.ebuild 696 BLAKE2B f8301d03329e2339b23679b11bd6a0752e1b30bb67da54b54caba8089893d07f3ff09081a455fbc9aca70734e62a0e76c0776cfb7dfde4079027ae2f41f3e3e0 SHA512 eeead03d0ca6b8216097301b7af41b655a2d081fc8e32c91d25c0d3fdaa6ef20db5e293b1ddc618f5ee4c474ae3f26087da6f420e431dadf7a5793fa44ef00f5
+EBUILD xsensors-0.80.ebuild 750 BLAKE2B 2d433a5fa6d4e4aaeaae36e7034425798c7b6cab9be1dc6809c796c3599a699c649935f96f0c53a4b7098859188866deb84fc41ed9dbcb14c84d47ee34b19d46 SHA512 b272acbd41d732f00fb7ca33d3660c471c0599ca531c7305b13ddce074909d1809dee7f0df17efddd8e742d25006097fba938d5053e8d6bb322af8f11922b0e2
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xsensors/files/xsensors-0.80-Werror.patch b/x11-misc/xsensors/files/xsensors-0.80-Werror.patch
new file mode 100644
index 000000000000..b903404256ac
--- /dev/null
+++ b/x11-misc/xsensors/files/xsensors-0.80-Werror.patch
@@ -0,0 +1,14 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -4,10 +4,7 @@
+ 	-DG_LOG_DOMAIN=\"GnomeCPUInfoApplet\"				\
+ 	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"		\
+ 	-DDATADIR=\""$(datadir)"\"					\
+-	-DG_DISABLE_DEPRECATED		-DGTK_DISABLE_DEPRECATED	\
+-	-DGDK_DISABLE_DEPRECATED	-DGNOME_DISABLE_DEPRECATED	\
+-	-ansi	-Wall	-Wmissing-prototypes	-Wmissing-declarations \
+-    -Werror
++	-ansi	-Wall	-Wmissing-prototypes	-Wmissing-declarations
+ 
+ bin_PROGRAMS = xsensors
+ 
diff --git a/x11-misc/xsensors/files/xsensors-0.80-gtk220.patch b/x11-misc/xsensors/files/xsensors-0.80-gtk220.patch
new file mode 100644
index 000000000000..9b53de088647
--- /dev/null
+++ b/x11-misc/xsensors/files/xsensors-0.80-gtk220.patch
@@ -0,0 +1,34 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -29,7 +29,7 @@
+             [Force GTK2 GUI, even if GTK3 is available @<:@default=check@:>@])],
+             [], [with_gtk2=no])
+ 
+-if [ test "x$with_gtk2" == xno ]; then
++if [ test "x$with_gtk2" = xno ]; then
+     PKG_CHECK_MODULES([GTK],[gtk+-3.0],foundgtk3=true,foundgtk3=false)
+ else
+     echo "Using GTK2..."
+@@ -37,18 +37,13 @@
+ fi
+ 
+ if [ $foundgtk3 ]; then
+-	XSENSORS_CFLAGS="`pkg-config --cflags gtk+-3.0` -Werror -Wall"
+-	XSENSORS_LIBS="`pkg-config --libs gtk+-3.0`"
++	XSENSORS_CFLAGS="`${PKG_CONFIG} --cflags gtk+-3.0` -Wall -Wall"
++	XSENSORS_LIBS="`${PKG_CONFIG} --libs gtk+-3.0`"
+ else
+-    if [ test "x$with_gtk2" == xno ]; then
+-        echo "GTK3 is not installed, checking for GTK2 instead..."
+-    fi
+-	AM_PATH_GTK_2_0(2.8.0,,AC_MSG_ERROR([
++    AC_MSG_ERROR([
+ *** GTK+ is required to build xsensors; please make sure you have the GTK+
+ *** development headers installed. The latest version of GTK+ is
+-*** always available at http://www.gtk.org/.]))
+-	XSENSORS_CFLAGS="`pkg-config --cflags gtk+-2.0` -Werror -Wall"
+-	XSENSORS_LIBS="`pkg-config --libs gtk+-2.0`"
++*** always available at http://www.gtk.org/.])
+ fi
+ 
+ AC_SUBST(XSENSORS_CFLAGS)
diff --git a/x11-misc/xsensors/xsensors-0.80.ebuild b/x11-misc/xsensors/xsensors-0.80.ebuild
new file mode 100644
index 000000000000..43258aef8b99
--- /dev/null
+++ b/x11-misc/xsensors/xsensors-0.80.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="A hardware health information viewer, interface to lm-sensors"
+HOMEPAGE="https://github.com/Mystro256/xsensors/"
+SRC_URI="https://github.com/Mystro256/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	>=sys-apps/lm-sensors-3
+	dev-libs/glib:2
+	x11-libs/gtk+:3
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-gtk220.patch
+	"${FILESDIR}"/${P}-Werror.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --without-gtk2
+}
+
+src_install() {
+	default
+
+	rm -r "${ED}"/usr/share/appdata || die
+}
diff --git a/x11-misc/xsnow/Manifest b/x11-misc/xsnow/Manifest
index c21d6f24bfb7..cf9d6c60c6d2 100644
--- a/x11-misc/xsnow/Manifest
+++ b/x11-misc/xsnow/Manifest
@@ -1,3 +1,6 @@
+AUX xsnow-3.0.7-gamesdir.patch 317 BLAKE2B 747eb31910be55b1086e05f685d39118e274c99629fd055708cd48aea28baa323ae4a8fd6d8ecc374aa6c457aeae74a336d9dee8992b601bcebcf28c3f634d4e SHA512 f947444e15fe12e1596d1e6869390ade46b8f0dc293bfcfcf7a60e9ff267de0857fe0d3830fa1524de2d9ed53748924d31e9973f1f90807c26d5b3b96aeaba67
 DIST xsnow-1.42.tar.gz 56752 BLAKE2B b6feefa4aabc464097b099a0e48d27b9bd5d1b82bc02ca187ffd8ab810f3562c1d11ad01f18f79994699e1fb1fa520269976a35634388fbab2838e2e2bb122bd SHA512 7833f3c1834d64944a578dc71bbf09966d47a1b4878fb826cf121606e76c69544d96d73665572b45c47e0e017dd0cb0bf49f76799aeb859c1dc72348da4ff257
+DIST xsnow-3.0.7.tar.gz 322314 BLAKE2B 21c754daddb989a2f0771199d15342d0c08d23669525bbd9672537c200f7ff06d92708c256f2f89b483bb91947374195e4e95c2291425e630883cfe3b9898563 SHA512 1bc58d8c4542839ccc80c7612e472754f7471d2d72c61785b27d8a89d5e6826d40b892628bcea8c7dcfcf22e4c13db76a825a8c580a32f1ea74785f6c478fb79
 EBUILD xsnow-1.42-r2.ebuild 840 BLAKE2B 26e9758f489b23dc14b0bd8fb36a99f70ef559bfa0ecddfa53c30ea103cdfdd1caf739ad4644acce8ea6ac678a33cf23e93235a8aa03dc32df71855502fa4e90 SHA512 92e50bb5485cb268bac62d773447a40a696feffb7ad3ec05f7a5feed52812298cefb58a7a24bac341de7448c777d7607b2d277c9dad4d1d397af1d36696be476
+EBUILD xsnow-3.0.7.ebuild 658 BLAKE2B 3f4c503239a02c9daa1d90663da347605d192ac7312928003fcb333d676e507c4ed8461ed6c7670aba7e3385c409c1e2777273beb685d9ae0738e4652a9a6c61 SHA512 a6255df42783b011fdf782c6dee452c2d2cf47c5c41c571e3bec7bb5bcf8698c2eae154c5c8a5f5eb3243a10ba8d151a41f39ac18c6e7966bd08f6c218cf1b63
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xsnow/files/xsnow-3.0.7-gamesdir.patch b/x11-misc/xsnow/files/xsnow-3.0.7-gamesdir.patch
new file mode 100644
index 000000000000..9272ad83ab47
--- /dev/null
+++ b/x11-misc/xsnow/files/xsnow-3.0.7-gamesdir.patch
@@ -0,0 +1,12 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -19,8 +19,7 @@
+ #-# 
+ SUBDIRS = Pixmaps
+ 
+-gamesdir = $(exec_prefix)/games
+-games_PROGRAMS = xsnow
++bin_PROGRAMS = xsnow
+ 
+ xsnow_CPPFLAGS = $(XML_CFLAGS) $(GTK_CFLAGS) $(DBUS_CFLAGS) -DUSE_LIST_NODE_ALLOCATOR 
+ xsnow_LDADD    = $(XML_LIBS)   $(GTK_LIBS)   $(DBUS_LIBS)
diff --git a/x11-misc/xsnow/xsnow-3.0.7.ebuild b/x11-misc/xsnow/xsnow-3.0.7.ebuild
new file mode 100644
index 000000000000..e5540612626c
--- /dev/null
+++ b/x11-misc/xsnow/xsnow-3.0.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools xdg
+
+DESCRIPTION="let it snow on your desktop and windows"
+HOMEPAGE="https://janswaal.home.xs4all.nl/Xsnow/ https://sourceforge.net/projects/xsnow/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libxml2
+	sys-apps/dbus
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXpm
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.7-gamesdir.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}