gentoo resync : 16.01.2021

28 files changed, 669 insertions, 123 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index eeccbecbb38e..cbadc772288b 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/bbcd/Manifest b/x11-misc/bbcd/Manifest
index f6704db44664..b8ea9c12987f 100644
--- a/x11-misc/bbcd/Manifest
+++ b/x11-misc/bbcd/Manifest
@@ -3,4 +3,5 @@ AUX bbcd-0.3.1-gcc4.3.patch 254 BLAKE2B 7ace4e13e7423fd0e54801b9ef5738545068ff47
 AUX bbcd-0.3.1_0.3.1a.diff 1794 BLAKE2B 233815b158b32e738e2849f9bd475cf5c3eabbcff30685c7aa1ac460dca466a4d4c38b6aaba054e39929d845cfeecd37201640e1693cf7707d45e8bb149df240 SHA512 422ae54b3e18e3d9dfaa4adc28e8d0285d127cb28a175fce2772ef4d3577755e95c43bdd15e1000469da64dd9b6693cb2f11d92c5d261266cc791b9671cdfd82
 DIST bbcd-0.3.1.tar.gz 74853 BLAKE2B 446f295b7716548f9a6ded07ee10323483bdac460d53b9308bd6dd22483e8c664a24bfd9848caeca730801d3273de3000bd771e925a9fd334a2c009453f773b3 SHA512 817c41e8989d28fed45b3a797ffac193ce2060bae7d8793253a8f2812945b0f72e2f14ecd607329f769fc07773b678ca507a84c7f3b214fb5ac4afd62d77de7f
 EBUILD bbcd-0.3.1-r3.ebuild 666 BLAKE2B 9ff23133a3597efb569341fd710e6cdf401da13ecef2f493e5df5acbdd38595a6b34a255737130b6277d614b458919e6196d818a5b3e73d946826a2cfb813b41 SHA512 6e662a2b1125cdfb6ec31dcd8d14835953e2f8ef91548cbad77c71a6170a35944361ea7386f3f4085378b5c8eb5ef0a414af74ff81e43ccad84907ce7761621a
+EBUILD bbcd-0.3.1-r4.ebuild 666 BLAKE2B 405405d15287bcb82ede57a0b4c5a8b712ed3e10ec3d0e0829e032e8bfdb156eb887dc45dd312aa2883f9a81078448c90719b2d0e8b31d6f09ded0c6a9b6e456 SHA512 7c940c2b54d5ac9407adf7e592816f2bd958aac186902d1da330d87749cfad5fd2e62b42fe1c52920a531fc4e782d465ea7d4372c5bd3476a63deea28f8b48a5
 MISC metadata.xml 245 BLAKE2B 4988fa1366a9b8a3769e503545339cdd493a0bdc362ca9237b158b94549de1f061477546b00fd3b21dc9325812423f7207071e22e3234d5c0b88c755197557d2 SHA512 e00be68ab9ad3acfce3d2d48721c47cf50e2c6358c9ceb45a2a23fc5303826ea26b9205ce4f230121c2e40c9c467367f2dc57863680899b21e8005034aa9118c
diff --git a/x11-misc/bbcd/bbcd-0.3.1-r4.ebuild b/x11-misc/bbcd/bbcd-0.3.1-r4.ebuild
new file mode 100644
index 000000000000..5932a96d6e09
--- /dev/null
+++ b/x11-misc/bbcd/bbcd-0.3.1-r4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+DESCRIPTION="Basic CD Player for blackbox wm"
+HOMEPAGE="http://tranber1.free.fr/bbcd.html"
+SRC_URI="http://tranber1.free.fr/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="media-libs/libcdaudio
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-libs/libXt"
+
+PATCHES=(
+	"${FILESDIR}"/${P}_${PV}a.diff
+	"${FILESDIR}"/${P}-gcc3.3.patch
+	"${FILESDIR}"/${P}-gcc4.3.patch
+)
+
+src_configure() {
+	append-cxxflags -std=c++14
+	default
+}
+
+src_install() {
+	default
+	rm "${ED}/usr/share/bbtools/README.bbcd" || die
+}
diff --git a/x11-misc/bbdate/Manifest b/x11-misc/bbdate/Manifest
index 20f31b47f38d..8ecfdcf6252c 100644
--- a/x11-misc/bbdate/Manifest
+++ b/x11-misc/bbdate/Manifest
@@ -1,4 +1,5 @@
 AUX bbdate-0.2.4-as-needed.patch 619 BLAKE2B 61672a67abade794501141c897f602c9d1bf865d56aa822383f84eda68db04c53b5bd60d0faa6947abc88f903ecf61f6bf526de0203c310e4d69683c234e87d2 SHA512 eb533f3802c64a557ebd791dc93e42f62eff0808ca49c07244396b4fc6ee22b59b7f75091b1e0f60403e0e1d1945a0e42953da071213a389c4a6f61447c3db10
 DIST bbdate-0.2.4.tar.gz 60644 BLAKE2B f8e55a9c4c041abb6ce8155c46653034f1d1380d3e65851b80898a93fab6b988db6c9e3b20663f4e1fd6cd6427ff0738cb1ca35766a47c7805c171e36ae31ab9 SHA512 90c51249a6ad0b90aea640b1f94cee4e9feb3ca46e4407ab3be645f92a32e7c3f1879c58a236c487dd7bfb24aae1f6a03da0a535c9218fbcbcdbd1e6f043d041
 EBUILD bbdate-0.2.4-r2.ebuild 924 BLAKE2B 68e37a0c40f097d521596d0fd6983401fd8a989f83ba56a67ea822db7561411fd7a5bb1277940b0ecab00bfe5a700a8fb572c28375fe8883eec15b6af116c13b SHA512 4073a3b8a159f61265f3a17685a8f3965cbf5dcb1fdeb6e7e2624272e73d838d6f64dd0bc5549ce9cef24dbb998708edb5c198e2ce388646e4dae2e3ec72fac7
+EBUILD bbdate-0.2.4-r3.ebuild 922 BLAKE2B e5af6f75c4c94178c22a271cd4f20a380b085c9c25ef6107ab4e7e3b5640c9e8942abaccd01b8003de16ef168bded9c7f7cb99be4d9352f313996067d639e305 SHA512 fe78870d04c741cc8a46adb601df05ac141af5252776164c52e3a319de5576e45b32fce1786e24d11c299c96965a05e50f80410996b60594e891ec4cb90bb6e4
 MISC metadata.xml 322 BLAKE2B 281372f32e95085fb9b3eda84565f4654b4004111fd38ff5345dd1bba3ea5342971b22fb4825a0222c671a6d4056ee0ae9ceab1d3550ebfcd8e08e4cdadd9319 SHA512 5668d105c8615a718c20ea503868087062882f519e98452f45e69ea3cd840b17b19dfc2540f8b808e92288cdbeba73a8070bdb7d10cd70a1c27525d5865754d7
