Merge updates from master

35 files changed, 204 insertions, 149 deletions

diff --git a/app-admin/ulogd/ulogd-2.0.7-r2.ebuild b/app-admin/ulogd/ulogd-2.0.7-r2.ebuild
index 0a589c116bc7..c252351ca7ea 100644
--- a/app-admin/ulogd/ulogd-2.0.7-r2.ebuild
+++ b/app-admin/ulogd/ulogd-2.0.7-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.netfilter.org/projects/ulogd/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ~x86"
+KEYWORDS="amd64 ~ia64 ppc x86"
 IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres selinux sqlite ulog"
 
 DEPEND="
diff --git a/app-editors/jedit/jedit-5.4.0.ebuild b/app-editors/jedit/jedit-5.4.0.ebuild
index 010c1a681eeb..c4a52eee362a 100644
--- a/app-editors/jedit/jedit-5.4.0.ebuild
+++ b/app-editors/jedit/jedit-5.4.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.jedit.org"
 SRC_URI="mirror://sourceforge/${PN}/${PN}${PV}source.tar.bz2"
 
 LICENSE="BSD GPL-2"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 SLOT="0"
 
 CP_DEPEND="dev-java/jsr305:0"
diff --git a/dev-libs/libusb/libusb-1.0.24-r1.ebuild b/dev-libs/libusb/libusb-1.0.24-r1.ebuild
index fe550656fe0d..64ded3d01011 100644
--- a/dev-libs/libusb/libusb-1.0.24-r1.ebuild
+++ b/dev-libs/libusb/libusb-1.0.24-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug doc examples static-libs test udev"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/dune-configurator/dune-configurator-2.8.4.ebuild b/dev-ml/dune-configurator/dune-configurator-2.8.4.ebuild
index 905f4217545d..56fd4108739d 100644
--- a/dev-ml/dune-configurator/dune-configurator-2.8.4.ebuild
+++ b/dev-ml/dune-configurator/dune-configurator-2.8.4.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/dune-${PV}"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/dune-private-libs/dune-private-libs-2.8.4.ebuild b/dev-ml/dune-private-libs/dune-private-libs-2.8.4.ebuild
index 211634557cd1..f11dee1ac83d 100644
--- a/dev-ml/dune-private-libs/dune-private-libs-2.8.4.ebuild
+++ b/dev-ml/dune-private-libs/dune-private-libs-2.8.4.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/dune-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/dune/dune-2.8.4.ebuild b/dev-ml/dune/dune-2.8.4.ebuild
index 796aa6575497..ae0c9474e80e 100644
--- a/dev-ml/dune/dune-2.8.4.ebuild
+++ b/dev-ml/dune/dune-2.8.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/dulwich/dulwich-0.20.20.ebuild b/dev-python/dulwich/dulwich-0.20.20.ebuild
index 4d8b68f98f43..9cc039c9e2f2 100644
--- a/dev-python/dulwich/dulwich-0.20.20.ebuild
+++ b/dev-python/dulwich/dulwich-0.20.20.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+ Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pillow/pillow-8.2.0.ebuild b/dev-python/pillow/pillow-8.2.0.ebuild
index 71ebe67a7359..af4b7299e066 100644
--- a/dev-python/pillow/pillow-8.2.0.ebuild
+++ b/dev-python/pillow/pillow-8.2.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg jpeg2k tiff )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pyproj/pyproj-3.0.1.ebuild b/dev-python/pyproj/pyproj-3.0.1.ebuild
index e9a704baf814..23672a0d5ffc 100644
--- a/dev-python/pyproj/pyproj-3.0.1.ebuild
+++ b/dev-python/pyproj/pyproj-3.0.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P/_p/.post}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
 
 RDEPEND=">=sci-libs/proj-7.2.0:="
 BDEPEND="
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild
index fae472e8685d..b62e32197a1e 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.30.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc64 ~sparc x86"
 
 IUSE="aqua +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build libnotify +opengl seccomp spell systemd wayland +X"
 
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 1f8cbb187522..ef96eb2f2241 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1 +1 @@
-DIST google-chrome-stable_90.0.4430.85-1_amd64.deb 83333276 BLAKE2B bc6f310403c83c41d9ea0069cb22eb640ead3efd6140f3b071806f04874a386a7cb0c3be9ccd6752ffb28cf09f8675dabb25d454d107f1e8a8ec713cf6dedfee SHA512 7a1453161acaeb67bc8ce2df15fd2870b903968581567761ef939ea91665fd36f71019b37193f7d667c79e8c25a9222be5523947eb50bbf1e4b5f79c6468ff69
+DIST google-chrome-stable_90.0.4430.93-1_amd64.deb 83324908 BLAKE2B 401dc1e4fdc648ac1c63acd09d5794a99ade58eb9044d96afd31934be18e164802414a38d51b1aadda8d81762260f8b110c7af09c5428bf0b842a6691992a9bd SHA512 4af2047a652aa386dca4756b39a854ceea712fcff7ac0d51c1c3803bac927f583f63af22fda86ced6813996559dc3799f19b01529dce8fc4e998c5eed55c1ca0
diff --git a/www-client/google-chrome/google-chrome-90.0.4430.85.ebuild b/www-client/google-chrome/google-chrome-90.0.4430.93.ebuild
index 999d91639041..999d91639041 100644
--- a/www-client/google-chrome/google-chrome-90.0.4430.85.ebuild
+++ b/www-client/google-chrome/google-chrome-90.0.4430.93.ebuild
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 028e59f730af..5d9ef551805a 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,3 +1,3 @@
 DIST google-chrome-beta_91.0.4472.19-1_amd64.deb 77694420 BLAKE2B b069b659f6bde7d6219a6947abe060a7458405884f0b7997a1bf1de0a9304b519536ed6d0eb5b5dca6f7787a5b6c9e04af33e0368db2bb9e058ca4b18df82583 SHA512 434c9a0a6d7c41a6f1f84b236d8c2f1d6dcfd9f4ae9eb4cf35f42d76dfcf701b622864de92ed36ddd0a294ff010414596673bdff79015dc0db7874e84dd30a44
