From 908778078736bd36f7a60a2d576d415cb8e000fa Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 22 May 2021 07:31:18 +0100
Subject: gentoo resync : 22.05.2021

---
 x11-misc/Manifest.gz                               | Bin 48602 -> 48617 bytes
 x11-misc/bbkeys/Manifest                           |   2 -
 x11-misc/bbkeys/bbkeys-0.9.1-r1.ebuild             |  26 -------
 x11-misc/compose-tables/Manifest                   |   2 +
 .../compose-tables/compose-tables-1.7.1.ebuild     |  41 ++++++++++
 x11-misc/dunst/Manifest                            |   2 +-
 x11-misc/dunst/dunst-1.6.1.ebuild                  |   2 +-
 x11-misc/fracplanet/Manifest                       |   2 +-
 x11-misc/fracplanet/fracplanet-0.5.1.ebuild        |   4 +-
 x11-misc/macopix/Manifest                          |   7 +-
 x11-misc/macopix/files/macopix-1.7.4-windres.patch |  58 --------------
 .../files/macopix-3.4.0-openssl-1.1.0.patch        |  10 +++
 x11-misc/macopix/macopix-1.7.4-r1.ebuild           |  86 ---------------------
 x11-misc/macopix/macopix-1.7.4-r2.ebuild           |  83 --------------------
 x11-misc/macopix/macopix-3.4.0.ebuild              |   9 ++-
 x11-misc/obconf/Manifest                           |   3 +-
 x11-misc/obconf/obconf-2.0.4_p20150213.ebuild      |  48 ++++++++++++
 x11-misc/obconf/obconf-9999.ebuild                 |  41 ----------
 x11-misc/pcmanfm-qt/Manifest                       |   4 +-
 x11-misc/pcmanfm-qt/pcmanfm-qt-0.16.0-r1.ebuild    |  52 +++++++++++++
 x11-misc/pcmanfm-qt/pcmanfm-qt-0.16.0.ebuild       |  52 -------------
 x11-misc/pcmanfm-qt/pcmanfm-qt-0.17.0-r1.ebuild    |  52 +++++++++++++
 x11-misc/pcmanfm-qt/pcmanfm-qt-0.17.0.ebuild       |  52 -------------
 x11-misc/pcmanfm/Manifest                          |   2 +-
 x11-misc/pcmanfm/pcmanfm-1.3.2-r1.ebuild           |  58 ++++++++++++++
 x11-misc/pcmanfm/pcmanfm-1.3.2.ebuild              |  58 --------------
 x11-misc/read-edid/Manifest                        |   2 +-
 x11-misc/read-edid/read-edid-3.0.2-r1.ebuild       |   2 +-
 x11-misc/spacefm/Manifest                          |   4 +-
 x11-misc/spacefm/spacefm-1.0.6-r1.ebuild           |   5 +-
 x11-misc/spacefm/spacefm-9999.ebuild               |   5 +-
 x11-misc/xdg-user-dirs-gtk/Manifest                |   2 +-
 .../xdg-user-dirs-gtk-0.10-r1.ebuild               |   4 +-
 x11-misc/xtermcontrol/Manifest                     |   2 +
 x11-misc/xtermcontrol/xtermcontrol-3.8.ebuild      |  12 +++
 x11-misc/xvfb-run/Manifest                         |   2 +-
 x11-misc/xvfb-run/xvfb-run-1.20.10.3.ebuild        |   2 +-
 37 files changed, 310 insertions(+), 488 deletions(-)
 delete mode 100644 x11-misc/bbkeys/bbkeys-0.9.1-r1.ebuild
 create mode 100644 x11-misc/compose-tables/compose-tables-1.7.1.ebuild
 delete mode 100644 x11-misc/macopix/files/macopix-1.7.4-windres.patch
 create mode 100644 x11-misc/macopix/files/macopix-3.4.0-openssl-1.1.0.patch
 delete mode 100644 x11-misc/macopix/macopix-1.7.4-r1.ebuild
 delete mode 100644 x11-misc/macopix/macopix-1.7.4-r2.ebuild
 create mode 100644 x11-misc/obconf/obconf-2.0.4_p20150213.ebuild
 delete mode 100644 x11-misc/obconf/obconf-9999.ebuild
 create mode 100644 x11-misc/pcmanfm-qt/pcmanfm-qt-0.16.0-r1.ebuild
 delete mode 100644 x11-misc/pcmanfm-qt/pcmanfm-qt-0.16.0.ebuild
 create mode 100644 x11-misc/pcmanfm-qt/pcmanfm-qt-0.17.0-r1.ebuild
 delete mode 100644 x11-misc/pcmanfm-qt/pcmanfm-qt-0.17.0.ebuild
 create mode 100644 x11-misc/pcmanfm/pcmanfm-1.3.2-r1.ebuild
 delete mode 100644 x11-misc/pcmanfm/pcmanfm-1.3.2.ebuild
 create mode 100644 x11-misc/xtermcontrol/xtermcontrol-3.8.ebuild

(limited to 'x11-misc')

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 20800e009668..16d138ba3446 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/bbkeys/Manifest b/x11-misc/bbkeys/Manifest
index fac1da2f647e..54e8c0d0273c 100644
--- a/x11-misc/bbkeys/Manifest
+++ b/x11-misc/bbkeys/Manifest
@@ -1,5 +1,3 @@
-DIST bbkeys-0.9.1.tar.gz 226941 BLAKE2B 43a946210f25679dfe7d5a383fbd3f938ae71b19a635a288590b958fc47f3588c690a1e901b44fdb1b31eb1a8ee7252ceeee85b5d012585b261de61cc0f012ab SHA512 c8643d51dbb8f080cf70149d545f33160d15f00a0c3cefdd6d3856dfdee224ff3f63fce0988669036249c75f70878be63711a697dfaa45d4357d2141a28b13bd
 DIST bbkeys-0.9.2.tar.gz 116313 BLAKE2B 03b9cb10b7a10380ef805f28605b0ed1969d2197ffc1a19704a3ae230d3555f265d721c800ec45e37af4fb28fa01587999c078d0122826589f688b146fbebef7 SHA512 3205bd37052589b6cba9447032e6906c09afc80b36d7f7869204d290faa7f5726b7b9de74ee06c73c25b794f88eb4e13663f8b096f78bd246d1764bc4ab8984d
-EBUILD bbkeys-0.9.1-r1.ebuild 602 BLAKE2B 8d032d2bee58ad01f326f34383803f5c379713ff83cc543bf2bc2e3290cf896b700ebe4787c6180c625c6dd21f2ad493afb8383a82f08cc76f835fba225e232a SHA512 6acad4c8b8e3e219561db3e6b3b4ee8a30e9555d3d029b9b930eb81a73fb631672a7257b3fed6c2b1427f89b72c104c9e9a48b8bfc5d3bbedd81b485bbaba52c
 EBUILD bbkeys-0.9.2.ebuild 882 BLAKE2B 0ab7ea75f50730307649bccacfba6dc2b2a7050a3d99228600a810db58b46f1c4390834c6ec770abcced8cd3061a9febf5f7a5fcdf158e664af5b3a4bc0e4097 SHA512 0977ca4f73603125afa743d340b1e26d1e160fca6343a99c3a7c25c4c0a1bf96f490ed109556e0e36acce02d41c7d28f7cc77ea8cacfcf59a48981861d45ab78
 MISC metadata.xml 325 BLAKE2B dd8be4385732b9cc123228980b0c4cea920db00f50df5defcfeb2dbfaa6b632b55aa6e898d9804f3e068c706f0099d8bb0a8d1ca45ebf4ab5a54e663c13ea86c SHA512 2b43e8b6b4324dedcc5b1dcefddf9b6412cd5a87d07692792097a8f3ae83cc8fb54a66c6d498d25e1b4b1f2f1bdbecf1322558976b70bbe742fd44f68e45ba11