diff --git a/x11-misc/bbdate/bbdate-0.2.4-r3.ebuild b/x11-misc/bbdate/bbdate-0.2.4-r3.ebuild
new file mode 100644
index 000000000000..faa221d7365b
--- /dev/null
+++ b/x11-misc/bbdate/bbdate-0.2.4-r3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit autotools
+
+DESCRIPTION="blackbox date display"
+HOMEPAGE="https://sourceforge.net/projects/bbtools"
+SRC_URI="mirror://sourceforge/bbtools/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
+
+DOCS=( README AUTHORS BUGS ChangeLog TODO data/README.bbdate )
+PATCHES=( "${FILESDIR}"/${P}-as-needed.patch )
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	sed -i \
+		-e 's|-helvetica-|-*-|g' \
+		resource.cc data/${PN}.{nobb,style} || die
+	eautoreconf
+}
+
+src_install() {
+	default
+	rm "${ED}"/usr/share/bbtools/README.bbdate || die
+	# since multiple bbtools packages provide this file, install
+	# it in /usr/share/doc/${PF}
+	mv "${ED}"/usr/share/bbtools/bbtoolsrc.in \
+		"${ED}"/usr/share/doc/${PF}/bbtoolsrc.example || die
+}
diff --git a/x11-misc/bbmail/Manifest b/x11-misc/bbmail/Manifest
index 88fb62be70e9..02c6f13d2c9b 100644
--- a/x11-misc/bbmail/Manifest
+++ b/x11-misc/bbmail/Manifest
@@ -3,4 +3,5 @@ AUX bbmail-0.9.3-gcc4.4.patch 2776 BLAKE2B b65b33d0f6d841a58e7032460deb85a57f1fb
 AUX bbmail-0.9.3-shebang.patch 276 BLAKE2B e6d685f91e5faf598cb9df8494b305de986b8d493b3b1edf1cd053b672f625c121b84ee908dff296161e63cfe4c010ab3f6df86c7e3cff187e588d4f3bea6d55 SHA512 3d84c579f461e97f542a1e21fe365c4fa86731dd9af0e4cdfcbe9bfa83c8b0e10f3a18b67515e35046f218c3b704838115d4695b84c8f2b879a90c89d97d8752
 DIST bbmail-0.9.3.tar.gz 186433 BLAKE2B 9fa31bc3495fc9f4c0fddbf38645c7fd8a3c50ebf364cf487d8d4e01e160e34151e741472f86c2edfa26869f7077051919456c00ba566815346d66edb161c0c5 SHA512 2c0e22092e08d247edf170e22054b6d108ebf84d3f606ab8e9f1af28154bf4bff26828b5ca55622563eb2cb468d88046d5859b79c0f272895c8785becd69c860
 EBUILD bbmail-0.9.3-r1.ebuild 669 BLAKE2B 5ad0e00b8fe4ffaea3d327570734d3392e3bd334d46aef6a860c0a3a1b8366badf770f4bb92a6fb1ff48d9fd18275a08720feabff3da55fb82b10f570c1f146c SHA512 d9f2c3dc93cf51246346ff2cca19549c9d89821e30ee541c05c3696ccb26531be0d4b4c36c349480fd5a6f96d81c6efd442f9341267f06015cbe291f62cf43d2
+EBUILD bbmail-0.9.3-r2.ebuild 672 BLAKE2B 0dbf5c36f7bc1dbd13a2f58623bce1b09ba769669b389e46df153ad88fe755c273db189a37e3adf74c66a3a9f944d28adf91aef46dbc9bc228353f2aa9fda7a1 SHA512 fe297d67066ac6cc448120f6a2109e33ef5b21b87e7ab6e49c146a70b88e0b418fc873db90e1b0578a3e3b49bd143442b0bbbdcaf670b64f8843d478ba05b8b9
 MISC metadata.xml 322 BLAKE2B 281372f32e95085fb9b3eda84565f4654b4004111fd38ff5345dd1bba3ea5342971b22fb4825a0222c671a6d4056ee0ae9ceab1d3550ebfcd8e08e4cdadd9319 SHA512 5668d105c8615a718c20ea503868087062882f519e98452f45e69ea3cd840b17b19dfc2540f8b808e92288cdbeba73a8070bdb7d10cd70a1c27525d5865754d7
diff --git a/x11-misc/bbmail/bbmail-0.9.3-r2.ebuild b/x11-misc/bbmail/bbmail-0.9.3-r2.ebuild
new file mode 100644
index 000000000000..5d219aae979b
--- /dev/null
+++ b/x11-misc/bbmail/bbmail-0.9.3-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="blackbox mail notification"
+HOMEPAGE="https://sourceforge.net/projects/bbtools"
+SRC_URI="mirror://sourceforge/bbtools/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-lang/perl
+	x11-wm/blackbox
+	x11-libs/libX11
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc4.3.patch
+	"${FILESDIR}"/${P}-gcc4.4.patch
+	"${FILESDIR}"/${P}-shebang.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	dobin scripts/bbmailparsefm.pl
+}
diff --git a/x11-misc/bbpager/Manifest b/x11-misc/bbpager/Manifest
index ae616d869bb1..4a5365b85797 100644
--- a/x11-misc/bbpager/Manifest
+++ b/x11-misc/bbpager/Manifest
@@ -2,4 +2,5 @@ AUX bbpager-0.4.7-as-needed.patch 2695 BLAKE2B 024405437506c3185a1256bc6ff7b1155
 AUX bbpager-0.4.7-gcc43.patch 1031 BLAKE2B cfc58c4cbb983fb139c051ac26029031cbbe2508f707c3b0464e953c156c02db6690c4923ff8c049e8545a9999ca49abddb8d641bf08c8be3d3fdf19033d19c6 SHA512 41ec95853663e89b356cd781719675fbc49a6d117886dcfc85c202fe1fe73d23151fb313c9694f946055ceca9f222e05b36a6b5a981672c6a832ddcf906109ef
 DIST bbpager-0.4.7.tar.gz 170575 BLAKE2B b8c7b8259f1c1e15ac0d8fafb908a8e84598bb44111a35aacf511346fad9f611fdb0e750a2c8412c86f5a4fb8ee5b99f3b0f3e2166cd309a5bc22de0999f06a0 SHA512 33202efd4d55639ab4c5f9fe54b9b0a6e4d32dd822119fb5517d5d2231922962d6985b51d7fa84dc3eb909ddea05033965a3882cda2dc10193aae2f873da1869
 EBUILD bbpager-0.4.7-r1.ebuild 676 BLAKE2B fff46339d9551ebfc68e4126c4af2b2e12ef8e08810f186809626dedd9f0d8ad8b9e8fece194ecde024765c42e8c8c8b51549d4e43db82706a0557ca81eb6276 SHA512 d8d93b4d02c4961aa43e70cbca3f005dc9908ba5c15b88743a01c2adc46d6cfb038f74a752c601c5f9b22b521f3a31edd02625dfb1425cb544c9ca79b0f7a4a1
+EBUILD bbpager-0.4.7-r2.ebuild 684 BLAKE2B d5c206d8e6a5aa630a9bbed608370cbc3bb2593f3a5fb7e1a978bc97b90476db33303365cd4a2f24904d2f8d251a33dbd25fefc05a59b2d1223b48bcc61602d5 SHA512 619e82504956fca2112c828498dc31cd083d6afa1e9e2f78d1facb4298a8c67cb7989c8978b3fbfadcd5966be8ddfcd4dcd7e7c20dcdb6300d67ac35b2b36190
 MISC metadata.xml 322 BLAKE2B 281372f32e95085fb9b3eda84565f4654b4004111fd38ff5345dd1bba3ea5342971b22fb4825a0222c671a6d4056ee0ae9ceab1d3550ebfcd8e08e4cdadd9319 SHA512 5668d105c8615a718c20ea503868087062882f519e98452f45e69ea3cd840b17b19dfc2540f8b808e92288cdbeba73a8070bdb7d10cd70a1c27525d5865754d7
diff --git a/x11-misc/bbpager/bbpager-0.4.7-r2.ebuild b/x11-misc/bbpager/bbpager-0.4.7-r2.ebuild
new file mode 100644
index 000000000000..02836b50e77a
--- /dev/null
+++ b/x11-misc/bbpager/bbpager-0.4.7-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="An understated pager for Blackbox"
+HOMEPAGE="http://bbtools.sourceforge.net/"
+SRC_URI="mirror://sourceforge/bbtools/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="x11-wm/blackbox"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( AUTHORS BUGS ChangeLog README TODO data/README.bbpager )
+PATCHES=(
+	"${FILESDIR}/${P}-gcc43.patch"
+	"${FILESDIR}/${P}-as-needed.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	rm "${ED}"/usr/share/bbtools/README.bbpager || die
+}
diff --git a/x11-misc/bbtime/Manifest b/x11-misc/bbtime/Manifest
index fd163d4487e6..f1039bc36cf2 100644
--- a/x11-misc/bbtime/Manifest
+++ b/x11-misc/bbtime/Manifest
@@ -1,4 +1,5 @@
 AUX bbtime-0.1.5-asneeded.patch 1082 BLAKE2B da63c4f38d1e6accbfcc071df4d26773f8e62609978d10ae53d95d7ec94b1d3cc8d46f3841a7910d753ed9cf1bf216c81082e0184981e336c3573592371ffe66 SHA512 23fa8c215f936d1a2235469780f3518c64a8333c5314a7273c6d1c824eab1162144be7fdea24511beee405142f146c6f947239220c521056ea041c0f3cb28494
 DIST bbtime-0.1.5.tar.gz 68842 BLAKE2B 33b66fd284d97d2e6780b29293ac6e67ef69ee2273362fffb7435d4a3fcdd2b33ec89ec3e6389676a9a603a34590a3912103fcbfd69ac663cfff5f091ba1a1cc SHA512 a27966e3a35b2e59b440547680daeecf46bd50ed4fab52e5c50fdea32a307da4a78e4c19e493f72e2f58d806cec74098312d549e8610214e227b99fd4074e669
 EBUILD bbtime-0.1.5-r1.ebuild 841 BLAKE2B dfdd927b77693ad9a089773d58a10ab308458fee361762b4e94c557a6784dda89bfccf04a88b318aa70428df7f6905c0881d2ed2d7084169ccd5666abe331c97 SHA512 b3f0608dd3c14b805371fade2422516844eba9cc339b31d2be23292661f6c6d23a77313abd6c8dac82b5b1fb0b2f9e5b6d06b0fa54edd606c85731c822f8f29a