-DIST google-chrome-stable_90.0.4430.85-1_amd64.deb 83333276 BLAKE2B bc6f310403c83c41d9ea0069cb22eb640ead3efd6140f3b071806f04874a386a7cb0c3be9ccd6752ffb28cf09f8675dabb25d454d107f1e8a8ec713cf6dedfee SHA512 7a1453161acaeb67bc8ce2df15fd2870b903968581567761ef939ea91665fd36f71019b37193f7d667c79e8c25a9222be5523947eb50bbf1e4b5f79c6468ff69
+DIST google-chrome-stable_90.0.4430.93-1_amd64.deb 83324908 BLAKE2B 401dc1e4fdc648ac1c63acd09d5794a99ade58eb9044d96afd31934be18e164802414a38d51b1aadda8d81762260f8b110c7af09c5428bf0b842a6691992a9bd SHA512 4af2047a652aa386dca4756b39a854ceea712fcff7ac0d51c1c3803bac927f583f63af22fda86ced6813996559dc3799f19b01529dce8fc4e998c5eed55c1ca0
 DIST google-chrome-unstable_92.0.4484.7-1_amd64.deb 78776016 BLAKE2B c7d2541d4b5bc0ac321036f1cfae5377d16029064f793123396a1b58760f7c3dcbaad2ea61a7f67386943ab235696af505b40b0e08aca6d977a40395bb199262 SHA512 69f2601c3d41cd8d1361bfa1f88afd908390f9ff1f38b371af5cbca664c65f3b5f16683933858f0730e7165797250b1eb879d3d3505db7a9eacc7b9e494619b7
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-90.0.4430.85.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-90.0.4430.93.ebuild
index 575d76b0e179..575d76b0e179 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-90.0.4430.85.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-90.0.4430.93.ebuild
diff --git a/x11-terms/xterm/xterm-367.ebuild b/x11-terms/xterm/xterm-367.ebuild
index 029ba4151c1a..7dcc4b83336a 100644
--- a/x11-terms/xterm/xterm-367.ebuild
+++ b/x11-terms/xterm/xterm-367.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
 
 BDEPEND="virtual/pkgconfig
