gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /x11-themes
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
96 files changed, 701 insertions, 451 deletions
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 4f22664c0626..51738bea8aef 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/QGnomePlatform/Manifest b/x11-themes/QGnomePlatform/Manifest
index be8b21a4d758..258a33eaad7a 100644
--- a/x11-themes/QGnomePlatform/Manifest
+++ b/x11-themes/QGnomePlatform/Manifest
@@ -2,6 +2,8 @@ AUX QGnomePlatform-0.6.1-qt5.15.patch 682 BLAKE2B 418b0c478d191e58186625cd2a307d
 AUX QGnomePlatform-0.7.0-qxdgdesktopfiledialog-fixes.patch 2915 BLAKE2B d485fafae9f15abeb79a44cf30a4926972aa3f1fc7bc69d1ea007ce97c30901eecbead9667b4f78619ae2d1d45a2bc6c70adbeece61ca7fcbd4b775fa896ecdc SHA512 a062330fb6ecc26e2c9d75dc8f11d1de207832fe0d15559aeccec79c4e62e4f866d848648f632595e6dfed4f8024a16dbb14d76d53815e000b064bd6b2bf24f7
 DIST QGnomePlatform-0.6.1.tar.gz 28996 BLAKE2B 3d0da37fcc8e85bd59263dffb19865666d25dd50d2c1e00b4d6358d745eb7079f415058ffb75a8228c9c7ed956003a656b3e10a3467d9fc9dcd5eee2c14bf7cd SHA512 5e0bab45a8ff4c56e6e34d636ed719ce1a087f116942dd356253403d4be40aac348ccbdbfc917f65f6cc4df8619e1031734f0a46a36d4d9b7bb4838ded61570c
 DIST QGnomePlatform-0.7.0.tar.gz 33398 BLAKE2B 28cd8c070465074f137c669c6bf5835ced26e53ebb2ae4fe96f5bf9ddabd5df6adf947499d51fa8700d5a77a35f5715711f4ccc117fe1613ec70cbfacde501fd SHA512 9bca42a79e536ec2ff03ff2ed89dac572ea15d8a1a7fc72ac564208a82dd5ac442f1a3eb4ef54ac466a754fbc66f078105ef9bea5b0206d20be63c0f942da243
+DIST QGnomePlatform-0.7.1.tar.gz 33633 BLAKE2B 167039a7de4bbd3cae163022adb94a2bd4764f5a862b8334600f2bc5b7cfe09b6a5facfe656438d05bbf150e10caab9f1aeb910d0aa8d55fbe8995393e89b0d8 SHA512 7e3ba774ee1387604f4c66bd75f9fb4c5305f4553886132e8e3991a3e42564844a7eafb1361e0e8c64743746e315c07b22c11c133be95c1c53afb62c062bfc6e
 EBUILD QGnomePlatform-0.6.1-r1.ebuild 697 BLAKE2B ea7d467da40c27d288cb803bcad0146cc10d4564f87e267d59af94716cc9fedab98b84e23cc77010310c8240a6af5679934053f4776c28e059bcd6c15dbe4b8c SHA512 4a7c1e0559ca73ca961fc00e8b68663b37e62bec019875ce4e4b921fb7730e935dce5b2dad77198d6c6b6e607d4e7d0dba1421322a15222aceccac3128a190fa
 EBUILD QGnomePlatform-0.7.0.ebuild 820 BLAKE2B 23d1c18c80f7552727cff8b2d0f4a8aa601137c41abc4fda17c3252bf1a1cb9a3ec17db89debb2b30ac8fc9e0755577e6591c3c26dda4cba6be596469bb0d929 SHA512 b24b7b1f2c36b97ee219ce9e359fcc98e1315ea67722c45b420ba13b148ff5a65de5fc7e502df410de66e1a105e0d62687af6f172e2bb9fd53a19845ccac9431
+EBUILD QGnomePlatform-0.7.1.ebuild 715 BLAKE2B ae1364d697daf42bc4a820332ae57e8f3eadc5b71dd7d83bf281a7b98fc932dfc1e930ea1ba8cb84333a0e63937806ca9ad044a93eb22e640b21eb799ef657a7 SHA512 5e70455c9b7b18b05548de30294a0ed6d8eab3070dc359c1923c1d424b611dc89f4167856967e2b31e94e67f9b7ef9ee31d1acebf0f6eba0776582daaf25df39
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/x11-themes/QGnomePlatform/QGnomePlatform-0.7.1.ebuild b/x11-themes/QGnomePlatform/QGnomePlatform-0.7.1.ebuild
new file mode 100644
index 000000000000..fc28ebf2a22a
--- /dev/null
+++ b/x11-themes/QGnomePlatform/QGnomePlatform-0.7.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qmake-utils
+
+DESCRIPTION="A Qt Platform Theme aimed to accommodate GNOME settings"
+HOMEPAGE="https://github.com/FedoraQt/QGnomePlatform"
+SRC_URI="https://github.com/FedoraQt/QGnomePlatform/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc64 ~x86"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtdbus:5=
+	>=dev-qt/qtwidgets-5.12:5=
+	dev-qt/qtwayland:5=
+	dev-qt/qtx11extras:5=
+	sys-apps/xdg-desktop-portal
+	x11-libs/gtk+:3[X]
+	>=x11-themes/adwaita-qt-1.2.0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	INSTALL_ROOT="${D}" default
+}
diff --git a/x11-themes/adwaita-icon-theme/Manifest b/x11-themes/adwaita-icon-theme/Manifest
index 3efa9ad25b20..2117a4af5c0a 100644
--- a/x11-themes/adwaita-icon-theme/Manifest
+++ b/x11-themes/adwaita-icon-theme/Manifest
@@ -1,8 +1,8 @@
 DIST adwaita-icon-theme-3.32.0.tar.xz 18540012 BLAKE2B a82ca6758cdbf459ac617d3b3d834e4147c3a3c5e6ca7c705ed2d16e8cf0a1255f5ae999d7e930b9716585b8c498c220f1ab40fec929dde7679efd56f3b18a45 SHA512 9609732cd51c6794d4d86598818bb2a589b0f4b6b795e57f3507dad69b21ef1b2fc2e83e24e937428bbace32fcccf587a5771cbc02c5768206e704f0456a6d1d
-DIST adwaita-icon-theme-3.36.1.tar.xz 17247020 BLAKE2B 51461ff3058f413cacea9b7ec76bedd13e7adc38fa2aa9a80e84718f371463d9cc2b2be80ef10e375bf670658d184680ecadc7f84089e8b5ee09a39bf9fa1924 SHA512 5df33c8592ebd17e05fb36590423177fa3e07345565302a5b7ef58fb7d7a9b2b3a1789907a81f5ca0abc7446f7e83af059ca9d6432e8182d5274394c79a24fb9
 DIST adwaita-icon-theme-3.38.0.tar.xz 17202144 BLAKE2B 88bde0758a40188cd55432d35edb92c3f1f62ce79a5b44b6271ea039841b22feadfea071899e71aaf449e3d077e6dcb65e01ecfbc62732c27036dca6cb72afb8 SHA512 710f034ef80476a4e9d60bcb7ba604e340ac561aafc67400b2cee2aac4696bfaab8a7d69a289116f884cce9bad1f8b3a3e0aff77588ecb9262e7bf250740af13
+DIST adwaita-icon-theme-40.0.tar.xz 18294376 BLAKE2B 7829db2d8e44a8c71372ebc427aed08125de61c12e313d3b8a4b8e1c7202a9b6e3b8e87e123a1498ef5f01360fa88436622f482add7aad6c9de6ae3256ca7682 SHA512 c9626bc4ea11f283c6e9396fe722414d3dde8609b6a952288f48185352841a88a229d837591351856ffcf840d6597b04ff4e78e58b3ebe22d44e3f509217455d
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
-EBUILD adwaita-icon-theme-3.32.0.ebuild 1600 BLAKE2B 471bca291b413189a55438d73a95e65956462ef8e159ed291928ba2f7166b8a37c5d79eaf2957c7c263651c0412be54f40af16e3160e3edc4008e94edb1f98c8 SHA512 20cbc5ae4ce2a0aba9a42387d866625142d8e589b68a4621a7874e961c4676402ed9c742a2ba24a36e0616b5f169518c3e4f9c78548f9cee81cffef18ca9404f
-EBUILD adwaita-icon-theme-3.36.1-r1.ebuild 1533 BLAKE2B 4a06ede80f585999f5999afd90f62ef36e33a0727658912105e7db84f34abeb932e579a37279286ddfdac6eee8663129576d92664be02e4da6520721fb64eb95 SHA512 5a46ed707bee8f4d55cec6eaa5896f53b5c6ff4d10d111dce6613077fed0e8e626c57256a8f59b4883a7f3af50209ba1543ed611d2f524d68250b0604482811e
-EBUILD adwaita-icon-theme-3.38.0.ebuild 1537 BLAKE2B 0b69e7cedc04afd0a419dfd8a7444cdca9e19905436b85bdc8cc5bea7bbfa502d4ddbbae7fc6f19cfc09b9375f64f13d593ed5498808fdc62e2b24109f1d4940 SHA512 abfea5c4295054e43e522e9436cec8880bbb40f4c1548c2b9f82711d9167bfe0f62ceed1736b1e0c6474bd9604fbedc678667e0c8b3a7cfa80e2f1e3af470212
+EBUILD adwaita-icon-theme-3.32.0.ebuild 1601 BLAKE2B f149f12ff28ad6f6a3b51dfb47fbceae31478086bc03a5bc38fac30de7c2f41b79b47a13f77217f0d8d672400ba18e88b97bc7763a0d7c48b37634bb709919f4 SHA512 038cc3edfb7f3a3a42d9dc099a63730b30e8c98ee94883ab746b7a141daba0bc46f3de8ccaca1b295138251b784d4d0c134089edd7640d040fc406ec91e6e26d
+EBUILD adwaita-icon-theme-3.38.0.ebuild 1533 BLAKE2B cc994a42f9a7b5c9caa1ebe2273e8440a739d39ada4eeedf9b01de064d1aaa89937abf18716ab0b617d37908609e34e69d957a682caa9deb4313747e4bcca68d SHA512 6d5c70d7ad67866436bc51b6094f063be223182fedbf1fe9561ccfc9cc6c19428a28b16b8a02dfc24cb441c6fba4eb9ee41a14da8e6c895735bba53b8d4a16da
+EBUILD adwaita-icon-theme-40.0.ebuild 1538 BLAKE2B 8e14d1f8b60e1121f5a1c724add5383773954acaba3822d60f18a2adb9882c7547f424629f6cb5541d6cd7b9d256db6cbdd778979e9d557774c2c3fd46496f6b SHA512 a15a61fd37d2456e3f0812248bd70cbd868b98780a17c3afa4ad19681ee333082447b649e6c5699360baf865bf33b0b85cf6d998db8ac0f325b9c96926502df0
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.32.0.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.32.0.ebuild
index e6b170a05836..d89ebf416d44 100644
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.32.0.ebuild
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.32.0.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
@@ -17,7 +17,7 @@ LICENSE="
 "
 SLOT="0"
 IUSE="branding"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 # gtk+:3 is needed for build for the gtk-encode-symbolic-svg utility
 # librsvg is needed for gtk-encode-symbolic-svg to be able to read the source SVG via its pixbuf loader and at runtime for rendering scalable icons shipped by the theme
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.38.0.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.38.0.ebuild
index fbd60b0b0d10..2bbec2a63be2 100644
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.38.0.ebuild
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.38.0.ebuild
@@ -17,7 +17,7 @@ LICENSE="
 "
 SLOT="0"
 IUSE="branding"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 
 # gtk+:3 is needed for build for the gtk-encode-symbolic-svg utility
 # librsvg is needed for gtk-encode-symbolic-svg to be able to read the source SVG via its pixbuf loader and at runtime for rendering scalable icons shipped by the theme
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.36.1-r1.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-40.0.ebuild
index ec449ae6fa1a..a801bc699898 100644
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.36.1-r1.ebuild
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-40.0.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
@@ -17,7 +17,7 @@ LICENSE="
 "
 SLOT="0"
 IUSE="branding"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 # gtk+:3 is needed for build for the gtk-encode-symbolic-svg utility
 # librsvg is needed for gtk-encode-symbolic-svg to be able to read the source SVG via its pixbuf loader and at runtime for rendering scalable icons shipped by the theme
diff --git a/x11-themes/adwaita-qt/Manifest b/x11-themes/adwaita-qt/Manifest
index 56c9127d17c0..168cd0e77837 100644
--- a/x11-themes/adwaita-qt/Manifest
+++ b/x11-themes/adwaita-qt/Manifest
@@ -1,5 +1,7 @@
 DIST adwaita-qt-1.1.4.tar.gz 436392 BLAKE2B 2a8ab80a2189cc7bbc21bb83c409b16c8824364cc768765246876dedab8ac4073f0325d28dd916b2173bb3cd7396bb2c4b19b07c8932d589200d91f3ea48e2b9 SHA512 78390787c4b080608036605c6c713bbd5d482b039796e76974ca8c034e0d8af694704e063d53f99a3e5e7ac4d48f6325ff1c90d67fbeb4bc9e49792485e11cb1
 DIST adwaita-qt-1.2.0.tar.gz 438425 BLAKE2B 752d00197f107b0c94d15dd3c0a1f5f55f5b388b077ce8cfaac5dd01651bea6b97e24e85e600298aa9d19bb6c0ea1cfbecef41248eb78a8cb60b284a5ede10e4 SHA512 313697ad6474dc15eae8e6650cd6eb2e31dc3005978c6de5aa92003f3c426f9a04523bb839922f9acaca35495566dedb049df9582d1a6666dcf97e8429a7a778
+DIST adwaita-qt-1.2.1.tar.gz 438614 BLAKE2B 783372158d67e51cf869b3f4c0732735c68ccf6d43ce354de41609878e582509becd97348c749c1e3b4ef1c73a5b1acda1dd3251d8d567a720d0b8286d154fb6 SHA512 a4482d9ae8e9f1ae4f6baa411d68f5f7b2ccafd157635c5e142723414f28bd0a5b3331d3ba16e17404159d410fff029b779447e8832d69c020a1fa1d40d926da
 EBUILD adwaita-qt-1.1.4.ebuild 872 BLAKE2B d560355c9a638a9d4d261091761d07374a51592b6fad05f75894335499d4ccc1b8a00e54d7f3519598efeaf86fef6fa852a8c94dddc84b3f09f9f4d0f9479fa0 SHA512 426e8787277aff420a4871a9f4b865a6353f221baa26dc308681f2315cce5e46e87c916c10b5a8ee7d2c2d170a28d4f49741c76d0014830bbf88074679b4ab80
 EBUILD adwaita-qt-1.2.0.ebuild 583 BLAKE2B 31ef4fadf0887d5926585b11731d65b9048c064c043d9c451e871f44c6459fbc5340bc472fc409002ed52bfef2c99d7a8a1c1128dcca002cce1e0d74fc0131d4 SHA512 237f0c254619affb7d7c778483e085a5b9a2b0d00bd51520a7049673dfaf0038d427fc0122d112741950cd53fd68fd353520af0a0ab2a9284f1e8e560575564f
+EBUILD adwaita-qt-1.2.1.ebuild 583 BLAKE2B 31ef4fadf0887d5926585b11731d65b9048c064c043d9c451e871f44c6459fbc5340bc472fc409002ed52bfef2c99d7a8a1c1128dcca002cce1e0d74fc0131d4 SHA512 237f0c254619affb7d7c778483e085a5b9a2b0d00bd51520a7049673dfaf0038d427fc0122d112741950cd53fd68fd353520af0a0ab2a9284f1e8e560575564f
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/x11-themes/adwaita-qt/adwaita-qt-1.2.1.ebuild b/x11-themes/adwaita-qt/adwaita-qt-1.2.1.ebuild
new file mode 100644
index 000000000000..008c282fd64b
--- /dev/null
+++ b/x11-themes/adwaita-qt/adwaita-qt-1.2.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A style to bend Qt applications to look like they belong into GNOME Shell"
+HOMEPAGE="https://github.com/FedoraQt/adwaita-qt"
+SRC_URI="https://github.com/FedoraQt/${PN}/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="gnome"
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+"
+RDEPEND="${DEPEND}"
+PDEPEND="gnome? ( x11-themes/QGnomePlatform )"
diff --git a/x11-themes/arc-theme/Manifest b/x11-themes/arc-theme/Manifest
index 5b15dd85af26..1292b307b6ca 100644
--- a/x11-themes/arc-theme/Manifest
+++ b/x11-themes/arc-theme/Manifest
@@ -4,6 +4,9 @@ DIST arc-theme-20201013-pngs.tar.xz 85204 BLAKE2B fb1ef7e0d9618238cf6057777d1494
 DIST arc-theme-20201013.tar.xz 241636 BLAKE2B 6f825b290c0f2cf1e67d72d9dbca0f23c83e7fc2ea89bc7b69013fb38bb7959205caad1b357a5cb1c4196e4b4460f13223515124c2012aa363a17765e89f992d SHA512 c1c70c80935af2b1f3c7c9bf79ee72d5fba907fd03caadecf96d6fd796bf70d325bbb16dbe93f95d9a63eff748c7d90bcb0bf837e446e5c2770cfdccb131f45c
 DIST arc-theme-20210127-pngs.tar.xz 159392 BLAKE2B 2a355e85766f44c21a4a85cacd184cb28ddb4ba19e7dff7cae70114c12422ed5d46a3930d780a6e2dd458684a944f5cbd17a769a0d3e331f94007b9fc9943238 SHA512 b0de3065e81979f2aa6b7f31edc1aad6dd6998776da2a1ba3b1030f6d8c552c9f1702e0bca0585e625e868541b0444b7a0d75631dfbeef517bdb9925e19e6159
 DIST arc-theme-20210127.tar.xz 256364 BLAKE2B 4e85d2ca801977588273715a94b91e199e3f16d304090789748e22b55c1339386a84938da1b1c143004655d8573678a51ff3b27e9ac3a2027de93625b0f39ada SHA512 bb0554c96cf6c3c3891698d973e7d719931fc316ea6cd910f69d21440110690aeef0e734b5f940ad1c81bdff238477b6353de4ae074cd54fbed09c680377d594