+EBUILD bbtime-0.1.5-r2.ebuild 837 BLAKE2B bb1ab65c9f97e60720367654c759df79eb5c07bd79870045f9f7d5d2aaf55ab2dd69eecc3e540c92f3616a21ddd31fbf79f269b14e4346d2861701292b177134 SHA512 d59ff6bc1b71f122074d53e9c459f2ffc0f1e11ce74af39332a6e3d4e3a09b3e38a3463d3aa6ba14ad0f46578e74b9383be6705f5f3835a85bfecb56c0791a1e
 MISC metadata.xml 322 BLAKE2B 281372f32e95085fb9b3eda84565f4654b4004111fd38ff5345dd1bba3ea5342971b22fb4825a0222c671a6d4056ee0ae9ceab1d3550ebfcd8e08e4cdadd9319 SHA512 5668d105c8615a718c20ea503868087062882f519e98452f45e69ea3cd840b17b19dfc2540f8b808e92288cdbeba73a8070bdb7d10cd70a1c27525d5865754d7
diff --git a/x11-misc/bbtime/bbtime-0.1.5-r2.ebuild b/x11-misc/bbtime/bbtime-0.1.5-r2.ebuild
new file mode 100644
index 000000000000..41b5aca4de1c
--- /dev/null
+++ b/x11-misc/bbtime/bbtime-0.1.5-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="blackbox time watcher"
+HOMEPAGE="https://sourceforge.net/projects/bbtools/"
+SRC_URI="mirror://sourceforge/bbtools/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
+
+DOCS=( README AUTHORS BUGS ChangeLog NEWS TODO data/README.bbtime )
+PATCHES=( "${FILESDIR}"/${P}-asneeded.patch )
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_install() {
+	default
+	rm "${ED}"/usr/share/bbtools/README.bbtime || die
+	# since multiple bbtools packages provide this file, install
+	# it in /usr/share/doc/${PF}
+	mv "${ED}/usr/share/bbtools/bbtoolsrc.in" \
+		"${ED}/usr/share/doc/${PF}/bbtoolsrc.example" || die
+}
diff --git a/x11-misc/mate-notification-daemon/Manifest b/x11-misc/mate-notification-daemon/Manifest
index b7493627bdf2..67b65fb89542 100644
--- a/x11-misc/mate-notification-daemon/Manifest
+++ b/x11-misc/mate-notification-daemon/Manifest
@@ -1,6 +1,4 @@
 AUX org.freedesktop.Notifications.service 94 BLAKE2B 1a97aac2db9c803c9e4babf9067283b564a1eecb1d251aee3a5e66b8a4f63d2554e3e09ea06749383ce3d5b8e77c8cc3bd87ae2dde48ae8feb4886ecaf7a3c27 SHA512 0575cbfc094455c0a2f04faa534a5e0d9cc41e6d9566ab9bcb0fcbce99e142213ded786ad00c36dc434ae1b9208d34d234a341dfc86adb72925dad0ee2b25f97
-DIST mate-notification-daemon-1.24.1.tar.xz 395444 BLAKE2B dca166664216c7027b2e816c7df64636c3f1c7ae25db253167f9c5d1b296cd9bf3c7533e1f7a33a7d4f2bf5fe074e8f0911462463fffa5b839fd8decd62a4716 SHA512 7c799e31229860cb34fa4a19421360a4a93d81826bc4381ed284e1ec280bae67d2f5bdf5d751f3dad6a1da424a5c598b2def60b7b24fd6ea41da5f126f456bac
 DIST mate-notification-daemon-1.24.2.tar.xz 396156 BLAKE2B 64bbada24bc53f296076ff80b364e156fecfe28f4b1d8b77a0f05910939ccc2378e0635861442cc5cff8c95db5ccda55484de8aaf3315e28eb8df75c1a4bc20d SHA512 be9db249bec6dc2206d69998b972f06ab4e2ee5c30b5bcf44c43b508954a9984a37bc9a2fe9989aec55969492256ed742fb2a9618b751e47ff43b66c383c1bd4
-EBUILD mate-notification-daemon-1.24.1.ebuild 992 BLAKE2B dbfee2e18d78dae939dfd5d9a83f23d98e8384843c52c8cda391ff1b68d8216397d5549028dd79ba352be4651f8d0fed4243a008a752d2a800be9dd9a4f776dc SHA512 7b141b8b94a1eb74b3471f99c678b413e7537bb893b59fa6e12d1e2e1c00ced1e20929ceef64a4c3f2783ba5c50b52bd901fabc38273e48db2771766f5712aa6
 EBUILD mate-notification-daemon-1.24.2.ebuild 999 BLAKE2B f13e99f367d74a4e4960161cdca6912cc598db283f61e71d74c16dc81d7c64ac112e649e242c0235618c0528e127982b402050421b11e5a99f00e3ae00e446cc SHA512 4c1233930436c1221893234651763a45c495ff02427db7e70ebd7f44ae0b0f28637489ed050b98f19deb34f435a0f078abac5ec56c3c13a69421d24e79a8e0b4
 MISC metadata.xml 354 BLAKE2B 1a12ca172c08806c1c9d2bbd6b2342fcbfde32b800af7bac33746f0611bb6c4376d558ad8b4a69008cc8ce78207246778d894e3454b52c1483606aa4a93dc05d SHA512 fc721d4464481caf4112d0d09f3a3243f31ce2cf97430c7d638728d8461f60e5070591f9698983b06b78c748bca563fa0ece998032a724cf8257bf72213ca492
diff --git a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.24.1.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.24.1.ebuild
deleted file mode 100644
index c39f4ba5c133..000000000000
--- a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.24.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="MATE Notification daemon"
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-
-IUSE=""
-
-COMMON_DEPEND="dev-libs/atk
-	>=dev-libs/glib-2.50:2
-	>=dev-libs/libxml2-2.9.0
-	>=sys-apps/dbus-1
-	x11-libs/cairo
-	>=x11-libs/gdk-pixbuf-2.22:2
-	>=x11-libs/libnotify-0.7
-	x11-libs/libX11
-	virtual/libintl
-	>=x11-libs/gtk+-3.22:3
-	>=x11-libs/libwnck-3:3
-	>=media-libs/libcanberra-0.4:0[gtk3]
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/libintl
-	!x11-misc/notify-osd
-	!x11-misc/qtnotifydaemon
-	!x11-misc/notification-daemon
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.19.8
-	>=sys-devel/libtool-2.2.6:2
-	virtual/pkgconfig
-"
-
-src_install() {
-	mate_src_install
-
-	insinto /usr/share/dbus-1/services
-	doins "${FILESDIR}/org.freedesktop.Notifications.service"
-}
diff --git a/x11-misc/picom/Manifest b/x11-misc/picom/Manifest
index e2a3c185541b..a52000c10db5 100644
--- a/x11-misc/picom/Manifest
+++ b/x11-misc/picom/Manifest
@@ -1,6 +1,6 @@
 DIST picom-8.2.tar.gz 242653 BLAKE2B 1c76ad4b3152d47155f957f8f1e75447ec8e30d05bc5fb9bf09c890552168cc3c607c8980b262b18cd5f3dc2654a3416cad20cb7fe829eaef8380783d1847c82 SHA512 bdc6675e73a211075ee0df2b056342cabb19ad27fd73586f5216886f503cd994536845eb866f371e07a8dc0404346c67b899a14830e9b7cbc9c01cbd782f36b1
 DIST picom-8.tar.gz 242059 BLAKE2B cfeec7f40eaa43c115bd326abeaa547553f7bdd22a2e6b2a96f46d87c164b0e9403a876f069077e3b85d11af685aadb0cff2a4e7df2cf87646f2552f9c1a01df SHA512 154dd42dea16aca463e7d7f9913a8f10740df892bfdda2fee210a94b13c8eaf6201b35e505daf45075fdb1980bb9b85adf170b649702c1b1e2fcdc1d88406b4a
 EBUILD picom-8-r1.ebuild 1526 BLAKE2B b016d3cbaa1b37d83866fc56923fe5d5d0c9d98f84b7ffaf61420cc929b902f2ff19c33f4a4f9b5220451c4124feca2e31aa53e48c9689510a1a92a12f6cfe25 SHA512 965f59726b168898fef69380c6d397632f19a9fcd7fb9b6458af815270700edd709ed845a37d59cf2b8329a6ccefd113516a03c2a57042b421c7b2c635f295ad