diff --git a/x11-themes/blueglass-xcursors/blueglass-xcursors-0.4.ebuild b/x11-themes/blueglass-xcursors/blueglass-xcursors-0.4-r1.ebuild
index 60f2a71174cb..dfe195a49546 100644
--- a/x11-themes/blueglass-xcursors/blueglass-xcursors-0.4.ebuild
+++ b/x11-themes/blueglass-xcursors/blueglass-xcursors-0.4-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
@@ -6,14 +6,15 @@ EAPI=7
 MY_P="5532-BlueGlass-XCursors-3D-${PV}"
 
 DESCRIPTION="A high quality set of Xfree 4.3.0 animated mouse cursors"
-HOMEPAGE="http://www.kde-look.org/content/show.php?content=5532"
-SRC_URI="http://kde-look.org/content/files/$MY_P.tar.bz2"
+HOMEPAGE="https://store.kde.org/p/999915/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P:5}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
 
-S="${WORKDIR}/${MY_P:5}"
+RDEPEND="x11-libs/libXcursor"
 
 # Note: although the package name is BlueGlass, the tarball & authors directions
 # use the directory 'Blue'.
diff --git a/x11-themes/blueglass-xcursors/metadata.xml b/x11-themes/blueglass-xcursors/metadata.xml
index 49c86a887b6a..ae370525356a 100644
--- a/x11-themes/blueglass-xcursors/metadata.xml
+++ b/x11-themes/blueglass-xcursors/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>desktop-misc@gentoo.org</email>
-	<name>Gentoo Desktop Miscellaneous Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/x11-themes/chameleon-xcursors/chameleon-xcursors-0.5-r1.ebuild b/x11-themes/chameleon-xcursors/chameleon-xcursors-0.5-r1.ebuild
deleted file mode 100644
index 370c1e7b7174..000000000000
--- a/x11-themes/chameleon-xcursors/chameleon-xcursors-0.5-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg
-
-MY_PN="Chameleon"
-
-DESCRIPTION="Style neutral scalable cursor theme"
-HOMEPAGE="http://www.egregorion.net/2007/03/26/chameleon/"
-
-COLOURS="Anthracite DarkSkyBlue SkyBlue Pearl White"
-SRC_URI=""
-for COLOUR in ${COLOURS} ; do
-	SRC_URI="${SRC_URI} mirror://gentoo/${MY_PN}-${COLOUR}-${PV}.tar.bz2"
-done
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}"
-
-src_install() {
-	dodir /usr/share/cursors/xorg-x11/
-	for COLOUR in ${COLOURS}; do
-		for SIZE in Large Regular Small; do
-			local name=${MY_PN}-${COLOUR}-${SIZE}
-			cp -r "${WORKDIR}"/${name}-${PV} \
-				"${ED}"/usr/share/cursors/xorg-x11/${name} || die
-		done
-	done
-}
diff --git a/x11-themes/chameleon-xcursors/chameleon-xcursors-0.5-r2.ebuild b/x11-themes/chameleon-xcursors/chameleon-xcursors-0.5-r2.ebuild
new file mode 100644
index 000000000000..435e7cda0663
--- /dev/null
+++ b/x11-themes/chameleon-xcursors/chameleon-xcursors-0.5-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg
+
+COLOURS=( "Anthracite" "DarkSkyBlue" "SkyBlue" "Pearl" "White" )
+MY_PN="Chameleon"
+
+DESCRIPTION="Style neutral scalable cursor theme"
+HOMEPAGE="https://store.kde.org/p/999948/"
+for COLOUR in "${COLOURS[@]}"; do
+	SRC_URI="${SRC_URI} mirror://gentoo/${MY_PN}-${COLOUR}-${PV}.tar.bz2"
+done
+S="${WORKDIR}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="x11-libs/libXcursor"
+
+src_install() {
+	dodir /usr/share/cursors/xorg-x11/
+
+	for COLOUR in "${COLOURS[@]}"; do
+		for SIZE in Large Regular Small; do
+			local name="${MY_PN}-${COLOUR}-${SIZE}"
+			rm "${WORKDIR}"/${name}-${PV}/{COPYRIGHT,LICENSE} || die
+			insinto /usr/share/cursors/xorg-x11/${name}
+			doins -r "${WORKDIR}"/${name}-${PV}
+		done
+	done
+}
diff --git a/x11-themes/chameleon-xcursors/metadata.xml b/x11-themes/chameleon-xcursors/metadata.xml
index 6d792b262e9b..619d7563cc5a 100644
--- a/x11-themes/chameleon-xcursors/metadata.xml
+++ b/x11-themes/chameleon-xcursors/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>gentoo@aisha.cc</email>
-    <name>Aisha Tammy</name>
-  </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>gentoo@aisha.cc</email>
+		<name>Aisha Tammy</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/x11-themes/comix-xcursors/Manifest b/x11-themes/comix-xcursors/Manifest
index 8705b5678dfd..6773725cdede 100644
--- a/x11-themes/comix-xcursors/Manifest
+++ b/x11-themes/comix-xcursors/Manifest
@@ -1,4 +1,8 @@
 DIST ComixCursors-0.8.2.tar.bz2 2190951 BLAKE2B ebbee6e1668d622a89a63dbdc7d6011456be7ce70efdd57aa4f0581064fc45ae687cb1ffd8e5194bcf0111eb808ed80bddd60256d71e12caf0dbbcd4e7f56172 SHA512 2061207f4a646903774151b17fdfa0749bd613cae12674c4ccaf5f277f7f5ee2d5ab82ae5dcda0a3d22df57e66a6576764b26b9ba004c639301bd6ca18aa9ee1