+DIST arc-theme-20210412-pngs.tar.xz 159340 BLAKE2B 40027335b8b44ae38bfadfa52e08858cf09646ed9c3e2fcddece8959d2f35845c4924002f36cea65cb27ecf61fdb3dffbf0d5c01024c34d16c31e21bf69b5a72 SHA512 85bdcd1fb81a5c33b479123bad178b1833a95ecf09310fa3b754c25f753ec10a7cada14983014b090c4a86d7a8497ac881fee9576737be29f4f772ccb59a8f1e
+DIST arc-theme-20210412.tar.xz 257248 BLAKE2B c525c3632670d8aa6b640baa8b3dddca6c5dd5f087734604c68d9140f810fc595f73db06f93b6193ba1c59a8cd85b87f5f6fda9777940adf36f3c436a8426810 SHA512 d3064546301e013a1e5a8db735346d74c73f37cbf808b7afeee6f88c820cea58ba6458fa63e1213377cdd33c8347167242e6f8f1eacf85ce212f3b2508c0bb80
 EBUILD arc-theme-20201013.ebuild 2290 BLAKE2B b857a0d484003c2a7501059ef894b222b4856e82ef1bab182480b1c9f5a12a003999ca61551bc535c581bf8fc1b214f64ffd611134ed65b475a90df05c54265e SHA512 e17c49db06eab011511bdd5db0105773fcec93dc44816ea2d5cb7bd2f3c7a7cf88c993d271d223d4eb3fc7e3664958b5676abc60b3472afa9ff4622439bb12e6
 EBUILD arc-theme-20210127.ebuild 2406 BLAKE2B e2840a54b0b27a40d4ef6494d737c86c4e479bd3eb15ec44759f78cf58073de4eff6983da4a45a40f9b990265c50ce9e52733b43c61df9acf2e12a204ee94ec8 SHA512 c7008d3816d84dbfa3f49f34ad74f0b379c15cf1edd6ba682f45dc685beba5000d93178d02bf07973ddcf2e681ace76a2530b35010547d26afeb03dbc79dc5bf
+EBUILD arc-theme-20210412.ebuild 2357 BLAKE2B 15748957c04f3fc5391195ce4bfbe1a85e0c48ca484a3e97b3d392d013648475af36f8a0c55df4605d030f9199890fe170cada93944f1822c92a41894d0a44ca SHA512 8caf9443cc0f1a8b52567777f877a161d7b86448de1a6d30940b5040f93c8ed9a51871f0f5d63f95f984a82db03c810480d5280e18a5d922ca7b3a15c5dbfe79
 MISC metadata.xml 898 BLAKE2B dc323fe2b56b97d7cd5654cda904e96cc5d9c46e7afea98b6ae0a36b560098f58a9a9a66bdba461f260bc7b01bc5f9c3397527ad38d3fee9142a1fad51882d6c SHA512 6d608de81b85bf534dba5818fd5683fca97b178ab16bb43916f4d61f9284922d84fab69f37770cb709fd1048a37dd53580cb494f3d36d6b5e19a57aa7d14ec0f