-EBUILD picom-8.2-r2.ebuild 1571 BLAKE2B 1a34b3747029521a437961651515852a0848e7b2eae64fedad08e33c08ae88c00c9165b500b5add7893a7b7fc430ccde5374b26130d716c38a1ce79677f4dd55 SHA512 9a705ae1291d4db41373465f3462badff819c1412f172d36b3ea10fdb3bb0c3f2851b027bcc3be187ce9fd5bc5e53b603e5fc0077816cdee62242433d4b036af
+EBUILD picom-8.2-r2.ebuild 1578 BLAKE2B 48e668b21513720af93703cce7049d30d26346dded57115f9e8322dfc38e54f479d21e1a811eb2d447abeb6c60a2a7932a9971843af4bee3c2cdb6ae740660e2 SHA512 559063fce7ff4a4a7c4dd07d2f604df379ff7d7a9cad58d99ab988df96723678d68bfee40ec7ecd800544f783779d7fda9cf2387655d3bfb2b16e8e5a13522c9
 EBUILD picom-9999.ebuild 1516 BLAKE2B 35d49008bffd1956f30f1038a23f4a34b242e5690fb84013ee2b968265b07522221720093a1b43eb01dbcdd6467bdc8cfb2ab66178b8b3d3f78072b2b4b1e69e SHA512 f51ef9e05acfd8d6e1dee42eccd6b029edc076395db79cf1e8235a696c856d322d53267d0dc68b5ccfe0ae2a8a1496409182a8c710acd8b3f048e6048f63c937
 MISC metadata.xml 678 BLAKE2B a2e430318134d3080d018d14913dce148151db13f6e59ed2c8b3c4b10c07e0fc16c2b7e9fbd95c0e849739753b1b3572c1d96418fd19955b2c6def2c655444da SHA512 7a172584db948430c11f8b682a918bb0d49d454ab835592047aafa9cf06f418fe0e3bfb2704f6a5ba45998a64096085dc23a2c0379c6f582a63d36f9ebb8e1b7
diff --git a/x11-misc/picom/picom-8.2-r2.ebuild b/x11-misc/picom/picom-8.2-r2.ebuild
index 8c0a8512f14d..d1eb0ff6f95b 100644
--- a/x11-misc/picom/picom-8.2-r2.ebuild
+++ b/x11-misc/picom/picom-8.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/yshui/picom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MPL-2.0 MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 IUSE="+config-file dbus +doc +drm opengl pcre test"
 
 REQUIRED_USE="test? ( dbus )" # avoid "DBus support not compiled in!"
diff --git a/x11-misc/x2x/Manifest b/x11-misc/x2x/Manifest
index 453aee474363..6f9d5658da0e 100644
--- a/x11-misc/x2x/Manifest
+++ b/x11-misc/x2x/Manifest
@@ -1,6 +1,9 @@
+AUX x2x_1.30-10-keymap.patch 3825 BLAKE2B 1dade51328dad2587e1ef9d13d86bb9ef53b3c88092402286a3371af2d6b18791844fc7aae45c260b1575ee24f50f0dcfc85b5554a10a9615b0810edc9413d97 SHA512 8ea3c6f7b219e5e8649d27108c89a1b253f73a3bede3c107eaa09ae1ca38634eeb391803f1dbfe05a5ec82e1ad31162c194f1f142203d342e980edc6e13ff143
 DIST x2x-1.27-keymap.diff.gz 1145 BLAKE2B cca78c368a9f5a27c94121eec12ab800322d1b0549c1be940b22dd455cbd42761283d1646bba8e098b94364cd6023ef6e615df9f788cf68913af967077eb6de9 SHA512 46e0d9cef4b985523e4bf2d6c550d68f488c0975a007433f2a6c03d77541ce0cbdffd44ea29472fa6db4e8b804503cdaf9e8b5f9d72c56d902270cf3291ca37f
 DIST x2x-1.27.tar.gz 16776 BLAKE2B 8f78d801c1911928b0d5bb37b406bcf5285d3a54daf5067abae40125ad4e4f7fc52b8cc74f4e1c35b99350fc794f80c26120cae48e5076326746ec87d7aee0f3 SHA512 c5f8b1ec49f9871bf0d8142a047a2dff9a6ee262dfafd459044c977973dd45e297186961a8793938fc8e328f2553ec4de97e06343bdf3550f3bc3f2368b23131