+DIST ComixCursors-0.9.2.tar.bz2 1994280 BLAKE2B 1d3ab9d77e6a458157489cc24fc7cea0bd536a93135f0b1b257bc5b5b0dcdeb9446ce5d313c9b56a9de4806ed26c2e28be4e176b764a87bb905911a310adcccd SHA512 f88a9a32089c6b55b8a836d46a1ffb6a97174b23cd646e419d662305029d22ef4be63e9ac2afea930230959988bc585ef7bb5db5c121b59d7df39d0cf12ca626
 DIST ComixCursors-LH-0.8.2.tar.bz2 2194027 BLAKE2B 83fb3a7cf7f9281dbd1db379d9d7b90bb7e981637b8b9d4f48728a9c91e51f7bd511654cdc2546533f062df5741fa6652152b842e6682ecb322b6972aad62dfe SHA512 35b843f0cede89e4599b52bb2e5bc7180691767b5125ab7bb7b8fc1cf28a68a60ab1464e1cb7561484235b9ea8b58604ce35ff6e1ffc055d8c399ab484986eb4
+DIST ComixCursors-LH-0.9.2.tar.bz2 2001522 BLAKE2B 1655bbe87ff687693394ecfda3987aeae330128407e0fa45f8c4e6cfea865d96fb1844215b150ac533d07ea03b33de8c3c5caa58b5a9c79969252877b14838cf SHA512 da48306c917a7c2093cc54ce3718eaef041f180161caacd098d527316f39c4c0e8b37e2bfd62bee58b7d8a0c585ca4dc54312761b5b29d7935dd407feb04d626
 DIST ComixCursors-LH-Opaque-0.8.2.tar.bz2 1915132 BLAKE2B b43374b7e6d706038a1ee3899ffa08d519186ad4c892c56922a678d1e97bd2f5014de0eb8de8e04fe958a6430f3d5fadd6dea822c9a0d2cf4487b1aa49f79ae7 SHA512 86a11adc280b732bd1d813b2e43ab3256bdadba7054f818a4134b44fc5891477377d01c23f2c4cb50ccc68c65c57f5022fbd15fdf215e556eaa6c2888410f78a
+DIST ComixCursors-LH-Opaque-0.9.2.tar.bz2 1800872 BLAKE2B d4f4b79ab67c0a6c5beae59afa1e3357538d8e9fd6a4bdfff64c4a14b921854a874aeb697f83c1fef74efb08b9389fbfb96ac187e436fa96cf879eeb86ef0e93 SHA512 06f4536aab0c39ef542fa3fa80d5e7913e7234f14d5bf7ad21f2f9c1dbb7cef413a440bc5272a02eacf0286eaf8a94871ca0e3fb5ee979f1cb4fc23b663e7009
 DIST ComixCursors-Opaque-0.8.2.tar.bz2 1910390 BLAKE2B 51f3a0c7e7ae697d3278074e1820a1341edd3f198a2dd117ed5eb5f6641f19f99fcad072146171b25d4882b478afa643004fd915dcf4c98e81fd064a464cbc96 SHA512 07c59aca614283af36c01b1c7b0f485f1d9a116dd596c86aa2cd4ddce6317d0bd08b96898e6655b7ef19082f16a1042bdc166e92fda801c0e95b6516d0ad1b14