diff --git a/x11-themes/arc-theme/arc-theme-20210412.ebuild b/x11-themes/arc-theme/arc-theme-20210412.ebuild
new file mode 100644
index 000000000000..8d4aefb69e32
--- /dev/null
+++ b/x11-themes/arc-theme/arc-theme-20210412.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# USE="-* gtk2 gtk3 xfce" ebuild ${P}.ebuild clean compile
+# cd $(portageq envvar PORTAGE_TMPDIR)/portage/x11-themes/${P}/work
+# find ${P}-build/ -name "*.png" | xargs tar Jcvf /usr/portage/distfiles/${P}-pngs.tar.xz --owner=root --group=root
+
+inherit meson toolchain-funcs
+
+DESCRIPTION="A flat theme with transparent elements for GTK+3, GTK+2 and GNOME Shell"
+HOMEPAGE="https://github.com/jnsh/arc-theme"
+SRC_URI="https://github.com/jnsh/${PN}/releases/download/${PV}/arc-theme-${PV}.tar.xz
+	pre-rendered? ( https://dev.gentoo.org/~chewi/distfiles/${P}-pngs.tar.xz )"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="cinnamon gnome-shell +gtk2 +gtk3 mate +pre-rendered xfce"
+
+SASSC_DEPEND="
+	dev-lang/sassc
+"
+
+SVG_DEPEND="
+	!pre-rendered? (
+		media-gfx/inkscape
+		media-gfx/optipng
+	)
+"
+
+# Supports various GTK+3, GNOME Shell, and Cinnamon versions and uses
+# pkg-config to determine which set of files to build. Updates will
+# therefore break existing installs but there's no way around this. At
+# least GTK+3 is unlikely to see a release beyond 3.24.
+BDEPEND="
+	>=dev-util/meson-0.56.0
+	cinnamon? (
+		${SASSC_DEPEND}
+		gnome-extra/cinnamon
+	)
+	gnome-shell? (
+		${SASSC_DEPEND}
+		>=gnome-base/gnome-shell-3.18
+	)
+	gtk2? (
+		${SVG_DEPEND}
+	)
+	gtk3? (
+		${SASSC_DEPEND}
+		${SVG_DEPEND}
+		virtual/pkgconfig
+		=x11-libs/gtk+-3.24*:3
+	)
+	xfce? (
+		${SVG_DEPEND}
+	)
+"
+
+# gnome-themes-standard is only needed by GTK+2 for the Adwaita
+# engine. This engine is built into GTK+3.
+RDEPEND="
+	gtk2? (
+		x11-themes/gnome-themes-standard
+		x11-themes/gtk-engines-murrine
+	)
+"
+
+src_configure() {
+	local themes=$(
+		printf "%s," \
+		$(usev cinnamon) \
+		$(usev gnome-shell) \
+		$(usev gtk2) \
+		$(usev gtk3) \
+		$(usex mate metacity "") \
+		$(usex xfce xfwm "")
+	)
+
+	local emesonargs=(
+		-Dthemes="${themes%,}"
+		-Dgtk3_version=3.24
+	)
+
+	if use pre-rendered; then
+		emesonargs+=(
+			$(if tc-is-cross-compiler; then
+				  echo --cross-file
+			  else
+				  echo --native-file
+			  fi)
+			"${FILESDIR}"/pre-rendered.ini
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_compile() {
+	# fontconfig issue?
+	# https://bugs.gentoo.org/666418#c28
+	use pre-rendered ||
+		addpredict "${BROOT}"/usr/share/inkscape/fonts/.uuid.TMP-XXXXXX
+
+	meson_src_compile
+}
diff --git a/x11-themes/blueglass-xcursors/Manifest b/x11-themes/blueglass-xcursors/Manifest
index 48d777432d98..43ffaffb343a 100644
--- a/x11-themes/blueglass-xcursors/Manifest
+++ b/x11-themes/blueglass-xcursors/Manifest
@@ -1,3 +1,3 @@
 DIST 5532-BlueGlass-XCursors-3D-0.4.tar.bz2 764792 BLAKE2B 04f43e7906cc9fc3a7d0d601e282e0d8e41076b18cea00d9427cc3fb0c84a36c293557d753df1c9b2ab9f1fa90e9a8814b0e7c244e278e477fa439e5251f7e09 SHA512 2d80a1a470e50c64c94a72e1bd553de10c2ff8e62e26fe348e3bc0c0dec18c0fcb589e3dfbc21c4032716d7a409efc0e42f361cf01f00d5829bde002329f976a
-EBUILD blueglass-xcursors-0.4.ebuild 1426 BLAKE2B 740207a0c89d13ba6945f49d03ad9221fe6042d4cf113a95280c2cdae3db73138b4fc6aaedb204a26f071d2b781ddedb03ba360dbe7a1acf8fe558aacdfc0bf0 SHA512 f53080c174bf8605b2b0bf98bee888b5fd0cae87aae01c8e2abe1ac4f740c7405ddf24e42ea1f7a9f53f8930ffd266c5cd8c88e813cec7179991e667db777c0a
-MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
+EBUILD blueglass-xcursors-0.4-r1.ebuild 1437 BLAKE2B 7baab8d7c7913dfff06e31a54ac56e109d6b6772af563d360b62fc63cd30c28fbcf6eec9d023545d341e2b5892668e82f6ffd8c8c70418a8b2dcf618be7d231b SHA512 14f085c1b9d9fc51637386120d0953635f155648be21e34f9c15f295f42c9061eb078de7e3ba78d8e25105efe7c5cba088d2e0ec1ab5c420d1d87f09afb3e8f8
+MISC metadata.xml 300 BLAKE2B 2e7b335e362ca748b158cae23162dc80012ea9195ba704d12a85f1136409e9525b144a1af16c52fabe6a9c45b2553a4a78673d8267d56f4506ebc1614eb82af2 SHA512 5309fea86ffe482382a564dce1ec6aa4163e3a34d8e0c6ad47db2fcbd5c4769c31cb04397b547c16fe3bb06c447d54b92956a637a8be95d94435d6ad6230a47a
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/Manifest b/x11-themes/chameleon-xcursors/Manifest
index fccb383d983a..f7887e90718b 100644
--- a/x11-themes/chameleon-xcursors/Manifest
+++ b/x11-themes/chameleon-xcursors/Manifest
@@ -3,5 +3,5 @@ DIST Chameleon-DarkSkyBlue-0.5.tar.bz2 1965717 BLAKE2B 9dbb6026c530f88326d7da968
 DIST Chameleon-Pearl-0.5.tar.bz2 1875789 BLAKE2B 2aef4e1fe456e7274c01cd3f8a025039c4200742b18dedaf119648fd4fdc9434e97b614abd7d5b3b99b668db1062dcb905dea049cacf6d454e3070d6769f96eb SHA512 83cf97f93b9f1073e6307238d6b15b8c31843f2b105e2149e0e8f3dffbaa83c4d1dafae9fbb76aad316aeca420abb9421f92420590fceed486df85fe689470e8
 DIST Chameleon-SkyBlue-0.5.tar.bz2 1959985 BLAKE2B 9c8e212155a36352ae50eeaa7a5d78bdeb2000a3d24fc3df424a037de9c7a45c482e74abf9765c3e32b84ecb948abe2fd40c6de82c5ecf1899b7862daaca5a57 SHA512 4fdbd7f3721ec5fc40ea38c29f9d884ec7f0250f3b58f58880c6b60c93e070e779e1268718246aa3709e48c4087e547deb8fa7a289f5c94d4ed36de48b7fff11
 DIST Chameleon-White-0.5.tar.bz2 1690839 BLAKE2B b8710672c0793c8af573d26d2dc242c07b0722e44341c724661e88b4a7858c81fd6e32c70928042e7be777944bd363a47ee5699ed054c37244e58cb3634c8709 SHA512 6b3c56e1ee8409fa711704d60371823ba080df050b52af89c233668d93e0c5a4278ae5642dee8f4e5794a63cde8dc471b33bc16c4edc95a428e29285f9088110
-EBUILD chameleon-xcursors-0.5-r1.ebuild 759 BLAKE2B d9f2a1516f9b5e93f29bf19dcf10a38e2361cddf787036cb9e3375aaa96586b9bcf62089149b6a2f6e48e5809b58729854ca865c6b5de3efe522f4bc7227b82f SHA512 1703e2e07a2e0d8d0d1bc3d97ce139faae0a5d5736cbc0de9f6330666014f7f33211eaea85d6fa5c61bdafd73773d6efe6abe493689bcb0eb5e29fa74bf6dd2b
-MISC metadata.xml 401 BLAKE2B 26943df6a7a12fc66fb729c8c35a2889a59987253c0f2e530b0c578c4888ab844d53340d654c16a36c92328587b5f8c09b91e67d7bb02da6f6e283dc8c23c1c9 SHA512 fc0b867fbc6e481513721f66e60c9a9d3e42ed9c950534d00530979067333040430e7cf7db70f765a8667658f0bf1c6292d09ab832b5f4a5cecfbf5f73c2cc2d
+EBUILD chameleon-xcursors-0.5-r2.ebuild 901 BLAKE2B 22f046f24fc1e6964ab5318b4de05cec41406e9632d81672a7c68ae6844e21eab0073a1c2985e6aedd88071751e307c3bab0b83d242dcb226c8c5e5450f39f0d SHA512 fc6bfab9bfc09f39ea27b0e1ea730c46f2fce884beba3c0910cfb90db4d91615b0b5adc41d38abd86b8ae1d4f45d7988b7458a508ddae3078c3a4b17f4d749fc
+MISC metadata.xml 413 BLAKE2B 1260a55ff2cb6dfe291fa6d44fe1b4bd57d1aae615dc2ba20bad4161d10caaf5c61a0bc845de36cbd406b760ad8d2c91f7f6f59f76a9a282b73f652bf3ac2e1d SHA512 6dbca00c59174a55326bddf244b7279adfba86c3f5f2c21cb969304f7453679e5dab9ad2debb0d036c4c0a023c7d7bbef78a4cbcbda8dc2810637aae4acdd349
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/clearlooks-phenix/Manifest b/x11-themes/clearlooks-phenix/Manifest
index d59986335476..e18e44b07c58 100644
--- a/x11-themes/clearlooks-phenix/Manifest
+++ b/x11-themes/clearlooks-phenix/Manifest
@@ -1,4 +1,3 @@
 DIST clearlooks-phenix-7.0.1.tar.gz 319467 BLAKE2B c1ba52ef1ea8bca06e47a9ae3f37f764dd70a32239d758be7117de1b28422ba2bee0f9549e2b32adfb05eff38f864baaf2515d04e274dee80412c0d743f1ac06 SHA512 f304278429d6ea796c566a4b9301bcf146243bda24807b9f0f1367c8eeca488106c62f20bd17e7b4e32580b11e21c8c8515eb9ae4dfbdf9da52d6c3d59d7730c
 EBUILD clearlooks-phenix-7.0.1.ebuild 551 BLAKE2B 9b6435085d0f71c71e7202fe05c45413b07525d9dbe2928ca38fc4df53c8f93452ce834562558b393049efa7040f540dda51a870d7029ae6829b3ed3b45cf073 SHA512 e245e70bf5f523220fab08e60b52205aacb68c5d89e018c7042e4b6092a5e8df45957ad6d2429d1ff3a72b1bf4fd5c3653a4df8ca93c18c13d499b92503e440f
-EBUILD clearlooks-phenix-9999.ebuild 609 BLAKE2B 8f6d8d3bbea834ab25304bee526953119af957e74998ec8e47500b1697e1b81f77fca1ca8de26f39c82e3bedba5361c9b5eac006ca6fe70ed09557c5a3282d49 SHA512 4aab6a4ea22222c1ac3778d9607f03bd15b47d1352f107ac9dd317d41b8e89a992f2d2fc14f024afff00883f84567caa1f1023300313ce0c7a6008fc8cadcb06
 MISC metadata.xml 257 BLAKE2B 2ed20562a7d6d8df5e260b1da8a283a3674221a2b92ddf9215ef942b46b02e6a0075463f9d1b4783738ff9ea5b720b6de21fa5f116f9deae6973debed454dad8 SHA512 90da36260a95c749fc919bcea0eb97829f8fa40300a642e7cc77ef84fbfdf00cacc4298bdeaad30a470f00bc93ae91fdaec104a54f6d875e103a765a134d53c4
diff --git a/x11-themes/clearlooks-phenix/clearlooks-phenix-9999.ebuild b/x11-themes/clearlooks-phenix/clearlooks-phenix-9999.ebuild
deleted file mode 100644
index 77a28af9ffa0..000000000000
--- a/x11-themes/clearlooks-phenix/clearlooks-phenix-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit git-r3
-
-DESCRIPTION="Clearlooks-Phenix is a GTK+ 3 port of Clearlooks, the default theme for GNOME 2"
-HOMEPAGE="https://github.com/jpfleury/clearlooks-phenix"
-EGIT_REPO_URI="https://github.com/jpfleury/clearlooks-phenix.git"
-
-KEYWORDS=""
-LICENSE="GPL-3"
-SLOT="live"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:3
-	x11-themes/gtk-engines"
-
-src_install() {
-	insinto "/usr/share/themes/Clearlooks-Phenix-${SLOT}"
-	doins -r *
-}
-
-pkg_postinst() {
-	elog "The theme is named Clearlooks-Phenix-${SLOT}."
-}
diff --git a/x11-themes/comix-xcursors/Manifest b/x11-themes/comix-xcursors/Manifest
index 01cbe7ea47da..780335baa9e5 100644
--- a/x11-themes/comix-xcursors/Manifest
+++ b/x11-themes/comix-xcursors/Manifest
@@ -1,6 +1,11 @@
 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
 EBUILD comix-xcursors-0.8.2.ebuild 821 BLAKE2B f9fef8cf854fb50ba09379ed4b660ec3469dceeda4acdcb0fa1f7c68dccbfebc689ea7d78428bc5473fdd89d97fd05dd2e001008551b1c5cadcc202c3fcacbe5 SHA512 2723837e115c28546c0bab54141e41526a2ac80198fee578d26ad3375b3d75a2789fe5c4a4144e6c49e311da00ad65811767bf71ae9b7f73de21ab72c2b9e0d6
-MISC metadata.xml 373 BLAKE2B 1bda1cfafb37c6be2672100ac9ee876bcd54493e5685b78bb8a5495bf3f312cc2a541dad97bd9a3183699f0ac0974355858e5d4bac7256153fd947c8c0e379cd SHA512 fbd75a7ddfdd7cb04f8de73349da9f85063f2517d3efd44b8636b1f28471273b97ddd5326d84b81e5bb31d0d7027589b60df266437be19a71b2e44d6858280c6
+EBUILD comix-xcursors-0.9.2.ebuild 883 BLAKE2B 5fb4ced37b8008cbd354b5c547a7cd760b539847f141f0b95e363f6006b1e5c756de8654b7b86ecfe52c4a3cdf345406722c7bcab10f9bd2c89f17a15f7070a1 SHA512 48ead50146dcf011634f936a350a27b96a9b2548f0ded9d5457c687e96c5bf5a0dd4b541a6b4989bdde157f9c54f4e06713cca660b8f1aa9d89feaa4fe12b696
+MISC metadata.xml 488 BLAKE2B 0506dd184629decc5c47ca9c4c688e48694cbd454faa03b84271fcc789eb67a2e703136b28527cc3c669701642e44ee17948e247f69a03844f23221e4af07f66 SHA512 430cd50ad76a73150055f25635780868882450ea026816ddbfff359d2ec501dedc5c1d5f8b3259c8d16d45a99927835349c55aa1bf12ecc3130a5c75d89123fb
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/e-flat-theme/Manifest b/x11-themes/e-flat-theme/Manifest
index 9d9796181ef3..8f7f63ef19e5 100644
--- a/x11-themes/e-flat-theme/Manifest
+++ b/x11-themes/e-flat-theme/Manifest
@@ -1,3 +1,3 @@
-DIST e-flat-theme-0_pre20210315.edj 45126549 BLAKE2B 7daccefe83a24ba33714f0b76f4340024a4f98c6ed8e128fad9922e1eb7eab78efc0ddd553876afde192fe4a4b82abeadad2b9f91d808c8321da820f83a04a6a SHA512 8f024aaae1cc949a84bfee4b5b3486b2cd24b50ed05e96a0c8c0e2e958d1963d1007c2af4344ee9acfc91b71891a88a7a513cfd68f866bebffa323c29f3ac755
-EBUILD e-flat-theme-0_pre20210315.ebuild 1030 BLAKE2B 016e3a9ac92dbf1fcb207ff6c60f7b4c2e2fa87d45c343905853cbf859fcabc62c6cf7cac71b89f48fdec9421209ba204644992abaf16e641af314c361403e6c SHA512 6fa4e78403c498530a7d862d5f50fca147fb633b00b9d9d634f2d3e275efc8faf5048faf36238aa6ebb2919cf5a7a6eadbc7dd48fb9f366b3bdab2f88460aa69
+DIST e-flat-theme-0_pre20210330.edj 44891525 BLAKE2B 478ca3b566875ac82cbbd59510ef66b803c3bfd353bccf018f4e105a8c351d8a778b301c9483b9cd295cdc0b373a7a6f872a96c4dabf04a7230a6865960f4cc0 SHA512 e2f28b1d19807f949b48719916e1795cae08d616e1bac20a7b7b5b9f028fdd6ddb91b82bffb079e01fe271465cc6002a67cfc022402818d527ae601943d1a90e
+EBUILD e-flat-theme-0_pre20210330.ebuild 1030 BLAKE2B 016e3a9ac92dbf1fcb207ff6c60f7b4c2e2fa87d45c343905853cbf859fcabc62c6cf7cac71b89f48fdec9421209ba204644992abaf16e641af314c361403e6c SHA512 6fa4e78403c498530a7d862d5f50fca147fb633b00b9d9d634f2d3e275efc8faf5048faf36238aa6ebb2919cf5a7a6eadbc7dd48fb9f366b3bdab2f88460aa69
 MISC metadata.xml 279 BLAKE2B 8a35347a0311617855cc5b982f14aee93fd54de69d01d51525a613c788a8d7c50310c62fe1d50e53db598d38a8791bd377fd77b8017d9f435534920673ec45d7 SHA512 03d0a7c99f21ce2ef849387c80f61aaa85dc5ed4128f61a11bc5ef74d5566c255b5306d7c860003177e29a00d95f81ed739c92baaeeaa76b6fa565b5bbc45a1f
diff --git a/x11-themes/e-flat-theme/e-flat-theme-0_pre20210315.ebuild b/x11-themes/e-flat-theme/e-flat-theme-0_pre20210330.ebuild
index d9b011896102..d9b011896102 100644
--- a/x11-themes/e-flat-theme/e-flat-theme-0_pre20210315.ebuild
+++ b/x11-themes/e-flat-theme/e-flat-theme-0_pre20210330.ebuild
diff --git a/x11-themes/gartoon-redux/Manifest b/x11-themes/gartoon-redux/Manifest
index 605feceb8ac8..5d7f5c20db2b 100644
--- a/x11-themes/gartoon-redux/Manifest
+++ b/x11-themes/gartoon-redux/Manifest
@@ -1,4 +1,4 @@
 AUX gartoon-redux-1.10-rsvg-convert.patch 299 BLAKE2B 666493106c71681cc363019ac6e40688d4a8ca8160ef4f2ff9527d17178ee5cd51e7d0de336b48e4bd8e16e03828abc9d013f10569ec7e4a9e2ff19508ec7d35 SHA512 ddbdf1b6f86363192fd04870335ebc54e35c466bd06f153e521fe1ce9034104cb7f9fae752301eb1627217b1feb724a2313b832a8374c8a7aeb7f21dd692e8b7
 DIST gartoon-redux-1.10.tar.gz 2907834 BLAKE2B 32b0e7d6c210051f6deb29f0fb92ca1a03fad8b66c28172f4e5749d458362541be1010599f282df891199c75b9b5fa5e96b4d24ca45573ff0d04bd3b374898ff SHA512 fc5ab8ebbb72564d507a4d65d5ff91a7574321d3e4464d813d65fa3c9879a510cced45808a419d070e31b086d12543d2d415703a4733bc12766f705fae4d40a3
-EBUILD gartoon-redux-1.10-r1.ebuild 968 BLAKE2B d0f73da56c34b1e02185047502e90515aa88c536ea8b09cb4579ff5cf9a6555c2bc4b66edc4332adf1397b54012007f7a933289c3317f1b76ad8af61c564d7cf SHA512 c114056c171ff104ec83d1b355504e7aaf416bddf198cddee6a9f0f56261d79a36a92a321e604f37e7e5246cec18c6404f365033a15610c722e2dc674d3ada0a
+EBUILD gartoon-redux-1.10-r1.ebuild 949 BLAKE2B c5f288ef6e7b540468c0867d57e7cd8d442a65647d42ce5408d0af21f2af829e67dc851f5044a516278ae99107484677a45220c23eda94977f039e88ca00e5ba SHA512 bb68d8b9cd6b70dad182c1073f9012af46ff526563ec22f8c4547bc11cd745f1e5acba1d4dc1213c7f25f70cf4bafb5a5941d83f78208ddd4bcf3e09c4cc4a10
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/x11-themes/gartoon-redux/gartoon-redux-1.10-r1.ebuild b/x11-themes/gartoon-redux/gartoon-redux-1.10-r1.ebuild
index 7939398070e6..e4b5163588bd 100644
--- a/x11-themes/gartoon-redux/gartoon-redux-1.10-r1.ebuild
+++ b/x11-themes/gartoon-redux/gartoon-redux-1.10-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils gnome2-utils
+EAPI=7
+
+inherit gnome2-utils
 
 DESCRIPTION="A massively improved variant of the well-known Gartoon theme"
 HOMEPAGE="https://gnome-look.org/content/show.php/?content=74841"
@@ -12,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="
+BDEPEND="
 	dev-lang/perl
 	dev-perl/Switch
 	gnome-base/librsvg
@@ -20,9 +21,9 @@ DEPEND="
 
 RESTRICT="binchecks strip"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.10-rsvg-convert.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10-rsvg-convert.patch
+)
 
 src_configure() {
 	# perl script, not autotools based
@@ -40,6 +41,14 @@ src_install() {
 	dodoc AUTHORS changelog README TODO
 }
 
-pkg_preinst() {	gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-themes/gentoo-xcursors/Manifest b/x11-themes/gentoo-xcursors/Manifest
index 9067004ba455..5261a1c0381f 100644
--- a/x11-themes/gentoo-xcursors/Manifest
+++ b/x11-themes/gentoo-xcursors/Manifest
@@ -1,3 +1,3 @@
 DIST gentoo-xcursors-0.3.2.tar.gz 2035025 BLAKE2B 520dbb3f8fe77bc915bb60c81f2abf4fce1ee6fb349ae5064ff5d2fa10c0af7ba2dd00dc0b36f992c96169214c4ebd28dceb1ba069e638e5efab7088ba804fe6 SHA512 5ccbd2e8be7bda4da0578c5a08d967dded9dc4c9163eb96f629c0eaa548f2e46e85f7301de44d5be707cc63a988b925c9c222863da5bac9095dc5170ca9c4aea
-EBUILD gentoo-xcursors-0.3.2.ebuild 1447 BLAKE2B 6711b8aba50bfeb7269ef4ef70183375393a45dab8b6fc70f4d14106c040d3a40134432e0e16bc720bce7a777996d28854b9b72cf72959301ae655156668b49f SHA512 143094cd4be1bb0c5e985fb7f7e13e69ecc1129ede6a48cfe9e9ed139023f650b6cfbeb9596378775db08ad27c71e85541f67fd3a071e68b3a63fe01d9ff0dff
-MISC metadata.xml 600 BLAKE2B 097e4e69694f16ada94402152ee9a91575425dc864a48aa71ebdf0cb6de6285dca9dd40dc1840bbbc71fef9ee9e1eb4418b9ce310545fd1afa3bb3c9fc4f9aeb SHA512 655d258f0224993d38c582377c9c3d6eb436533db197fa9f25936734c794e3104bc739eed4823ea775dd1e3cdc5cb6e5bc020a6eab4932cb8fc2d5db6c6bbe14
+EBUILD gentoo-xcursors-0.3.2-r1.ebuild 1440 BLAKE2B a9b4bf070791fdec7be4d8966b63893807d8cea13eb2f6c0c542869185ec1b74cd00315d5423683b44e4edbe47fe75f48364da8e4048991e8104b951e144c964 SHA512 095534b14414735d5490862eb8224c48b06a729c691d040745cde1787bf99474d9653f148aad2bb2f57501919fedc757d0db018c605ce52578cb771422957c91
+MISC metadata.xml 624 BLAKE2B e084e7e1cf912c8c0a983299501e0eacaf9f0ca1ece46522060cb11b0485525b0805772e05895b28f9e7b98cb4eb751ef06aadd81744f96bbf8ae3cf9685f0bb SHA512 d851d545182cc16b235bc804005edabd96a5890f9ac45e16aad72edc743036e4bedd67c141c5ac86527d348444192e013b9344fb6d7465bf242a1fc67c191ca9
diff --git a/x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.2.ebuild b/x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.2-r1.ebuild
index ce5f58eb7696..f13b85327b3b 100644
--- a/x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.2.ebuild
+++ b/x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2005-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,16 +6,13 @@ EAPI=7
 DESCRIPTION="A high quality set of animated mouse cursors"
 HOMEPAGE="https://schlomp.space/tastytea/gentoo-xcursors"
 SRC_URI="https://schlomp.space/tastytea/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/gentoo-xcursors"
+RDEPEND="x11-libs/libXcursor"
 
 src_install() {
 	insinto /usr/share/cursors/xorg-x11
diff --git a/x11-themes/gentoo-xcursors/metadata.xml b/x11-themes/gentoo-xcursors/metadata.xml
index 5337cea475cd..10f42e36d150 100644
--- a/x11-themes/gentoo-xcursors/metadata.xml
+++ b/x11-themes/gentoo-xcursors/metadata.xml
@@ -13,6 +13,7 @@
 		<email>x11@gentoo.org</email>
 		<name>X11</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<bugs-to>https://schlomp.space/tastytea/gentoo-xcursors/issues</bugs-to>
 	</upstream>
diff --git a/x11-themes/gnome-backgrounds/Manifest b/x11-themes/gnome-backgrounds/Manifest
index 8250e225daa7..5f8fc0caaeb4 100644
--- a/x11-themes/gnome-backgrounds/Manifest
+++ b/x11-themes/gnome-backgrounds/Manifest
@@ -1,5 +1,5 @@
-DIST gnome-backgrounds-3.36.0.tar.xz 50499380 BLAKE2B bd2e211e15a0994f78fa28b3e43ea64cb47dbacf740bc7137f997b9212d453d038dd7aa1c9126aa7e6dd4ac7bbb8d5d10543661547b95b300760bce31a127389 SHA512 5c30b6e70a49e85ddea5a46a37c2f690e4c62c68d582f040dfd4ecdd6d50f364469e27c51115a7b1ba72edd58776ad2005d9bbcfef337570e50111e9443d4a21
 DIST gnome-backgrounds-3.38.0.tar.xz 41179824 BLAKE2B 27c2e7c4bad43b24127c85dcadc5ba912c9fed45b0d78414293b92822fcb9a855fd22c5163cbf99f234a083b3ed200abc00d66662fd0e23a92b9da84b1742ebc SHA512 01000409d6d54af81e520b8b292c24bb64e763a493c69cf71cabb9f885c7feee5a1805db40e2d0544834c40b7866f889c106e9816fd8e8b8f5273b0a099f1488
-EBUILD gnome-backgrounds-3.36.0.ebuild 450 BLAKE2B 07b50e84a15b954fefa68547487cfadf8ceeade345fdca2c8d64e040d7015b56c2af5de327a8e4725a4d74e61e3c3f5c8ca10c9f1430ae750b2ac1cea5c17b9c SHA512 4755801c86f8b49ea0b08d0a289aa75737d5e6abdddd831c8a2526ee558f7a7112b97ff8af4ded046999317bafff13d5839c234f9360f14aa276c77bcae850db
-EBUILD gnome-backgrounds-3.38.0.ebuild 451 BLAKE2B 6a064704b42b97c1885939bea3270af2fe63db3ec97d96f1c3df862762fde5b42cb3d9fc7e1ad12ccd24dc7d7e06c57b3609c6e1c4fa430755414cd01308c0d6 SHA512 0790f8717eeab0aee4f6b538e63d0f8d01b8fca4173d0750df155ebd67f7109b87b0f9ed9c0e74354917abd145484ebfa85d49751f54c5014203063b9b600a37
+DIST gnome-backgrounds-40.0.tar.xz 57703164 BLAKE2B f6f32efb6563957c9e2a7fe9c124d2fb705d2f33b93f9d65e5e20b08026ee9cc7fd80d687754a8108c1073f2ad1cf28c56d6896fdb7cb1e2f48d2b11bfcafcf5 SHA512 d7e01c956c9705a4278717db999ccb965a1113059f1d1646fd24a8294482ea067c64edba53de2cd97a0d814e89619e77f6d667e272185c98701437a746eeabd8
+EBUILD gnome-backgrounds-3.38.0.ebuild 450 BLAKE2B 51b548cc5fd5a83c053daad1d7a2e7524d063c43f4d58077e46c0a6d9f3710d0b8eb136a350396df6c095bd1d39dac422e60d931a2baae9244dcf6357bf7c866 SHA512 5d82934e1a1014f2e5e4acc565eb0d68f9abfda9df8ed30457856953a6f6e9971ed11a897c058b91b51ada1609df769176bec0510d8a812ca2dfb4cf5b59072b
+EBUILD gnome-backgrounds-40.0.ebuild 452 BLAKE2B 75fed1f5c26c58dc74b61819f292357ffe69904edefe32e468131d99504b34b36077adf51f48c5a39a1d829a57db7f119622993aa2606b6fd2cd3e36606a0433 SHA512 1fce9fb862b3b544a212912429d95fb77a96d39a275d4d3fd9ba19cb010b1f7c96ae29ce026d796a9cc6017df49f9f10aea62d455d4741008de2a61858c7b3fc
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-themes/gnome-backgrounds/gnome-backgrounds-3.38.0.ebuild b/x11-themes/gnome-backgrounds/gnome-backgrounds-3.38.0.ebuild
index 98dad8e95bb7..92e0c2d0968b 100644
--- a/x11-themes/gnome-backgrounds/gnome-backgrounds-3.38.0.ebuild
+++ b/x11-themes/gnome-backgrounds/gnome-backgrounds-3.38.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-backgrounds"
 
 LICENSE="CC-BY-SA-2.0 CC-BY-SA-3.0 CC-BY-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-themes/gnome-backgrounds/gnome-backgrounds-3.36.0.ebuild b/x11-themes/gnome-backgrounds/gnome-backgrounds-40.0.ebuild
index d889b2e4937b..9c26a1539f41 100644
--- a/x11-themes/gnome-backgrounds/gnome-backgrounds-3.36.0.ebuild
+++ b/x11-themes/gnome-backgrounds/gnome-backgrounds-40.0.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://git.gnome.org/browse/gnome-backgrounds"
 
 LICENSE="CC-BY-SA-2.0 CC-BY-SA-3.0 CC-BY-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-themes/gnome-themes-standard/Manifest b/x11-themes/gnome-themes-standard/Manifest
index a79be649b6f2..687658da3455 100644
--- a/x11-themes/gnome-themes-standard/Manifest
+++ b/x11-themes/gnome-themes-standard/Manifest
@@ -1,4 +1,4 @@
 AUX gnome-themes-standard-3.22.2-exclude-engine.patch 1893 BLAKE2B 416f89fb438ced13d04ed94cb7a8504fd0cf664bd61a8a30e703f8c0e9afb16407c34ed14dcb395f9c9a4d19d3d90c1d73f2a64f2acb3de34b6d9ba6a649afe8 SHA512 9b7f4efdce158485850e12566dce91a7b3494bae8191bcacb581a737dde15bcce9b10af8f28ab920605e86008744ad380312f26fc3d624bada910599501159f9
 DIST gnome-themes-extra-3.28.tar.xz 2953272 BLAKE2B 122ff5f1d95086c5cad6818efa79763ab574b7d6792b846198ac7ed5b521747d4357025ebd0ac6b5ea1161bf1dd3482ac2e867822bf863928b05a8486172ba0d SHA512 bccc446e86b12476b86a0fe2e3354500c8fb3eef62a85c3823d69aaa259e032e1f94e7993bf633397b669c425ef42635b0cf17b376f0b7cf1869bb1d7160ede0
-EBUILD gnome-themes-standard-3.28.ebuild 1009 BLAKE2B 05b579343ef16c91ae2e6a87c3ae0a83e312a1e23eab2e5dbdc0a8626e27f47c77677a1c3e771323d3d882cc9c4c15de1f334c4c44f87a03f4db2e1c3f840ee2 SHA512 19801fb2083a4ba9aab4cd291b4a2769491f283791c0568891c56a7587f1c1f037ff44feba2368b36203eb9f69a2b64de675fd406e3a306887c64ccf741eff4d
+EBUILD gnome-themes-standard-3.28.ebuild 1010 BLAKE2B 7766e397aea266c8d22de942a53e1fe518cd2fd735bdd4dedb14f83f92a5608f68224e4cc3e28921cf9035d7c4abe11fe242b8059061ac679ce429bebea6e664 SHA512 a608a74889c89fd16ca7240224310ba4b2d1e11f0fe1543f82a96e31e9ebc417eb662cbad06aaad4a2137be5d6922c46f08f3dc08f0ab192e300c3824f2ee2e7
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.28.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.28.ebuild
index 1411f1b518ff..5df61e130b23 100644
--- a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.28.ebuild
+++ b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-themes-extra"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 # Depend on gsettings-desktop-schemas-3.4 to make sure 3.2 users don't lose
 # their default background image
diff --git a/x11-themes/gnustep-neos-theme/Manifest b/x11-themes/gnustep-neos-theme/Manifest
index 4ba4b0271732..7be82d1d487b 100644
--- a/x11-themes/gnustep-neos-theme/Manifest
+++ b/x11-themes/gnustep-neos-theme/Manifest
@@ -1,3 +1,3 @@
 DIST Neos-0.1.theme.tar.gz 63018 BLAKE2B 3fc90eb3819a80b64b32d9fd30e8f9f2e48c96c7ea03117df81073f85f248790ce0463fe7c8ca23d5a5241b291ad92190632b95d60c33e54576342c156a373b2 SHA512 9c8c404d2a67c77f64dec94b9828ff54e48360357e7dab5d374481a0249998e93a23a32344bf8ebfb9c1a5822c553265903e6c6cb576be3e8123c68b114e2874
-EBUILD gnustep-neos-theme-0.1.ebuild 702 BLAKE2B a107d58aac36b3c3a995a02728f27594de3d8e5b4a907c0c6dc13d3220c197bf735e392dc01912bc5b7de2c0975b6e416b59d217448c4c1b9f8639545c2bbb2e SHA512 5443000e64f416beb8f770dc71597acd2e1ab27c10ad7f85d2fc563e536ea8d2a5c3f5c3dfb2be4065a4183ecfd273df4cd7165848ba60bd473aae155b823362
+EBUILD gnustep-neos-theme-0.1.ebuild 695 BLAKE2B 6f22f7545dc8d772a4684e1b9350ff4d22987f94ed0600bc2a48dfd9e01b66dded19999aa29fdfff1d2dedd1147ac1ef929e7c384ef67642829d3ef6e1c8694f SHA512 9b3490c2f256ea9e721ff10d988444da1f12dce2a4e384236e398fb0cddeeba9ba28e157c6a614bef934f5827a2cd4319d52f60d83b54d9eac5ff164d55945c4
 MISC metadata.xml 637 BLAKE2B a1264e965704e6c71bc5fbf543cf1958fc0943dfe762ae5f1817b17997b9ad1048318da73c1567459da916ea5cc5352196ab3f1e6a2b96a491a1071b85b5b0c7 SHA512 5a5d44b5c66dd38f3bb5e70dc09e46c770c1e2f8f93b2868b9b5e9ea9b7654e3d299a22877a6821736e0b4e6091a498751b181c4369ba05fcb1aebb818ce851a
diff --git a/x11-themes/gnustep-neos-theme/gnustep-neos-theme-0.1.ebuild b/x11-themes/gnustep-neos-theme/gnustep-neos-theme-0.1.ebuild
index 37f68eabdf9e..a06b099d78ad 100644
--- a/x11-themes/gnustep-neos-theme/gnustep-neos-theme-0.1.ebuild
+++ b/x11-themes/gnustep-neos-theme/gnustep-neos-theme-0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils gnustep-2 vcs-clean
+inherit gnustep-2 vcs-clean
 
 DESCRIPTION="GNUstep theme closely following the original NeXT look and feel"
 HOMEPAGE="http://gap.nongnu.org/themes/index.html"
diff --git a/x11-themes/golden-xcursors/Manifest b/x11-themes/golden-xcursors/Manifest
index 36d172060686..07ebd5c54f93 100644
--- a/x11-themes/golden-xcursors/Manifest
+++ b/x11-themes/golden-xcursors/Manifest
@@ -1,4 +1,4 @@
 AUX README.gentoo 555 BLAKE2B 234694a3bf671c5dc30af125a6dfd95bc75574e5ae40a7f5df2d8629504835dff6fce0e0c351de4d978c951f73580115c7e174e23be3f3c3250cafc48bde7368 SHA512 f6312da0a054328109f16f7d056bcb79c8109bed332544b8a57102c19f16d3a09ce1734b44af0180759612414fb5cd714c2555a15c231d8b851532db0edf0736
 DIST 5507-Golden-XCursors-3D-0.8.tar.bz2 752331 BLAKE2B 70051f961a891902a125182f24c1d80a295842cb82160030d92c5b95276491bccd521c4d5cb1e3b34522dae4689b4d5d4cb95d2a6440223e6bf91550b3dac076 SHA512 b0098742afae6c18f80150b3c82ea8be0da4d71eabaebc1eb51d52b2300faab683c794fccbe46162109b09a0a00f86e63228bfcd296f97c1c54dd5c113063049
-EBUILD golden-xcursors-0.8-r1.ebuild 640 BLAKE2B c74c2fc4284b84eac845ecaffb1a37de378d688277c7971086f17b932f7f625bf3b0236b8c76989fd1daa893d663a1acdd93dc1fac183b092b2b6000c21c2e9e SHA512 9638235af96672db9d6df399753de4e6c45856c484e5e4eeff7a14dc925c49e22d00ef0903b55b6d8277d9f588b2394d2f91ad67ce1d72724e4a3b9f2890bb06
-MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
+EBUILD golden-xcursors-0.8-r2.ebuild 596 BLAKE2B ed8c126bdad69edea9323a6a24d04954100bf4f5e04dfe3037a1704dd8335f4e7ab4b52fd0ce2016e2341f09a133ec949877a3373b4249de23d73c0cf8c385f5 SHA512 d3792ed5aa3635b9be3fc480c4d6f496f1cb5c23f6c0a0dc15b855e1f14f5b43c07297c2d01bcb4d3db17162f0701f0abe7e06eeeb7516ff4a99d51f83105175
+MISC metadata.xml 300 BLAKE2B 2e7b335e362ca748b158cae23162dc80012ea9195ba704d12a85f1136409e9525b144a1af16c52fabe6a9c45b2553a4a78673d8267d56f4506ebc1614eb82af2 SHA512 5309fea86ffe482382a564dce1ec6aa4163e3a34d8e0c6ad47db2fcbd5c4769c31cb04397b547c16fe3bb06c447d54b92956a637a8be95d94435d6ad6230a47a
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/greybird/Manifest b/x11-themes/greybird/Manifest
index fde2d8dc1180..dcf47567676a 100644
--- a/x11-themes/greybird/Manifest
+++ b/x11-themes/greybird/Manifest
@@ -1,3 +1,3 @@
 DIST greybird-3.22.14.tar.gz 283933 BLAKE2B 68f0b71dc71d260cf8f2a6971fac15ecedf345655309558c600848b531b3338ba3670c09c13182c24baa90f2fec24fdacc7498ee12bc1b1f00416bf12f68ac39 SHA512 766099b80eb81cfca07b52671e721ab281bb120ea252e369be2f83b6f38f1b7be5c0a2cc2d25b35f565063589e28982393f5c911b8c3ade608999339c93a490e
-EBUILD greybird-3.22.14.ebuild 775 BLAKE2B ddd39cb7f4b09694478916973516ec033622011970834b34d239d13922b823c5664d45be309764aca4a0f3cc9eb0142260f95a57e6289a66afd804e5bf11d881 SHA512 214ba180ec0781f23e0f7c4d8453c8ada7588787a6d31bbf64e9f2a9ac4b7886b5e6df7c868b99efcf677f9ee6b8e3ae4e6195ea22399b86b30103bef4c0b6ef
+EBUILD greybird-3.22.14.ebuild 736 BLAKE2B 77b6854e7f1d50259f2e9f60bd7650d9eba04ee4f2b9df8a6f1021327d64b1a3b44aa0a3e5dce525f153277206e741053e90de7df0033925257abc8bb2ac4894 SHA512 899cbe8016ccc5624b704b946eb1d0fd672dbdd5e5f0424a028387153bd48573ec87b7b7d84bcf1986657989b1c867cdf7ab5ea17a30726e1d8cc680ff2f8790
 MISC metadata.xml 603 BLAKE2B 693742db014373336bf55cf57b7366c1e642ee4a5b6933495d4d44bd740def1e680ed5feee7664f2268e5869b0ab9971071e2c0c376013800fa458681661657a SHA512 7daadf572dca60c73cb5bd6bac4104677704839a7a609246984dce35e0f59cb7cba116cf0bd0c077f3312bcf6aae65df2a6ddb0bcc7ee82110358aa1e0168e7a
diff --git a/x11-themes/greybird/greybird-3.22.14.ebuild b/x11-themes/greybird/greybird-3.22.14.ebuild
index 9b41f8fae753..4cece2ecfb02 100644
--- a/x11-themes/greybird/greybird-3.22.14.ebuild
+++ b/x11-themes/greybird/greybird-3.22.14.ebuild
@@ -25,7 +25,6 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${P^}"
 
 pkg_postinst() {
-	elog "Optional uninstalled features:"
 	optfeature "matching icon theme" x11-themes/elementary-xfce-icon-theme
 	optfeature "matching cursor theme" x11-themes/vanilla-dmz-xcursors
 }
diff --git a/x11-themes/gtk-chtheme/Manifest b/x11-themes/gtk-chtheme/Manifest
index 7ec789f1791a..9e132be4171f 100644
--- a/x11-themes/gtk-chtheme/Manifest
+++ b/x11-themes/gtk-chtheme/Manifest
@@ -1,6 +1,6 @@
-AUX gtk-chtheme-0.3.1-asneeded.patch 798 BLAKE2B 400934bf1efea7ecd2f9e520e925a44018e1f5121fe8eebbf5c9e973f0dce926e32c4f139f78f07d9822dcc1364859e23625073cbdb05b5b8f2ba69d39bcaf5e SHA512 9570974f8fdca357c1787be5856f3b7f5201ba8b9a8892cf2dc235a1dedebadebba8ba7858a062d334aacfca450f0344ef3f4c10811d5f9c89921416e7103d0c
-AUX gtk-chtheme-0.3.1-implicit.patch 542 BLAKE2B a74777d479158e923ab3ac3891705813e389085c295a0733e5750c8c3071685775975296cb743ebf24fac5c55ac55e1617918a3d9c3545f5d62b68cc3921ce20 SHA512 94ac90e53b49bee88b09d4c54671bc0bb8e7dc2767c52bc7821aaf114edb1b75bfd2f1eb8b45532d0338f03cd29b29f40c3ffa00efacd0d1daa8bd82dbf88d3b
+AUX gtk-chtheme-0.3.1-asneeded.patch 726 BLAKE2B 378d9a3615a814904830c5b1104f5479fb49cd0f70fe8915588375cf9d169c78aa5422609034caa3ca8624a664942375d91d671f861bd1dacea6b8e86b837a5e SHA512 0ced6e25eed65c68de1a203694595743cc87d4701bc934de291bca2069a1f95be13afb0c13d3bb590692bd49ec5363f74fdb06e1afaa94c8a8233dca9ddc19e8
+AUX gtk-chtheme-0.3.1-implicit.patch 364 BLAKE2B fafbaf600fc40590e4d697a11e53bf66a968f9655d0114079ee3b4f4779aa4d01ca7e76f7b20c61e52fdf7d1c0533057b44b6448e02a0d8d7902013461b64e5c SHA512 642573a4ef8a73f303a62cd84b7b778de2abb8472bf9fbcb22b74f6b5a5af37a8ce023c245713957c18c3081d113c82bc2f28d22b7b08fc872e049116a3f51a8
 AUX gtk-chtheme-0.3.1-qgtkstyle.patch 484 BLAKE2B 4138c7f0c7b7f7256db7a334381002bd7c90b9a715d5a59fa5f05773299fc14ad3bd9b6dbda9e3e95ec0a98d9386036ab705fddbe93ac122cad01de4c6abd360 SHA512 8a3ce1278155dfa61e69fb639829b652d21dd0946578c6ac0e371cae2e54ea2834cbd15c7124fc02fd2839feda29184b41cd45205d0b56c368435cb1fdfbd1d7
 DIST gtk-chtheme-0.3.1.tar.bz2 18205 BLAKE2B 628f10656be4560c476b74b4c1379a4bafd1cc6a6593852bdce352919663fa10519494ca5cac3f920b036bc7a06f045488635bce91148ebc94613aae1ecb8d3d SHA512 162cdafe81294621f43c5aab550d6bda08a07f9f23456b82d9e885b677ed9e56ee6f602c86ce5b6f2dac5bab91a09d9e97bb07e59c9a393867410bcdcff375dd
-EBUILD gtk-chtheme-0.3.1-r3.ebuild 910 BLAKE2B 18d0ac219749f884543c5ca4a9faa10c03fd243c70e55a76a6c6c493d8fb60fd9d07a109b7691177ab4f445f3540cbb88ce87b4cc8c12c058adfc723f506a244 SHA512 4c0275c2001a8e846848d7d0bcdb51ea23017b2652cd83d4d48f296f8e17696c6522a1b61d9a1e959d10486ae389dba149aa7402252f9372fa28194f8cd4bc91
+EBUILD gtk-chtheme-0.3.1-r3.ebuild 903 BLAKE2B bc5f730b113c438f4fc6288331ec6b5d18e94e0d04215af03fcc871bb2cebf9efca24fb80a2207e345aff406dc23fd24602fe5732b0d25b4c5d472eb3c13a804 SHA512 9a0ec35cdb9e3586b7c0ce4af5546e39ac61c87f2dd1a1a15fcd362a374fb66533151c333635ceed827deba0c15dc1b2125b84633c3764dafbd699b8cf70c088
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/x11-themes/gtk-chtheme/files/gtk-chtheme-0.3.1-asneeded.patch b/x11-themes/gtk-chtheme/files/gtk-chtheme-0.3.1-asneeded.patch
index 8cceb98a7565..2fabd7d7c6f2 100644
--- a/x11-themes/gtk-chtheme/files/gtk-chtheme-0.3.1-asneeded.patch
+++ b/x11-themes/gtk-chtheme/files/gtk-chtheme-0.3.1-asneeded.patch
@@ -2,8 +2,8 @@
 # Fixes issue with forced --as-needed
 #
 # https://bugs.gentoo.org/show_bug.cgi?id=248655
---- a/Makefile	2009-02-26 00:43:54.000000000 +0100
-+++ b/Makefile	2009-02-26 00:43:32.000000000 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -2,7 +2,7 @@
  
  CFLAGS := $(if $(RPM_OPT_FLAGS), $(RPM_OPT_FLAGS), $(CFLAGS))
diff --git a/x11-themes/gtk-chtheme/files/gtk-chtheme-0.3.1-implicit.patch b/x11-themes/gtk-chtheme/files/gtk-chtheme-0.3.1-implicit.patch
index 7d9f18cc6b55..6b448ef715e4 100644
--- a/x11-themes/gtk-chtheme/files/gtk-chtheme-0.3.1-implicit.patch
+++ b/x11-themes/gtk-chtheme/files/gtk-chtheme-0.3.1-implicit.patch
@@ -1,6 +1,5 @@
-diff -aur gtk-chtheme-0.3.1-orig/Makefile gtk-chtheme-0.3.1/Makefile
---- gtk-chtheme-0.3.1-orig/Makefile	2004-02-09 12:08:41.000000000 -0500
-+++ gtk-chtheme-0.3.1/Makefile	2008-06-27 12:19:02.000000000 -0400
+--- a/Makefile
++++ b/Makefile
 @@ -4,7 +4,7 @@
  
  LDFLAGS = $(shell pkg-config --libs gtk+-2.0)
diff --git a/x11-themes/gtk-chtheme/gtk-chtheme-0.3.1-r3.ebuild b/x11-themes/gtk-chtheme/gtk-chtheme-0.3.1-r3.ebuild
index a196e1faf27d..bd7dd770de66 100644
--- a/x11-themes/gtk-chtheme/gtk-chtheme-0.3.1-r3.ebuild
+++ b/x11-themes/gtk-chtheme/gtk-chtheme-0.3.1-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="GTK-2.0 Theme Switcher"
 HOMEPAGE="http://plasmasturm.org/programs/gtk-chtheme/"
diff --git a/x11-themes/gtk-engines-adwaita/Manifest b/x11-themes/gtk-engines-adwaita/Manifest
index 5c6536ac95f9..b927afb14e55 100644
--- a/x11-themes/gtk-engines-adwaita/Manifest
+++ b/x11-themes/gtk-engines-adwaita/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-themes-extra-3.28.tar.xz 2953272 BLAKE2B 122ff5f1d95086c5cad6818efa79763ab574b7d6792b846198ac7ed5b521747d4357025ebd0ac6b5ea1161bf1dd3482ac2e867822bf863928b05a8486172ba0d SHA512 bccc446e86b12476b86a0fe2e3354500c8fb3eef62a85c3823d69aaa259e032e1f94e7993bf633397b669c425ef42635b0cf17b376f0b7cf1869bb1d7160ede0
-EBUILD gtk-engines-adwaita-3.28.ebuild 1046 BLAKE2B 199830836dc938eb2e658b4019360c6af54cbfcbabe156947e92ebe8bb2367d956e129ae0ae1f5337a68a4f7ade5de1fecec8e296c4117142661d9f56affe72f SHA512 bf888eddd0051d8ee24d493e0008b0ff55ac0cc458ad3f4cb1572865b598c15b469934724c1ed260db1c655fdd142d94526c9813b96a4017ce30f754b0c9f3ca
+EBUILD gtk-engines-adwaita-3.28.ebuild 1047 BLAKE2B c5a9a4ff6df6c0366bbfbbaa255c7d8c19f59afa63b65136730fbfe6bc04be03c4e4076e8cb3d7678a70e46a171ea597949022ef71c87ff03580da7ca40d6775 SHA512 fb437f1e72a499c86c050659edd825ea7ca9877b957156235d50c4557668ae23e9d3144c3bd916bd0da639966701b5c05af03d9430940e9939cd83d790e9caf1
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-themes/gtk-engines-adwaita/gtk-engines-adwaita-3.28.ebuild b/x11-themes/gtk-engines-adwaita/gtk-engines-adwaita-3.28.ebuild
index eb94c0181f60..ca21345a86d9 100644
--- a/x11-themes/gtk-engines-adwaita/gtk-engines-adwaita-3.28.ebuild
+++ b/x11-themes/gtk-engines-adwaita/gtk-engines-adwaita-3.28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-themes-extra/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	>=x11-libs/gtk+-2.24.15:2[${MULTILIB_USEDEP}]
diff --git a/x11-themes/gtk-engines-aurora/Manifest b/x11-themes/gtk-engines-aurora/Manifest
index d07f375d42ce..f0f26afb6256 100644
--- a/x11-themes/gtk-engines-aurora/Manifest
+++ b/x11-themes/gtk-engines-aurora/Manifest
@@ -1,4 +1,5 @@
 AUX gtk-engines-aurora-1.5.1-glib-2.31.patch 229 BLAKE2B 5cb08af273de69609a4c0a08f88381e3e2bc044cc7af72ba181deb9c4bb515d88f5b1e75cbb5bcd7f955adfc111a13b18b2e9b0bce2bdebc563c37a5848895a1 SHA512 e5620b76eb4c9423eb6412d23c2bfdefbcb5467f24cedc2e73299e4857c87ee84b57081d7996dc56c858f14bda2bfd7dbe004555f2d54273ab441b749611308b
+AUX gtk-engines-aurora-1.5.1-slibtool-undefined-references.patch 900 BLAKE2B 7e2212190a443ebe152c23f276beb6b2883887b7950440983c1973c7624e9ec4f175ca0edd7a014e884954f4610b0d81bb31a484b5208c6bde5ce022bc297b67 SHA512 4929a84c927577e7509cd25fbbf9bf7355ac0ec42e0da2eb692078ec1cb0e8152203d7c5d24ae17d93b0603b0cef61a558c6c6e18b3384add4bed21f55471f34
 DIST 56438-aurora-1.5.1.tar.bz2 371792 BLAKE2B da4a06c5fc51e74e536a1f6ff9934b4312cd74f61a885b958139300a3e5f9e19a2b70fa6cbfd9317654b70cc73cf1b137a6c8e08c97656d1a815b746948f2dca SHA512 d8e2a2b071ff66597232f8dd681324cba9b649c9884b69b8135c83de23ff371baac0420968677ea1e28153953b7b5a0a26c2cfba20ef95179d9140e9a9faa67e
-EBUILD gtk-engines-aurora-1.5.1.ebuild 873 BLAKE2B 727acc9b5686a64c6526b0c2afbb9ef3c4f79a7142c4faf4e515605911102a226ae58892e32b5dadb29e207e48e8f7962b4f19cfe71f6ae84f68e0b7ca9bc065 SHA512 0c8d91a76d08dbef1e623b6ba54c7d01157e95930277e18e676147c12da8ae2a01eaabfc81339a521c59fd3a50906394be642f33c0803b42af43844a552ada1b
+EBUILD gtk-engines-aurora-1.5.1.ebuild 929 BLAKE2B 8d7a260d8d2265a72f6571dc0aa575a077e7984558dc6ff58ffac48b54e57d8eefdff23f1b8d355f004ed58af0ee7cb3c0c9d26c2ccecdfff38da187e637eee1 SHA512 ceab1a8908f1eb67ded67cfbf7e2873c9298331d136f9cf0328269aacffda0de9e04ddcfb922a488706fa64e5ff9d16969c13dae80e2d5dfd051c25e1bf8b1e0
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-themes/gtk-engines-aurora/files/gtk-engines-aurora-1.5.1-slibtool-undefined-references.patch b/x11-themes/gtk-engines-aurora/files/gtk-engines-aurora-1.5.1-slibtool-undefined-references.patch
new file mode 100644
index 000000000000..b88f21cac82b
--- /dev/null
+++ b/x11-themes/gtk-engines-aurora/files/gtk-engines-aurora-1.5.1-slibtool-undefined-references.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/779406
+
+commit e55f6880d6bb649b2f1bd55c31bd4ba6265ccae0
+Author: orbea <orbea@riseup.net>
+Date:   Tue Mar 30 11:54:33 2021 -0700
+
+    build: Fix undefined references for libm.
+
+diff --git a/Makefile.am b/Makefile.am
+index 16d29ea..09a51bb 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -22,4 +22,4 @@ libaurora_la_SOURCES =		\
+ 	./src/config.h
+ 
+ libaurora_la_LDFLAGS = -module -avoid-version -no-undefined
+-libaurora_la_LIBADD =  $(GTK_LIBS)
++libaurora_la_LIBADD = $(GTK_LIBS) $(LIBM)
+diff --git a/configure.ac b/configure.ac
+index b1c35e9..9b446c3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,6 +20,9 @@ AC_ARG_ENABLE(animation, 	[  --enable-animation      compile aurora with animati
+ 
+ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.10.0,,AC_MSG_ERROR([GTK+-2.10 is required to compile aurora]))
+ 
++AC_CHECK_LIBM
++AC_SUBST([LIBM])
++
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_LIBS)
+ 
diff --git a/x11-themes/gtk-engines-aurora/gtk-engines-aurora-1.5.1.ebuild b/x11-themes/gtk-engines-aurora/gtk-engines-aurora-1.5.1.ebuild
index 2a8bfa1c6b8c..68deb8904145 100644
--- a/x11-themes/gtk-engines-aurora/gtk-engines-aurora-1.5.1.ebuild
+++ b/x11-themes/gtk-engines-aurora/gtk-engines-aurora-1.5.1.ebuild
@@ -4,10 +4,10 @@
 EAPI=7
 
 MY_MAJ=$(ver_cut 1-2)
-
 DESCRIPTION="Aurora GTK+ 2.x Theme Engine"
 HOMEPAGE="https://www.gnome-look.org/content/show.php?content=56438"
 SRC_URI="https://gnome-look.org/CONTENT/content-files/56438-aurora-${PV}.tar.bz2"
+S="${WORKDIR}/aurora-${MY_MAJ}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,9 +19,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/aurora-${MY_MAJ}"
-
-PATCHES=( "${FILESDIR}"/${P}-glib-2.31.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-glib-2.31.patch
+	"${FILESDIR}"/${P}-slibtool-undefined-references.patch
+)
 
 src_unpack() {
 	unpack ${A}
@@ -40,5 +41,5 @@ src_install() {
 	doins -r ../Aurora/.
 
 	# no static archives
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/x11-themes/gtk-engines-qtpixmap/Manifest b/x11-themes/gtk-engines-qtpixmap/Manifest
index 0323dbc7143d..e80c770abaf3 100644
--- a/x11-themes/gtk-engines-qtpixmap/Manifest
+++ b/x11-themes/gtk-engines-qtpixmap/Manifest
@@ -1,4 +1,4 @@
-AUX gtk-engines-qtpixmap-0.28-gtk_switches.patch 3612 BLAKE2B 9204941c5a2dbd925460b13b65ba7abfdd2eb8c09fc88ee4038e38dc11fdc022e5ec0925ce24579b14aac2f72dbe9835896c7f214e1b64776de45012f35da578 SHA512 2e3162f85cde2f2ba4e0cf6e9812af53a3e0802a9e47f1a993bc9c8ccd559c2f71d6781189ffc765d54fdbe725a36165d9a5addabab12f30a471ef5982d8750a
+AUX gtk-engines-qtpixmap-0.28-gtk_switches.patch 3434 BLAKE2B 413b34d387d2b621ba8561afb897ebd3157df158cee7b78e93266821e3b7993cf007c337d55bbcc5fc11f05c1bca57088e3444cec58a68930ebfdc638dba0a94 SHA512 b3f849bd691488cfab596f85fbafcf0e0736a0766bac25c256d7678ae874229cdb038aa9085f1fbb73cb573ed47400fcee20dc8c095d8a4802708adf84546bf1
 DIST QtPixmap-0.28.tar.gz 429698 BLAKE2B 4010cc922bcbae1a049f119a6ca5b90b73dd2e082770f2a83d2c4760f0a0920578d59a65849c2c3b2d18409aad7a5542bc36cf1137ca240b55dc46c3f5aa0fbe SHA512 42a16ed163ed12665d5db587bec3babcd5d802e63a3c282a9382041dc22e0dbcdfc9ae739b8ce224525c877b31f9c615d2c731a633722151a9b1185621a96e55
-EBUILD gtk-engines-qtpixmap-0.28-r2.ebuild 1006 BLAKE2B 2d8e60437bcead9949e8c8572ff5d4d783a23fd03fc7028cd7eb0a15007dd75c6905c47b9a89ee6538ef5bfe169a25d54e440bc0d20494b329e30d40dc1a8521 SHA512 9da574cf99907b750ac2847b88d77e8479973c490a5eed4ba8e0ef5d82df2e2b8041098fd227cca116016fcff6ba1a0bb294d6244e9e3eb1822f0a7b2fb21c0b
+EBUILD gtk-engines-qtpixmap-0.28-r2.ebuild 1034 BLAKE2B a35e14f915513ea70f50fe9d1ffa81ce69c5114759323c0ed9caf83167cb743834421bf4a22f9309ed8c11a648d19e638dc5fb698df6530852808a9b55b7e1d6 SHA512 d91e02a7668bdbef35baa6cb083d305c7395c2f21ecc428b4aac9a25a3300676f47a965f82cefad4b4535aadd1401abcb81cbd13d0b7c5a13691815ba551fd24
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-themes/gtk-engines-qtpixmap/files/gtk-engines-qtpixmap-0.28-gtk_switches.patch b/x11-themes/gtk-engines-qtpixmap/files/gtk-engines-qtpixmap-0.28-gtk_switches.patch
index 8f5e10d6681c..4ffbe414554f 100644
--- a/x11-themes/gtk-engines-qtpixmap/files/gtk-engines-qtpixmap-0.28-gtk_switches.patch
+++ b/x11-themes/gtk-engines-qtpixmap/files/gtk-engines-qtpixmap-0.28-gtk_switches.patch
@@ -1,6 +1,5 @@
-diff -NurdB QtPixmap-0.28/configure.in QtPixmap-0.28-patched/configure.in
---- QtPixmap-0.28/configure.in	2004-02-03 06:26:07.000000000 -0500
-+++ QtPixmap-0.28-patched/configure.in	2005-08-02 21:59:35.000000000 -0500
+--- a/configure.ac
++++ b/configure.ac
 @@ -19,23 +19,28 @@
  FOUND_IMLIB=0
  FOUND_GTK2=0
diff --git a/x11-themes/gtk-engines-qtpixmap/gtk-engines-qtpixmap-0.28-r2.ebuild b/x11-themes/gtk-engines-qtpixmap/gtk-engines-qtpixmap-0.28-r2.ebuild
index 7d4a1d4adf07..449e98283a8c 100644
--- a/x11-themes/gtk-engines-qtpixmap/gtk-engines-qtpixmap-0.28-r2.ebuild
+++ b/x11-themes/gtk-engines-qtpixmap/gtk-engines-qtpixmap-0.28-r2.ebuild
@@ -1,43 +1,40 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
+EAPI=7
 
-inherit autotools eutils gnome2
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+inherit autotools gnome2
 
 MY_P="QtPixmap-${PV}"
 
 DESCRIPTION="Theme engine based on GTK pixmap engine using the Plasma color scheme"
 HOMEPAGE="http://www.kde-look.org/content/show.php?content=7043"
 SRC_URI="http://www.cpdrummond.freeuk.com/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
 
-KEYWORDS="~alpha amd64 ~ia64 ~mips ppc sparc x86"
 LICENSE="GPL-2"
 SLOT="0"
-
-IUSE=""
+KEYWORDS="~alpha amd64 ~ia64 ~mips ppc sparc x86"
 
 RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
+PATCHES=(
 	# Add switches to enable/disable gtk1 and gtk2 engines in the configure
 	# script.
-	epatch "${FILESDIR}/${P}-gtk_switches.patch"
+	"${FILESDIR}"/${P}-gtk_switches.patch
+)
 
+src_prepare() {
 	sed -i -e 's/AC_CHECK_COMPILERS/AC_PROG_CC/' configure.in || die
 	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die
 
-	rm acinclude.m4
+	rm acinclude.m4 || die
+	mv configure.{in,ac} || die
 
-	eautoreconf
 	gnome2_src_prepare
 }
 
diff --git a/x11-themes/haematite-xcursors/Manifest b/x11-themes/haematite-xcursors/Manifest
index 811f624ff82b..446f8af44553 100644
--- a/x11-themes/haematite-xcursors/Manifest
+++ b/x11-themes/haematite-xcursors/Manifest
@@ -1,3 +1,3 @@
 DIST 19594-haematite-1.0.tar.gz 23514 BLAKE2B 275b46d77650a5aa3b7ff1f3f054b659df60063413cebc04bd4fe462a689ce3ee7d5387b1d3dd461642232ee97cc1f6f1d0749e30354d9bd9c242f96aa67f161 SHA512 3e135a10300a5a4fdda626a2b3831b4b715ce3ed4da53d65f185396d38f6239611806474ef2bb5060a0bf7250815007690ea8c15c49c25d0c55030fb11cb45d7
-EBUILD haematite-xcursors-1.0.ebuild 1274 BLAKE2B 6887a327188a08654e4efa3cfefa267c583f13ec2d5b530f50a88ce9a8b5aad5574bf7b481fbd636c5fb00d91d6755741c305a7c0f9d6064e7a0e513f75b6345 SHA512 e4ad11f1760247b22cb4eda0d08712b2b28f9d32cd3ce3716515c9529965d3d9c9e08b6bc41bcb8bd5c75184a288bc8c47e4a45ba8a7dda5651ac5a1abdc25bf
-MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
+EBUILD haematite-xcursors-1.0-r1.ebuild 1305 BLAKE2B c8f38a4f297d869331ba9afd4f24b665bb4ac574ad4d952d1ff39fcae687f3200f1413c992abf280d868019ab1fd0fe281e1268b99917247a4b66e0ffda1d89c SHA512 5c466c3eeae922ba9132e465643f3a2d4241b961ed40eddaa18cbd42d7fb7d3373238912e75b2fab7ed1c43023c75c8d4f2db1f185c0f979d83e9d04499986d9
+MISC metadata.xml 300 BLAKE2B 2e7b335e362ca748b158cae23162dc80012ea9195ba704d12a85f1136409e9525b144a1af16c52fabe6a9c45b2553a4a78673d8267d56f4506ebc1614eb82af2 SHA512 5309fea86ffe482382a564dce1ec6aa4163e3a34d8e0c6ad47db2fcbd5c4769c31cb04397b547c16fe3bb06c447d54b92956a637a8be95d94435d6ad6230a47a
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/hicolor-icon-theme/Manifest b/x11-themes/hicolor-icon-theme/Manifest
index 337e0113899f..f9caa4661359 100644
--- a/x11-themes/hicolor-icon-theme/Manifest
+++ b/x11-themes/hicolor-icon-theme/Manifest
@@ -1,3 +1,3 @@
 DIST hicolor-icon-theme-0.17.tar.xz 53016 BLAKE2B c20c6e23eae799468d9f4aac038d823611cabdbcc8237d9fdb4f3d7ee5c8031223b0e9e0cf7c2b3fdf975291489223445775f340024cb6d4bdbdd29a4cf5548e SHA512 eca8655930aa7e234f42630041c0053fde067b970fad1f81c55fcd4c5046c03edfdf2ede72a3e78fba2908e7da53e9463d3c5ae12ab9f5ef261e29a49f9c7a8d
-EBUILD hicolor-icon-theme-0.17.ebuild 661 BLAKE2B 0b0c41bd785681cfb283a1381f09a3a891fcbee8d7fc4cab86f35d4abd3260d40597e7ca482503aa29c16500001883eca786ef38aa1293033f65a1a94ee7934e SHA512 ee8076b345269249eb682cd7d798f6ccefd530807ecdfa10c0e7b761d47de6aaf44eb1a3103b3b1d2a1122d4738c829303482558701eb413761c1f0855a0217e
+EBUILD hicolor-icon-theme-0.17.ebuild 662 BLAKE2B 5dd01d071b1ae925ab8ab1c6c4d0eceb3c32be14cc332b2e30872dedf9060d0ac050a629138c8b9d50ae5849a489a18c8486abc905ca92b28cf95320ac394d51 SHA512 d75fa1748337814cad692fff98ebe1773ffd1b27dcc46ffae29527ba2b4ada7b9a898fb4d0a197278cf5bb2411045f08b1fdb5f56d8e929c3c11bad0c7df7772
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/x11-themes/hicolor-icon-theme/hicolor-icon-theme-0.17.ebuild b/x11-themes/hicolor-icon-theme/hicolor-icon-theme-0.17.ebuild
index 65ad4e07118f..757370d9d999 100644
--- a/x11-themes/hicolor-icon-theme/hicolor-icon-theme-0.17.ebuild
+++ b/x11-themes/hicolor-icon-theme/hicolor-icon-theme-0.17.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://icon-theme.freedesktop.org/releases/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="app-arch/xz-utils"
 
diff --git a/x11-themes/light-themes/Manifest b/x11-themes/light-themes/Manifest
index 15224c4f13d7..8d6fb750aa27 100644
--- a/x11-themes/light-themes/Manifest
+++ b/x11-themes/light-themes/Manifest
@@ -1,4 +1,4 @@
 DIST Gentoo-Buttons-r1.tar.xz 80476 BLAKE2B 802ce2cc0d8dd3c639cbb1b8ca51732cfb87194ecc2bd0ca68c7945c8768b8662d206bf191f443f983e80e25a21ebf7d1909771b2f51b7825b763494a4edac81 SHA512 d1c093fe8ce905a409cd3ce85fde8490f26b918bb1dd3ccb6695eaa6c7a4908d7ba1e1d14a9443a16331168ca9b3fa58b5b28805fc583b4345932602f7c19168
 DIST ubuntu-themes_20.10.orig.tar.gz 15679746 BLAKE2B bcb1bae746379fe26700b7e88db4e91b0220e7145f55c59b951a31d768c2311d843c5d92c989b049e1009afbfc6e918e65726408298858e8fd689d0bbab1ca42 SHA512 0118f7c2404856216ff2df0246ea2fa98d0d5b25973abc3df13a998f7a41f2eeb32ca08281ba41399a91fa16ab046e3b3292f504503958983a6488c1e3001ac4
-EBUILD light-themes-20.10-r2.ebuild 1985 BLAKE2B 929dd036323bea57229b8476d1f5d5df06985ee941d1c34f3b502275cf2bf9e92fcdcf1fabb0b43711c05cf5d29548311b8ec5e52cc198f8f5d54a898eb8c70e SHA512 59e1f76b407459a2bfb3a75530e5103a97188c35ef5aae66715e4e5f243d25f13c5a6f8cc5e81e4be9204aa0da31fc0c459cd8686b3a71e607c67fb748eba73f
+EBUILD light-themes-20.10-r2.ebuild 1986 BLAKE2B 1d0c8ffc7df0ca949f385b49c639e0c097f8ffcc0191daa2dbd4db0d871edace5cdae7906232980d1047e13b95feb5b67ac2d12fcc53acc16888a985cf709ec8 SHA512 0d24d3d53051080ee6dc97d9373f321ae5b6d08e1e156089fc9741aadec9d24f8d37dc5ea0e7e9a9d7c48b5bfc0617f5ee5747ffa28bf5cddf49c3b3aede8b63
 MISC metadata.xml 443 BLAKE2B fc45e5e5a7d20ef6f474dd52a0744e52af86c13d19e62d047b3eaea2ea2e3672b2c996a3fc213ee3a8497368cf7adfbd32721ce87f8722da3e312c1c60d307c5 SHA512 626c2cbfb3dcd67a35e30c8502f2eadb16da9cf40660fd82485023ab42e92971dcbf71c064a602678afc8ebb1b54774e9ef3b92651f55da254cd12bcc7fee5b5
diff --git a/x11-themes/light-themes/light-themes-20.10-r2.ebuild b/x11-themes/light-themes/light-themes-20.10-r2.ebuild
index fd7aee3d71eb..14ae92e32854 100644
--- a/x11-themes/light-themes/light-themes-20.10-r2.ebuild
+++ b/x11-themes/light-themes/light-themes-20.10-r2.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="app-arch/xz-utils"
+BDEPEND="app-arch/xz-utils"
 RDEPEND="
 	x11-themes/gtk-engines-murrine
 "
diff --git a/x11-themes/lxqt-themes/Manifest b/x11-themes/lxqt-themes/Manifest
index 12ab9662163d..067a2484e29d 100644
--- a/x11-themes/lxqt-themes/Manifest
+++ b/x11-themes/lxqt-themes/Manifest
@@ -1,3 +1,5 @@
 DIST lxqt-themes-0.16.0.tar.xz 3220864 BLAKE2B 93f5b7c964f7907204234164db602842fb2247b7fe27c27647cd6981f114c111f5ae4b0c9efd220e1c1283d8dd689d1b90e0a112cd23289d58ccb29ae8e334e2 SHA512 fce067e621df4e3cad62a73f552c06ecf413e83ee2d67643424c4bdc0752c2c0acd1095c92714294ecc3ef96d137a2685860e360e09b81880fadf69b2c041258
+DIST lxqt-themes-0.17.0.tar.xz 3221148 BLAKE2B 6445aedcd26f65a046193b3dc0e9c6ff8e14c84e1a1a3f42334b1af42834f08e953eaef6ba3e3f54c8465266a54f52825a63618e40527226465ae7e069cbeb20 SHA512 60e89e65095f9478501719caa2262ce559ebb9e0ff6ef3c001ee87f76cb62c8b5f2e5a9f4fa72cdfbbd4c97dffacfb88a52cff6de31a13b2635487441fc07328
 EBUILD lxqt-themes-0.16.0.ebuild 488 BLAKE2B e52598acf4eabdebdb649824aafbc70aead2e4cc588403bdd4354ca3c30266d270183c2bdc9b390d2cf61f6c28391b5a59f6efab04b95c04a6a9f44a10987d84 SHA512 26656382bef9132b883e9d4fdccf3c3a0b64b35bfc98ce5bccd045a2868dd7030fc9ee895f2ac813f597123fd664a8a3297f55967f9e41afe4d820119994ebfa
+EBUILD lxqt-themes-0.17.0.ebuild 490 BLAKE2B be9e332d16a9a41f774f7a82574bf010996ee6a20f078f21922fa21ec1a02ee74c6603dba5abfbdccc047a8e747ebb92c9e741ec592393cfebbde478787946a7 SHA512 22d279b62e82337fcf33925ce060234eb448983f1095cc87a22efa85b138cb4d2aa94f95fa1c97c8218746f727c7e611a915b5b279d0125de5d5e7f27d926a90
 MISC metadata.xml 317 BLAKE2B 5570995b3ad6a8fbde584e6ec5d9d0e09e6000313c1b7e1caaea7fc36aed93f86af522fd4ce0ace8ad764135d7d07a3c3a27b97e8144c915a9d3621f53e77c3f SHA512 7ac9d03d1f2248513ae60d61ec213d18ac6757f66924d0273bf93f9c47e6b32a5f05d393c4c92484c59b23d7ddb8f4fd915bc31e45885bef91f44f6a9cabad41
diff --git a/x11-themes/lxqt-themes/lxqt-themes-0.17.0.ebuild b/x11-themes/lxqt-themes/lxqt-themes-0.17.0.ebuild
new file mode 100644
index 000000000000..e9df8dd6dc08
--- /dev/null
+++ b/x11-themes/lxqt-themes/lxqt-themes-0.17.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="LXQt Themes"
+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="LGPL-2.1+"
+SLOT="0"
+
+BDEPEND=">=dev-util/lxqt-build-tools-0.9.0"
diff --git a/x11-themes/neutral-xcursors/Manifest b/x11-themes/neutral-xcursors/Manifest
index 5e74a38130f3..5cfe314a4b96 100644
--- a/x11-themes/neutral-xcursors/Manifest
+++ b/x11-themes/neutral-xcursors/Manifest
@@ -3,5 +3,5 @@ DIST Neutral++-1.0.3.tar.bz2 43751 BLAKE2B eb5ca2983b7cd5638dadffdcda6e86dde7808
 DIST Neutral++_White-1.1.1.tar.bz2 42982 BLAKE2B b7e4cfe258ae1aeda9c0415136acd9a67c18c00d8c076153109ac86d9c481d9a936fcedecd5e7ea15ae26862c96b824d62cfb8928ae9818c2b3b83e1525532dd SHA512 0027dd2823c605c810904d86fd25d021cde14c24c4b1cb507dd5829ac0cd6763fa96296db76422a1b2667b7e2a4b4ca397bfc26823f5b2656753a507cb71f0a2
 DIST Neutral-1.13a.tar.gz 68777 BLAKE2B 53e999c79d8637cf14af0b1e70b549452b72df6881b4517ea568f67d3b78f4bd73bb51a5c95c84864daf271d7c63cba795ab4a1c7a895c4a361e900f3b9ca5e9 SHA512 bee7d433294e74fd4c4e1e7892b15035c9f880a85da7b5faae16efc517cfd939a14258b36a9aa297db30ff994547262f1c8114a10ec1db497e88245b1905d4c3
 DIST Neutral_Plus-1.2.tar.bz2 61354 BLAKE2B ce3fb7d375228ce7f6179234dbe8461ae6f712177350a5c0b41175d7bf0419e7c385d016b7a7d28b1023798aed478c1c3a504c8d6fe2cb0b1a2790a8b0efa574 SHA512 e20b4aa172561b04d39a3209a0977d6d7d8f1956fb4d60f7dd022b7ae6195890956b76facbe58fe3d5fd6a4b844f0c14da5d09f7f82379048c610e41133a713d
-EBUILD neutral-xcursors-20150106.ebuild 2796 BLAKE2B 8b55bf5af02261f75b115b38d76a1ce6329dffe85931ae31b177ab8272a43f111875b7649e89971cfe0311f304ba68bb92f59e5e480fcb98227eacc342247204 SHA512 10d3f76aeaff140092753d43ea6b0a7d5569e54309345f31d5765f154d61463150277efaa90eabda189fd60416e02b290af8068a73b518300733651c7142eb9e
-MISC metadata.xml 168 BLAKE2B 95e3160d1d6abb3e5510581fe45ddcd9ad526f89bbc0d3ad226e2782d148a0c71e50426809a87fb45e6fc9356e597a1d271002764caebc79be8846301eb82d5e SHA512 5edd6cda32972ff5e53cf5f883928bd1887b4a45572657f99101284a909ea04ff906b8f4068d247d1b3367bde813dbb37ba11565aaff880d9b500685b0f5a33d
+EBUILD neutral-xcursors-20150106-r1.ebuild 1824 BLAKE2B d9c1922d30b0d20379bbf928bcb0be56e37fcab1a2141f85e4c60295b06791fb71902081f6e009e02dac98dc80ec634a02d227f6423190ef76bcd8d1eb345d2a SHA512 5c574d668aa74cb99f44ba47bd7d0651b5d19c596722978ebe62b1d032add120acb134bd0637861c955f37de150fc27c903e08cb8fbfe9d1d047022503f4f8d1
+MISC metadata.xml 191 BLAKE2B 8bff04ca02f4930d6f77dd32df009c145cacaad2d1cf271d91ae928f85acdccb0d73b0202a41aa3e60470ba6c7853e41ef76587601b2163f9ec249b7fa1c5274 SHA512 da06af54ba93db06f717082e3f09bbca9e17adad4b070a28131f2ffec15d0dfc82c79a3b2fb045fa33d6756c6df85254733622b0b7b1952b33d5590a71865c62
diff --git a/x11-themes/neutral-xcursors/metadata.xml b/x11-themes/neutral-xcursors/metadata.xml
index 585b0dc75dda..3c58a0219fbe 100644
--- a/x11-themes/neutral-xcursors/metadata.xml
+++ b/x11-themes/neutral-xcursors/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	</pkgmetadata>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/x11-themes/neutral-xcursors/neutral-xcursors-20150106-r1.ebuild b/x11-themes/neutral-xcursors/neutral-xcursors-20150106-r1.ebuild
new file mode 100644
index 000000000000..28dbb5e6b7d4
--- /dev/null
+++ b/x11-themes/neutral-xcursors/neutral-xcursors-20150106-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+NEUTRAL_PN="Neutral"
+NEUTRAL_PV="1.13a"
+NEUTRAL_P="${NEUTRAL_PN}-${NEUTRAL_PV}"
+
+PLUS_PN="Neutral_Plus"
+PLUS_PV="1.2"
+PLUS_P="${PLUS_PN}-${PLUS_PV}"
+
+PLUSPLUS_PN="Neutral++"
+PLUSPLUS_PV="1.0.3"
+PLUSPLUS_P="${PLUSPLUS_PN}-${PLUSPLUS_PV}"
+
+WHITE_PN="Neutral++_White"
+WHITE_PV="1.1.1"
+WHITE_P="${WHITE_PN}-${WHITE_PV}"
+
+DESCRIPTION="A family of smoothed and shadowed cursors that resemble the standard X ones"
+HOMEPAGE="
+	https://store.kde.org/p/999947/
+	https://store.kde.org/p/999928/
+	https://store.kde.org/p/999941/
+	https://store.kde.org/p/999806/
+"
+
+SRC_URI="
+	mirror://gentoo/${NEUTRAL_P}.tar.gz
+	mirror://gentoo/${PLUS_P}.tar.bz2
+	mirror://gentoo/${PLUSPLUS_P}.tar.bz2
+	mirror://gentoo/${WHITE_P}.tar.bz2
+"
+S="${WORKDIR}"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
+
+DEPEND="x11-apps/xcursorgen"
+RDEPEND="x11-libs/libXcursor"
+
+src_prepare() {
+	default
+
+	mv neutral Neutral || die
+	mkdir -p "${PLUS_PN}"/source/cursors || die
+}
+
+src_compile() {
+	local cursor_dirs=( "${NEUTRAL_PN}" "${PLUS_PN}" "${PLUSPLUS_PN}" "${WHITE_PN}"	)
+	for cursor_dir in "${cursor_dirs[@]}"; do
+		pushd "${cursor_dir}"/source
+			./make.sh || die
+		popd
+	done
+}
+
+src_install() {
+	pushd "${NEUTRAL_PN}"
+		insinto /usr/share/cursors/xorg-x11/"${NEUTRAL_PN}"
+		doins -r index.theme source/cursors/
+	popd
+
+	pushd "${PLUS_PN}"
+		insinto /usr/share/cursors/xorg-x11/"${PLUS_PN}"
+		doins -r "${FILESDIR}/index.theme" source/cursors/
+	popd
+
+	pushd "${PLUSPLUS_PN}"
+		insinto /usr/share/cursors/xorg-x11/"${PLUSPLUS_PN}"
+		doins -r index.theme cursors/
+	popd
+
+	pushd "${WHITE_PN}"
+		insinto /usr/share/cursors/xorg-x11/"${WHITE_PN}"
+		doins -r index.theme cursors/
+	popd
+}
diff --git a/x11-themes/neutral-xcursors/neutral-xcursors-20150106.ebuild b/x11-themes/neutral-xcursors/neutral-xcursors-20150106.ebuild
deleted file mode 100644
index d60e6d4a9bb0..000000000000
--- a/x11-themes/neutral-xcursors/neutral-xcursors-20150106.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-NEUTRAL_PN="Neutral"
-NEUTRAL_PV="1.13a"		# 2006-03-06
-NEUTRAL_P="${NEUTRAL_PN}-${NEUTRAL_PV}"
-
-PLUS_PN="Neutral_Plus"
-PLUS_PV="1.2"			# 2007-06-23
-PLUS_P="${PLUS_PN}-${PLUS_PV}"
-
-PLUSPLUS_PN="Neutral++"
-PLUSPLUS_PV="1.0.3"		# 2015-01-06
-PLUSPLUS_P="${PLUSPLUS_PN}-${PLUSPLUS_PV}"
-
-WHITE_PN="Neutral++_White"
-WHITE_PV="1.1.1"		# 2015-01-06
-WHITE_P="${WHITE_PN}-${WHITE_PV}"
-
-inherit gnome2-utils vcs-snapshot
-
-DESCRIPTION="A family of smoothed and shadowed cursors that resemble the standard X ones"
-HOMEPAGE="
-	https://opendesktop.org/content/show.php/Neutral?content=28310
-	https://opendesktop.org/content/show.php/Neutral+Plus?content=48837
-	https://opendesktop.org/content/show.php/Neutral%2B%2B?content=108142
-	https://opendesktop.org/content/show.php/Neutral%2B%2B+White?content=108143
-"
-# Neutral++{,_White} URIs return tar.xz archives that are actually tar.bz2.
-SRC_URI="
-	https://opendesktop.org/CONTENT/content-files/28310-neutral-${NEUTRAL_PV}.tar.gz -> ${NEUTRAL_P}.tar.gz
-	https://opendesktop.org/CONTENT/content-files/48837-Neutral_Plus_${PLUS_PV}.tar.bz2 -> ${PLUS_P}.tar.bz2
-	https://opendesktop.org/CONTENT/content-files/108142-Neutral++-${PLUSPLUS_PV}.tar.xz -> ${PLUSPLUS_P}.tar.bz2
-	https://opendesktop.org/CONTENT/content-files/108143-Neutral++_White-${WHITE_PV}.tar.xz -> ${WHITE_P}.tar.bz2
-"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 sparc x86"
-IUSE=""
-
-DEPEND="x11-apps/xcursorgen"
-
-RESTRICT="binchecks strip"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default_src_prepare
-	sed -i -e 's|neutral|Neutral|g' ${NEUTRAL_P}/index.theme || die
-	mkdir -p ${PLUS_P}/source/cursors || die
-}
-
-src_compile() {
-	local cursor_dir
-	for cursor_dir in ${NEUTRAL_P} ${PLUS_P} ${PLUSPLUS_P} ${WHITE_P}; do
-		pushd ${cursor_dir}/source > /dev/null || die
-			sh make.sh || die
-		popd > /dev/null || die
-	done
-}
-
-src_install() {
-	pushd ${NEUTRAL_P} > /dev/null || die
-		insinto /usr/share/icons/${NEUTRAL_PN}
-		doins -r index.theme source/cursors/
-	popd > /dev/null || die
-
-	pushd ${PLUS_P} > /dev/null || die
-		insinto /usr/share/icons/${PLUS_PN}
-		# Upstream ships an invalid (as per freedesktop.org) index.theme.
-		# See https://www.freedesktop.org/wiki/Specifications/icon-theme-spec/
-		doins -r "${FILESDIR}/index.theme" source/cursors/
-	popd > /dev/null || die
-
-	pushd ${PLUSPLUS_P} > /dev/null || die
-		insinto /usr/share/icons/${PLUSPLUS_PN}
-		doins -r index.theme cursors/
-	popd > /dev/null || die
-
-	pushd ${WHITE_P} > /dev/null || die
-		insinto /usr/share/icons/${WHITE_PN}
-		doins -r index.theme cursors/
-	popd > /dev/null || die
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-themes/obsidian-xcursors/Manifest b/x11-themes/obsidian-xcursors/Manifest
index 7a87f27f748b..a31f54243762 100644
--- a/x11-themes/obsidian-xcursors/Manifest
+++ b/x11-themes/obsidian-xcursors/Manifest
@@ -1,3 +1,3 @@
 DIST 73135-Obsidian.tar.bz2 262096 BLAKE2B 9521f26ac749343f841bc307809619954e688cc8367a59bc2b3dabd38e065a1bbbf1c275e573101a048cbf1185542dc5636914a0e11088caf4a130abccebe7f7 SHA512 e705f1faa2d094b2aa7ca5525f687595ff619ad8b49e3b533a429ea4268550babe24008fbe8b53332bf5753825e9d6d13e2e8ff9049fdc55b44b1ff64c70ec6a
-EBUILD obsidian-xcursors-1.0.ebuild 1250 BLAKE2B e30f437c1513e3c249bd002ba7e4b346d9aa36a2c38a4fcf0c4d7037391ecc866bb558c54d5187d870fa11c5b9fd0cbfaf43970b67ee07f206be3a21ec5cc64d SHA512 5692f65e051663b044ae101ed03d428f668e74438ed349e90fc2be1547ddf91cc6b050f92b6369e7a67ebe49593ff24246255e036a48d48e24032150b711830a
-MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
+EBUILD obsidian-xcursors-1.0-r1.ebuild 1267 BLAKE2B afbf8d1210cbd77691d334ae43d61986b329416eb9157ce071ea8520650b7acca88ef493306fffe7ebd5d12ea407bdaf326b19aef4d80e2cffee1715fa167ede SHA512 4989ae4d88e3fc111fad9d93b243fecafa4a1bb73a1214f5a51e74c3366b5cee49309ca60448c64d37f12133156a20cd0f67cd8c5b3f4c119d1cc4e1ba0eca3c
+MISC metadata.xml 300 BLAKE2B 2e7b335e362ca748b158cae23162dc80012ea9195ba704d12a85f1136409e9525b144a1af16c52fabe6a9c45b2553a4a78673d8267d56f4506ebc1614eb82af2 SHA512 5309fea86ffe482382a564dce1ec6aa4163e3a34d8e0c6ad47db2fcbd5c4769c31cb04397b547c16fe3bb06c447d54b92956a637a8be95d94435d6ad6230a47a
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/papirus-icon-theme/Manifest b/x11-themes/papirus-icon-theme/Manifest
index c12b74497fb4..8a04a67cf30e 100644
--- a/x11-themes/papirus-icon-theme/Manifest
+++ b/x11-themes/papirus-icon-theme/Manifest
@@ -1,5 +1,5 @@
 DIST papirus-icon-theme-20200901.tar.gz 24109177 BLAKE2B c30aefa8d056c4c8e86425b3ebca4720d01ca7b0853f33edfb382a280f347df5da75815b354549c96285478fd4e6bacf5469a4212047fe0ba14cc6d2d1b7e292 SHA512 0c1abdf58aeaff6aa8bce2b1db541377633e15282024f757d949adc4cf3e73d08b66b5188fa31530394cb804e88881b5a66c4d80772469d606cfc192c076224e
-DIST papirus-icon-theme-20210302.tar.gz 26557577 BLAKE2B 6dfba45b97d466deffd23852694cec62c40035a7552c5424dbc84fb9e5755fc0ba97eab302947e45e408a3f36ce3d6eead4af9c335c066355398a4cf30c66085 SHA512 b8bba6a3f68b34da7f9e55ac19b37240d7dc0b1b7cb6523431d5e1ce08a90179e26beb621c8da4ff219d2c1e9ad390f8d0e6f413bc4296c15b1da872f09dfd26
+DIST papirus-icon-theme-20210401.tar.gz 27153786 BLAKE2B 95f8b10cd13540f3d2b9f1b1febf0649764d8761f1b4a9d6a2038073b1e8e73e331226ee8c6a4069ac7d26052d49db3b18565ecfd08edd197d4f729769ddca9d SHA512 317eed658897dd55d8393669cb62b2a8f9211120b8e132263c70ddd2f5710973c78230f37bd0f60c75b7b67912d7d2cff2d048dd7b29ffb9c68c73c2ab89ee2b
 EBUILD papirus-icon-theme-20200901.ebuild 642 BLAKE2B 8308fbe6b5cf8e36ff8901f0f23e68e75a4b2ba5ced78edef8f7f8929da1a6572d439f83bbe493300036acb468efce0f2829b3592ce96770866284d779aef902 SHA512 b32c9cf25eac46d8b71448e86af8a847eb1c48e4fdd5934309897a74861be16fb7845d6587aca7afdf77a643035fbdda4da14e566f6435485227e0a92c5f521e
-EBUILD papirus-icon-theme-20210302.ebuild 514 BLAKE2B f2bbca3cfc276732e8179cf60066c21aa6e773a27f3ed718de0f3fa8f8861ce1e2a9863d34ffd6a4d051136ebc213951cd06c8620bc4bf2443d9d839c85a73b2 SHA512 2960e8ffc6e7303d3ae9296574a27e9bc1565d0846babe1bab8d1d9c7ca01c6bc9ba3e27e6e9d588f155c03fb0976acdbea54f0b848f1643dd4f1f2c36d70e3c
+EBUILD papirus-icon-theme-20210401.ebuild 514 BLAKE2B f2bbca3cfc276732e8179cf60066c21aa6e773a27f3ed718de0f3fa8f8861ce1e2a9863d34ffd6a4d051136ebc213951cd06c8620bc4bf2443d9d839c85a73b2 SHA512 2960e8ffc6e7303d3ae9296574a27e9bc1565d0846babe1bab8d1d9c7ca01c6bc9ba3e27e6e9d588f155c03fb0976acdbea54f0b848f1643dd4f1f2c36d70e3c
 MISC metadata.xml 525 BLAKE2B 3bbe9a86093c0fc70d0be5a031247101282292a5d1a29cb43a0dea77b85088e9e2ffc6b36e2be7c98f918f2936a871794291a96a32da4d3b282bf57c9bca77e6 SHA512 fb15793d3dd73fc5a03cb9316f82cf89460b064a0c11cbad00617ae6a6daa39e3442ef3884b4f10bfb72bf226e64118e76bc2651857938b2d88548969644947b
diff --git a/x11-themes/papirus-icon-theme/papirus-icon-theme-20210302.ebuild b/x11-themes/papirus-icon-theme/papirus-icon-theme-20210401.ebuild
index cdc7ac948197..cdc7ac948197 100644
--- a/x11-themes/papirus-icon-theme/papirus-icon-theme-20210302.ebuild
+++ b/x11-themes/papirus-icon-theme/papirus-icon-theme-20210401.ebuild
diff --git a/x11-themes/pearlgrey-xcursors/Manifest b/x11-themes/pearlgrey-xcursors/Manifest
index d8037233be6e..8d51bf52a98e 100644
--- a/x11-themes/pearlgrey-xcursors/Manifest
+++ b/x11-themes/pearlgrey-xcursors/Manifest
@@ -1,3 +1,3 @@
 DIST 11313-pearlgrey-1.0.tar.gz 17978 BLAKE2B aa2b35885a25bdd2a36ac6d9265ce9bacb1a5e1f4319ec3ad5434a1202c1fafff18236197f133c0268219c13d141ed0d75ca0014d935b731977db059203b1e20 SHA512 863b9d0ff5f0ef387b66e85c1f0b9431e4f77b362d4f5f55ab6ec00c511bc357e1c2b20c0c14cea41bbc90ea5c7aa0da57dc34c474da672cf04094d4f6247e99
-EBUILD pearlgrey-xcursors-1.0.ebuild 1275 BLAKE2B ac980c8d41f1b01b58e712762219a5dd7c4ee52a60e99f77d4002505025c43b75c5e3b9d5b916920d3bca942ca50e72417276c07da86b39a122d67c37c210786 SHA512 e9b5699e5361f5b61942c083371f3c23751323e7b0d8e72ea4706c86297e3eb2abd10f76989d7c7c2092ae3f146f0d8b3cb463891bb264d9f58e47077e8947f4
-MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
+EBUILD pearlgrey-xcursors-1.0-r1.ebuild 1306 BLAKE2B 0d284dd72f15ea53d926c8264067e0606a7dec12748685cec653c698661c217bbdda88361d35aac06dfe36c09ff2e17bf1a3cdad2ec5dea63969acd1c1f6fa74 SHA512 116014e953db040192302e20294368b3d6df3c75d179ba3ea4d9950cfcf449d550bb987cf3e21666105731a1b769042e5ac96b8d11b25ded9ecae246db74188f
+MISC metadata.xml 300 BLAKE2B 2e7b335e362ca748b158cae23162dc80012ea9195ba704d12a85f1136409e9525b144a1af16c52fabe6a9c45b2553a4a78673d8267d56f4506ebc1614eb82af2 SHA512 5309fea86ffe482382a564dce1ec6aa4163e3a34d8e0c6ad47db2fcbd5c4769c31cb04397b547c16fe3bb06c447d54b92956a637a8be95d94435d6ad6230a47a
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/redhat-artwork/Manifest b/x11-themes/redhat-artwork/Manifest
index aa080949f15c..cfa4d1ef35f6 100644
--- a/x11-themes/redhat-artwork/Manifest
+++ b/x11-themes/redhat-artwork/Manifest
@@ -1,3 +1,3 @@
 DIST redhat-artwork-5.0.8-4.fc7.src.rpm 8298864 BLAKE2B 1add8f4138ee506a5bd26ad31ab04dad14dfb7d84a6015a3f870d542ae21fa87826f0a171e0537710983b79f41d054883e21cf92bc23339b872eb817cc86897b SHA512 e063a281fd561708e560d91b9eb276b0caa80dd6060513240a0a31b6089f3c97fb9959091d719dd6e84b47838408c991a9645be9fc081709027de4d2f2c95a51
-EBUILD redhat-artwork-5.0.8-r4.ebuild 3880 BLAKE2B ac914cc278bf30dc819aa8c6830f4934e7d77c97e13a02fc409363baf874ed648f029fe8f04136c8db5cad16a4258397cae9b682a04f5cacb8bbc640080297db SHA512 02de1cb34d32fc79320bac45b83018a5d51fd65de9ae22907227480707f83616c5f5688498980004516e8651699c35e312beaa1ee671a438cbcc3d930d555a89
+EBUILD redhat-artwork-5.0.8-r4.ebuild 3880 BLAKE2B f79d562c1bae7f93295bd5bd146caf840a5a05ed43b8263bbf95c55ddae7f24170e9abac79bdfc69f6b3dc867137597e5a5f0e6f290c5f669cd4873f0673fbca SHA512 ee4df9a087358b75ffb3f4115b7e35c01c71ce26f6fee7f92ec1ee9298846ea67ed1322256edb35c4cace8e103a112b5bac4f0779ffcab0d373835b7dc90595f
 MISC metadata.xml 622 BLAKE2B 7ec845fa96460f4ff2f4ae416fa9d65d45376217b793d527d407e323e3fa9ac4059805de4308e93ec70b0b816b15f8edf936e47df5850e8d699fec876ca5633a SHA512 e106f17d6330dee2ef583705edc9a58189fbb15814766d89531f2f5a7a104fae86b0d3368b7cb84c2816cfadc91762d0022fceea0597031f6263c8dc2867ba16
diff --git a/x11-themes/redhat-artwork/redhat-artwork-5.0.8-r4.ebuild b/x11-themes/redhat-artwork/redhat-artwork-5.0.8-r4.ebuild
index dd4ebe9193b8..898f24a08984 100644
--- a/x11-themes/redhat-artwork/redhat-artwork-5.0.8-r4.ebuild
+++ b/x11-themes/redhat-artwork/redhat-artwork-5.0.8-r4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit autotools eutils rpm
+inherit autotools epatch rpm
 
 MY_R=${PR/r/}
 DESCRIPTION="RedHat's Bluecurve theme for GTK2, KDE, GDM, Metacity and Nautilus"
diff --git a/x11-themes/silver-xcursors/Manifest b/x11-themes/silver-xcursors/Manifest
index 1c94357742ff..2432df2f32c1 100644
--- a/x11-themes/silver-xcursors/Manifest
+++ b/x11-themes/silver-xcursors/Manifest
@@ -1,4 +1,4 @@
 AUX README.gentoo 568 BLAKE2B 3ae63af300467ccc8061fc7bceb862bfdbda0ff14bc3ca5cf8c7f0ddb9dac0b838fc4fcf8e6293ee96e4887249a7d3455a7cb77419addf613322eb60f4a09f71 SHA512 09a4bf7b2d7a395167ea67ce95e6f6b63f98af495d437b84757d742b73371b64e48ef6fafd61c57cbb5075506322318285d42aa18c25b98b5cc35cea0e71205d
 DIST 5533-Silver-XCursors-3D-0.4.tar.bz2 756159 BLAKE2B 7d90a44a022512e685b592e6285786e5b4898df723cba9deb52100e66c76865b5d2ed07968901656fc5c1ef565c54f281138e9e6f323e94bcb6c1b7884c792c5 SHA512 b5b44a796d5d9341a0e92f8f4351b84eb3974d1908eb2fdb012c0490e4374404e3d33b35873f49c1f7ccd56bdced4fff14338319edabab7d11ddf31cb46fd245
-EBUILD silver-xcursors-0.4-r1.ebuild 651 BLAKE2B 2e3c114db15ea0f288f5e124dc98c4509d9e9459b74649c7266b5435ff8540a20ffe525e9068e3a03384a39d76817839143b32a3f4367ce8d626362201c18fcd SHA512 60d382e06f972d3119d2a81f2bea2ee8051a1841a1f558b4c95228f06a38fdbe1ed67e638fadcc553101e4522fab835e2915be04a231183d56bbf2514948a23f
-MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
+EBUILD silver-xcursors-0.4-r2.ebuild 597 BLAKE2B 40ce1563e3021c0da937ea59ec925839cc72d40091956ffac1f2e67c04f11c343a75e5f75ba44cd34891f628e29f694889d3c6129dc9265ebe13b084b412589d SHA512 a3a05d91463723c09741e378bb8bef005fa35098320e24172bef4bffcfb1dd0137d713a1f18aab0bfc90ca47dca80c3e515d0beca743242abf6f6825b525785c
+MISC metadata.xml 300 BLAKE2B 2e7b335e362ca748b158cae23162dc80012ea9195ba704d12a85f1136409e9525b144a1af16c52fabe6a9c45b2553a4a78673d8267d56f4506ebc1614eb82af2 SHA512 5309fea86ffe482382a564dce1ec6aa4163e3a34d8e0c6ad47db2fcbd5c4769c31cb04397b547c16fe3bb06c447d54b92956a637a8be95d94435d6ad6230a47a
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
+}
diff --git a/x11-themes/slim-themes/Manifest b/x11-themes/slim-themes/Manifest
index b37e9864e487..2d7bdff305b8 100644
--- a/x11-themes/slim-themes/Manifest
+++ b/x11-themes/slim-themes/Manifest
@@ -1,4 +1,4 @@
-AUX slim-theme-flat.diff 952 BLAKE2B abdd88c5d7a1394b2c22ca77ff952b4d31dddf9e73691c568d7f9a43efdd5d366742bd7da0a0c68b4e4d37d4d6c8c4f5b66b1f305ad5e193982c1238a709dbb0 SHA512 250541ba316d09445ef146301105e75c56926ef32167ef073b49e766ec27af00a1c73fab37195a8cc8e19b3d21d4500cffe2a59628ae8bd621ded3b977f53ed0
+AUX slim-theme-flat.patch 879 BLAKE2B fc249d349ef79264a14fb6ec83a09c0573c05db57ad4ad6b5631f98f57501780ac265fcd57ab32a5afc9c58a3d5b67cda7d7f05e371ce40139e0706a08742789 SHA512 cc66867d496424104da9a928e02a9fe2ad325158f59ab804c73debcc8862e1d1e866a9a5ac667162b85caf42e88a92a9155a2e54d22be9586b70674bb7e1c134
 DIST 48605-xfce-g-box-slim-0.1.tar.gz 477441 BLAKE2B 4a8fc9191795abbafa802cf152cb85b03f78e623da59472918f7f8251810874559d90dce03a244594d6b61411a5b912b2e2aa2f2f8328a10ec96d9c6e251a89e SHA512 03f6ccd65cd321dcd94f69d8bc057fe64c7f0fae9807035283fbf1824f67bd5ee5d78275da53e6015c98d10fa021a3136a780dffd58072b389f9f8831eed7e68
 DIST gentoo_10_blue-r1.tar.bz2 1507034 BLAKE2B ed83dc45f1ea0875c1fc517602d589e15547a104d5017490fe5f5bdb2001bc6c2104273b52f611b3e76dd88402c9d613b4d8cdae680c1cec631572d686b3a217 SHA512 e1b227d3fcf510c35c847796dcf336e11e29fe1dad9575beaf59230b269a0969ae1b1594d2388f03499e8458be2104b6eddfee643a6db70537f494ccb6fa5c5d
 DIST gentoo_10_dark-r1.tar.bz2 411448 BLAKE2B 6fc5bab305ff2d9efb0bf672a1659e7388e1b262486384fd082ae9059c42344b4775a39f0f93f4d79b0b96a197bd3d157dd8e16ddd0c834b4460901c2b5b025a SHA512 66d89429cb46af09071cce65b901eaf5066b86994a64e81523ebffd53810905339ebc858ec69988557a1d5f22f1d452d0d3331244b3a009a6fd92bd0169f2e59
@@ -20,5 +20,5 @@ DIST slim-scotland-road.tar.gz 224691 BLAKE2B a0cd1a53a7105f05645953fe21c4597e27
 DIST slim-subway.tar.gz 259307 BLAKE2B 71a096d95355e1ed3009a1590ceefdcf03dbdf316106663129a3850878adc441d030051150033bd591afafdef1542ca72d89e5d36bf8911a7d215ffb9c7e66c2 SHA512 af082f93028683970d9a5233ffd05b2aed175c5c51d8a08488db50335f61363c3df54cfba84b351aed5b529222e4253a607be643ab38af6dc29237502775a799
 DIST slim-wave.tar.gz 277774 BLAKE2B 48ecedf22ada97bf7fce3398e7a457c5568bbc334e6e710f8b1e1c0cbbf9986fd65217c515eb5752dd18880a51c58e14c8195f8772a7c4537bbe7863a51655fb SHA512 0e2ae1fbed9cc6d82bc7f46b0dfac1c837b2e09f5e6504e171eabcefbf0a7dc3f7d647328fce7a21a60c4eb59e16d3d6f4622800df2fdc9973fccf36d2806253
 DIST slim-zenwalk.tar.gz 337070 BLAKE2B 37696398590c4faa402ca15168505e7f5352e20792ccfd87c3728a37ad8f004b7ecc3397bad8d947d7a04195b51a08f71b885d411dfb403d6a430edff2a80d85 SHA512 8f0cdc4fe3830d3dc25d91781853af102d0c3f8f6a24ee917c1d5107c2ae353c590c257ff329fe549b981928d387340cacd9d87c17d7b6c9dd39f2a950ac491e
-EBUILD slim-themes-1.2.3a-r7.ebuild 2433 BLAKE2B 8c20a87d6a5dddd8a57932d52f071f8081b2cc2c1aa70b5bd4b2541b58d3837908646d3105d63e70450ef22ab6323761967b42f778df34a509d39ee09b2443b7 SHA512 058205a86520eb9c2805b9aa7257a746abae73bc75e843443da926ba98423306ca400a788853454a6ae0ff0354510b05d81fb1c3140fc579414a5b42fb47e122
+EBUILD slim-themes-1.2.3a-r7.ebuild 2368 BLAKE2B 629d7fdc2404055b7022f46614087396b33a3cc730bb1fd2fcdad1b61d2393421dcef7ee50a594e152e5e7e7a3fc89eda84a8a5167ba401733f273f1de9511d8 SHA512 7cc23fdb2128fdc2b7a0a9b22dac20ab91290209bcce5340de06dbf3e5a4489178a395e5452f654b8c741a106784f5d25ba5cbe38d64270a7d991af4eb704425
 MISC metadata.xml 358 BLAKE2B cdd64e3b4d17039249f135b5772d3431089606b00e48b9c4c7dec4be90f0abbf56ef3c763de6239cd346f4acbc02ee0680218f90e730028d5ef2fe24cb018f37 SHA512 ecb7ec379a014fd758570c21260dd6bd6843d368d06aec23195649060e94cfacf6a915d3b3fcd12e6e112943ca097d6b34a4bf7fe7fa3bb05651ff7f4ded2218
diff --git a/x11-themes/slim-themes/files/slim-theme-flat.diff b/x11-themes/slim-themes/files/slim-theme-flat.patch
index 345a70ff7085..63a63149514e 100644
--- a/x11-themes/slim-themes/files/slim-theme-flat.diff
+++ b/x11-themes/slim-themes/files/slim-theme-flat.patch
@@ -1,5 +1,5 @@
---- flat/slim.theme.orig	2010-01-15 14:10:18.000000000 -0200
-+++ flat/slim.theme	2010-01-15 14:25:10.000000000 -0200
+--- a/flat/slim.theme
++++ b/flat/slim.theme
 @@ -20,9 +20,9 @@
  input_pass_y            163
  
diff --git a/x11-themes/slim-themes/slim-themes-1.2.3a-r7.ebuild b/x11-themes/slim-themes/slim-themes-1.2.3a-r7.ebuild
index 55fe88f83849..cef9b7238795 100644
--- a/x11-themes/slim-themes/slim-themes-1.2.3a-r7.ebuild
+++ b/x11-themes/slim-themes/slim-themes-1.2.3a-r7.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils
+EAPI=7
 
 DESCRIPTION="SLiM (Simple Login Manager) themes pack"
 HOMEPAGE="https://sourceforge.net/projects/slim.berlios/"
-SRC_URI="mirror://sourceforge/project/slim.berlios/slim-1.2.3-themepack1a.tar.gz
+SRC_URI="
+	mirror://sourceforge/project/slim.berlios/slim-1.2.3-themepack1a.tar.gz
 	mirror://sourceforge/project/slim.berlios/slim-gentoo-simple.tar.bz2
 	mirror://gentoo/slim-archlinux.tar.gz
 	mirror://sourceforge/project/slim.berlios/slim-debian-moreblue.tar.bz2
@@ -26,27 +26,21 @@ SRC_URI="mirror://sourceforge/project/slim.berlios/slim-1.2.3-themepack1a.tar.gz
 	http://www.xfce-look.org/CONTENT/content-files/48605-xfce-g-box-slim-0.1.tar.gz
 	http://www.konstantinhansen.de/source/slim_themes/gentoo_10_purple/gentoo_10_purple.tar.bz2 -> gentoo_10_purple-r1.tar.bz2
 	http://www.konstantinhansen.de/source/slim_themes/gentoo_10_blue/gentoo_10_blue.tar.bz2 -> gentoo_10_blue-r1.tar.bz2
-	http://www.konstantinhansen.de/source/slim_themes/gentoo_10_dark/gentoo_10_dark.tar.bz2 -> gentoo_10_dark-r1.tar.bz2"
+	http://www.konstantinhansen.de/source/slim_themes/gentoo_10_dark/gentoo_10_dark.tar.bz2 -> gentoo_10_dark-r1.tar.bz2
+"
+S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 sparc x86"
-IUSE=""
 
 RDEPEND="x11-misc/slim"
-DEPEND=""
 
 RESTRICT="strip binchecks"
 
-S="${WORKDIR}"
-
-src_prepare() {
-	epatch "${FILESDIR}/slim-theme-flat.diff"
-}
-
-src_compile() {
-	:
-}
+PATCHES=(
+	"${FILESDIR}/slim-theme-flat.patch"
+)
 
 src_install() {
 	for i in capernoited flower2 gentoo isolated lotus-{sage,midnight} \
diff --git a/x11-themes/vanilla-dmz-aa-xcursors/Manifest b/x11-themes/vanilla-dmz-aa-xcursors/Manifest
index 5b3c3ad51f5c..37d8406f3ecc 100644
--- a/x11-themes/vanilla-dmz-aa-xcursors/Manifest
+++ b/x11-themes/vanilla-dmz-aa-xcursors/Manifest
@@ -1,3 +1,3 @@
 DIST dmz-cursor-theme_0.4.5.tar.xz 947544 BLAKE2B 6c945575f57c3db87a95545ef023a4a7d8cc6a329c5a083d0501452e34c9603568cfe41e495bae4d2982d01641dbcd4deef39e0291d6aa12e4d7a35c47e4797c SHA512 627fff9e4f690e30c6acbedb06035abc3ca7f6c6656a7e1290d752e115dbd8a41c37a2fe0d7cd7ece697c54dd7a343dd78d3c4604d124158961d95125f899f73
-EBUILD vanilla-dmz-aa-xcursors-0.4.5.ebuild 695 BLAKE2B 5f2c31e51caca4369c0a5fc56303d8f7d64493fc6f027fe857058201ad3faa5e6e7c6ee6a9d345ec9aef528a52e681e671d9c44d1ad87e9f764ff93d32dd4199 SHA512 de9f52deef384749a018a5d7b9809cfa18099b3f014a55e27a159fa2028201f20ebe1913161cbc1718a1ba23246bcc86d4c1c3ecae5e266b587b95e44f6f0838
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+EBUILD vanilla-dmz-aa-xcursors-0.4.5-r1.ebuild 751 BLAKE2B 4c9cb78e0446c0ff1b9d0a14fb7017084cff843f6eb197a03db484114f791849219632d3addccc2e94deb719eee7430613f7a36d3e22d25efa6598abd04af86f SHA512 c648d37d0c16d82e4806eda2243c1e80a8998a798e8898cd5339ad4b0a44e82ffcf6c27973108caece114c69d446f83a590ffb29954ad645c4934f923b5c598c
+MISC metadata.xml 191 BLAKE2B 8bff04ca02f4930d6f77dd32df009c145cacaad2d1cf271d91ae928f85acdccb0d73b0202a41aa3e60470ba6c7853e41ef76587601b2163f9ec249b7fa1c5274 SHA512 da06af54ba93db06f717082e3f09bbca9e17adad4b070a28131f2ffec15d0dfc82c79a3b2fb045fa33d6756c6df85254733622b0b7b1952b33d5590a71865c62
diff --git a/x11-themes/vanilla-dmz-aa-xcursors/metadata.xml b/x11-themes/vanilla-dmz-aa-xcursors/metadata.xml
index 7a38bb900964..3c58a0219fbe 100644
--- a/x11-themes/vanilla-dmz-aa-xcursors/metadata.xml
+++ b/x11-themes/vanilla-dmz-aa-xcursors/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/x11-themes/vanilla-dmz-aa-xcursors/vanilla-dmz-aa-xcursors-0.4.5.ebuild b/x11-themes/vanilla-dmz-aa-xcursors/vanilla-dmz-aa-xcursors-0.4.5-r1.ebuild
index 34c28e8f6a0f..1c19832b75a3 100644
--- a/x11-themes/vanilla-dmz-aa-xcursors/vanilla-dmz-aa-xcursors-0.4.5.ebuild
+++ b/x11-themes/vanilla-dmz-aa-xcursors/vanilla-dmz-aa-xcursors-0.4.5-r1.ebuild
@@ -1,29 +1,30 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Style neutral scalable cursor theme (black version)"
-HOMEPAGE="http://jimmac.musichall.cz/"
+HOMEPAGE="https://jimmac.eu/"
 SRC_URI="mirror://debian/pool/main/d/dmz-cursor-theme/dmz-cursor-theme_${PV}.tar.xz"
+S="${WORKDIR}/dmz-cursor-theme-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86"
-IUSE=""
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 DEPEND="x11-apps/xcursorgen"
-
-S="${WORKDIR}/dmz-cursor-theme-${PV}"
+RDEPEND="x11-libs/libXcursor"
 
 src_compile() {
-	cd "${S}/DMZ-Black/pngs" || die
-	./make.sh || die
+	pushd "${S}/DMZ-Black/pngs"
+		./make.sh || die
+	popd
 }
 
 src_install() {
-	insinto /usr/share/icons/Vanilla-DMZ-AA/cursors
-	doins -r DMZ-Black/xcursors/.
-	insinto /usr/share/icons/Vanilla-DMZ-AA
+	insinto /usr/share/cursors/xorg-x11/DMZ-Black
 	doins DMZ-Black/index.theme
+
+	insinto /usr/share/cursors/xorg-x11/DMZ-Black/cursors
+	doins -r DMZ-Black/xcursors/.
 }
diff --git a/x11-themes/vanilla-dmz-xcursors/Manifest b/x11-themes/vanilla-dmz-xcursors/Manifest
index 942784150bad..322c192d469e 100644
--- a/x11-themes/vanilla-dmz-xcursors/Manifest
+++ b/x11-themes/vanilla-dmz-xcursors/Manifest
@@ -1,3 +1,3 @@
 DIST dmz-cursor-theme_0.4.5.tar.xz 947544 BLAKE2B 6c945575f57c3db87a95545ef023a4a7d8cc6a329c5a083d0501452e34c9603568cfe41e495bae4d2982d01641dbcd4deef39e0291d6aa12e4d7a35c47e4797c SHA512 627fff9e4f690e30c6acbedb06035abc3ca7f6c6656a7e1290d752e115dbd8a41c37a2fe0d7cd7ece697c54dd7a343dd78d3c4604d124158961d95125f899f73
-EBUILD vanilla-dmz-xcursors-0.4.5.ebuild 687 BLAKE2B a78997b82db9970e6f3311a7fd73de1e1911a5bfae44e6eb7ef975deeadcf0916a772c99088e2e8fe241c98ad9c5412cb0e58277be4305cac61362c9a27bbd49 SHA512 be1b159720f43c111aacde9df468f00d8920933749eab09285b7d1caf29b1beb87546e86995b6c0789e7dd94fd2a80343b519a19c5d27955840224e6514f4211
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+EBUILD vanilla-dmz-xcursors-0.4.5-r1.ebuild 751 BLAKE2B 7cf0ab3b2bc338b5db039aff2e8d1ca1d224a64326a7b656889485186dfadb3e6e8cf8d60e5382e628eaa7d3e95bf30f4473e363a5f481ce64fa04b3496d785e SHA512 45aa0867a53b5bfa55fb3df36d1ee1c46f7c7085922ac75439875346f660c3bfd1d906688ad9203b4d364bf8e18736d1b8f1ce7b0c0da63c9fb33af951d6dbfe
+MISC metadata.xml 191 BLAKE2B 8bff04ca02f4930d6f77dd32df009c145cacaad2d1cf271d91ae928f85acdccb0d73b0202a41aa3e60470ba6c7853e41ef76587601b2163f9ec249b7fa1c5274 SHA512 da06af54ba93db06f717082e3f09bbca9e17adad4b070a28131f2ffec15d0dfc82c79a3b2fb045fa33d6756c6df85254733622b0b7b1952b33d5590a71865c62
diff --git a/x11-themes/vanilla-dmz-xcursors/metadata.xml b/x11-themes/vanilla-dmz-xcursors/metadata.xml
index 7a38bb900964..3c58a0219fbe 100644
--- a/x11-themes/vanilla-dmz-xcursors/metadata.xml
+++ b/x11-themes/vanilla-dmz-xcursors/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/x11-themes/vanilla-dmz-xcursors/vanilla-dmz-xcursors-0.4.5-r1.ebuild b/x11-themes/vanilla-dmz-xcursors/vanilla-dmz-xcursors-0.4.5-r1.ebuild
new file mode 100644
index 000000000000..3d9eea6edd8b
--- /dev/null
+++ b/x11-themes/vanilla-dmz-xcursors/vanilla-dmz-xcursors-0.4.5-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Style neutral scalable cursor theme (black version)"
+HOMEPAGE="https://jimmac.eu/"
+SRC_URI="mirror://debian/pool/main/d/dmz-cursor-theme/dmz-cursor-theme_${PV}.tar.xz"
+S="${WORKDIR}/dmz-cursor-theme-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+
+DEPEND="x11-apps/xcursorgen"
+RDEPEND="x11-libs/libXcursor"
+
+src_compile() {
+	pushd "${S}/DMZ-White/pngs"
+		./make.sh || die
+	popd
+}
+
+src_install() {
+	insinto /usr/share/cursors/xorg-x11/DMZ-White
+	doins DMZ-White/index.theme
+
+	insinto /usr/share/cursors/xorg-x11/DMZ-White/cursors
+	doins -r DMZ-White/xcursors/.
+}
diff --git a/x11-themes/vanilla-dmz-xcursors/vanilla-dmz-xcursors-0.4.5.ebuild b/x11-themes/vanilla-dmz-xcursors/vanilla-dmz-xcursors-0.4.5.ebuild
deleted file mode 100644
index dc46ef679386..000000000000
--- a/x11-themes/vanilla-dmz-xcursors/vanilla-dmz-xcursors-0.4.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Style neutral scalable cursor theme (white version)"
-HOMEPAGE="http://jimmac.musichall.cz/"
-SRC_URI="mirror://debian/pool/main/d/dmz-cursor-theme/dmz-cursor-theme_${PV}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="x11-apps/xcursorgen"
-
-S="${WORKDIR}/dmz-cursor-theme-${PV}"
-
-src_compile() {
-	cd "${S}/DMZ-White/pngs" || die
-	./make.sh || die
-}
-
-src_install() {
-	insinto /usr/share/icons/Vanilla-DMZ/cursors
-	doins -r DMZ-White/xcursors/.
-	insinto /usr/share/icons/Vanilla-DMZ
-	doins DMZ-White/index.theme
-}
diff --git a/x11-themes/windowmaker-themes/Manifest b/x11-themes/windowmaker-themes/Manifest
index 34b1fb570130..60bb3550f694 100644
--- a/x11-themes/windowmaker-themes/Manifest
+++ b/x11-themes/windowmaker-themes/Manifest
@@ -1,3 +1,3 @@
 DIST windowmaker-themes-0.1.tar.gz 16413142 BLAKE2B db65c3a15731a4526d8ce45c56ee7987a3f4c2e32a1020c35ccaae6c722aebda758d83fedbac375f7d42e989544295c57dc2ee8143dd0682ab3fe4d82992621c SHA512 2ecdd6155d9f62ed8e815c8c91e6f46114c1ff79bc4c1c79f383c2dfa55caa576f2c0c0010b469db7d851f4afa6fa196302b4ff5a7acb9d708f81f6708052b47
-EBUILD windowmaker-themes-0.1-r1.ebuild 1059 BLAKE2B eb21fc1efacf460656bd5930c6aad84a0dbfc05dba1a32302d96b61f89d060c7390a9843ea974cb3f6b85fd09a899939b76f0eb6f4f7ee2c3557b1f8f5315221 SHA512 fd92a2b1ca34ba1ec1f9768fb9591d4ea012c5fb1d0ce788a46f5482ce3660003d833d747aba872788fe3ec8b89902bf3fd42dce7301cb2bd78e14a7504b4264
+EBUILD windowmaker-themes-0.1-r1.ebuild 1148 BLAKE2B 545cc80e1482d7176f85d2c07b0bc1c9bcf5dbdec1992d3060c4b3e1641a3c39d0521f1079bd0abdd773319e7df6403bfba5fb39768075ebdb8bb58e8c26b62d SHA512 5f56ba26f27064f9216a90e4e6a2e5a8c033a0746a1657e5829a7f469d81cf5745461ddd0804c55220ac773bfb90e4e94a9cf9844fe790f5d005ca6314469cc1
 MISC metadata.xml 253 BLAKE2B 3b0c2aef2a8a4a9d91417347a62b76bee2b27a774bee648874d8a4d20800ed78d3452f3c5289b6d47c6bd2188752b41ef94f0919cff5de8cc7d4aafa5bbcffe4 SHA512 2adb9b9e4859c6d1063e67c509015594eec484e91882e3a71b70ac031e02b6f01ab5a2ad4e1a12329c284b34f7d69b19e08b593a0dc3901e2470eabb3e8d3fb5
diff --git a/x11-themes/windowmaker-themes/windowmaker-themes-0.1-r1.ebuild b/x11-themes/windowmaker-themes/windowmaker-themes-0.1-r1.ebuild
index 985047da31af..974c392ea86d 100644
--- a/x11-themes/windowmaker-themes/windowmaker-themes-0.1-r1.ebuild
+++ b/x11-themes/windowmaker-themes/windowmaker-themes-0.1-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
@@ -21,10 +21,19 @@ RDEPEND="x11-wm/windowmaker"
 BDEPEND=""
 
 src_prepare() {
-	MY_OFFENSIVE="3white Anguish"
+	MY_OFFENSIVE=(
+		3White
+		Anguish
+		Crave
+		"Darwins iMac"
+		"Digital Girls"
+		"Imacgirl Grape"
+		"Red Slip"
+		WMSecksy
+	)
 	if ! use offensive ; then
-		for j in ${MY_OFFENSIVE} ; do
-			rm -rf ${MY_OFFENSIVE}.themed
+		for j in "${MY_OFFENSIVE[@]}" ; do
+			rm -rf "${j}".themed
 		done
 	fi
 
diff --git a/x11-themes/wm-icons/Manifest b/x11-themes/wm-icons/Manifest
index 6ca82799b437..56526e7cd2cf 100644
--- a/x11-themes/wm-icons/Manifest
+++ b/x11-themes/wm-icons/Manifest
@@ -1,4 +1,4 @@
 AUX wm-icons-0.4.0-build.patch 673 BLAKE2B a34fd33584928874f4c0a24a34842b640dc1ab4ad030a77d9d596bab1c5eea4cf182c2c06074fe2994cbb7ed09641b43ed5683f51d4976174f608f0fb3cc50d9 SHA512 c55c6b94cfbe4d7502db4c9bb5727fe9858865f7205c06959b483c9a3714d41d22508710322bd17b8aae3259f7b5eb9b01840bb540add3de5d8543b8c72d0b79
 DIST wm-icons-0.4.0.tar.bz2 3433177 BLAKE2B d5d04aaa8da0f0bc8c4887de77febd5a7546981c2f7da0b0869bb2ce9e080488c57ddc4ed89374bb24c0b708c3ac77a6890da4a3624cd98db7e4031336098d98 SHA512 9b21dbb1ac697520792c1e8bfc6b06d4d9933828759571b7af978a670223841fcfe9adcf7f945de3f3a4a39e0d991045d6086be9b293bd89b67cf937262d53a5
-EBUILD wm-icons-0.4.0.ebuild 1229 BLAKE2B 43cc1b9d8a5306bfc5a1277907928b07ac73c6b65a50fde93647bc4c54ec02c24a0f1b349a879ff3e075ab7825ca34f06ae686649efbf573e5beed70f7aea827 SHA512 cc731fa7b9132ec3a2104971437705829955b487224ad62e98eae0cd93f0530b13a8dee81549f526e66576ba058ed9599ce1d0c017cc0aeba703c55bb3333c7b
+EBUILD wm-icons-0.4.0.ebuild 1224 BLAKE2B cc0aaf6b9667795909fed38712c8ba163a5ef58c20b9a3ed334b50ace7c45d76162896fc9872a5e672233ddf590434807a86473396b86fafa88ca60e9363aad9 SHA512 321055928b8cf2713b4c49ff75be99ed41202b5787b20f6da0ceaa5ef034a394ea7f43a73afc62ddfc818450c8612b9d132e06814f1e826a83a8569c10700deb
 MISC metadata.xml 413 BLAKE2B 8658f6251830bc9b10bb617d272d7b77b5ec50e8af755e0b1b906a931634c723535a46f870aab969762a05a6f5b66f4603e22c43db5c41e02076bf160e9a7b9e SHA512 3ac253166be95b1fc9bdc58cf47efeb6095e8ce37ebb76dc8e9a3db57c9385f4777eb0233a0214b044812639ec9406c1f0c80b3ae20c26f411c8494434b5f5b4
diff --git a/x11-themes/wm-icons/wm-icons-0.4.0.ebuild b/x11-themes/wm-icons/wm-icons-0.4.0.ebuild
index 133b45ebf592..2c59b902ddf6 100644
--- a/x11-themes/wm-icons/wm-icons-0.4.0.ebuild
+++ b/x11-themes/wm-icons/wm-icons-0.4.0.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit readme.gentoo-r1
 
 DESCRIPTION="A Large Assortment of Beautiful Themed Icons, Created with FVWM in mind"
@@ -36,10 +37,10 @@ src_configure() {
 
 src_install() {
 	# strange makefile...
-	emake icondir="${ED%/}/usr/share/icons/wm-icons" DESTDIR="${D}" install
+	emake icondir="${ED}/usr/share/icons/wm-icons" DESTDIR="${D}" install
 
 	einfo "Setting default aliases..."
-	"${ED%/}/usr/bin/wm-icons-config" --force --user-dir="${ED%/}/usr/share/icons/wm-icons" --defaults || die
+	"${ED}/usr/bin/wm-icons-config" --force --user-dir="${ED}/usr/share/icons/wm-icons" --defaults || die
 
 	einstalldocs
 	readme.gentoo_create_doc
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /x11-themes
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)