+DIST x2x-1.30.tar.gz 52760 BLAKE2B fae2eeb9aa68241c3ba9e79021aa9313a5852048f23b6be8ad5de7dd090d2cd09c006f4c1b1403ccfa8057f314657c2248463a7c53187e41291742cfaa04139a SHA512 cb14b40e1511e3fe6c927443f5f411a827ebf6c313bfb46af0165eebdd534c8aa3abcc8064b89420b7f44c23c518ed4f02bab4c23bbcfaece8910a3f824c9c11
 DIST x2x_1.27-8-initvars.patch.gz 494 BLAKE2B 97d48f4a2e7b65fd6755860c51399e5b6343bd0c7e6c79c7dd311792a899a02ed0ac6991d16495e96ca34913fbcec011b106bac6d0f9798540fb5704ca12f4cf SHA512 53060affef7575106932380063616473103c738193fdeab9118e0fb9ec1d1de2fe63f4112e5af82fe38198d0b42a10effde574bb9dee95c8fefdbdf680dbdf01
 DIST x2x_1.27-8.diff.gz 13291 BLAKE2B 4a4a0bf34a864596cff2f0722163bfe53968e30892bd0a18ed18ca6c3ef8f5bc763b215381c46792b499839397dbecab033bd9095646fad36613ad11beba1240 SHA512 8201ab5fd0efd93adec53cec3b48f7b4de907b2db184ffa6e85a1e16739b4d0021f4562820d0b4730a0f6a2779985b5574973c2b0ceb04b241f0d7dc15060b71
 EBUILD x2x-1.27-r3.ebuild 1472 BLAKE2B d31f4329ed5974fcda95f5f8c40b9989d0533bae79a4f6aa3c5e3bd1b100b158819095b433603527054d79e89082761fee5c29d121f7eebd4e20f8c85d8c2d08 SHA512 6d6a8605cf947b97701f2581a93973e6a8356c9dcdc0d2f9d0bcf77930c7800673044f4192f2ebb7e9b35e9ae2fa1bb6f25591cfbe022563d78af68586bb6aa6
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
+EBUILD x2x-1.30.ebuild 1009 BLAKE2B 461f6782305834fd1e37339f5de17635481b00143bf8e4422b670a6dab9afb65adba5b6c942141ad4f63d8aada2fa319ee5380715d443bc94d7299508b123ed7 SHA512 12b445d4ee03a7fd10c81b4ea5899b55c62ea251abc974e8eb33e8cdd88580f34bf570d4a04dec720fc7ec93b84284b7b8e2ca95bfc120aa6dc23618d616793e
+MISC metadata.xml 405 BLAKE2B 8b71db6f16bfb481e524a331eac615661b267d2d2fddde3aa6c9244b75026eacada167e2ed2ad6e7611bad234b53c0b073063925ae6745832585771d5342c913 SHA512 23f707e5ed833c5901d482e0d9cedbae751434311d8c67e7b300b452faabd958eb0c12a5b1c48a3c6d4773891cf3c7426d60a85eecd4b3ceb3358f68f4c8ad87
diff --git a/x11-misc/x2x/files/x2x_1.30-10-keymap.patch b/x11-misc/x2x/files/x2x_1.30-10-keymap.patch
new file mode 100644
index 000000000000..b9bb1f9b9623
--- /dev/null
+++ b/x11-misc/x2x/files/x2x_1.30-10-keymap.patch
@@ -0,0 +1,115 @@
+--- a./x2x.c
++++ b./x2x.c
+@@ -321,6 +321,12 @@ typedef struct _sticky {
+   KeySym keysym;
+ } STICKY, *PSTICKY;
+ 
++typedef struct _keymap {
++  struct _keymap * pNext;
++  KeySym from;
++  KeySym to;
++} KEYMAP, *PKEYMAP;
++
+ typedef int  (*HANDLER)(); /* event handler function */
+ 
+ /* These prototypes need the typedefs */
+@@ -377,6 +383,7 @@ static Bool    doDpmsMouse  = False;
+ static int     logicalOffset= 0;
+ static int     nButtons     = 0;
+ static KeySym  buttonmap[N_BUTTONS + 1][MAX_BUTTONMAPEVENTS + 1];
++static PKEYMAP keymaps      = NULL;
+ static Bool    noScale      = False;
+ static int     compRegLeft  = 0;
+ static int     compRegRight = 0;
+@@ -571,7 +578,8 @@ char **argv;
+   PSHADOW pShadow;
+   extern  char *lawyerese;
+   PSTICKY pNewSticky;
+-  KeySym  keysym;
++  PKEYMAP pNewKeymap;
++  KeySym  keysym,keysym2;
+   int     button;
+   int     eventno;
+   char    *keyname, *argptr;
+@@ -703,6 +711,22 @@ char **argv;
+       } else {
+         printf("x2x: warning: can't translate %s\n", argv[arg]);
+       }
++    } else if (!strcasecmp(argv[arg], "-keymap")) {
++      if ((++arg+1) >= argc) Usage();
++      if (((keysym = XStringToKeysym(argv[arg])) != NoSymbol) &&
++	  ((keysym2 = XStringToKeysym(argv[arg+1])) != NoSymbol)) {
++	pNewKeymap = (PKEYMAP)malloc(sizeof(KEYMAP));
++	pNewKeymap->pNext = keymaps;
++	pNewKeymap->from  = keysym;
++	pNewKeymap->to    = keysym2;
++	keymaps = pNewKeymap;
++#ifdef DEBUG
++	printf("will translate key %s to %s\n", argv[arg],argv[arg+1]);
++#endif
++      } else {
++	printf("x2x: warning: can't translate %s or %s\n", argv[arg],argv[arg+1]);
++      }
++      arg++;
+     } else if (!strcasecmp(argv[arg], "-buttonmap")) {
+       if (++arg >= argc) Usage();
+       button = atoi(argv[arg]);
+@@ -842,6 +842,7 @@ static void Usage()
+   printf("       -completeregionup <COORDINATE>\n");
+   printf("       -completeregionlow <COORDINATE>\n");
+   printf("       -struts\n");
++  printf("       -keymap <FROM-KEYSYM> <TO-KEYSYM>\n");
+ #ifdef WIN_2_X
+   printf("       -offset [-]<pixel offset of \"to\">\n");
+   printf("WIN_2_X build allows Windows or X as -from display\n");
+@@ -2200,6 +2224,7 @@ XKeyEvent *pEv;
+   PSHADOW   pShadow;
+   Bool      bPress;
+   PSTICKY   pSticky;
++  PKEYMAP   pKeymap;
+   Bool      DoFakeShift = False;
+   KeyCode   toShiftCode;
+ 
+@@ -2211,6 +2236,15 @@ XKeyEvent *pEv;
+ 	XKeysymToString(keysym), (bPress ? "pressed" : "released"), pEv->state);
+ #endif
+ 
++  for (pKeymap = keymaps; pKeymap; pKeymap = pKeymap->pNext) 
++    if (keysym == pKeymap->from) {
++      keysym = pKeymap->to;
++#ifdef DEBUG
++      printf("Key mapped from  %x to %x\n", pKeymap->from, pKeymap->to);
++#endif 
++    }
++
++
+   /* If CapsLock is on, we need to do some funny business to make sure the */
+   /* "to" display does the right thing */
+   if(doCapsLkHack && (pEv->state & 0x2))
+
+--- a./x2x.1
++++ b./x2x.1
+@@ -309,6 +309,12 @@ Describes uppermost coordinate of complete rectangle region in from-display.
+ .B \-completeregionlow
+ .IP
+ Describes lowermost coordinate of complete rectangle region in from-display.
++.TP
++.B \-keymap \fIfrom-keysym\fP \fIto-keysym\fP
++.IP
++Translates the \fIfrom-keysym\fP keysym of the first X to \fIto-keysym\fP of the second X.
++See X11/keysymdef.h for available keysyms.
++Alternatively you can use setxkbmap, as described in the BUGS section.
+ .SH EXAMPLES
+ Calling the system whose keyboard is to be used "primary" and the
+ other system "secondary", you need to specify either \-from
+@@ -329,6 +333,10 @@ secondary $ ssh \-X primary x2x \-from :0 \-west
+ run directly indirectly on primary:
+ .IP
+ primary $ ssh \-A secondary env DISPLAY=:0.0 ssh \-X primary x2x \-from :0 \-east
++.TP
++set a custom keymap binding:
++.IP
++x2x -keymap ISO_Level3_Shift Mode_switch
+ 
+ .RE
+ If your primary display is configured with several monitors having different
diff --git a/x11-misc/x2x/metadata.xml b/x11-misc/x2x/metadata.xml
index 115e9d64a669..5d2f87cc3174 100644
--- a/x11-misc/x2x/metadata.xml
+++ b/x11-misc/x2x/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>rndxelement@protonmail.com</email>
+		<name>Philipp Rösner</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/x2x/x2x-1.30.ebuild b/x11-misc/x2x/x2x-1.30.ebuild
new file mode 100644
index 000000000000..09d330e821dd
--- /dev/null
+++ b/x11-misc/x2x/x2x-1.30.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="A utility to connect the mouse and keyboard to another X"
+HOMEPAGE="https://github.com/dottedmag/x2x"
+SRC_URI="https://github.com/dottedmag/x2x/archive/refs/tags/debian/${PV}-10.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXtst
+	x11-libs/libXext"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/rman
+	x11-base/xorg-proto
+	>=x11-misc/imake-1.0.8-r1"
+
+S="${WORKDIR}"/${PN}-debian-1.30-10
+
+PATCHES=(
+	# Patch to fix bug #126939
+	# AltGr does not work in x2x with different keymaps:
+	"${FILESDIR}"/${PN}_1.30-10-keymap.patch
+)
+DOCS=( README AUTHORS INSTALL ChangeLog ChangeLog.old )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}"
+}
+
+src_install() {
+	default
+	dodoc -r docs/
+}
diff --git a/x11-misc/xaos/Manifest b/x11-misc/xaos/Manifest
index f7b31832391c..1ed70dba2466 100644
--- a/x11-misc/xaos/Manifest
+++ b/x11-misc/xaos/Manifest
@@ -2,6 +2,8 @@ AUX xaos-3.4-include.patch 143 BLAKE2B 8dcf1e4abb9b8acc2198a3ac6ff70a7900397c644
 AUX xaos-3.5-build-fix-i686.patch 708 BLAKE2B 9c857438f7272a173b6047a3050e57311aa357fc59e280632d85ccfdf803ff3a232ab878fcef638506030077561406ed1d1152c8b960cd4528e1a5e1b098b39f SHA512 f1732cc5116f92893fc9e560e293e86df10901655dd12a2e6e81a90b13c216a613c5be60bce7adfc99ee21f5a6208c4f30a6730d1d5d3963e5efcba6d728c481
 AUX xaos-3.6-buildsystem.patch 2460 BLAKE2B 7f8c5fe68e1f7f626236ffd687bb1e33ce1a064cf5555748fc7680b19b041db054a06616391a25e7fd9f37b0ae5a34bcb7773676d15d9222b4e416bc0fb704cf SHA512 79d1a738c709510dd36d4cbe17eb4376c212a81af2e08c45d292a182e9862f2f3e1f5075f488789f490d857f2b7eb76409d558caca93eb14914522f36f78d5cf
 DIST xaos-3.6.tar.gz 2040707 BLAKE2B 7f8bd0e34e6ef81b57d3ac7203f590efb7bea4f6878ff69f0ffe34f2455290381dc01dc4de98efeadfbe02c55671c4d2a0de601a6b8673ced81b72bfb5158548 SHA512 5f61df978b7842b84a52cfb28f7daf1a5ab11d9d7adadbd0dd5bfb60240fcb2fc59b2a3d34faff7896c0c44c32daaf3941071d70db3d58b06b1aef1bcd1022c1