diff --git a/x11-misc/bbkeys/bbkeys-0.9.1-r1.ebuild b/x11-misc/bbkeys/bbkeys-0.9.1-r1.ebuild
deleted file mode 100644
index 642de9a75e6e..000000000000
--- a/x11-misc/bbkeys/bbkeys-0.9.1-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Use keyboard shortcuts in the blackbox wm"
-HOMEPAGE="http://bbkeys.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-RDEPEND=">=x11-wm/blackbox-0.70.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_install() {
-	emake DESTDIR="${D}" install
-	rm -rf "${ED%/}"/usr/share/doc || die
-	einstalldocs
-
-	echo PRELINK_PATH_MASK=\""${EPREFIX}"/usr/bin/bbkeys\" > "${T}"/99bbkeys || die
-	doenvd "${T}"/99bbkeys
-}
diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest
index 93017ea1a31c..1f9dbb2a534e 100644
--- a/x11-misc/compose-tables/Manifest
+++ b/x11-misc/compose-tables/Manifest
@@ -1,3 +1,5 @@
 DIST libX11-1.7.0.tar.bz2 2409144 BLAKE2B 1eb6aa8f2fe50ddb2f6d324429b3d9cecfb48833c3f52f22ae8e32846be614c8db63c57d25e2b1c46612b6b333ff61ceab8ac0b605b117bcea1224f918af8e6d SHA512 f661ca90350fd8a94f054b00f12f5122cea068ebff706acfd399462236c189a296a2358d17d16166635101cf56cc19303dd407873a159932d093c9f33556f9fb
+DIST libX11-1.7.1.tar.bz2 2426509 BLAKE2B 18db9146f1d1907bccc4c5a48c8d6707b070b8b76703ece1948f53a0307996ba3e538e429df6ea0d9c32f577f9d019ba8a1ae63ab28f840d2c35ee9aa01b6748 SHA512 a76f0a82fce6f9b50646a7cd7ec5ee046650f225816050226068a7548fa083ef07d146d40faaf44e033c59c17b0fda5ffdee3a127dac3ab56cee02133819aa3d
 EBUILD compose-tables-1.7.0.ebuild 875 BLAKE2B 175050ee8e184a4f740f4fc2bbfc55076ffd7609ab1736f0f8fa915d5c58938734e8d2f8bcc4e4554e4a41987b62d1bde5d427a9b16a3fb3a175a4639ca7c99f SHA512 8b38cb39673e97611c30dfb27e0a6bb751c9c9027e098fa09da52d31322cf8c17fa8052906c2aa6238d7253c66c31d9a6a67927af2ee93c8ef9f2570146f5828
+EBUILD compose-tables-1.7.1.ebuild 923 BLAKE2B a16c544ea98f30284a77811f03b5a553afca851be5a252e6e7089eb60069886f3edd5de121e9cd14666faedb7a96b4703b9bab0cf9821272bef129fa6fcad461 SHA512 77cd00826542b0397b1cc954fc67d0a51df1d05cff191226536376f0bd179ff1a8c9d31ebc41f12bee0219b1134e4040dabfcf29a9aeb75b2dba982e0167a89d
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-misc/compose-tables/compose-tables-1.7.1.ebuild b/x11-misc/compose-tables/compose-tables-1.7.1.ebuild
new file mode 100644
index 000000000000..f6965e30115f
--- /dev/null
+++ b/x11-misc/compose-tables/compose-tables-1.7.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_MULTILIB=no
+inherit xorg-3
+
+# Note: please bump this with x11-libs/libX11
+DESCRIPTION="X.Org Compose Key tables from libX11"
+# xorg-3.eclass would attempt to fetch a tarball with a matching name to this package
+SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}"
+S="${WORKDIR}/libX11-${PV}/"
+
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+# Only needed by configure
+DEPEND="
+	x11-base/xorg-proto
+	>=x11-libs/libxcb-1.11.1
+	x11-libs/xtrans"
+RDEPEND="!<x11-libs/libX11-1.7.0"
+
+XORG_CONFIGURE_OPTIONS=(
+	--without-xmlto
+	--without-fop
+	--disable-specs
+	--disable-xkb
+)
+
+src_compile() {
+	emake -C nls
+}
+
+src_test() {
+	:;
+}
+
+src_install() {
+	emake DESTDIR="${D}" -C nls install
+}
diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest
index 4d44099a6987..3ce1fd842e9f 100644
--- a/x11-misc/dunst/Manifest
+++ b/x11-misc/dunst/Manifest
@@ -4,6 +4,6 @@ DIST dunst-1.5.0.tar.gz 169272 BLAKE2B 63c33e62f61aefec67e5420d5afe41808cf8b377c
 DIST dunst-1.6.1.tar.gz 217267 BLAKE2B 267e5be6a079097fb5a677bd2451b0e5bcbcddadf4c4de9af87d4eab7dd90b61908f140db3f1238b6a79d370fc3bb89c062c6b4deeefae6c9c0069b55017e907 SHA512 079ffd0ff75f1865b68cb8db261849cbe4f68b5c632c39ef8f7a3d193ff3eba3734bca31cb7268f27c9a411aec56e4c484c383b419bc0b4755b7d80ede84cd96
 EBUILD dunst-1.4.1.ebuild 1042 BLAKE2B 80f0cab6a7592ed4da0bdee6a8d595f0910567357e3eaf808d279264fc40d1be9d5bd028fff0ac568c9a083e35b5bd461f8d1cd8bb4301926da8fb052668cade SHA512 1fa787b051a4fb4472da55f44bf8d7ddd0175becb13423d7af68468b4e4706dda2be7995443c658cdf65d7561801886bdf8a7a359c623edb61ca671e7d394bab
 EBUILD dunst-1.5.0.ebuild 951 BLAKE2B 92ce2b3a4e3b66fa84184f3a80847d9ae4d6d4fcef3fb83ec9353828132702a51653cba91b322725490ed8d554b3e0854015b0cb089181db03a5490ce893a055 SHA512 85c7b4acb808207ede30e9f28047861a295c377c3311dbd1112a5fc01c61b415ccd966e88ef501dd14f6c6d73d802f47a1af60d19bae3d3c0b8c1fd7013bd45e
-EBUILD dunst-1.6.1.ebuild 1342 BLAKE2B ff602cf08af41dd3645840569e3aed19cd7937b0377e86a43f256103c85c9c9fef6c2a223fd3ab568befa2159418f7993f6865b3138e8b9cb292da19ef11d340 SHA512 b3b5be65c50a80f3031e6e2925f0a0ed654913e605c329619ea4853bd61fa49791d7cf22c32be9f36b3eac98d47bbc6262633eac331594ddd8819a42375e01f7
+EBUILD dunst-1.6.1.ebuild 1340 BLAKE2B bf51111b1f244cdaeca167b8bcd63786c61fc809d6ae0c42278830fdaac06ee384739c5d112911b7fe21d33c9ec210297b48a3799817903e7ddc68581e18dbde SHA512 5e8ae0babb55274f447dd0e892b50c2f37d149a43da9671ca1ffa1a2cf05ec5d4d0e17202e5112431aee141706f90ccff5533c43434f9f6b9c5cbac5b4c79786
 EBUILD dunst-9999.ebuild 1342 BLAKE2B ff602cf08af41dd3645840569e3aed19cd7937b0377e86a43f256103c85c9c9fef6c2a223fd3ab568befa2159418f7993f6865b3138e8b9cb292da19ef11d340 SHA512 b3b5be65c50a80f3031e6e2925f0a0ed654913e605c329619ea4853bd61fa49791d7cf22c32be9f36b3eac98d47bbc6262633eac331594ddd8819a42375e01f7
 MISC metadata.xml 561 BLAKE2B 5e945d9c374ed86d48f7f5b1efefb11c8b12dff0c73b903e283f24c84ed698d6213d6b38a741272572068919583e3c87dad0d7e8f5c70a63be760cb6453bd403 SHA512 85eb2d4acb0da5bb6375a86a41861f6998db6c4a7f9c15fc06531a15cc25528b1b690768f258730edc88533df06680acddc453d194374c52d431339c6014bf22
diff --git a/x11-misc/dunst/dunst-1.6.1.ebuild b/x11-misc/dunst/dunst-1.6.1.ebuild
index 9e6ef65b51bb..fb0a1988036b 100644
--- a/x11-misc/dunst/dunst-1.6.1.ebuild
+++ b/x11-misc/dunst/dunst-1.6.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/dunst-project/dunst"
 else
 	SRC_URI="https://github.com/dunst-project/dunst/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 fi
 
 LICENSE="BSD"