+DIST ComixCursors-Opaque-0.9.2.tar.bz2 1792080 BLAKE2B c25817e265c8aad9ea0dcb8651ae0a77459774fc0f43541ef9f7c512476fe62220e7f13eb471e9b7cd740f7784f1ef9c81cf5f17d8260f9ba0552b0b760990b6 SHA512 1717e8a5b81ac71857dcd51e69bba7b02ea29734af41e407915ef72cc613085a3bab98da4566dec441ec70e144f95801adbf20aa941062c1f06aa9b5f64ba65c
diff --git a/x11-themes/comix-xcursors/comix-xcursors-0.9.2.ebuild b/x11-themes/comix-xcursors/comix-xcursors-0.9.2.ebuild
new file mode 100644
index 000000000000..5ac89af6841d
--- /dev/null
+++ b/x11-themes/comix-xcursors/comix-xcursors-0.9.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="ComixCursors"
+
+DESCRIPTION="X11 mouse theme with a comics feeling"
+HOMEPAGE="
+	https://limitland.de/comixcursors
+	https://gitlab.com/limitland/comixcursors
+"
+SRC_URI="
+	https://limitland.gitlab.io/comixcursors/${MY_PN}-${PV}.tar.bz2
+	lefthanded? ( https://limitland.gitlab.io/comixcursors/${MY_PN}-LH-${PV}.tar.bz2 )
+	opaque? ( https://limitland.gitlab.io/comixcursors/${MY_PN}-Opaque-${PV}.tar.bz2 )
+	lefthanded? ( opaque? ( https://limitland.gitlab.io/comixcursors/${MY_PN}-LH-Opaque-${PV}.tar.bz2 ) )
+"
+S="${WORKDIR}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="lefthanded opaque"
+
+RDEPEND="x11-libs/libXcursor"
+
+src_install() {
+	insinto /usr/share/cursors/xorg-x11
+	doins -r "${S}"/*
+}
diff --git a/x11-themes/comix-xcursors/metadata.xml b/x11-themes/comix-xcursors/metadata.xml
index 99768f227263..a9a0d8d32a08 100644
--- a/x11-themes/comix-xcursors/metadata.xml
+++ b/x11-themes/comix-xcursors/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<!-- maintainer-needed -->
 	<use>
-		<flag name="lefthanded">Install lefthanded version of theme in addition to default one</flag>
-		<flag name="opaque">Install non-transparent version of theme in addition to default one</flag>
+		<flag name="lefthanded">Install lefthanded version of theme in addition to default one.</flag>
+		<flag name="opaque">Install non-transparent version of theme in addition to default one.</flag>
 	</use>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="gitlab">limitland/comixcursors</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-themes/golden-xcursors/golden-xcursors-0.8-r1.ebuild b/x11-themes/golden-xcursors/golden-xcursors-0.8-r1.ebuild
deleted file mode 100644
index f50bd556b129..000000000000
--- a/x11-themes/golden-xcursors/golden-xcursors-0.8-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="5507-Golden-XCursors-3D-${PV}"
-DESCRIPTION="A high quality set of Xfree 4.3.0 animated mouse cursors"
-HOMEPAGE="http://www.kde-look.org/content/show.php?content=5507"
-SRC_URI="http://www.kde-look.org/content/files/$MY_P.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-
-S=${WORKDIR}/${MY_P:5}
-
-src_install() {
-	dodir /usr/share/cursors/xorg-x11/Gold/cursors/
-	cp -R Gold/cursors "${D}"/usr/share/cursors/xorg-x11/Gold/ || die
-	dodoc README "${FILESDIR}"/README.gentoo
-}
diff --git a/x11-themes/golden-xcursors/golden-xcursors-0.8-r2.ebuild b/x11-themes/golden-xcursors/golden-xcursors-0.8-r2.ebuild
new file mode 100644
index 000000000000..caf193db5f26
--- /dev/null
+++ b/x11-themes/golden-xcursors/golden-xcursors-0.8-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="5507-Golden-XCursors-3D-${PV}"
+
+DESCRIPTION="A high quality set of animated mouse cursors"
+HOMEPAGE="https://store.kde.org/p/999860/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P:5}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+
+RDEPEND="x11-libs/libXcursor"
+
+src_install() {
+	insinto /usr/share/cursors/xorg-x11/Gold/cursors
+	doins -r Gold/cursors/.
+	dodoc README "${FILESDIR}"/README.gentoo
+}
diff --git a/x11-themes/golden-xcursors/metadata.xml b/x11-themes/golden-xcursors/metadata.xml
index 49c86a887b6a..ae370525356a 100644
--- a/x11-themes/golden-xcursors/metadata.xml
+++ b/x11-themes/golden-xcursors/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>desktop-misc@gentoo.org</email>
-	<name>Gentoo Desktop Miscellaneous Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/x11-themes/haematite-xcursors/haematite-xcursors-1.0.ebuild b/x11-themes/haematite-xcursors/haematite-xcursors-1.0-r1.ebuild
index dab4234c4ccf..7ea78546a448 100644
--- a/x11-themes/haematite-xcursors/haematite-xcursors-1.0.ebuild
+++ b/x11-themes/haematite-xcursors/haematite-xcursors-1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,18 +6,19 @@ EAPI=7
 MY_PN="${PN/-xcursors/}"
 
 DESCRIPTION="A simple crispy dark-grey xcursor theme"
-HOMEPAGE="http://www.kde-look.org/content/show.php/Haematite?content=19594"
-SRC_URI="http://www.kde-look.org/CONTENT/content-files/19594-${MY_PN}-${PV}.tar.gz"
+HOMEPAGE="https://store.kde.org/p/999432/"
+SRC_URI="mirror://gentoo/19594-${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 
-S="${WORKDIR}/${MY_PN}-${PV}"
+RDEPEND="x11-libs/libXcursor"
 
 src_install() {
-	insinto /usr/share/cursors/xorg-x11/${MY_PN}
-	doins -r ${MY_PN}/cursors
+	insinto /usr/share/cursors/xorg-x11/haematite
+	doins -r haematite/cursors
 }
 
 pkg_postinst() {
diff --git a/x11-themes/haematite-xcursors/metadata.xml b/x11-themes/haematite-xcursors/metadata.xml
index bc1b97e1eb76..ae370525356a 100644
--- a/x11-themes/haematite-xcursors/metadata.xml
+++ b/x11-themes/haematite-xcursors/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>desktop-misc@gentoo.org</email>
-    <name>Gentoo Desktop Miscellaneous Project</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/x11-themes/obsidian-xcursors/metadata.xml b/x11-themes/obsidian-xcursors/metadata.xml
index bc1b97e1eb76..ae370525356a 100644
--- a/x11-themes/obsidian-xcursors/metadata.xml
+++ b/x11-themes/obsidian-xcursors/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>desktop-misc@gentoo.org</email>
-    <name>Gentoo Desktop Miscellaneous Project</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/x11-themes/obsidian-xcursors/obsidian-xcursors-1.0.ebuild b/x11-themes/obsidian-xcursors/obsidian-xcursors-1.0-r1.ebuild
index 8e5b355625e0..b45f0120275f 100644
--- a/x11-themes/obsidian-xcursors/obsidian-xcursors-1.0.ebuild
+++ b/x11-themes/obsidian-xcursors/obsidian-xcursors-1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,17 +6,18 @@ EAPI=7
 MY_PN="Obsidian"
 
 DESCRIPTION="A shiny and clean xcursor theme"
-HOMEPAGE="http://www.kde-look.org/content/show.php/Obsidian+Cursors?content=73135"
-SRC_URI="http://www.kde-look.org/CONTENT/content-files/73135-${MY_PN}.tar.bz2"
+HOMEPAGE="https://store.kde.org/p/999984/"
+SRC_URI="mirror://gentoo/73135-${MY_PN}.tar.bz2"
+S="${WORKDIR}/${MY_PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 
-S="${WORKDIR}/${MY_PN}"
+RDEPEND="x11-libs/libXcursor"
 
 src_install() {
-	insinto /usr/share/cursors/xorg-x11/${MY_PN}
+	insinto /usr/share/cursors/xorg-x11/Obsidian
 	doins -r cursors
 }
 
diff --git a/x11-themes/pearlgrey-xcursors/metadata.xml b/x11-themes/pearlgrey-xcursors/metadata.xml
index bc1b97e1eb76..ae370525356a 100644
--- a/x11-themes/pearlgrey-xcursors/metadata.xml
+++ b/x11-themes/pearlgrey-xcursors/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>desktop-misc@gentoo.org</email>
-    <name>Gentoo Desktop Miscellaneous Project</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/x11-themes/pearlgrey-xcursors/pearlgrey-xcursors-1.0.ebuild b/x11-themes/pearlgrey-xcursors/pearlgrey-xcursors-1.0-r1.ebuild
index 7faf0e6e30b6..9fb85be372ee 100644
--- a/x11-themes/pearlgrey-xcursors/pearlgrey-xcursors-1.0.ebuild
+++ b/x11-themes/pearlgrey-xcursors/pearlgrey-xcursors-1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,18 +6,19 @@ EAPI=7
 MY_PN="${PN/-xcursors/}"
 
 DESCRIPTION="A simple crispy white-grey xcursor theme"
-HOMEPAGE="http://www.kde-look.org/content/show.php/PearlGrey?content=11313"
-SRC_URI="http://www.kde-look.org/CONTENT/content-files/11313-${MY_PN}-${PV}.tar.gz"
+HOMEPAGE="https://store.kde.org/p/999829/"
+SRC_URI="mirror://gentoo/11313-${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 
-S="${WORKDIR}/${MY_PN}-${PV}"
+RDEPEND="x11-libs/libXcursor"
 
 src_install() {
-	insinto /usr/share/cursors/xorg-x11/${MY_PN}
-	doins -r ${MY_PN}/cursors
+	insinto /usr/share/cursors/xorg-x11/pearlgrey
+	doins -r pearlgrey/cursors
 }
 
 pkg_postinst() {
diff --git a/x11-themes/silver-xcursors/metadata.xml b/x11-themes/silver-xcursors/metadata.xml
index 49c86a887b6a..ae370525356a 100644
--- a/x11-themes/silver-xcursors/metadata.xml
+++ b/x11-themes/silver-xcursors/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>desktop-misc@gentoo.org</email>
-	<name>Gentoo Desktop Miscellaneous Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/x11-themes/silver-xcursors/silver-xcursors-0.4-r1.ebuild b/x11-themes/silver-xcursors/silver-xcursors-0.4-r1.ebuild
deleted file mode 100644
index 5345336dffd5..000000000000
--- a/x11-themes/silver-xcursors/silver-xcursors-0.4-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="5533-Silver-XCursors-3D-${PV}"
-DESCRIPTION="A high quality set of Xfree 4.3.0 animated mouse cursors"
-HOMEPAGE="http://www.kde-look.org/content/show.php?content=5533"
-SRC_URI="http://www.kde-look.org/CONTENT/content-files/$MY_P.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc sparc x86"
-
-S="${WORKDIR}/${MY_P:5}"
-
-src_install() {
-	dodir /usr/share/cursors/xorg-x11/Silver/cursors/
-	cp -R  Silver/cursors "${D}"/usr/share/cursors/xorg-x11/Silver/ || die
-	dodoc README "${FILESDIR}"/README.gentoo
-}
diff --git a/x11-themes/silver-xcursors/silver-xcursors-0.4-r2.ebuild b/x11-themes/silver-xcursors/silver-xcursors-0.4-r2.ebuild
new file mode 100644
index 000000000000..a24cd8a1d26b
--- /dev/null
+++ b/x11-themes/silver-xcursors/silver-xcursors-0.4-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="5533-Silver-XCursors-3D-${PV}"
+
+DESCRIPTION="A high quality set of animated mouse cursors"
+HOMEPAGE="https://store.kde.org/p/999966/"
+SRC_URI="mirror://gentoo/$MY_P.tar.bz2"
+S="${WORKDIR}/${MY_P:5}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86"
+
+RDEPEND="x11-libs/libXcursor"
+
+src_install() {
+	insinto /usr/share/cursors/xorg-x11/Silver/cursors
+	doins -r Silver/cursors
+	dodoc README "${FILESDIR}"/README.gentoo
+}