+DIST xaos-4.2.1_p20210828.tar.gz 10918756 BLAKE2B c1431596b503d9b99c880945edae577c493ff4061020052d16dafe79f3abce0b137b789493b103a35d96ac954a47d76aa47d32972feaab0406d2cedc0e685504 SHA512 847315566c72d6b793f32b2c468b0c90e69877d9e9620f1f871e768cfdaf5b156c0d5b568274f3fb89b58ffb74c990108a96a94c21a753965b682adc5e99dbf3
 DIST xaos.png.tar 10240 BLAKE2B 5c925f00d19f6b74ff12c8910fbbfd9d108191d1454be82f8bb0d243001d004f2c10b84d93383bff8214f6192766fb8b4f84435ae129a822d0c2f10accb27f9d SHA512 43d51a07ac8014162b0ff4e9bbefdeeca759d3613816a95149b6fd2397b7c661adcfb33bb45b8de4dedfa41d8799ef7df3eacb426712679e867098eaf144a262
 EBUILD xaos-3.6.ebuild 1888 BLAKE2B a7d18e55c90a18a757dc676374797f85cb04b395f087aca6e61b3f7b1631df8614133f27732437f1cb44ba13d8a2ccd79bb461c1d24a304e149eda0860396e9b SHA512 2556ac07dafcabc7c2e7e32da3995f156ff81352c9f619a6aa2e81062acc132f826bbe7700855a6f57ac30dc867ad898e8736a542df81d4d82c3cd3c38bb4122
+EBUILD xaos-4.2.1_p20210828.ebuild 1181 BLAKE2B 2bd92b637e2df0ca1524595fe14bc6caca92b33a32a737bf976c5875103d91547abbbb31130797cef218acc7ff472fda361b65854dbc7e14797ae885582a0252 SHA512 9ded7e023a38d2a8e9ac08d45f9e04cdaf13476935404c5635e517aeb6aabc292c889383509b11bd4028b62f72cf6b1e26128f01d8cb2343f304e0169a6b8c86
 MISC metadata.xml 767 BLAKE2B 1709036b6c009a4e32ac8408081a08eadd14a61a918fb2f5202b1a1ce491c94fa04b36977f80dcd67aec6b8cf81a37af9e986c3fbe06a2e71ecfbf3585888d6a SHA512 d61fcb1e94a7e9a0ac5401dfaeebd82917545aca438932855b79c6a394cb33dd477605843c6864d4200214e73eca3a159b49b4f9332973436fd4893bd2e81990
diff --git a/x11-misc/xaos/xaos-4.2.1_p20210828.ebuild b/x11-misc/xaos/xaos-4.2.1_p20210828.ebuild
new file mode 100644
index 000000000000..cb49a8809e6b
--- /dev/null
+++ b/x11-misc/xaos/xaos-4.2.1_p20210828.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VIRTUALX_REQUIRED="always"
+DOCS_BUILDER="doxygen"
+DOCS_DEPEND="media-gfx/graphviz"
+
+inherit docs qmake-utils
+
+COMMIT="de9e4f16849c5388760ba3a2e3b0955c5a39b71a"
+
+DESCRIPTION="Very fast real-time fractal zoomer"
+HOMEPAGE="https://xaos-project.github.io/"
+SRC_URI="https://github.com/xaos-project/XaoS/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/XaoS-${COMMIT}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtcore:5
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools"
+
+src_configure() {
+	# install into /usr/ instead of /usr/local
+	sed -i -e "s:PREFIX = /usr/local:PREFIX = /usr:g" XaoS.pro || die
+	eqmake5
+	# Don't strip, this requires running X/wayland session
+	sed -i -e '/$(STRIP) $(TARGET)/d' Makefile || die
+	# Fix INSTALL_ROOT ignored for examples dir
+	sed -i -e "s:cp {} /usr/share/XaoS/examples:cp {} \${INSTALL_ROOT}/usr/share/XaoS/examples:g" Makefile || die
+}
+
+src_compile() {
+	default
+	docs_compile
+}
+
+src_install() {
+	INSTALL_ROOT="${ED}" default
+}
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index f88a5e8e495b..bde2b4ce14dc 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -8,5 +8,7 @@ AUX xscreensaver-6.01-interix.patch 946 BLAKE2B e5a61a4de1373195747abb8f6e658027
 AUX xscreensaver-6.01-non-gtk-install.patch 1780 BLAKE2B 38d2a71fb9d35d1694fac4d92b60860e9a4e53b48cbb80d22981d4cf1d76b838538e19fb390a30fb5783023c66e5aa14b03e7f9ab3ca857c1fe29c7709afb6e1 SHA512 d949fe410df79833b112f1cd7442a1ab11d68f10b2415a39feb51229b0b067612d6970e6909cafd89b28081959754c98c35f0776be2e6069771bdb9f2310bdfd
 AUX xscreensaver-6.01-without-gl-makefile.patch 862 BLAKE2B 9762e84d535b4e913c0e4da6818605d8ff6fc0c9d184ff2cdc60969fab977b603bc18b16dfab7b1124948e814d230a50cd384bfabe785ad1e38e735a5e063d0c SHA512 8b445ca766d24b23904423c8d3a561a0558eca6d4b70b242d05df4949c371e455251be5a473b07fa837505550e00ea13c3154e2efda239468bf7a2a73a063c1f
 DIST xscreensaver-6.01.tar.gz 27820165 BLAKE2B b2c90b47fb65db79d2473c1e396717156e414a0200672971adadf5729056ad9210822955a71f1a098e2142c00c5e60b24aababf9431903f96ff76e8c2d474052 SHA512 3a6e875196e1340909b2a379c25e758fef490d3d10154aef3096ec1be50fabe0d852de806d45a067eefd061381c8541acd7902d28be3bac15b76bd9d4bf0c02a
+DIST xscreensaver-6.02.tar.gz 22672643 BLAKE2B 2d931fe93230e8c7344abd9180e26ab8775f82604e6f4804c82821c486203be567708cf50f7a11276a6b39df493fe5652b4198765ecb3bc5afc8cbc5a01d4801 SHA512 2291ec6ca2d2a24dae975f7f3a8e1733c06f289eb74955db5b3344c7ddcc1d72f82d380df984ef9199f2ed7ab8a7bc920da57d98f589ae5fd1cee082755ba1ff
 EBUILD xscreensaver-6.01-r4.ebuild 5884 BLAKE2B e6e2b8f44c38c9c22181262b227bccc4fe16339c283de394de919670010ed1b0690681da990792162760ff93ff5090f9ffb2a01547c9abe25686d5726586ace9 SHA512 ded2ad6cf75c380f343b33d64ac2f3540b55fb3a91f640dd49d6f2cabae4634b17c124637e38a6ebd6425f1aeaf54092eb75f3787fbdf7f690e211f4960f3900