diff --git a/x11-misc/fracplanet/Manifest b/x11-misc/fracplanet/Manifest
index dfcc365282db..0aca5273da8b 100644
--- a/x11-misc/fracplanet/Manifest
+++ b/x11-misc/fracplanet/Manifest
@@ -1,3 +1,3 @@
 DIST fracplanet-0.5.1.tar.gz 111911 BLAKE2B 81f5986bdf7a0ddc1a7ef8fd08bf07fbc23ae38ac1cdc452de6696354d291205cb1183d16c3a7fa8bfb250158229d84d94f3c24dafa09d20518fb5d19b31471f SHA512 40aeb6c33c2cb3403cc85193319a63bdc90637110c8bb40d9b0f4bd816a80018ca1cf81296337fc5a13fac583d7864adfde8d22dcc3a3cd65314c34ec63b508e
-EBUILD fracplanet-0.5.1.ebuild 848 BLAKE2B 17ec269b2c8da445eaa2127cd138d8c388f3aca946e0e2ea82916c8effb0a4c81c26f195afc2d1661ff349d491c6ace3a4e1f19c3641cad79492850f1c28edff SHA512 58366144ff655afa19ed51db1ec7631b138f2cfe23bffa4cce67a274c7a799d623b49ccd2407239fa13d53eea8ab5ed495fec390b7537cb10b874569e8ae0037
+EBUILD fracplanet-0.5.1.ebuild 861 BLAKE2B 55f436c4fefb4915b9f10f20320768bda029bab9e65390772ddceda51da755faa1ccce17ff35338acf8c4894cc746c44a05da9beb7776c4769e563aeca5f273d SHA512 ba18bf494d7dc831b325b0aa1f48fa84f88d3229dd6ce5ef7513b575abed311e0cc3e56c937ce6885209f34d98948945286ba9a9d047d7c541d7523fe25c94fb
 MISC metadata.xml 325 BLAKE2B 13c927873af9f831bcf43c551d1f7dc3a7025c148112a417c6b779c3c08dd85fe227e7c2952c07f7808e4ad53b6c08e1ce4606b376e26d7ee34a207d8f35ea47 SHA512 946bf34ca9c0fd8b1a306413a6fbf1d7f8fac6e2e0656beb46325e58f0fe58a2e85e12791271372e6161ba59daef299ea4dc598129bf7d75646a52d2bd0d9cde
diff --git a/x11-misc/fracplanet/fracplanet-0.5.1.ebuild b/x11-misc/fracplanet/fracplanet-0.5.1.ebuild
index 86a237d31893..5f89bd2b1b43 100644
--- a/x11-misc/fracplanet/fracplanet-0.5.1.ebuild
+++ b/x11-misc/fracplanet/fracplanet-0.5.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
@@ -18,7 +18,7 @@ RDEPEND="
 	dev-libs/boost:=
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
+	dev-qt/qtopengl:5[-gles2-only]
 	dev-qt/qtwidgets:5
 	virtual/glu
 	virtual/opengl
diff --git a/x11-misc/macopix/Manifest b/x11-misc/macopix/Manifest
index c67c787f6570..d10a6ad2f162 100644
--- a/x11-misc/macopix/Manifest
+++ b/x11-misc/macopix/Manifest
@@ -1,9 +1,8 @@
-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-openssl-1.1.0.patch 185 BLAKE2B 8a89ebc1a9ea5668659793a8d26e8cd930e0e05b2277f0f9cfeee6a7bff0b4b2cfef127f84695ed874b776d3515072915719fb9e6970395b3ad28794647f187f SHA512 95313728a87568338324a20c4f1340cbd576b06eb4c40ee9e862c455e1737662f526d35872dc2514fc65d1d86eebb3a5604390aa92b94bbbe3bba251b3c0d31e
 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
@@ -15,7 +14,5 @@ DIST macopix-mascot-one-euc-ja-1.02.tar.gz 199796 BLAKE2B 64c303704daadcd47379ea
 DIST macopix-mascot-pia2-euc-ja-1.02.tar.gz 191520 BLAKE2B 7fa81c34df02751563fff92fba5bde1d60720f659f49d714cbc5d45c93c394b9bae399c65b3950ed3defe929b9058e13bf51d08241ddacc80626e0ac4fa22d0f SHA512 4e0177ca699d9e9caea7a9b6f6d81b41a25e1f05f44c9df1ea31578ddb908fcf12e6463bb84f0536ae25df24aca712b17a0d068d74c587671bb202c8441b7f42
 DIST macopix-mascot-triangle_heart-euc-ja-1.02.tar.gz 310099 BLAKE2B f52f2ad14cd9c76f32eb8c582bd07886f50eb6ae2615766306081ea1850b51b205b5177831ca30ab4049fd07081ff42d5dc7c9858efa49ab79a6acf2135ff9b1 SHA512 133a3446a3713192ffef84cd381065b2a99db2eb0dd18692d54e7974eb26aa63eef6d051466ddf89152f6baa8e4625ae6e7e975cf944dd12e0b6cc17c56e5673
 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 1911 BLAKE2B 4e0d5238ae726e376a0b8df95a2c9f01fa27c38edba5dca270b10548df94a8bcfcd92a15de731558743df21e00ec9903fa46ae67df36ed2cf3197d78417228f2 SHA512 01ed6a5adc73b50e5b746d06fa1d8b83f3131e35a190d7ba1045220e88acc7ac9e849a7b32d80d714c0a02f05b22037d8c54cb877b2a493532445f36953e2c62
+EBUILD macopix-3.4.0.ebuild 1966 BLAKE2B 66ccdb346db043cb04a1db46385f60a1a9fc38ea815ded291dcb9cde29dec8ad6e81c6b16cee3639a99c4ec2e1ddf01969c6d10e68959feb93d3f5133ed3e398 SHA512 0565e9ab4abb7f36152536d39debda9327f38d140709ac20128bd2c34193d9dfb6de2918dbbdf20a9771f592626593073497c361dd152b7bd3bcf885984a2d0d
 MISC metadata.xml 247 BLAKE2B 9b6f19fbcb6084773af3f04b2965ed66f9dd87ed94de032b9e88ef713ad0e980d87bf0e488ec0858ff98bdde4e2fd8e34bf9b7e3de4cd20474c0b293b7f06887 SHA512 6fb7777fe5e0553aba14e07da24c8fec5fc21ef1b032aaa4846dedf7ff71ac86e2b0e6fc931ef2fedec3073eb8114d698ec77f21edec8b4ce87e40c50620008d
