gentoo resync : 03.03.2021

21 files changed, 99 insertions, 331 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index f775c51315fa..225c4dd72f2f 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index 338072e65441..ce455fe1530d 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -9,5 +9,5 @@ AUX awesome-session 1999 BLAKE2B c7c784fba884ff0e579eb60cb049e695022be162a535065
 AUX awesome-xsession.patch 291 BLAKE2B fb8ca929487ef45cd64c44bbb3db2b7c4a1be4f5abf5f8fa7467694226bdcd1441bd5c601f0f27e7d2c8656bb4c75cb364cd6d8d641a648611ed2658b27cd389 SHA512 1d19f3ac5e9f8fd1084fd5e092d52ffbabb06fc3dc94f6f8e62834a3a03bd5bcb04adc698ac3a022c5446a07a847be35e3f3003e8bc9e7d35c6c82350517233d
 DIST awesome-4.3.tar.xz 1037816 BLAKE2B b4afc5e7bfb01ddc16b67776cc00dd7b0bcbefc9d17f9bec9c04256953858aef2bf0e4b15a525909029b7da771ade0d749758aba2878832f356d7b2c4f0363b7 SHA512 c5ef1e8dc593e7783b895d22143154aea8f211beeda24672a7ee4ed5112b4f4284043f848a151f3d3c4f569e91308670367a4353f705b20511b36495b22fa3f5
 EBUILD awesome-4.3-r101.ebuild 4013 BLAKE2B 8de97a602b1d365a241115ee410fa0967176b629f8906b68519951ad194e5b958b3e401d6b5bead8b55bfc76e1de2d361eb00842f750aea35ddc9d491e859e25 SHA512 9cfc73d8d2c514548d06c9d25343ddb4750b208c00eb57cc8a30b41b0041cec7fd36c44f4db1bf8944f116a1f247c6e33655bb0ce82e06ef9fc42c628c19080d
-EBUILD awesome-9999.ebuild 3959 BLAKE2B c8198273b9ad36c5dabfc202bd4d64438b8156370a9a1220f5b0b36d4422a64c493cbe9116b25a69016474e3c4ae1d7445925961f2f9d2d3ad0f7e033f9aa59b SHA512 bf6b1b79f597e476a6754c6bbd24e50311e10f137d89ec7fb65d4d4e683ca12f65f71f51bc9e6f014a65528489520b4b01891d4fc00f43289e5a80e55339880c
+EBUILD awesome-9999.ebuild 4102 BLAKE2B 760a4a15685ae98b46c8e60d8655eb5bc1ade549f7a750378848c0eb8148c500e7b47ecf2757ff4a222378c525dbdcd0011825f88bc42edf8021c74221ad199f SHA512 569057234828cb29dadb99cbc68793972795ff7785f6a472f13e709ee7c5afe6294f6c8b865992b0282cbc6d407c7852f5568d7d3b4fa648d57006c0a59d409f
 MISC metadata.xml 327 BLAKE2B 2b34d6e8f8e02580c16d30bf9d65e33e29447c848fe58f4fb2324d0d3adbe93e7ba7eaeb440d1bd987ce300f21116742383b59c3fe53c15176a14eda684c6a5e SHA512 4bfbb536edf61389e39e0f6ae53e7255a4f2cf78f197f44317be2e11419ddb950b2aab540d48a1552c2b4c9cc050665ba944e10da5227f95ddacac29ed741276
diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-9999.ebuild
index 1c3583824abf..e8a8a5130ca6 100644
--- a/x11-wm/awesome/awesome-9999.ebuild
+++ b/x11-wm/awesome/awesome-9999.ebuild
@@ -76,11 +76,14 @@ PATCHES=(
 )
 
 src_configure() {
-	# Compression of manpages is handled by portage
+	# Compression of manpages is handled by portage.
+	# WITH_DBUS uses AutoOption.cmake which currently does not
+	# understand yes/no (or indeed any values other than ON, OFF
+	# or AUTO).
 	local mycmakeargs=(
 		-DSYSCONFDIR="${EPREFIX}"/etc
 		-DCOMPRESS_MANPAGES=OFF
-		-DWITH_DBUS=$(usex dbus)
+		-DWITH_DBUS=$(usex dbus ON OFF)
 		-DGENERATE_DOC=$(usex doc)
 		-DAWESOME_DOC_PATH="${EPREFIX}"/usr/share/doc/${PF}
 		-DLUA_INCLUDE_DIR="$(lua_get_include_dir)"
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index 4ab87fb0e78b..5c0777d1fdde 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -1,3 +1,3 @@
 DIST enlightenment-0.24.2.tar.xz 28716060 BLAKE2B 432722693beaece97eeb318a1120b6101bf76e1536347b824b00ba4378326c093f3333eefa634d7266a59c09dc4337c8bd1f9a4d89e0a4c9a223fdcacd924fa0 SHA512 5d96b17d89e822271048a0a6a8356658fd02680f54da2f15dde7c632752bbf0a396eaf23986164402e61f631e68937b3ba7c29d9dd787ddd470cff4a390abace
-EBUILD enlightenment-0.24.2-r1.ebuild 2897 BLAKE2B 26188ab06629b984c5ea2fd5ae80051355a5de10b5da127252bffe61aa5efeecc17650f45e596cea2ba33322613f91762da46a4a3778ee9807eeb70b2e760a3a SHA512 77267e1df1557baa2a757722f852062d687c76b759a1e56a312c4a574b58235ad663563f1f359b628e93769a275127a4500ff496f0894d75f456a917cd02c8dd
+EBUILD enlightenment-0.24.2-r1.ebuild 2964 BLAKE2B ad45c058b9ffa1c47a0d8d61ad51afe5b92e18a57dc73eb86be0192e5c20bd7afa1ba9df6558bcdb6b2c557c11b1999887f635ea3df2bb7b63dcbce9a253fc6a SHA512 8e3901feb2d1bc66fbdacfec215e0986675d8ef12e4cf9e021b92be21d0b03e36236b0674a50544d685a37c57dd08986a7b12bb0202c5925498d84714166a3ca
 MISC metadata.xml 721 BLAKE2B 85587a677b7e22cd1dbfe187c367574ccef7ad88a1bdde00acecc9fc5f62d48adb9e14c2086953287efc728cc616d6d286fde1b659a44404086fef5e6bde90b1 SHA512 6d22a2f8639b3b75fd1113c0b381edc2869d91e5d3d04d6c67c845c15fae9ba0e370918e30b45e89e91c695f873f1d0ef5966f7720ab5e9cd270c6254c792dc5
diff --git a/x11-wm/enlightenment/enlightenment-0.24.2-r1.ebuild b/x11-wm/enlightenment/enlightenment-0.24.2-r1.ebuild
index 5503d259ae4e..6651273cf861 100644
--- a/x11-wm/enlightenment/enlightenment-0.24.2-r1.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.24.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -98,6 +98,7 @@ pkg_postinst() {
 	xdg_mimeinfo_database_update
 
 	elog "Additional programs to complete full EFL suite: "
+	optfeature "efl-based pinentry interface" app-crypt/pinentry[efl]
 	optfeature "better monitor backlight and brightness controls" app-misc/ddcutil
 	optfeature "office file thumbnails" app-office/libreoffice app-office/libreoffice-bin
 	optfeature "an EFL-based IDE" dev-util/edi
diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest
index b1d5cb1c608e..5f4fc634e0a0 100644
--- a/x11-wm/i3-gaps/Manifest
+++ b/x11-wm/i3-gaps/Manifest
@@ -7,4 +7,4 @@ DIST i3-gaps-4.19.tar.gz 4192134 BLAKE2B cc70e36fd01e777e1e4357d1799777eb42c21f1
 EBUILD i3-gaps-4.18.2.ebuild 2027 BLAKE2B 93bbcd939e72a2707245e74ad9874183cba84c633b5a834c84edf930cf916b81ddcdb1174204c53294bfec0bf56433d81049423ce9c1c812ca5227424952cb4d SHA512 2222ff5a4d28f6a2dc70dbbbf022c2bcb09e571c8c9681309ac04a785a6b298a57317526a4297d11ab3d79b870c903ee330f266bc083d253809b802f9f3a6791
 EBUILD i3-gaps-4.19.1.ebuild 1761 BLAKE2B 98922037f619cdc9bbfa8a7da9a8316d5ad00a06faee1711c7d60ecc9bcbdd2e0262e82fbfe2dd0ea452887caec38d48b7a718f9d859177ad374927c38d83b7b SHA512 a5ffad13f394a64e35c7e66901d3874e0a1dc75067961e830c14ddc32146764cc2489416d4f49789415090b58d99d3fd4f58422f49719bd5e5ec477cc3f05146
 EBUILD i3-gaps-4.19.ebuild 1765 BLAKE2B 4924ca2460b8c1c31e90c23513221ae7e0f900996ce0855eae842f7a8bc01cc3ff78358d36591ec16a191f63a7974897525723684206535973fd95ff64733d65 SHA512 4900cf098c796d05b42dc1222e671a9ada688ed2628aeedc4451aec139eb52150abb1e202edac5ef582f5cf554e47d210db1a3f5f104a59e2c2dc39f32d14586
-MISC metadata.xml 553 BLAKE2B a975c29cc436e391e4e85bd93b30258dfeb20cdd6f4895641cddb3b933a9674c0ddb9fc325b6b8a9f4e9ede42ebb4c7dbebd9917e14142a3a2b5054ce35d852b SHA512 2df67f18499497b55cbede5d732874cb5fbdb48c489a2e26a024e05b39a3355a0075d4c2b1fb4e42b4d12bf8ef927d9494b7b3a97d6fd52bca7bb1b17f4191bc
+MISC metadata.xml 430 BLAKE2B 2d41057b2583b01bd9dffcfd36d73821f582cc3f93595d9db0f0f076a1e4f108acbaec2448e327412e54426472d81cebd5cdbea665b37c42e135c7b09f243105 SHA512 a902d2dd794bac1a42a3a07886ca016593b5201988b0d01983da6e2d612d0a5ac298b631cf5e7ba1adf71bbbb529b7bddfd0474029da6046d94d4d34ad020790
diff --git a/x11-wm/i3-gaps/metadata.xml b/x11-wm/i3-gaps/metadata.xml
index fbc9f7517917..2e166989d8d4 100644
--- a/x11-wm/i3-gaps/metadata.xml
+++ b/x11-wm/i3-gaps/metadata.xml
@@ -6,13 +6,9 @@
 		<name>Johannes Huber</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>jchelmert3@posteo.net</email>
+		<email>ajak@gentoo.org</email>
 		<name>John Helmert III</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">Airblader/i3</remote-id>
 	</upstream>
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index 22937a5cc2f4..893cb297df36 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,10 +1,10 @@
 AUX icewm 33 BLAKE2B 5605658012ad8ed16bbd4cf0c4cb7cbe5204f73c20ef2c3d9fef1011a80b9e68863de64b45e4b043604b147c9d31f3f5d2617d067b694f5ec5329ad895472b0e SHA512 3fe619e59cc5d354242ccd85d3b1982dd7db6d0f6170f46f9d33975872f6d5a342a08d69db763162dc43681eedb96e9ba5075455bf54adf4fb86bf19887bf6e0
-DIST icewm-1.9.2.tar.lz 1694602 BLAKE2B cf30a695ba48093b386aa2f3af5120e78a9fcc57da9038bcd546ade0986e1bc359a3da91d2eeeb8d3a105173f5d755223675a84b38cfc8c907269efd2561c706 SHA512 7b4f8c47c636a0113af576bc1bcd9fde111ae70eb0bcf21fb1d906ca43bea4d8b0337a728e5da35bcfeabd56c66fd0d14581d7377f063dd750fdf01362b24be2
 DIST icewm-2.0.1.tar.lz 1694439 BLAKE2B 1476f33fa7350a98b7eca8c5c265455d0a78b28bcbd35ab78969b528ae02d3c960fb73cf2b24ea999ee5e08c9f0641d3502c7d5ed8b285777162c334d645b6db SHA512 ac4126b38d592aed60d2269f58c5a1612b61e871565e3c3e51bc2b430e4da6a4708f78e86c16091fa4dfb9eefd4109ae89102ab708e3bce9a44f1e5fe1970c59
-DIST icewm-2.1.1.tar.lz 1695855 BLAKE2B 81903735a71e13953635a4d70547f2518983b5e58fd9e90124e4aecb6b9b53827d48f77bbff3cec59b929456f4c1ab14fde999bbc45f90c8916bbb1017b8eb20 SHA512 7d0acd655f505755fe0b1186b7422a254805bd1c56f00170ecac90272c31c1c0673f781e4e89e04682515b7313dd57b78797398a81edc62b86abc6991abfc45c
 DIST icewm-2.1.2.tar.lz 1694969 BLAKE2B 640af2b7afb34ebcf6fc4f1762161bd8cae124e58735ad3e5af3f8a12723ead71e491fbef9e9119792c54e4e116c7cc491847da1e103b2c46765044bfda71f2d SHA512 92c52b057c7ac1c81eb72cb01d4041715fae2b1c221ecc0e5286a9bfad87e1607a3d7c60dde125436ad32c9a72dac01ee82a3bfe4b671b2d458ba3ce4c0c5a62
-EBUILD icewm-1.9.2.ebuild 2751 BLAKE2B ffbbde71ff1e7e055de75878203dfcfe4ddf47e0883f9c51d9ed4a68d007c1d294d2bc33ce0009b0fb4b5b8c679a341aefc30252fe3fd3cc0a963574a3b31955 SHA512 42c3df4c4709f963e23264785acb1e56df30fb1b580fbdc06029e86cb7c7fe1b78b4dc46d250cae50195404ccd166582d2560940076f7823e368e36de333e333
+DIST icewm-2.2.0.tar.lz 1697312 BLAKE2B c030b7675a645b91ad3e2476735acc0c2cd4425227d96b99ffc81d57e859f8c6ece029b892f32bff2fbba0683f3e279fd73446e935d5c76a1c472376897810ba SHA512 c0d84bba176f30e7a5a1d8272e306279dfc2e7c130461d72b45fe55c691a6d262484dd4c7b818ac7ec55db878cad3c84bba33d6e451355036fa4e7ba89ee1fdb
+DIST icewm-2.2.1.tar.lz 1697220 BLAKE2B a1c236c5aa3f2b958f3ad53c6d757abbce344da3c1c9c8f49bd4c986c68aef7421e799100dfabcb03e612d4c6a44af6a063080730b054e96ee054c85c21d5d1e SHA512 700122ace9a120300a06f17f334b76c12395154693583587527254903f53d12feb6e991754fc714960cc78b0d7809202879e43f2508f4d7ffa3fc7af84e628d6
 EBUILD icewm-2.0.1.ebuild 2945 BLAKE2B 8d84aab27149ed83bdea11800913905561fcda897aea287243faa7164df8462ece8f17e1ca4b7f94b4fd345932ef01e006174b39afae850ec533b772535f5b80 SHA512 7398ea8cf49d6c8fcacf40fb49f6489e0ba0f6015c96306e8873bac68063f46c52f44ba19d279f5abc60fd1f354f03778a54a41cb1f409a7038cc9c3178fa58d
-EBUILD icewm-2.1.1.ebuild 2949 BLAKE2B 7cbb263b4244bc2112c5dd6ac91a0b970d31e3ce36034a31d036e1fd77d34923da8de8bfe64ef4d212984640d932727a9b362bf7f2ff6ecea10a9ae57db15906 SHA512 96ef7961a4754b355678b222b1c99f5ea7efc2cf2ec5badf951458fadee580c26a5614dccb540b9685d118e6761cf20df14b71b7ce7ef98f84b8df8bfb596e19
-EBUILD icewm-2.1.2.ebuild 2949 BLAKE2B 7cbb263b4244bc2112c5dd6ac91a0b970d31e3ce36034a31d036e1fd77d34923da8de8bfe64ef4d212984640d932727a9b362bf7f2ff6ecea10a9ae57db15906 SHA512 96ef7961a4754b355678b222b1c99f5ea7efc2cf2ec5badf951458fadee580c26a5614dccb540b9685d118e6761cf20df14b71b7ce7ef98f84b8df8bfb596e19
+EBUILD icewm-2.1.2.ebuild 2956 BLAKE2B a29971bc37782d51dd81352475005d0860682ce1fa18ce04d9f69d67bdc1cefaf667a6179d58c63a6d39cb44f0971bd41ae54694896c37b0a3183a6a4fc360b4 SHA512 07b44baf1a7f48d9da2b8abdae82b3dda800662ce912f6f69cf1e7ea665407931aeb77b9f04e902b8862fc43790c4981bb1c57cd04c112cbed49991385a58174
+EBUILD icewm-2.2.0.ebuild 2956 BLAKE2B a29971bc37782d51dd81352475005d0860682ce1fa18ce04d9f69d67bdc1cefaf667a6179d58c63a6d39cb44f0971bd41ae54694896c37b0a3183a6a4fc360b4 SHA512 07b44baf1a7f48d9da2b8abdae82b3dda800662ce912f6f69cf1e7ea665407931aeb77b9f04e902b8862fc43790c4981bb1c57cd04c112cbed49991385a58174
+EBUILD icewm-2.2.1.ebuild 2956 BLAKE2B a29971bc37782d51dd81352475005d0860682ce1fa18ce04d9f69d67bdc1cefaf667a6179d58c63a6d39cb44f0971bd41ae54694896c37b0a3183a6a4fc360b4 SHA512 07b44baf1a7f48d9da2b8abdae82b3dda800662ce912f6f69cf1e7ea665407931aeb77b9f04e902b8862fc43790c4981bb1c57cd04c112cbed49991385a58174
 MISC metadata.xml 747 BLAKE2B a986dc65f9b603519ef92fecc63cadd2921d6569e8735956a55ce91673426082e367664cce23c2b80cec19e0d997da357ac8f9d3d78c738ad92f42f6f426c225 SHA512 f9b84c60b780b5999c8a295b64bdf1bdb734108984e48f1271257cb35602df024a347560526de52f43ede16f67031551f4ae3f37401d3320e4dbdfb913e557fe
diff --git a/x11-wm/icewm/icewm-2.1.2.ebuild b/x11-wm/icewm/icewm-2.1.2.ebuild
index ec1d0545c005..7b0d626e90a0 100644
--- a/x11-wm/icewm/icewm-2.1.2.ebuild
+++ b/x11-wm/icewm/icewm-2.1.2.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.lz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+alsa ao bidi debug +gdk-pixbuf imlib nls truetype uclibc xinerama"
 
 # Tests broken in all versions, patches welcome, bug #323907, #389533
diff --git a/x11-wm/icewm/icewm-2.1.1.ebuild b/x11-wm/icewm/icewm-2.2.0.ebuild
index ec1d0545c005..7b0d626e90a0 100644
--- a/x11-wm/icewm/icewm-2.1.1.ebuild
+++ b/x11-wm/icewm/icewm-2.2.0.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.lz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+alsa ao bidi debug +gdk-pixbuf imlib nls truetype uclibc xinerama"
 
 # Tests broken in all versions, patches welcome, bug #323907, #389533
diff --git a/x11-wm/icewm/icewm-1.9.2.ebuild b/x11-wm/icewm/icewm-2.2.1.ebuild
index bd9668540305..7b0d626e90a0 100644
--- a/x11-wm/icewm/icewm-1.9.2.ebuild
+++ b/x11-wm/icewm/icewm-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,13 +11,14 @@ LICENSE="GPL-2"
 SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.lz"
 
 SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="+alsa ao bidi debug +gdk-pixbuf nls truetype uclibc xinerama"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+alsa ao bidi debug +gdk-pixbuf imlib nls truetype uclibc xinerama"
 
 # Tests broken in all versions, patches welcome, bug #323907, #389533
 RESTRICT="test"
 
 REQUIRED_USE="|| ( alsa ao )"
+#?? ( gdk-pixbuf imlib )
 
 #fix for icewm preversion package names
 S="${WORKDIR}/${P/_}"
@@ -36,6 +37,7 @@ CORE_DEPEND="
 
 RDEPEND="
 	${CORE_DEPEND}
+	dev-libs/glib:2
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libXft
@@ -55,15 +57,20 @@ RDEPEND="
 		>=x11-libs/gdk-pixbuf-2.42.0:2
 	)
 	!gdk-pixbuf? (
-		media-libs/libpng:0=
-		virtual/jpeg
+		imlib? (
+			gnome-base/librsvg:2
+			media-libs/imlib2
+		)
+		!imlib? (
+			media-libs/libpng:0=
+			virtual/jpeg
+		)
 	)
 	xinerama? ( x11-libs/libXinerama )
 "
 DEPEND="
 	${RDEPEND}
 	$(unpacker_src_uri_depends)
-	dev-libs/glib:2
 	x11-base/xorg-proto
 	gdk-pixbuf? ( gnome-base/librsvg:2 )
 "
@@ -74,10 +81,15 @@ BDEPEND="
 	nls? ( >=sys-devel/gettext-0.19.8 )
 "
 
-src_prepare() {
-	# Fix bug #486710 - TODO: Still needed?
-	#use uclibc && PATCHES+=( "${FILESDIR}/${PN}-1.3.8-uclibc.patch" )
+pkg_pretend() {
+	if use gdk-pixbuf && use imlib ; then
+		einfo 'Confilcting USE flags have been enabled:'
+		einfo '"gdk-pixbuf" and "imlib" exclude each other!'
+		einfo 'Using "gdk-pixbuf".'
+	fi
+}
 
+src_prepare() {
 	default
 	eautoreconf
 }
@@ -103,6 +115,7 @@ src_configure() {
 		$(use_enable debug)
 		$(use_enable debug logevents)
 		$(use_enable gdk-pixbuf)
+		$(use_enable imlib imlib2)
 		$(use_enable nls i18n)
 		$(use_enable nls)
 		$(use_enable xinerama)
@@ -120,8 +133,10 @@ src_configure() {
 
 	econf "${myconf[@]}"
 
-	sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die
-	sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
+	sed \
+		-e "s:/icewm-\$(VERSION)::" \
+		-e "s:ungif:gif:" \
+		-i src/Makefile || die
 }
 
 src_install() {
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index 35799a7a6bd4..649ac0bad038 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,5 +1,5 @@
 DIST muffin-4.6.3.tar.gz 5196072 BLAKE2B 1b8c0eeab13c35fc0b66898328f378331cb2bfc78b27a48a8f9e22c842df1a223613f27f5b29fe28c1edaaeb59972262024ed656dfabafa6c9454c4c4c0a74b9 SHA512 c07d83656d3a9164ad488b500f98acb88e0c8e2374af858776ff27dbe90880db4310405505d79539222ba3b4ddedb22934ef3e0f1f6198dc7b36986b784b48f5
 DIST muffin-4.8.1.tar.gz 5195618 BLAKE2B 33dbbf7231b8f8d5c7df23d6cf8ddb29a86caca7b8c3b4af1231c98e114ee797d1c6bc866574348fcabaa65a93ff95c80366329bd5a41a46a74ba53ba81ce545 SHA512 61b621c7a4e25fc8ac69f2f5182e2caf52dfcfd456154f3b91ebb8b126319e704acd927ab5abe9e19ff057f38002a3b7e322e8d411db21e0fee7ec19d7928d31
-EBUILD muffin-4.6.3.ebuild 2227 BLAKE2B 701c1acb5e51e8cea8f8091a9d4de96a0891f49a55d5c79924632670104cc9844c1530e4a3a45f30a40d0d89666e951be442ab0386e8bc9275edd8ab45a1f16a SHA512 0370da5f4e7ce8b90b994550562666a89061e36c88ed6d0aba4779636fc444406231cb726e0c11120c705a4d888997a52d28844589d805441b4a4bb6779b295f
-EBUILD muffin-4.8.1.ebuild 2361 BLAKE2B 4357c71c8397490710a5e430f896687223ba1ad5837b3e86dcb5d05235ecdf7db022b65341543c013393bba5cde807f891a8a49cb3ae4c308fd20a4a60a738ef SHA512 f062ec4cd35055d9a92b2096ec47d58353032b41c9236b68a6a7c89f49f939fc6f25eca9166cadc0a2f473df36eea610b3646ed56e264999f0fea6ebd648ab8f
+EBUILD muffin-4.6.3.ebuild 2204 BLAKE2B a5c62fdb96cce1b9b3ba424c801caab4cec0fbc70abf42c8f425e56a6afc5fd27ddf9834a74b75d9ccfc908728b202da318afe6434f62ff2fbc873972bd3028d SHA512 1a3af4ecd5b38aba64ab9f7d802e615d8c8080b59577e51b9c1197d4863f257133a90af97f7bc1308d1d7958fa3ca365366201dd8e9c2036c676d6d8e32aee36
+EBUILD muffin-4.8.1.ebuild 2338 BLAKE2B 9f88d9f356e4cc3033836d2c659575b82f477fa178fb1dc473d445d1e6b7407441aa268e4a76a590f0a0709d4dad14668eeecc52a71cf199b3a32c3fb25b5682 SHA512 27d26ae3fea92ef20a89e7d9503d31a0c3128776292b31d5b80b3f510e566fc023565806d3753587594581de2f7aaa95ef6784a172a10d442c56a14ec01cfb8d
 MISC metadata.xml 455 BLAKE2B d4584f37c17ed7f43e3200c5b4cf5db9d73634ec2634575d0667a2b6de278f746839cb52b037f9239aa1a570a056fa6ff3990bd26a1cde3975a391ef44360660 SHA512 e21ad4e3cab168c13fd6b34335e1d615a548160f78c558655def493f1632ac6cac170892b781a020f8e6a877526d320051154aa0cfcf986d3e76dcc89e61bf21
diff --git a/x11-wm/muffin/muffin-4.6.3.ebuild b/x11-wm/muffin/muffin-4.6.3.ebuild
index 150cbd51a513..2b397f1eaebc 100644
--- a/x11-wm/muffin/muffin-4.6.3.ebuild
+++ b/x11-wm/muffin/muffin-4.6.3.ebuild
@@ -59,7 +59,6 @@ BDEPEND="
 "
 
 src_prepare() {
-	xdg_environment_reset
 	default
 	eautoreconf
 	gnome2_disable_deprecation_warning
diff --git a/x11-wm/muffin/muffin-4.8.1.ebuild b/x11-wm/muffin/muffin-4.8.1.ebuild
index 2ba5eea03ff7..28b45d8ec772 100644
--- a/x11-wm/muffin/muffin-4.8.1.ebuild
+++ b/x11-wm/muffin/muffin-4.8.1.ebuild
@@ -62,7 +62,6 @@ BDEPEND="
 "
 
 src_prepare() {
-	xdg_environment_reset
 	default
 	eautoreconf
 	gnome2_disable_deprecation_warning
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index 3eddaf7f636b..bb22c7641a45 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -1,11 +1,7 @@
 AUX windowmaker-0.95.8-configure_default_search_paths.patch 2599 BLAKE2B 1b76e547a955e45571860e5a5d87ba6bc0de565cb38355d08019a791965170eb0b5d6f215cd1bcb673f93addfde86485847cc7af987a72bfc02324dd56142f4d SHA512 9c12516dd0a2c3e81f7236e2e0f2f8137710e7f1a54ae84d279850d65afb52cb46cada6e84a0ba1f2c92fdfa8d7a0b4630f703e5a5e24664e0fec5ee718f83ae
-AUX windowmaker-0.95.8-imagemagick7.patch 1340 BLAKE2B d3ba22b324a405cba0d0d266e2d25b0b6e41ece01cc42e18d3746c46d9e6f38f3048abe928ade603ec9f90206e19e285445e1de7775b18527602a0557d86aae1 SHA512 90316ffe66fe92f7db43afa504225bdb97ddb8ec8ff742f69760e4e233172e2b2f704449f014935f9851d6bd7ebe91cde97e5ae65dfb73284a21743a44b7492d
 AUX wmaker.desktop 206 BLAKE2B 62fe60afde032c1f37c5c818bc37a97d70605e041e539e922f18d56a7582fffd1689762f600fa3c69c5b62dd399867c8c1208d393060e734b38a84540143bf79 SHA512 d1dc99aa29047434e1265c8f93ce366b7c026f27eec8a166904fda1ab4144e0d6142807ac09ba6cbcb86480257893e5553046a0ba1a8e1d6315f23dd8468482b
-DIST WindowMaker-0.95.8.tar.gz 3253515 BLAKE2B 225dae9eb10f913931e129fdf78860123a14406ad8e61ba42fe4eadcf5d3f03c88040a2b982e74abaf79088f4a063291ccfb7b7d42f1bf211adb7b02c765a664 SHA512 6ab16ed4304aba20f0f3a4083adf63a47fa674ade7bc39aaa8aa6466c7842e3f10ab73af96e2afce0842b11c57a35eb69f43183a4044d8cd95d4e2a4d2c079a2
 DIST WindowMaker-0.95.9.tar.gz 3397167 BLAKE2B ec751fe0139b359933f4388f8dac3f2bf18db1f28fb4cb290d86db1ded9ffdab0cf51b451e28475bc51ee2735cb71c7fd2b01fa7472f5f0f4f1a1e00e1509339 SHA512 ca3ddc863f5b5b782e90f38c0019fe14d1109d6b11d0a3d5d6c728ddc1817747eea92e22e36933d445e72c70661e039ee56efa70f2654657c8980269fd5b4584
 DIST WindowMaker-extra-0.1.tar.gz 238018 BLAKE2B 865b12975d0cdefc1f05a76344b449fdcf8a2841d6a7adf1ab6435857d89cbc4fda22bb62432a1bbba921267380d00a0cded718bfbd344bbb5e6207e59b76096 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8
-EBUILD windowmaker-0.95.8-r1.ebuild 3118 BLAKE2B 426b31a868c8d9dc807eddc211ede8c54928077aef7eeb72e2f264a5d8da95f76f606829237701e383e3a14ec323586301ddd72539525bb9078d7101e32e5186 SHA512 37c1f9604e7811cb025e43054d1848cfa1103fc24921419ed66e17cd4e816c45ecaeffef2ea2a2c11373de35b4ca23124ec400bd60944479307d4dcb13644aa0
-EBUILD windowmaker-0.95.9-r1.ebuild 3079 BLAKE2B 333833e1b61ffe17dc37e19d768a8e29f254c038cfa8dc46c2bec04a8de420769d6b3ec40c669a78c231a72f0a26b270a982b2c3447bfcc43031ce403fd37133 SHA512 0bd1371818c59d3dd4861ad740aabc76e19cbb160acc9a2c56dbd0b1bede9170c29f5d6453e3141fc3c4381ddd4c3c7bb09a173bae58a9c87943b72f9d8bbce3
-EBUILD windowmaker-0.95.9-r2.ebuild 3203 BLAKE2B f034cdbb024931aa4888f87e97423fa797bbc62fb3dd28498e4f6c3ff54c65066a9ef29b96a49a93775f7e10f6e7cddd076d1895c0352024636d7e53f3e175f3 SHA512 efff8fc40b52364cdff6536752ca41cd928dc188d9338eee17e8cb49f56b85dd8794613247f2a24956d04774207a3afc07733f32be13c259c02f42f9a2a48983
+EBUILD windowmaker-0.95.9-r2.ebuild 3202 BLAKE2B 10e65a499404e5da7ab2305365142618c4b8fc2464dd9e3de617e4367b496eb2593e012817b4cdbac87992b1894abe9489354e2569e28132a183b1fa396b5de7 SHA512 e2391c97fc15e87394cd7d0f91e8b44ad65ff73c0908e4d6f837b05573acc3fb4d08dbffc6901362f856e9d2640ad004a1e4b853aa1604a9101cb39336a6a98e
 EBUILD windowmaker-9999.ebuild 3027 BLAKE2B cbdbe30ce0edf4c903db6d21e16deb64a27d5d6c7b67a72636e58b939e73a6f8c37da29422092d38ca349f4179f3541fb1688321d03afe04bcd35258132eed3a SHA512 550d6fe89f3c4161f9cf40f9298ad178c811d740475b74a139ddc2222c87b920c2677ef066c25c3dba43b0b40f0e8da885dfaa66dc53c69a3f2df792248d5ea4
 MISC metadata.xml 490 BLAKE2B a74e46dfe5b90558720726c3a18b9c9cf2752fb90ade60450ae568547c52b807e9dee74d1deb842c11cc3e6f564c0793adc5f8e24686893138808669f6fc9766 SHA512 ae731acb1fe00cfbda949fc9cafad9f861b83fb37103a699157256840c67e4a2cd0023114d30eab0b25f6dcb154c00e2a659a4feffaabad97e8ed7aa2a03e3ca
diff --git a/x11-wm/windowmaker/files/windowmaker-0.95.8-imagemagick7.patch b/x11-wm/windowmaker/files/windowmaker-0.95.8-imagemagick7.patch
deleted file mode 100644
index b4cccab5a71e..000000000000
--- a/x11-wm/windowmaker/files/windowmaker-0.95.8-imagemagick7.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-imagemagick 7.0 now uses MagickWand/
----
- m4/wm_imgfmt_check.m4 | 2 +-
- wrlib/load_magick.c   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/m4/wm_imgfmt_check.m4 b/m4/wm_imgfmt_check.m4
-index 5dd9ec7f..14e52bb3 100644
---- a/m4/wm_imgfmt_check.m4
-+++ b/m4/wm_imgfmt_check.m4
-@@ -312,7 +312,7 @@ AS_IF([test "x$enable_magick" = "xno"],
-               dnl
-               dnl The library was found, check if header is available and compiles
-               wm_save_CFLAGS="$CFLAGS"
--              AS_IF([wm_fn_lib_try_compile "wand/magick_wand.h" "MagickWand *wand;" "wand = NewMagickWand()" "$wm_cv_libchk_magick_cflags"],
-+              AS_IF([wm_fn_lib_try_compile "MagickWand/MagickWand.h" "MagickWand *wand;" "wand = NewMagickWand()" "$wm_cv_libchk_magick_cflags"],
-                   [wm_cv_libchk_magick="$wm_cv_libchk_magick_cflags % $wm_cv_libchk_magick_libs"],
-                   [AC_MSG_ERROR([found MagickWand library but could not compile its header])])
-               CFLAGS="$wm_save_CFLAGS"])dnl
-diff --git a/wrlib/load_magick.c b/wrlib/load_magick.c
-index 3e809ba2..1edbebc3 100644
---- a/wrlib/load_magick.c
-+++ b/wrlib/load_magick.c
-@@ -22,7 +22,7 @@
- 
- #include "config.h"
- 
--#include <wand/MagickWand.h>
-+#include <MagickWand/MagickWand.h>
- 
- #include "wraster.h"
- #include "imgformat.h"
--- 
-2.13.0
-
diff --git a/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild
deleted file mode 100644
index c3e50292c33d..000000000000
--- a/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop eutils
-
-DESCRIPTION="The fast and light GNUstep window manager"
-HOMEPAGE="https://www.windowmaker.org/"
-SRC_URI="https://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
-	https://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="media-libs/fontconfig
-	>=x11-libs/libXft-2.1.0
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-	x11-libs/libXv
-	gif? ( >=media-libs/giflib-4.1.0-r3 )
-	imagemagick? ( media-gfx/imagemagick:0= )
-	jpeg? ( virtual/jpeg:0= )
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff:0 )
-	webp? ( media-libs/libwebp )
-	xinerama? ( x11-libs/libXinerama )
-	xrandr? ( x11-libs/libXrandr )"
-RDEPEND="${DEPEND}
-	nls? ( >=sys-devel/gettext-0.10.39 )"
-
-S=${WORKDIR}/${P/windowm/WindowM}
-
-PATCHES=( "${FILESDIR}"/${P}-configure_default_search_paths.patch )
-
-src_prepare() {
-	# Fix some paths
-	for file in WindowMaker/*menu* util/wmgenmenu.c; do
-		if [[ -r $file ]] ; then
-			sed -i -e "s:/usr/local/GNUstep/Applications/WPrefs.app:${EPREFIX}/usr/bin/:g;" "$file" || die
-			sed -i -e "s:/usr/local/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
-			sed -i -e "s:/opt/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
-		fi;
-	done;
-
-	if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
-		eapply "${FILESDIR}/${P}-imagemagick7.patch"
-	fi
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# image format types
-	myconf="$(use_enable imagemagick magick) $(use_enable jpeg) $(use_enable gif) $(use_enable png) $(use_enable tiff) $(use_enable webp) $(use_enable xpm)"
-
-	# non required X capabilities
-	myconf="${myconf} $(use_enable modelock) $(use_enable xrandr randr) $(use_enable xinerama)"
-
-	if use nls; then
-		[[ -z $LINGUAS ]] && export LINGUAS="$(ls po/*.po | sed 's:po/\(.*\)\.po$:\1:' | xargs)"
-	else
-		myconf="${myconf} --disable-locale"
-	fi
-
-	# default settings with $myconf appended
-	econf \
-		--sysconfdir="${EPREFIX}"/etc/X11 \
-		--with-x \
-		--enable-usermenu \
-		--with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \
-		--localedir="${EPREFIX}"/usr/share/locale \
-		${myconf}
-
-	cd ../WindowMaker-extra-0.1
-	econf
-}
-
-src_compile() {
-	emake
-
-	# WindowMaker Extra Package (themes and icons)
-	cd ../WindowMaker-extra-0.1
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \
-		  README* NEWS TODO
-
-	# WindowMaker Extra
-	cd ../WindowMaker-extra-0.1
-	emake DESTDIR="${D}" install
-
-	newdoc README README.extra
-
-	# create wmaker session shell script
-	echo "#!/usr/bin/env bash" > wmaker
-	echo "${EPREFIX}/usr/bin/wmaker" >> wmaker
-	exeinto /etc/X11/Sessions/
-	doexe wmaker
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}"/wmaker.desktop
-	make_desktop_entry /usr/bin/wmaker
-}
diff --git a/x11-wm/windowmaker/windowmaker-0.95.9-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.95.9-r1.ebuild
deleted file mode 100644
index f7096cff3be4..000000000000
--- a/x11-wm/windowmaker/windowmaker-0.95.9-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools desktop eutils
-
-DESCRIPTION="The fast and light GNUstep window manager"
-HOMEPAGE="https://www.windowmaker.org/"
-SRC_URI="https://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
-	https://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="media-libs/fontconfig
-	>=x11-libs/libXft-2.1.0
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-	x11-libs/libXv
-	gif? ( >=media-libs/giflib-4.1.0-r3 )
-	imagemagick? ( >=media-gfx/imagemagick-7:0= )
-	jpeg? ( virtual/jpeg:0= )
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff:0 )
-	webp? ( media-libs/libwebp )
-	xinerama? ( x11-libs/libXinerama )
-	xrandr? ( x11-libs/libXrandr )"
-RDEPEND="${DEPEND}
-	nls? ( >=sys-devel/gettext-0.10.39 )"
-
-S=${WORKDIR}/${P/windowm/WindowM}
-
-DOCS=( AUTHORS BUGFORM BUGS ChangeLog INSTALL INSTALL-WMAKER FAQ
-	NEWS README README.definable-cursor README.i18n TODO )
-PATCHES=( "${FILESDIR}"/${PN}-0.95.8-configure_default_search_paths.patch )
-
-src_prepare() {
-	# Fix some paths
-	for file in WindowMaker/*menu* util/wmgenmenu.c; do
-		if [[ -r $file ]] ; then
-			sed -i -e "s|/usr/local/GNUstep/Applications/WPrefs.app|${EPREFIX}/usr/bin/|g;" "$file" || die
-			sed -i -e "s|/usr/local/share/WindowMaker|${EPREFIX}/usr/share/WindowMaker|g;" "$file" || die
-			sed -i -e "s|/opt/share/WindowMaker|${EPREFIX}/usr/share/WindowMaker|g;" "$file" || die
-		fi;
-	done;
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# image format types
-	myconf="$(use_enable imagemagick magick) $(use_enable jpeg) $(use_enable gif) $(use_enable png) $(use_enable tiff) $(use_enable webp) $(use_enable xpm)"
-
-	# non required X capabilities
-	myconf="${myconf} $(use_enable modelock) $(use_enable xrandr randr) $(use_enable xinerama)"
-
-	if use nls; then
-		[[ -z $LINGUAS ]] && export LINGUAS="$(ls po/*.po | sed 's:po/\(.*\)\.po$:\1:' | xargs)"
-	else
-		myconf="${myconf} --disable-locale"
-	fi
-
-	# default settings with $myconf appended
-	econf \
-		--sysconfdir="${EPREFIX}"/etc/X11 \
-		--with-x \
-		--enable-usermenu \
-		--with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \
-		--localedir="${EPREFIX}"/usr/share/locale \
-		${myconf}
-
-	pushd ../WindowMaker-extra-0.1 || die
-	econf
-}
-
-src_compile() {
-	emake
-
-	# WindowMaker Extra Package (themes and icons)
-	pushd ../WindowMaker-extra-0.1 || die
-	emake
-}
-
-src_install() {
-	default
-
-	# WindowMaker Extra
-	pushd ../WindowMaker-extra-0.1 || die
-	emake DESTDIR="${D}" install
-
-	newdoc README README.extra
-
-	# create wmaker session shell script
-	echo "#!/usr/bin/env bash" > wmaker
-	echo "${EPREFIX}/usr/bin/wmaker" >> wmaker
-	exeinto /etc/X11/Sessions/
-	doexe wmaker
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}"/wmaker.desktop
-	make_desktop_entry /usr/bin/wmaker
-}
diff --git a/x11-wm/windowmaker/windowmaker-0.95.9-r2.ebuild b/x11-wm/windowmaker/windowmaker-0.95.9-r2.ebuild
index 1ee2d638d3ac..27d0b6ffe5a5 100644
--- a/x11-wm/windowmaker/windowmaker-0.95.9-r2.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.95.9-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="media-libs/fontconfig
 	>=x11-libs/libXft-2.1.0
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index ed76b5d89f6c..9680cba484dc 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -4,9 +4,9 @@ AUX xpra-3.0.2_ignore-gentoo-no-compile.patch 610 BLAKE2B 963b3b61602f6a7ad7c824
 AUX xpra-4.0.3-suid-warning.patch 731 BLAKE2B 6e576c088bc59ee7a52e15a8fbceb9117a47e4bf818b6777ffe977b5db1f9e72077ffeea07570312603f160d5556d2980914887f56d9733b1b6bf49ae385d0e4 SHA512 d3a3c2a2510159e83d6d6bda11f37b5500ce80d4bac059d3bcee8293caa93652a132d074f46a728204b012c61707994ebb87e0e02afd0c4efeab7a705ba5ea69
 AUX xpra-4.0.6-r28363.patch 10454 BLAKE2B 8385dc347edf9e3464784cf0d9bb8450696b66bb66af3b14e3a3440fb2b6ffea9f1d7c640f1973e8d37084eced58daad451162ac2b6798a7b5e7fb8f6f89b430 SHA512 a75534371a391fe1fbf6cd327e0df9eeb1fc7b65376de734f523984ea124ad95c7782af380735b95500cc63002e065c9684bb92095c5850f2cf42e7b15d661f8
 DIST xpra-3.0.5.tar.xz 2752016 BLAKE2B a36d6a4ebb0b14665014da92d510c0d5f978c96db653709ddc09a1015426d6ac6f71f9a221db68ee1114c95eeaca6600f9e49102ce9f936d9b0ee298ac432647 SHA512 3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681
-DIST xpra-4.0.5.tar.xz 2795828 BLAKE2B fed6514d75dbb08f386325e30e375fd2077db1dad91602e575e3955a622a52ade2fc8e0c6c823d8a495684afb3a2f55f27e28abdf8734d0eca25275a3d358193 SHA512 d2aa2b70b6ec702bca5b0c2b06378107d45c4cad79f83ee2a1ed27fd5f66474e2d8e1d28d5111e60417ed089f91bab0b1566b0c9b3dcf6f0cb5e204ff5c42c92
 DIST xpra-4.0.6.tar.xz 2797752 BLAKE2B 3f2d4108fec1f1b5c0cd38a26f1a2c41af253fd234427e8e54104ff3742b9f7ae3e1863db837addd76acc6856b6f3cfcbde97edc2bc75314b215d4ca46a816f8 SHA512 e3dc66040898ed40ef12b8cdb89e5f42c2f36edc071afb435334389e727f376ddc116dbee47018468bff24f2cdd7be35750b58bc108ba73c5558bd9eccbd04ea
+DIST xpra-4.1.tar.xz 2680552 BLAKE2B 7b23ac9cc226cea7aaf076c7c747189a76e95b520ac629e5649b627cd78211aba34e31c2c09477d55d50694659921a0553eec8c8ad3e1d7c98299dec8e75b236 SHA512 b2ce7875aaa5cef52195aa16b5914a2f9fa3ff279d39d7c7a72ea3da11afefeb5536d46987525d5bc948c28e3fea01d5cc975d2b32edc2a541b3fb0130560224
 EBUILD xpra-3.0.5-r2.ebuild 3841 BLAKE2B 387b36e4114eb489815bc6c09cd2ec7f9cb560d9c37e50aaadb567d5a8b9917c68f7b6db086a01d9efe719b955791c6ac70b8b913e5c86d25bff4d6da3d8679f SHA512 6fd77a9190d67a7c77b329d929890716d6b5814470383eea1dbf816fe190b8570997833bde5741d766745e54bd7e5e4f6f746609a69d0cc69c23f0f27907959c
-EBUILD xpra-4.0.5.ebuild 3795 BLAKE2B 559f5dd85d9f9736521dc793ecaeb331d7a9fe78e88e66349811f0b109bfff4a113932fe947ef17ade052d0683b90e10d27cf9bb5244f7e6dd098422991170cb SHA512 7f24aeea7b6eaf74f94df410cb660fc97ef00802a6a9cc428e71b58cf3f12a537fa85b291d85508f9c1657b737d7ab5e38b7722722c9327bc8adc7896288cf55
 EBUILD xpra-4.0.6_p28363.ebuild 3903 BLAKE2B 21eed5f246a785f88fc1a00f77fa707c522de1f2c8a52fb5e9343aecfdff2c2fe726ad5f778dcb79dc1c6237ec3e2fa35ad0647a2b034bb6434d8a10dc15ccd2 SHA512 6d1ff46e3625937d9b71f7ea8f15f41c84e66f9014712f622bd259cb9026fe314e57b454aabdc8df3ec0cea78606f05e54d5f9883d49ff3d793ec62182b16962
+EBUILD xpra-4.1.ebuild 3905 BLAKE2B 7eb6ec4ef2ead2166f938dc90f1ab1720da1b4e21f2b91e8775f8113ff3acc773a06c1d60d0e1391e3360dc658a9691506255ca11abbcbe05d68c10f21910eb0 SHA512 6ffba9a2cfbdee776711f44a688c2aebe0167aad65932d1644147bb4c62422e4486b0076145a06cbb065e9a4994201bb75eea41ca254421e22d514dc6f12d26f
 MISC metadata.xml 1090 BLAKE2B 51b66f86c4858f3c6081e03ee5444b0fd84de0db0355e7538a507ae6290b82f09407acef6e335ac7c5d7dfa2801da5e6b0f0b904daea6fd5c34f19d17492007a SHA512 99dde78c6a33dbbb890b071165c9e0ca57ea3d7a6866abfccda2d976006dcf17b531b2dd464a2c0e312c181d1a3561ba61316a8c5c9c27976281965673aca55d
diff --git a/x11-wm/xpra/xpra-4.0.5.ebuild b/x11-wm/xpra/xpra-4.1.ebuild
index 7e464f4eb4d0..65e293302714 100644
--- a/x11-wm/xpra/xpra-4.0.5.ebuild
+++ b/x11-wm/xpra/xpra-4.1.ebuild
@@ -1,20 +1,21 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_SINGLE_IMPL=yes
 DISTUTILS_USE_SETUPTOOLS=no
-inherit xdg distutils-r1 eutils flag-o-matic tmpfiles prefix
+inherit xdg distutils-r1 tmpfiles prefix
 
 DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
-HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
-SRC_URI="http://xpra.org/src/${P}.tar.xz"
+HOMEPAGE="https://xpra.org/"
+SRC_URI="https://xpra.org/src/${P}.tar.xz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="brotli +client +clipboard csc cups dbus ffmpeg jpeg +lz4 lzo minimal opengl pillow pulseaudio server sound test vpx webcam webp"
+IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg +lz4 lzo minimal opengl pillow pulseaudio server sound test vpx webcam webp"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	|| ( client server )
@@ -22,8 +23,13 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	opengl? ( client )
 "
 
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+DEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+		opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+		sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
+	')
 	x11-libs/gtk+:3[introspection]
 	x11-libs/libX11
 	x11-libs/libXcomposite
@@ -36,40 +42,51 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	csc? ( >=media-video/ffmpeg-1.2.2:0= )
 	ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
 	jpeg? ( media-libs/libjpeg-turbo )
-	opengl? ( dev-python/pyopengl )
 	pulseaudio? (
 		media-sound/pulseaudio
 		media-plugins/gst-plugins-pulse:1.0
 	)
-	sound? ( media-libs/gstreamer:1.0
+	sound? (
+		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
-		dev-python/gst-python:1.0 )
+	)
 	vpx? ( media-libs/libvpx media-video/ffmpeg )
 	webp? ( media-libs/libwebp )
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="
+	${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/netifaces[${PYTHON_USEDEP}]
+		dev-python/rencode[${PYTHON_USEDEP}]
+		dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
+		cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
+		dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+		lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
+		lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
+		opengl? (
+			client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
+		)
+		webcam? (
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/pyinotify[${PYTHON_USEDEP}]
+			media-libs/opencv[${PYTHON_USEDEP},python]
+		)
+	')
 	acct-group/xpra
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/rencode[${PYTHON_USEDEP}]
-	dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
 	virtual/ssh
 	x11-apps/xmodmap
-	cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
-	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
-	lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
-	opengl? (
-		client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
-	)
-	server? ( x11-base/xorg-server[-minimal,xvfb]
+	server? (
+		x11-base/xorg-server[-minimal,xvfb]
 		x11-drivers/xf86-input-void
 	)
-	webcam? ( dev-python/numpy[${PYTHON_USEDEP}]
-		media-libs/opencv[python]
-		dev-python/pyinotify[${PYTHON_USEDEP}] )"
-DEPEND="${COMMON_DEPEND}
+"
+BDEPEND="
 	virtual/pkgconfig
-	>=dev-python/cython-0.16[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		>=dev-python/cython-0.16[${PYTHON_USEDEP}]
+	')
+	doc? ( app-text/pandoc )
+"
 
 RESTRICT="!test? ( test )"
 
@@ -90,6 +107,9 @@ python_prepare_all() {
 	hprefixify tmpfiles.d/xpra.conf xpra/server/server_util.py \
 		xpra/platform{/xposix,}/paths.py xpra/scripts/server.py
 
+	sed -r -e "/\bdoc_dir =/s:/${PN}\":/${PF}/html\":" \
+		-i setup.py || die
+
 	if use minimal; then
 		sed -r -e 's/^(pam|scripts|xdg_open)_ENABLED.*/\1_ENABLED=False/' \
 			-i setup.py || die
@@ -114,16 +134,15 @@ python_configure_all() {
 		$(use_with cups printing)
 		--without-debug
 		$(use_with dbus)
+		$(use_with doc docs)
 		$(use_with ffmpeg dec_avcodec2)
 		$(use_with ffmpeg enc_ffmpeg)
 		$(use_with ffmpeg enc_x264)
 		$(use_with ffmpeg enc_x265)
 		--with-gtk3
-		--without-html5
 		$(use_with jpeg jpeg_encoder)
 		$(use_with jpeg jpeg_decoder)
 		--without-mdns
-		--without-minify
 		$(use_with opengl)
 		$(use_with server shadow)
 		$(use_with server)
@@ -136,9 +155,5 @@ python_configure_all() {
 		--with-x11
 	)
 
-	# see https://www.xpra.org/trac/ticket/1080
-	# and http://trac.cython.org/ticket/395
-	append-cflags -fno-strict-aliasing
-
 	export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
 }