-MISC metadata.xml 888 BLAKE2B 3a8f2d22133fb37f4bf7bbeee0b566f78940b35da37aa12e3374abdb9fc2735d224e98a3714e29850c2d58c27560980cdb7ba311cbe57a2bc2ff08750836d2af SHA512 8ec4105927164449ee0875a051b8735b46d2a23a586e8320683d13a388b74b8b1d1d49c29b251cda7560986c2174c5a0c01500a2b2a1122bdc06ab80c4d2d646
+EBUILD xscreensaver-6.02.ebuild 6176 BLAKE2B eeed4e54e629fde6ac33bc37f2e8e5ad519ee075f1c195d47e704a738f1a212491a9438a3ef88b76413452a75480b5350c21e763961e1906dccde806f73040ab SHA512 2f0fd29c7a17500bcfeae371805eaf70c39659ccd532bfa81d1db10c2fd88bb97e6259493aee846e15ec4b5ba39edc101349e02124cd4327b9e18a1d76a147c9
+MISC metadata.xml 1125 BLAKE2B a1ac7ece845498dceb98238023472300253798ca00e14a278479e0fad6d91dd37e8cbe205f59ba3080b4cd942bb503a8f3c20ec4513d9b88b397f23b7eaf91a1 SHA512 045d8161087ba016fbfc0bf3ba82b3018e93f0be9467e44b9707818084adb110fce2c94f59f2623a2c4ec3ecadb99a91ebb7f1beb31c16565582da37bb6d582c
diff --git a/x11-misc/xscreensaver/metadata.xml b/x11-misc/xscreensaver/metadata.xml
index 41a55d69ca62..e6446e8ce0e8 100644
--- a/x11-misc/xscreensaver/metadata.xml
+++ b/x11-misc/xscreensaver/metadata.xml
@@ -12,6 +12,8 @@
 		<flag name="fonts">Install the fonts shipped with XScreenSaver that have clear licensing</flag>
 		<flag name="gdk-pixbuf">Include support for the <pkg>x11-libs/gdk-pixbuf</pkg> library in some demos, which will make it possible for them to read GIF, JPEG, and PNG files as well</flag>
 		<flag name="gdm">Use gdmflexiserver from <pkg>gnome-base/gdm</pkg> instead of <pkg>x11-misc/lightdm</pkg></flag>
+		<flag name="gles" restrict="&gt;=x11-misc/xscreensaver-6.0.2">Emulate OpenGL 1.3 in terms of OpenGL ES 1.x</flag>
+		<flag name="glx" restrict="&gt;=x11-misc/xscreensaver-6.0.2">Use GLX to interface OpenGL and X11 instead of EGL</flag>
 		<flag name="locking">Compile in support for locking the display</flag>
 		<flag name="new-login">Enable user switching support using gdmflexiserver (<pkg>x11-misc/lightdm</pkg>)</flag>
 	</use>