diff --git a/x11-misc/macopix/files/macopix-1.7.4-windres.patch b/x11-misc/macopix/files/macopix-1.7.4-windres.patch
deleted file mode 100644
index e26bf62e7b74..000000000000
--- a/x11-misc/macopix/files/macopix-1.7.4-windres.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -145,26 +145,10 @@
- 		            [use Gtk+1.2 insted of Gtk+2]),
- 			    [use_gtk1=yes])
- 
--if test x"${use_gtk1}" = "xyes"; then
--AM_PATH_GLIB(1.2.6,,
--        AC_MSG_ERROR(Test for GLIB failed. See the file 'INSTALL' for help.),
--        gthread)
--AM_PATH_GTK(1.2.0, ,
--            AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?))
--AM_PATH_GDK_PIXBUF(0.7.0, ,
--              AC_MSG_ERROR(Cannot find GdkPixbuf: Is gdk-pixbuf-config in path?))
--dnl for libpng  (In the case of Gtk+2, gdk_pixbuf_save are used.)
--AC_CHECK_LIB(png,png_create_write_struct,
--        [PNGLIB_LIBS="-lz -lpng -lm"],
--        [AC_MSG_ERROR(libpng is required.)],
--	-lz -lm)
--
--else
- AM_PATH_GLIB_2_0(2.0.0,, AC_MSG_ERROR([glib-2.x is required]), gthread gobject)
- AM_PATH_GTK_2_0(2.0.0,, AC_MSG_ERROR([gtk+-2.x is required]), gthread gobject)
- AC_DEFINE(USE_GTK2,[], [Use Gtk+2.x instead of Gtk+1.x])
- PNGLIB_LIBS=""
--fi
- AC_SUBST(PNGLIB_LIBS)
- 
- 
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -9,14 +9,6 @@
- 	 bmp.h sockmsg.h codeconv.h unmime.h base64.h quoted-printable.h\
-          macopix_icon.h tar32api.h ssl.h
- 
--if HAVE_WINDRES
--MACOPIX_RES = macopix.res
--macopix.res: macopix_res.rc
--	$(WINDRES) $< -O coff -o $@
--else
--MACOPIX_RES = 
--endif
--
- EXTRA_DIST = \
- 	macopix_res.rc.in\
-         macopix.ico\
-@@ -25,9 +17,9 @@
- 	tar32.dll\
- 	libtar32.a
- 
--INCLUDES        = @GTK_CFLAGS@  @GDK_PIXBUF_CFLAGS@ $(GNUTLS_CFLAGS)\
-+INCLUDES        = @GTK_CFLAGS@ $(GNUTLS_CFLAGS)\
- 		  $(DISABLE_DEPRECATED)
--LDADD           = @GTK_LIBS@  @GDK_PIXBUF_LIBS@ $(PNGLIB_LIBS) $(WINMM_LIBS)\
-+LDADD           = @GTK_LIBS@ $(PNGLIB_LIBS) $(WINMM_LIBS)\
-                    $(MACOPIX_RES)  $(WINSOCK_LIBS) $(UNLHA32_LIBS)  $(TAR32_LIBS) $(GNUTLS_LIBS) $(WIN32_ICONV_LIBS)
- CLEANFILES      = *~
- DISTCLEANFILES  = .deps/*.P
diff --git a/x11-misc/macopix/files/macopix-3.4.0-openssl-1.1.0.patch b/x11-misc/macopix/files/macopix-3.4.0-openssl-1.1.0.patch
new file mode 100644
index 000000000000..7d816e7d5e50
--- /dev/null
+++ b/x11-misc/macopix/files/macopix-3.4.0-openssl-1.1.0.patch
@@ -0,0 +1,10 @@
+--- a/src/http-client.c
++++ b/src/http-client.c
+@@ -516,7 +516,6 @@
+   SSL_shutdown(ssl);
+   SSL_free(ssl);
+   SSL_CTX_free(ctx);
+-  ERR_free_strings();
+   
+   close(command_socket);
+ 
diff --git a/x11-misc/macopix/macopix-1.7.4-r1.ebuild b/x11-misc/macopix/macopix-1.7.4-r1.ebuild
deleted file mode 100644
index 2d547a63583e..000000000000
--- a/x11-misc/macopix/macopix-1.7.4-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic
-
-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.bz2"
-
-# NOTE: These mascots are not redistributable on commercial CD-ROM.
-# The author granted to use them under Gentoo Linux.
-MY_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 ${MY_MASCOTS} ; do
-	SRC_URI+=" ${BASE_URI}/${i}.tar.gz"
-done
-
-# programme 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
-	x11-libs/gtk+:2
-	gnutls? ( net-libs/gnutls )
-	!gnutls? ( dev-libs/openssl:0= )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${P}-windres.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	append-libs -lX11
-
-	econf $(use_with gnutls)
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS ChangeLog* NEWS *README*
-
-	# install mascots
-	for d in ${MY_MASCOTS} ; do
-		einfo "Installing ${d}..."
-		cd "${WORKDIR}/${d}" || die
-		insinto /usr/share/"${PN}"
-		for i in *.mcpx *.menu ; do
-			doins "$i"
-		done
-		insinto /usr/share/"${PN}"/pixmap
-		for i in *.png ; do
-			doins "$i"
-		done
-		docinto "${d}"
-		dodoc README.jp
-	done
-}
diff --git a/x11-misc/macopix/macopix-1.7.4-r2.ebuild b/x11-misc/macopix/macopix-1.7.4-r2.ebuild
deleted file mode 100644
index 21fa93789d0b..000000000000
--- a/x11-misc/macopix/macopix-1.7.4-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic
-
-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.bz2"
-
-# 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
-
-# programme 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
-	x11-libs/gtk+:2
-	gnutls? ( net-libs/gnutls )
-	!gnutls? ( dev-libs/openssl:0= )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${P}-windres.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cflags -fcommon
-	append-libs -lX11
-
-	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/macopix/macopix-3.4.0.ebuild b/x11-misc/macopix/macopix-3.4.0.ebuild
index b7351081a80f..530a80225d7f 100644
--- a/x11-misc/macopix/macopix-3.4.0.ebuild
+++ b/x11-misc/macopix/macopix-3.4.0.ebuild
@@ -2,6 +2,7 @@
 # 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"
@@ -32,7 +33,7 @@ done
 # program itself is GPL-2, and mascots are free-noncomm
 LICENSE="GPL-2 free-noncomm"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="gnutls nls"
 
 RDEPEND="
@@ -43,15 +44,17 @@ RDEPEND="
 	!gnutls? ( dev-libs/openssl:0= )
 	x11-libs/gtk+:3
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	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
+	"${FILESDIR}"/${PN}-3.4.0-openssl-1.1.0.patch
 )
 
 src_prepare() {
diff --git a/x11-misc/obconf/Manifest b/x11-misc/obconf/Manifest
index acab6189146e..6a8369ddce4c 100644
--- a/x11-misc/obconf/Manifest
+++ b/x11-misc/obconf/Manifest
@@ -1,4 +1,5 @@
 DIST obconf-2.0.4.tar.gz 456523 BLAKE2B ef3b3e4664ccd1095f5e1cd468fa3d021cd469a641930309a41c7b1cf418b9d87b2d8f4420342363dc4781d8e3aca3e8ffc0b9aac0151a2399579c5ff0997cc8 SHA512 b8cf6f363fa8c2f1d21142a3f79687a72f683f564285b05751c822ddf7a421b09c3440cbc5b08eb09d151601c6ada835ff5cc940bf5abeec2210cca26b552294
+DIST obconf-2.0.4_p20150213.tar.gz 154638 BLAKE2B 9ff9d206b8f789d2c7bf68f6f959f34d19f368645bc4efb77b5a730a8f69db5309ddecc0afb09e7cd2f9cb2af4e705112f3365f43dfbe94c4ff523d8a7f0dff5 SHA512 987c97729b248e9d9fb4c82a131517ee8f31df5dd455b5b658730204c354bf17f7876c269c1d1ec6497ca360698a393c7275b9e7ada5b31abb75ed7b06092e30
 EBUILD obconf-2.0.4.ebuild 800 BLAKE2B 7b1347909fae8830eef9781a31126397e857fee02769a8cf719fc2db8bba8678c49e19e4e0372ce7c3fbdd91a4b44fa3412535e5d7e5c2d37276005ca0f50d6c SHA512 a74608f458dc0d372cd5ce8f9137ed53a283babb2696bc3e76ec4b93d0279267cf695f220c0899c33c25639c34125c3e754972615a6a297ee5af638204b58ef1
-EBUILD obconf-9999.ebuild 767 BLAKE2B 83d6d4c188108b33926b8afa8f1115a00dff7fb0ac2d3f4ccd94f0930567305ca2bd626f5159ed5e0683a6b2619e9bf6b0c6f563268a7db6be2bb218a861a364 SHA512 cc71a7f24edc705f8155ddc52e368027beef8bce3f5abc063ff1a7a6f71e8baa0bdddbcd66d95a79be6a64b682d27b8aa607771bd6ce90abbefaf667072cf71c
+EBUILD obconf-2.0.4_p20150213.ebuild 983 BLAKE2B 3d534b9bb0647112d086c20b5b3820d18198740cef818eefb67eb8ed1cc2cf397690d5c846482bda19ee201521d137c4fec67486a66ed1e24cf344f2ea2e0b7c SHA512 6d6052a0b24da24783991d1f0e047c5470006b4fdc52c8569d87577a615c50d9b0112caeff64d4ca834c5fee9d0ffd93e3ddedc675e96c0c9451ec7bf3afdb85
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/x11-misc/obconf/obconf-2.0.4_p20150213.ebuild b/x11-misc/obconf/obconf-2.0.4_p20150213.ebuild
new file mode 100644
index 000000000000..b20d7f915a06
--- /dev/null
+++ b/x11-misc/obconf/obconf-2.0.4_p20150213.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT=63ec47c5e295ad4f09d1df6d92afb7e10c3fec39
+inherit autotools xdg-utils
+
+DESCRIPTION="Tool for configuring the Openbox window manager"
+HOMEPAGE="http://openbox.org/wiki/ObConf:About"
+SRC_URI="http://git.openbox.org/?p=dana/obconf.git;a=snapshot;h=${COMMIT};sf=tgz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT:0:7}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+IUSE="nls"
+
+RDEPEND="
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/startup-notification
+	>=x11-wm/openbox-3.5.2
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/x11-misc/obconf/obconf-9999.ebuild b/x11-misc/obconf/obconf-9999.ebuild
deleted file mode 100644
index 182f34ce49f0..000000000000
--- a/x11-misc/obconf/obconf-9999.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools xdg-utils git-r3
-
-DESCRIPTION="ObConf is a tool for configuring the Openbox window manager"
-HOMEPAGE="http://openbox.org/wiki/ObConf:About"
-EGIT_REPO_URI="git://git.openbox.org/dana/obconf.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="nls"
-
-RDEPEND="x11-libs/gtk+:3
-	x11-libs/startup-notification
-	=x11-wm/openbox-9999"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-misc/pcmanfm-qt/Manifest b/x11-misc/pcmanfm-qt/Manifest
index b4e0337eadd7..5d8efcaa6800 100644
--- a/x11-misc/pcmanfm-qt/Manifest
+++ b/x11-misc/pcmanfm-qt/Manifest
@@ -1,5 +1,5 @@
 DIST pcmanfm-qt-0.16.0.tar.xz 275792 BLAKE2B 65deed6a6d942a57c6cdf497d254d5052b1bcca219198f3cbaa2bcd29048976610afcfc31cc2101f8ddad88f436bc8dba2483b8305ff55f178dd65c91a549814 SHA512 42c754267966b29722bd771d6f6f09c20cdb3b33bbe49deec982bdac98379dff92ac13f6f70b603aea963a3e1003034475cb682ec4264cfcf581c189826ea727
 DIST pcmanfm-qt-0.17.0.tar.xz 296000 BLAKE2B bfe6a7ed701d375030c8a20fca3a9b1076810c426388e03644bca0a0482f5b86ac784e197463c7316514e78fe72ab360c73df75cb1ee16dc22a2fe313d4f9d01 SHA512 6de9083b90a2d06db892941e50dc9817e1ab8cf5bab80e331cd083c4756b7ede1207ca35fc1fc43b81b52651acb57dfd85953ab8f8deef2a2c0d362374726daa
-EBUILD pcmanfm-qt-0.16.0.ebuild 1098 BLAKE2B 8e337b446f6c3c948a5cee463bffac0899bfc3f15006c52a97f5a2de0d07c6886a11c814e741b6312519e2a72ad823c108728a3f757772e1768baca186ffd350 SHA512 71288802c33d465ae74c1a9bef001a287ad8c7b2a4fd519c5811a1935a5226e482684d64c648a1f6df8cc8126908fcf133e4bf011d8037a74a6bec291685d8ee
-EBUILD pcmanfm-qt-0.17.0.ebuild 1109 BLAKE2B 48885a9ece00e0833eafa4685833c729ac4ac35cb8a991da2dd57b2e39ef294b29e0039324c3ff4749a6f75ef0ba1d29e10e8e2032ff27385133dfc95fe0e8ee SHA512 dbd34db8c5a89b52d279670512cb43c161885d9ca73a0b59850dc3d9bdf0b41e61b81f7192076f2ea0b634850d664e4c6f442649414d4edf8574daf40f7bfc05
+EBUILD pcmanfm-qt-0.16.0-r1.ebuild 1104 BLAKE2B 61a8f6d92cc8fed341460e4c53f129076d1f3751e3ea89125c0d5588c37d0ac6ed4a888851e38253d851e32d6770a74e314f235479c859f4e46d4f9aaaa4f2eb SHA512 0e2bc95c9a8339c4a7697d69425f07724ca626f56e087b85c7df3ca80c9ee0d6264cac7697592559738c63fc32b683915dc4f686e5c2cdecd10c80b816cc954c
+EBUILD pcmanfm-qt-0.17.0-r1.ebuild 1115 BLAKE2B 93f3432181b4eb495df6e450638f1ed17a35d32603192ad0e5cd0f5985a629a8971108ae76c838d6944f870301f03e6e7433872ad8fd14d54b3e014d3d1f262a SHA512 98a8fc93e720fc76c21dbcf424b3a3011a04e9fc04f7aab16da53f89bcbce2356bc4294c712bf5b671daff72a1a12c35105bd2ca77eab43417725f18ed00175b
 MISC metadata.xml 316 BLAKE2B bdf0d6e5b1f3c247fee5717c1aa5bf04bc87254e12fe1bbfef77d8479686585c2d9101b13c2c7b1ac00a4876f809271a59667bceb648c7c034500f529d919558 SHA512 d38170dda875860b80d34ffd83fe0daa56edd14dbc1dd06ab23a21a9f45f95971754299bd488ebc4cc328c0347dc9cdf2265964aab04759b908232d6aea441ea
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.16.0-r1.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.16.0-r1.ebuild
new file mode 100644
index 000000000000..ca97c1aaa28e
--- /dev/null
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.16.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake optfeature xdg-utils
+
+DESCRIPTION="Qt GUI Tabbed Filemanager"
+HOMEPAGE="https://lxqt.github.io/"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+fi
+
+LICENSE="GPL-2 GPL-2+ LGPL-2.1+"
+SLOT="0"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.8.0
+"
+DEPEND="
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	sys-apps/util-linux
+	=x11-libs/libfm-qt-$(ver_cut 1-2)*
+	x11-libs/libxcb:=
+	x11-misc/xdg-utils
+	virtual/freedesktop-icon-theme
+"
+RDEPEND="${DEPEND}
+	!lxqt-base/lxqt-l10n
+"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	optfeature "mount password storing" gnome-base/gnome-keyring
+	! has_version lxqt-base/lxqt-meta && optfeature "trash functionality" gnome-base/gvfs
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.16.0.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.16.0.ebuild
deleted file mode 100644
index 471e0052a4ba..000000000000
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.16.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake optfeature xdg-utils
-
-DESCRIPTION="Qt GUI Tabbed Filemanager"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="GPL-2 GPL-2+ LGPL-2.1+"
-SLOT="0"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.8.0
-"
-DEPEND="
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	=x11-libs/libfm-qt-$(ver_cut 1-2)*
-	x11-libs/libxcb:=
-	x11-misc/xdg-utils
-	virtual/eject
-	virtual/freedesktop-icon-theme
-"
-RDEPEND="${DEPEND}
-	!lxqt-base/lxqt-l10n
-"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	optfeature "mount password storing" gnome-base/gnome-keyring
-	! has_version lxqt-base/lxqt-meta && optfeature "trash functionality" gnome-base/gvfs
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.17.0-r1.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.17.0-r1.ebuild
new file mode 100644
index 000000000000..11ef42c99714
--- /dev/null
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.17.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake optfeature xdg-utils
+
+DESCRIPTION="Qt GUI Tabbed Filemanager"
+HOMEPAGE="https://lxqt.github.io/"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2 GPL-2+ LGPL-2.1+"
+SLOT="0"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.9.0
+"
+DEPEND="
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	sys-apps/util-linux
+	=x11-libs/libfm-qt-$(ver_cut 1-2)*
+	x11-libs/libxcb:=
+	x11-misc/xdg-utils
+	virtual/freedesktop-icon-theme
+"
+RDEPEND="${DEPEND}
+	>=lxde-base/lxmenu-data-0.1.5
+"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	optfeature "mount password storing" gnome-base/gnome-keyring
+	! has_version lxqt-base/lxqt-meta && optfeature "trash functionality" gnome-base/gvfs
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.17.0.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.17.0.ebuild
deleted file mode 100644
index fe8612da014c..000000000000
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.17.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake optfeature xdg-utils
-
-DESCRIPTION="Qt GUI Tabbed Filemanager"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-2 GPL-2+ LGPL-2.1+"
-SLOT="0"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.9.0
-"
-DEPEND="
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	=x11-libs/libfm-qt-$(ver_cut 1-2)*
-	x11-libs/libxcb:=
-	x11-misc/xdg-utils
-	virtual/eject
-	virtual/freedesktop-icon-theme
-"
-RDEPEND="${DEPEND}
-	>=lxde-base/lxmenu-data-0.1.5
-"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	optfeature "mount password storing" gnome-base/gnome-keyring
-	! has_version lxqt-base/lxqt-meta && optfeature "trash functionality" gnome-base/gvfs
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/x11-misc/pcmanfm/Manifest b/x11-misc/pcmanfm/Manifest
index b602ce72cd69..7a8b00dc0dae 100644
--- a/x11-misc/pcmanfm/Manifest
+++ b/x11-misc/pcmanfm/Manifest
@@ -1,3 +1,3 @@
 DIST pcmanfm-1.3.2.tar.xz 424236 BLAKE2B 7d13383cd2b61905bdf14b4b4df8c3d8043a340b597f4d43e40148f61451f82ad3ca36c4c199d81a41dc7e07dde6ed5832aeff985112fae352bc49e873bb67a0 SHA512 bcca1af20500e7a84ebfe5f1efd5a1a2945d32ad3ea5fa945ad908794c56614bd85921fac1e7a3b2fc5ef82267d5d3ffc5ad7065e9878a920dd578cb830776c9
-EBUILD pcmanfm-1.3.2.ebuild 1173 BLAKE2B 729cc032de3e83d6ef71759d8a06c50a82e3893502d5b09f9349f97ccd9a21d5a84146a22bbe07b870040faf9a8dc6d69261c2dc6986d27173542f03e504cbc6 SHA512 cd0954f34168f71d3f22134c9f9ac5932838aeef6a89e6b68a1a311a630007c15802ada0aead82b23c808d60f95d2fcd7bdfb08387a3bd7b842997b67c19a24b
+EBUILD pcmanfm-1.3.2-r1.ebuild 1179 BLAKE2B 7e4d10bf5db4c3b814f70d506a894fd6407fa26f9f002b80c7fa019eda18bd1d995505e0dc626a8cdbb9bccecd57798cd698a1928b22e0021bc6ec6b84d5f9b1 SHA512 5086abeafd65f666e5464fb64dc22a2de5313d84ccb55edc4ca840c018de3f0118ed640e7e1a5d173276156a0da1e377ba039e0b3cd4f087f0294461ea68a124
 MISC metadata.xml 249 BLAKE2B 9253edb9862aabb3fb8518f030c5b2b5c61ab29edf4967dbb44a18c76a95bcfa6927b0c6fbd31ac67ca0ac4a8fb4041483bbce6a01c16f721322804fe3c631aa SHA512 ac804612b7a417323548cbf30fcfaf85b782e0b1f90084d6ac194d28044c9445e07f0a30d54ab41d6861cf0d9f3e7135649477bfdcac340d3a16936420091d94
diff --git a/x11-misc/pcmanfm/pcmanfm-1.3.2-r1.ebuild b/x11-misc/pcmanfm/pcmanfm-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..f157cddc9ac1
--- /dev/null
+++ b/x11-misc/pcmanfm/pcmanfm-1.3.2-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN}-${PV/_/}"
+inherit xdg readme.gentoo-r1
+
+DESCRIPTION="Fast lightweight tabbed filemanager"
+HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
+IUSE="debug"
+
+RDEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.18:2
+	>=lxde-base/menu-cache-1.1.0-r1
+	sys-apps/util-linux
+	virtual/freedesktop-icon-theme
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	>=x11-libs/libfm-${PV}:=[gtk]
+	x11-libs/libX11
+	x11-libs/pango
+	x11-misc/shared-mime-info
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	econf \
+		--sysconfdir="${EPREFIX}"/etc \
+		--with-gtk=3 \
+		$(use_enable debug)
+}
+
+src_install() {
+	default
+
+	local DOC_CONTENTS="PCmanFM can optionally support the menu://applications/
+	location. You should install lxde-base/lxmenu-data for that functionality."
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/x11-misc/pcmanfm/pcmanfm-1.3.2.ebuild b/x11-misc/pcmanfm/pcmanfm-1.3.2.ebuild
deleted file mode 100644
index a57bad0e46c0..000000000000
--- a/x11-misc/pcmanfm/pcmanfm-1.3.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${PN}-${PV/_/}"
-inherit xdg readme.gentoo-r1
-
-DESCRIPTION="Fast lightweight tabbed filemanager"
-HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
-IUSE="debug"
-
-RDEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.18:2
-	>=lxde-base/menu-cache-1.1.0-r1
-	virtual/eject
-	virtual/freedesktop-icon-theme
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	>=x11-libs/libfm-${PV}:=[gtk]
-	x11-libs/libX11
-	x11-libs/pango
-	x11-misc/shared-mime-info
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	econf \
-		--sysconfdir="${EPREFIX}"/etc \
-		--with-gtk=3 \
-		$(use_enable debug)
-}
-
-src_install() {
-	default
-
-	local DOC_CONTENTS="PCmanFM can optionally support the menu://applications/
-	location. You should install lxde-base/lxmenu-data for that functionality."
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/x11-misc/read-edid/Manifest b/x11-misc/read-edid/Manifest
index b6a3a512be51..eaed887485e8 100644
--- a/x11-misc/read-edid/Manifest
+++ b/x11-misc/read-edid/Manifest
@@ -1,6 +1,6 @@
 DIST read-edid-1.4.2.tar.gz 84138 BLAKE2B 300d2bf71477ffaf4a3ee2a100f6935635e17db3bd8419ea13e6d7c7fafc2e2d9476bdeadb231c73a71e299ecf9e62dfe7830187167ac40b92ef6e65e54c509c SHA512 b52c763a7713661a542f707d48251257c9540c4b1ad517b7ddbbc051edf919600cf27f93c13e32d5d6d148dd08327dc91f11eecc0b6db82179d044cef5b52550
 DIST read-edid-3.0.2.tar.gz 17508 BLAKE2B bd27f01fba0b9bf5ca5e5d8d4af422cc14120ce280ec1abe047f31e11f85fbe1b8a8e729b97ef2272e2ab3354871175e91bc11f8c15b2aec0cd10d37aceba392 SHA512 779ebe7f1ffb6e7952762b5f886e07974f2c0fe5fa9be0722b928559466b56aae450f741817bb91bb2e33ca66ab27af39cea3c7af220c99b85dae81734138aac
 EBUILD read-edid-1.4.2.ebuild 398 BLAKE2B b148b8369304073919a5af6b03aa2376400246edddc0357572d5c155d6029c2feef0599252a8e700f5708c4bbe87319879344d7a948e291fdf0d7efefc105739 SHA512 67b788582eed4a5fff82932ca8a10e0aeee71f4bd3e3d8e14821cdc8fd99881bb1f2cf255f4bcbed9510144206bd3b28b69dc3c508e6e24d912e882d8a59274d
-EBUILD read-edid-3.0.2-r1.ebuild 1012 BLAKE2B 1d5a2606e5f4caa190b8c0834f66dc06cfc53896b38d9fc873be69c8c49283f5e7a4f441e3f93a5a1bd363cb05290214555e0ebfe879c485a70d81ee6ea72b93 SHA512 73a3e789017de2a63719871f80addff8e5ee82a56f47665415b386db51ba4394eaa265d7cc989999e2de855c7c82c228574a7859812ddcf556ef3a11b6dce827
+EBUILD read-edid-3.0.2-r1.ebuild 1019 BLAKE2B 837f398a39cdfd15a9fee4ae7a9bd4cb68c5044868cbf9c17c19595525ebb11792c6a8337af0672b0a86da4e50f5b7bd07b91a596427e0d0a736746ac7537d9c SHA512 ead4772dfb2cb0dbdc36bf921374a3d19983e518f8f22089a9db9f895a6a0d375e433f4582a9ba9f01789dcdddd75efe5823861100b283bd8f19efd7a1c5735d
 EBUILD read-edid-3.0.2.ebuild 629 BLAKE2B ef065bcab0c70fa24c771c7a07949652d6c4b97b0e210915bbe4cdb109f115765102db2754f10fdede931a9c66938c55f3aba3bddb346432b67da4cab6d2398e SHA512 9d07fd2d4045c9d73c3f422dbf6a1dce609568c58a666ae2e7e3a548cda236f79f30b3f0b493df1710ada9b2541293fe1d9154362bc84a31b74e3e302d588708
 MISC metadata.xml 392 BLAKE2B d9477711f154ae3dd3b22254d6e8117c27840af5629a7296a3a2dae88bbed00174d30dc8a658eb5c0400b7db2b9b38d9f598916256b40ddae0dd33830e532f89 SHA512 76a7b26f9af8ae7ca060114b5aa077610916880c4d75b565bbe766beaf0ef7a86f92f0c71dec57f9f7aee07c003dc2455f12e1b9c4529b505466d904ba0eb5f1
diff --git a/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild b/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild
index fd3656658546..a0505646508a 100644
--- a/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild
+++ b/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.polypux.org/projects/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="vbe-mode"
 
 DEPEND="vbe-mode? ( >=dev-libs/libx86-1.1 )"
diff --git a/x11-misc/spacefm/Manifest b/x11-misc/spacefm/Manifest
index ade2b53d09d9..5b2128473061 100644
--- a/x11-misc/spacefm/Manifest
+++ b/x11-misc/spacefm/Manifest
@@ -1,6 +1,6 @@
 AUX spacefm-9999-include-sysmacros.patch 192 BLAKE2B 6d5d99c7a49310833ff07f1c0ea93b3399e67e791241a1f56d2a4e1d796b79c3fdb2b38a11f06b508512ed0e565c43d20f988e31e333291d8942bb1d698984cd SHA512 9bc689f5d9e97ef6515ba6d475571ede0d4acd85bbe9c000e393eaf2caffa99807bd6172bb1e085b761bddad17417cef1e0530f289fb05152a6790307f8e1428
 AUX spacefm-fno-common.patch 2316 BLAKE2B 3f91d4eb0039a3b0e4ba3fe13b9d6436bd91beca0e224af7722d3fa2002e413c6e78cdb7f2eb690e2d58dda90638d896c8f186de8de544829a5bd0ff078b7a60 SHA512 02cd669d89080b5644adfa3092c452ebd3e6a1c39610ba96f5e49e23f3b6697996aa7e35709e46e6b8eb3fc73ff026cc9cf2c7183d4d867ef52e880fc33d31c4
 DIST spacefm-1.0.6.tar.gz 3498587 BLAKE2B fc4753ff370fa940ef5737bc7826558847dfbbbec43c1a150d887ed38655f9e45255a737f61a024318c9f37e86a15989da66c83d4dcf5a811603950009b20547 SHA512 37fc0dd31f02158502f592415b4c375ee49560af6f03d75b035d7c6c45bdc47064bba1ae8987b4cc8be2e02b3dfcdc17ec760411975e7b5f74343a2293fb2c8c
-EBUILD spacefm-1.0.6-r1.ebuild 1932 BLAKE2B 37d44f70ae207d68ef3a95f24e7b5a492239a3cb02e8860c0a1b8df57a5812fcf75ff527c56169f4cb8590ef6fbeceeebdf955f2cfe9421924fb691081e4d0ca SHA512 b386d07854a5d568b2d48df2a3034c87c8d1032b9c58de4e053b1099e3a9db5f8f3d9a764febdb69528c71c1f232bb1b97ebc10755ee3a91727e941c88a5cc6a
-EBUILD spacefm-9999.ebuild 1932 BLAKE2B 37d44f70ae207d68ef3a95f24e7b5a492239a3cb02e8860c0a1b8df57a5812fcf75ff527c56169f4cb8590ef6fbeceeebdf955f2cfe9421924fb691081e4d0ca SHA512 b386d07854a5d568b2d48df2a3034c87c8d1032b9c58de4e053b1099e3a9db5f8f3d9a764febdb69528c71c1f232bb1b97ebc10755ee3a91727e941c88a5cc6a
+EBUILD spacefm-1.0.6-r1.ebuild 1983 BLAKE2B 491c88ff1ffe86f25107b5309b8785b39f51cf76957abfdadf5c510263f009c5311c2c1d773e17bc0c5bfcbc74dd2bf2e692cf6e11e570e1fe463c1ea3d0faa7 SHA512 db2ce14a353bddb63d48a23b0fb35d901499bb838fb3a77ae96d5dae008802a676adb8b5c9eec410950a81ad81f1c38dabf45436f3747f50fb896da6321dbd9d
+EBUILD spacefm-9999.ebuild 1983 BLAKE2B 491c88ff1ffe86f25107b5309b8785b39f51cf76957abfdadf5c510263f009c5311c2c1d773e17bc0c5bfcbc74dd2bf2e692cf6e11e570e1fe463c1ea3d0faa7 SHA512 db2ce14a353bddb63d48a23b0fb35d901499bb838fb3a77ae96d5dae008802a676adb8b5c9eec410950a81ad81f1c38dabf45436f3747f50fb896da6321dbd9d
 MISC metadata.xml 1073 BLAKE2B 3b14ed88b877532bc7d856e9ad7590207502695685a0ae303ff81dbefa177ad566a81762395a905302a7cdefa753f4428becfd2a6cd0a09fb8797e73fc047f08 SHA512 699c306adee51a68456e787fcc313a2232e95545cbee5d9b2b46a45da7823e166ffbc725356636692c47f78311c2fbf5fdabd4d2e5df3712451975b1bfc889a1
diff --git a/x11-misc/spacefm/spacefm-1.0.6-r1.ebuild b/x11-misc/spacefm/spacefm-1.0.6-r1.ebuild
index b206e28490ad..bf27995498f1 100644
--- a/x11-misc/spacefm/spacefm-1.0.6-r1.ebuild
+++ b/x11-misc/spacefm/spacefm-1.0.6-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
@@ -58,7 +58,8 @@ pkg_postinst() {
 	optfeature "mounting as non-root user" sys-apps/udevil sys-apps/pmount sys-fs/udisks
 	optfeature "supporting ftp/nfs/smb/ssh URLs in the path bar" sys-apps/udevil
 	optfeature "performing as root" x11-misc/ktsuss kde-plasma/kde-cli-tools[kdesu]
-	optfeature "other optional dependencies" sys-apps/dbus sys-process/lsof virtual/eject
+	# sys-apps/util-linux is required for eject
+	optfeature "other optional dependencies" sys-apps/dbus sys-process/lsof sys-apps/util-linux
 
 	if ! has_version 'sys-fs/udisks' ; then
 		elog "When using SpaceFM without udisks, and without the udisks-daemon running,"
diff --git a/x11-misc/spacefm/spacefm-9999.ebuild b/x11-misc/spacefm/spacefm-9999.ebuild
index b206e28490ad..bf27995498f1 100644
--- a/x11-misc/spacefm/spacefm-9999.ebuild
+++ b/x11-misc/spacefm/spacefm-9999.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
@@ -58,7 +58,8 @@ pkg_postinst() {
 	optfeature "mounting as non-root user" sys-apps/udevil sys-apps/pmount sys-fs/udisks
 	optfeature "supporting ftp/nfs/smb/ssh URLs in the path bar" sys-apps/udevil
 	optfeature "performing as root" x11-misc/ktsuss kde-plasma/kde-cli-tools[kdesu]
-	optfeature "other optional dependencies" sys-apps/dbus sys-process/lsof virtual/eject
+	# sys-apps/util-linux is required for eject
+	optfeature "other optional dependencies" sys-apps/dbus sys-process/lsof sys-apps/util-linux
 
 	if ! has_version 'sys-fs/udisks' ; then
 		elog "When using SpaceFM without udisks, and without the udisks-daemon running,"
diff --git a/x11-misc/xdg-user-dirs-gtk/Manifest b/x11-misc/xdg-user-dirs-gtk/Manifest
index c7a07f252b43..6f638112cb3b 100644
--- a/x11-misc/xdg-user-dirs-gtk/Manifest
+++ b/x11-misc/xdg-user-dirs-gtk/Manifest
@@ -1,3 +1,3 @@
 DIST xdg-user-dirs-gtk-0.10.tar.xz 116528 BLAKE2B f86237859636046ecc72bdd62ee5c6a3726ad701aabe04f14bff6541554d3e9de82265cb95b353714adba5d6c8742f94150df9b6f3e4043db9e6885e61e569c1 SHA512 c3ef070244cd1c87312c2c2602dbe7bc3dd26eed632b0d8d779580d7ee6259efdda453ab7bdf4415cc72fad7a74d9dd36476189fe446d5627e4db75d905302f5
-EBUILD xdg-user-dirs-gtk-0.10-r1.ebuild 1412 BLAKE2B da64628f1729724aa072cf3171cc1a7523f40c0164ad6c741fad9afaa23f75bf1771db6199487f18330eddc98f99626d2dcc8cfcf2df11c60065082905f2bd68 SHA512 c337e6c93510b951cb1480ba12df9194dfa3768602bf3d0a3b087e8a383c1ea5d9142d501a1852691ac044f9fa15f9906e1e7405a725aa9ceb775111ce57b112
+EBUILD xdg-user-dirs-gtk-0.10-r1.ebuild 1419 BLAKE2B 418797069c10d169068cc793f3e4275cd119b8c779285e6a069b5e159c08a8ac62aea3bcda208671da2906304c46abfdedfb28e8a175fd4579c596b8d82f7526 SHA512 8033c0acba93604734211441fc6439aa4a50640131167c49480373033512960d415b3c33ea673a6027143f3764b08306ee56872a44819df8a92416960d3efbaf
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
index 2d9acf66e618..7798361ee000 100644
--- a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
+++ b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-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
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-user-dirs"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="
 	dev-libs/glib
diff --git a/x11-misc/xtermcontrol/Manifest b/x11-misc/xtermcontrol/Manifest
index bfddc077cfe7..c5191c6dc5a9 100644
--- a/x11-misc/xtermcontrol/Manifest
+++ b/x11-misc/xtermcontrol/Manifest
@@ -1,3 +1,5 @@
 DIST xtermcontrol-3.7.tar.gz 151984 BLAKE2B 246b17e0b38540cfe022321129d76ae196c8d0b50b2a2fffbb523029321c5e8fde093fc5af16e5a550fc39eb2fcaf1fca4882de2948c45397c9bd4a9a11a06cb SHA512 b23da5dd07ea8fc59717752e937cffb36038870f3ad486d43b8d0477826916255ae8f00f894293efb2dead46ff9122c7e27200d5fc15b7bd91d9df1b649e2081
+DIST xtermcontrol-3.8.tar.gz 181399 BLAKE2B b65acd8ecdf6e0293fcd856cd05f7a3c2eaf868f6f7e0ea34829fbfece4e2a17c2085042e6eeb50a20504200db754badde8ffba0305358547d5f65cf18df564c SHA512 9dacddc57c31705d00f52753f906cd83ae4b7ae34ff2e712869becc452535dbce9fb3e0e9aaf689b55edd34889d9e37553e3702c26ccbd136f544016fcfedbf1
 EBUILD xtermcontrol-3.7.ebuild 372 BLAKE2B e79fe3ec397bc714f2123e71413202fd3436de53cfd6944c5248ab6d194a30f2259793638485092db965b89eac548a37666f7a8f60eeb8f9e78914205181b1ef SHA512 949eac5ba6192597f9a3d80762aeb1b52df81a9659d0f2c02c6ad120df407b7cae9ffac1816d64c078ecb229eeab420c948fdde3468ac4fda75c8e3333662718
+EBUILD xtermcontrol-3.8.ebuild 368 BLAKE2B 1b3b390da7ca10f9c4f9428d83a8054917c996fd7929893eb2d926055acb56c3186ebdd60d9bb480f6f56e8f343aab87d1fd4e8e77b72c5b2c64adda4d8de86a SHA512 31fc15b2b2e7b16fb12bed4862d2822154620e7ac1cf36aa508d21ed7abe9a2bb9f4574db9086b4cd4eff6f430b7ba41cb9ee26151d4f790af28073b188103c7
 MISC metadata.xml 689 BLAKE2B fce013dc9ec9488e94202966a807b7e28491fc553fc243008846f845462034a8645a68a2122832c2118a3911856c0e0fce13c563ead4da707375eaa16cc81fe4 SHA512 ee635786fb7c6876636390fac2aa50cf01946dcbead809021f7bb795ef713bf21ee04123f574d4d7d12402f93c9262f3bcae46fdd0580dd316321cb42421687e
diff --git a/x11-misc/xtermcontrol/xtermcontrol-3.8.ebuild b/x11-misc/xtermcontrol/xtermcontrol-3.8.ebuild
new file mode 100644
index 000000000000..d31df69220d9
--- /dev/null
+++ b/x11-misc/xtermcontrol/xtermcontrol-3.8.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="xtermcontrol enables dynamic control of XFree86 xterm properties"
+HOMEPAGE="https://www.thrysoee.dk/xtermcontrol/"
+SRC_URI="https://www.thrysoee.dk/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
diff --git a/x11-misc/xvfb-run/Manifest b/x11-misc/xvfb-run/Manifest
index 5f572c34c495..1119942841f3 100644
--- a/x11-misc/xvfb-run/Manifest
+++ b/x11-misc/xvfb-run/Manifest
@@ -1,7 +1,7 @@
 DIST xorg-server_1.20.10-2.diff.gz 152303 BLAKE2B beb1d07e86378a62bad956990ee210375c3cfa0135acd51e2756c0ddc2933d13092e400a53909a72755b3c1dfb31faa32a137c7ff719fdb8dcc23f11cca72e05 SHA512 c19e16764720b79df53b8032947ca64bb4ca0b9c380d4c2e3317c37b6fa2937815de01e82019ec93921919690c0a5ae1b59bf1fae189d8f7e9e80fb4860fd713
 DIST xorg-server_1.20.10-3.diff.gz 152420 BLAKE2B e87d8800a905962cf3ddeb41e5e9cf0962c5b3ff16ee8ce4d31de96a3d94798fc70dee4ee3f05759d16758f2083436fb91c212ab22f719bd3f086fac51ee5d73 SHA512 16fffd2c92d30c985f55093f46249440388a1eeeca9bd70cd06883f75052170c9717925b18dd01b16ce55d03758bbbf5f2b10c76de00f752b3e7ff64e74e646d
 DIST xorg-server_1.20.8-2.diff.gz 171769 BLAKE2B 5572320e4bc1de63ba221e5c9804d6676cc7c918d417b4069572fec4385d62b73e5636a4f17eebb1897f410e323e190dff68056abd888373df4ccdd688ed7c47 SHA512 89115023fc802a3cf2fc21fabed4499112b1e6f52967eb134795f041194b05d86c59b1477d8b9001c2935efdeb64e8a0dd281a43a6252802df2d19349972f7d7
-EBUILD xvfb-run-1.20.10.3.ebuild 776 BLAKE2B 4c5dfcb64fc3427931fd6e04773e8d031043edf01d4d5dc6fb3635feb7eea4645e178689b0cbd48a0ec10c5c80ae875c907c23fb9069e13a391f630fb9a0d583 SHA512 6db43ddf338044cefa8e1396ec81ede29fffc89d96b9ca785870c9af8b9829e4cb8a37e2ce2db32d94ca988ed55de492bbbaa84bf99a8c4a5157db69cffe2c85
+EBUILD xvfb-run-1.20.10.3.ebuild 775 BLAKE2B 9c070bbee3901b23015422be999c7c853e3a0ba6673648c1ac6083506f14f1dc51fa3dee63e6d9324d2d862438d3b23ab8288d1e96b94caf0dc5edca8ea7b7eb SHA512 36779fcdd347a8fd5021e5614625aec9d91c18bb9b7b2fa628fee9e4f313f0d99507ca8a5200633b511d3d0ce39f449953d55575d2a12b23c6394d655d78a65f
 EBUILD xvfb-run-1.20.10_p2.ebuild 757 BLAKE2B 480f78fea0fb293e3656ac40a94833c37cacb294c8dbeaddd6629e3c2ccc329b6f47277926d7435b41c35a33eadafb59bdda731ec006fa93465fd9c7c772f397 SHA512 7948f90a2716af559e6c8028898454dae4d4419e337163ba962e24a72f6d2fed11288a39cee3e0fdd921e1fcdf6ee57072646aa9dee56c2f7ee38a0c301cc5d3
 EBUILD xvfb-run-1.20.8_p2.ebuild 755 BLAKE2B b2e7dd470ff90c72d40a64f77f85de998f97c451cb6bde49d4ef00cd3d5a3dd211d6639f5beb4c0e1a728dba2cac6cb25542c4916a900fb41f1c9bce78b2d4c7 SHA512 07594ffef5bffc8c3eab48a278048e87ff3507480d28a927fb8e54ff25161f2e48f99e1717442a2206407ebfad50756359c2122565e2f26a296ad05881931ae4
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/x11-misc/xvfb-run/xvfb-run-1.20.10.3.ebuild b/x11-misc/xvfb-run/xvfb-run-1.20.10.3.ebuild
index 78d927365aa6..4c53cd93e986 100644
--- a/x11-misc/xvfb-run/xvfb-run-1.20.10.3.ebuild
+++ b/x11-misc/xvfb-run/xvfb-run-1.20.10.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${MY_PV}.diff.
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="dev-util/patchutils"
-- 
cgit v1.2.3