diff --git a/x11-misc/xscreensaver/xscreensaver-6.02.ebuild b/x11-misc/xscreensaver/xscreensaver-6.02.ebuild
new file mode 100644
index 000000000000..575d1cd4c43f
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-6.02.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic font optfeature pam strip-linguas
+
+DESCRIPTION="Modular screen saver and locker for the X Window System"
+HOMEPAGE="https://www.jwz.org/xscreensaver/"
+SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz"
+
+# Font license mapping for folder ./hacks/fonts/ as following:
+#   clacon.ttf       -- MIT
+#   gallant12x22.ttf -- unclear, hence dropped
+#   luximr.ttf       -- bh-luxi (package media-fonts/font-bh-ttf)
+#   OCRAStd.otf      -- unclear, hence dropped
+#   SpecialElite.ttf -- Apache-2.0
+LICENSE="BSD fonts? ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login offensive opengl pam +perl +png selinux suid systemd +xft xinerama"
+REQUIRED_USE="
+	gdk-pixbuf? ( gtk )
+	gles? ( !glx opengl )
+	glx? ( opengl )
+	gtk? ( png )
+	opengl? ( png )
+	?? ( elogind systemd )
+"
+
+COMMON_DEPEND="
+	dev-libs/libxml2
+	x11-apps/appres
+	x11-apps/xwininfo
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXt
+	x11-libs/libXxf86vm
+	elogind? ( sys-auth/elogind )
+	gdk-pixbuf? (
+		x11-libs/gdk-pixbuf-xlib
+		>=x11-libs/gdk-pixbuf-2.42.0:2
+	)
+	gtk? ( x11-libs/gtk+:2 )
+	jpeg? ( virtual/jpeg:0 )
+	new-login? (
+		gdm? ( gnome-base/gdm )
+		!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
+	)
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	pam? ( sys-libs/pam )
+	png? ( media-libs/libpng:= )
+	systemd? ( >=sys-apps/systemd-221 )
+	xft? ( x11-libs/libXft )
+	xinerama? ( x11-libs/libXinerama )
+"
+# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
+RDEPEND="
+	${COMMON_DEPEND}
+	media-gfx/fbida
+	perl? (
+		dev-lang/perl
+		dev-perl/libwww-perl
+		virtual/perl-Digest-MD5
+	)
+	selinux? ( sec-policy/selinux-xscreensaver )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/bc
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.01-interix.patch
+	"${FILESDIR}"/${PN}-5.31-pragma.patch
+	"${FILESDIR}"/${PN}-6.01-gentoo.patch
+	"${FILESDIR}"/${PN}-5.45-gcc.patch
+	"${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch
+	"${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch
+	"${FILESDIR}"/${PN}-6.01-non-gtk-install.patch
+	"${FILESDIR}"/${PN}-6.01-gtk-detection.patch
+	"${FILESDIR}"/${PN}-6.01-configure-install_sh.patch
+)
+
+DOCS=( README{,.hacking} )
+
+src_prepare() {
+	default
+
+	sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die
+	strip-linguas -i po/
+	export ALL_LINGUAS="${LINGUAS}"
+
+	if use new-login && ! use gdm; then #392967
+		sed -i \
+			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
+			configure{,.ac} || die
+	fi
+
+	# We are patching driver/XScreenSaver.ad.in, so let's delete the
+	# header generated from it so that it gets back in sync during build:
+	rm driver/XScreenSaver_ad.h || die
+
+	if ! use offensive; then
+		sed -i \
+			-e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \
+			hacks/barcode.c || die
+		sed -i \
+			-e 's|erect penis|shuffle board|g' \
+			-e 's|flaccid penis|flaccid anchor|g' \
+			-e 's|vagina|engagement ring|g' \
+			-e 's|Penis|Shuttle|g' \
+			hacks/glx/glsnake.c || die
+		sed -i \
+			's| Stay.*fucking mask\.$||' \
+			hacks/glx/covid19.man \
+			hacks/config/covid19.xml || die
+	fi
+
+	# Must be eauto*re*conf, to force the rebuild
+	eautoreconf
+}
+
+src_configure() {
+	if use ppc || use ppc64; then
+		filter-flags -maltivec -mabi=altivec
+		append-flags -U__VEC__
+	fi
+
+	unset BC_ENV_ARGS #24568
+
+	# Works similarly to -Werror, 
+	# https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wimplicit-function-declaration
+	filter-flags -pedantic-errors
+
+	# WARNING: This is NOT a normal autoconf script
+	# Some of the --with options are NOT standard, and expect "--with-X=no" rather than "--without-X"
+	ECONF_OPTS=(
+		$(use_enable locking)
+		$(use_with elogind)
+		$(use_with gdk-pixbuf pixbuf)
+		$(use_with gles)
+		$(use_with glx)
+		$(use_with gtk)
+		$(use_with new-login login-manager)
+		$(use_with opengl gl)
+		$(use_with pam)
+		$(use_with suid setuid-hacks)
+		$(use_with systemd)
+		$(use_with xinerama xinerama-ext)
+		--with-jpeg=$(usex jpeg yes no)
+		--with-png=$(usex png yes no)
+		--with-xft=$(usex xft yes no)
+		--with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults
+		--with-configdir="${EPREFIX}"/usr/share/${PN}/config
+		--with-dpms-ext
+		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN}
+		--with-proc-interrupts
+		--with-randr-ext
+		--with-text-file="${EPREFIX}"/etc/gentoo-release
+		--with-xdbe-ext
+		--with-xf86gamma-ext
+		--with-xf86vmode-ext
+		--with-xinput-ext
+		--with-xkb-ext
+		--with-xshm-ext
+		--without-gle
+		--without-kerberos
+		--without-motif
+		--with-proc-oom
+		--x-includes="${EPREFIX}"/usr/include
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
+	)
+	# WARNING: This is NOT a normal autoconf script
+	econf "${ECONF_OPTS[@]}"
+}
+
+src_compile() {
+	# stock target is "default", which is broken in some releases.
+	emake all
+}
+
+src_install() {
+	use pam && dodir /etc/pam.d/
+	emake install_prefix="${D}" DESTDIR="${D}" install
+
+	if use fonts; then
+		# Do not install fonts with unclear licensing
+		rm -v "${ED}${FONTDIR}"/{gallant12x22.ttf,OCRAStd.otf} || die
+
+		# Do not duplicate font Luxi Mono (of package media-fonts/font-bh-ttf)
+		rm -v "${ED}${FONTDIR}"/luximr.ttf || die
+
+		font_xfont_config
+	else
+		rm -v "${ED}${FONTDIR}"/*.{ttf,otf} || die
+		rmdir -v "${ED}${FONTDIR}" || die #812473
+	fi
+
+	einstalldocs
+
+	if use pam; then
+		fperms 755 /usr/bin/${PN}
+		pamd_mimic_system ${PN} auth
+	fi
+
+	# bugs #809599, #828869
+	if ! use gtk; then
+		rm "${ED}/usr/bin/xscreensaver-demo" || die
+	fi
+}
+
+pkg_postinst() {
+	use fonts && font_pkg_postinst
+
+	# bug #811885
+	if ! use glx && use opengl; then
+		elog "Enable USE='glx' if OpenGL screensavers are crashing."
+	fi
+
+	optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi
+	optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi
+	optfeature 'Truetype font Luxi Mono' media-fonts/font-bh-ttf
+}
+
+pkg_postrm() {
+	use fonts && font_pkg_postrm
+}
diff --git a/x11-misc/xwallpaper/Manifest b/x11-misc/xwallpaper/Manifest
index ff49adc2436a..f8adea9be57e 100644
--- a/x11-misc/xwallpaper/Manifest
+++ b/x11-misc/xwallpaper/Manifest
@@ -1,6 +1,4 @@
-DIST xwallpaper-0.7.2.tar.xz 86212 BLAKE2B 1958ad8eb3f80f2cccdd969230e32986e7d144bf820a4c820a93d0bfdbcaa5512f08eb4014a8b57edb40f1ed55ce54080835c2d2dd46205c399b2ea6adcf1df1 SHA512 2b7166b719edae0d21460682d6c8991739d1a753078920bccb253f905300c694cb6fb12695456be58707d895f8adacd6007023c8e1abd23a0e369e9e80e5106e
 DIST xwallpaper-0.7.3.tar.xz 86388 BLAKE2B 45942dbe7e3627fbbf99ac5ab94c88ecea919e48131f268f0be10a0fba15a4feddf207c0787ac47f75bc6a5cc94f2b78d599e97950609196930a73073ae21ec1 SHA512 7fa9cc9ca2445afdfcb647724a6dc8bb3b52b9a6c91d237f6b443cf1fe6624c67d16d611bf4e435c5f3dcdae6cbf73bbde257a4e194bc127dc13dca1f8067c19
-EBUILD xwallpaper-0.7.2.ebuild 972 BLAKE2B b4311d7453e1e242967db28ac436806dea2bc2fa75cf6964264635a4f4bfc3d5dc757639c767c5b1a68d3f4efe195946220f583cdd724069e81cef1fccc91381 SHA512 3b9d7c425c81ee841e0c17d463d4b1e52ff9bee238c65ca2d39ffa8ac4686d45d437425050cb4e4fd2115680ee16c0aa6935ce046b506b566cd3f73472c3ce7c
-EBUILD xwallpaper-0.7.3.ebuild 976 BLAKE2B c68ae52bc82362e6d77a0243e82241a137dbcad52591196f2d44d3e9a434459b67c956d8177ec8f60a4cf6e46936ab705c1250627b132c037a42b07471cd8a3c SHA512 3a818859908b0c37b68cfa9b4f4621fdac43ec6466b2dc0b8c9903fdb6661b5eff65ea6cd371c3528b05acb429a5706ec18319024965be4241774dc44062a0e2
-EBUILD xwallpaper-9999.ebuild 967 BLAKE2B 015785bb4227a1269a03488df74bf4258cf6e39d621be80bf8b0c11d22dd863f9c1f9034dbf08b41717cd4a5b445cd6bd3cc22e987ccb0b7e859ca5376748e5d SHA512 ce4fb8f6f20922422e2f7ff1a5537f3f03f9664db850461e411b3a5f4e89e60c4cfc7e848f12d6f574dd5b7f12f3849c78b6ae56c23989a10d8cf444c34f4b37
+EBUILD xwallpaper-0.7.3.ebuild 972 BLAKE2B 464e9e3c716845f13654c2c33d0f99500d8e380746f54258d469904006817d93549f0aeb6b4b1711ad3ecf47b6a8d66e0d97c89b5bdfdda21e57c5e5ea5f5428 SHA512 0eeda67a5eee6cb81fd7e5b886cfdddca0fae217ae60354975c34bf9041a833b097c3b270dd1f4384dac6656fd2bedd55801e61e587ed732ce9f0f64c162d1b0
+EBUILD xwallpaper-9999.ebuild 976 BLAKE2B 81ac722c9a42644ed32e12b0d0be2851f1ab8f28b1ac5743d31ed7eb86b6245e4c7962b3dd6e1550b72af02db23c31a39b56e40b8dfc8ad7a839ca47a780fa5e SHA512 affccbe00896db98ca8bf17a3116c95e6a944f1076c433c39166d04b23b265ae79cfc82c8a10f7dacd488846ad1fb3b82335cedf950d17e5ee0d5bbdb164224e
 MISC metadata.xml 805 BLAKE2B a7409f94475503fb529e9cf99e759294099f32b35107c35a35636d69bf2a0d6c7741eaa0ae52823132ce6abfb4a7a61e9a9913c1bb32967ee5c2b610d409c2be SHA512 57b629ed7f757e7e9bf59198ef9930f257a602f4b00954dd38f3c9ecdc527f4240d0885ce7b096b78cd1c1067625680d452988c434dfe5ca4c95a0451f3fc674
diff --git a/x11-misc/xwallpaper/xwallpaper-0.7.2.ebuild b/x11-misc/xwallpaper/xwallpaper-0.7.2.ebuild
deleted file mode 100644
index 2c89348e8c20..000000000000
--- a/x11-misc/xwallpaper/xwallpaper-0.7.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Wallpaper setting utility for X"
-HOMEPAGE="https://github.com/stoeckmann/xwallpaper"
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git"
-else
-	SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 ppc64 x86"
-fi
-
-LICENSE="ISC"
-SLOT="0"
-IUSE="+jpeg +png seccomp xpm"
-
-RDEPEND="
-	x11-libs/pixman
-	x11-libs/xcb-util
-	x11-libs/xcb-util-image
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	png? ( media-libs/libpng:0= )
-	seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
-	xpm? ( x11-libs/libXpm )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_with jpeg)
-		$(use_with png)
-		$(use_with seccomp)
-		$(use_with xpm)
-		--with-randr
-	)
-	econf "${myconf[@]}"
-}
diff --git a/x11-misc/xwallpaper/xwallpaper-0.7.3.ebuild b/x11-misc/xwallpaper/xwallpaper-0.7.3.ebuild
index 548fe3496699..82ae178851d7 100644
--- a/x11-misc/xwallpaper/xwallpaper-0.7.3.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-0.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,12 +8,12 @@ inherit autotools
 DESCRIPTION="Wallpaper setting utility for X"
 HOMEPAGE="https://github.com/stoeckmann/xwallpaper"
 
-if [ ${PV} == "9999" ] ; then
+if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git"
 else
 	SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 arm64 ppc64 x86"
 fi
 
 LICENSE="ISC"
diff --git a/x11-misc/xwallpaper/xwallpaper-9999.ebuild b/x11-misc/xwallpaper/xwallpaper-9999.ebuild
index 4b3d25796853..eabdc06bd22f 100644
--- a/x11-misc/xwallpaper/xwallpaper-9999.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,17 +8,17 @@ inherit autotools
 DESCRIPTION="Wallpaper setting utility for X"
 HOMEPAGE="https://github.com/stoeckmann/xwallpaper"
 
-if [ ${PV} == "9999" ] ; then
+if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git"
 else
 	SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="ISC"
 SLOT="0"
-IUSE="jpeg png seccomp xpm"
+IUSE="+jpeg +png seccomp xpm"
 
 RDEPEND="
 	x11-libs/pixman