From 441d1370330332b7d78f238d2f5e13f7aed5e4e0 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 25 Dec 2020 23:06:25 +0000
Subject: gentoo christmass resync : 25.12.2020

---
 x11-themes/Manifest.gz                              | Bin 22415 -> 22446 bytes
 x11-themes/adwaita-icon-theme/Manifest              |   4 ++--
 .../adwaita-icon-theme-3.32.0.ebuild                |  14 ++++++--------
 .../adwaita-icon-theme-3.36.1-r1.ebuild             |  19 ++++++-------------
 x11-themes/geany-themes/Manifest                    |   2 +-
 .../geany-themes/geany-themes-1.22.2-r1.ebuild      |   2 +-
 x11-themes/gnome-themes-standard/Manifest           |   2 +-
 .../gnome-themes-standard-3.28.ebuild               |   7 +++----
 x11-themes/goddard-backgrounds/Manifest             |   2 +-
 .../goddard-backgrounds-13.0.0.3-r1.ebuild          |   2 +-
 x11-themes/gtk-engines-adwaita/Manifest             |   2 +-
 .../gtk-engines-adwaita-3.28.ebuild                 |  17 +++++++++--------
 x11-themes/gtk-engines/Manifest                     |   2 +-
 .../gtk-engines/gtk-engines-2.20.2-r100.ebuild      |  20 +++++++-------------
 x11-themes/laughlin-backgrounds/Manifest            |   2 +-
 .../laughlin-backgrounds-14.1.0.3-r1.ebuild         |   2 +-
 x11-themes/leonidas-backgrounds/Manifest            |   2 +-
 .../leonidas-backgrounds-11.0.0.2-r1.ebuild         |   2 +-
 x11-themes/neutral-xcursors/Manifest                |   2 +-
 .../neutral-xcursors-20150106.ebuild                |   2 +-
 x11-themes/solar-backgrounds/Manifest               |   2 +-
 .../solar-backgrounds-0.92.0.5-r1.ebuild            |   2 +-
 x11-themes/verne-backgrounds/Manifest               |   2 +-
 .../verne-backgrounds-15.91.0.1-r1.ebuild           |   2 +-
 24 files changed, 50 insertions(+), 65 deletions(-)

(limited to 'x11-themes')

diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 7f4018b47da3..545a038aa59a 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/adwaita-icon-theme/Manifest b/x11-themes/adwaita-icon-theme/Manifest
index d435024701fc..a6fafc9a6ceb 100644
--- a/x11-themes/adwaita-icon-theme/Manifest
+++ b/x11-themes/adwaita-icon-theme/Manifest
@@ -1,6 +1,6 @@
 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 tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
-EBUILD adwaita-icon-theme-3.32.0.ebuild 1653 BLAKE2B cdb2f6f32ff05764cf1565dd791a542bfcf5feedae2e6c74d302489a4dd1052a23d7ae5bd151eff5c18ce77ac239a3c610e13780221859f0653f2f8aeb7d5afe SHA512 d23d394b6bf1d6897dc9f58cac0cc8bb0113dee3b22a99843065391739936cbf36ee115c15dfcc4bad5b3339e67d35f53b04fdd7ca257162dc2ee8cc103f0a76
-EBUILD adwaita-icon-theme-3.36.1-r1.ebuild 1950 BLAKE2B 3fcbec7efd08927e514de81bec0d7c31403225c0dcba91781c6a246767e1c9cdf13ecbe0cdbe43cec57bae3bdb30ada2a05ca30d72f53fc34b2fd2d27b52dd1b SHA512 613fcbdb359876c36fa58493277cde94f116bb539cf0ca9c9a974fff942ae38bd7526d4bbe7e890c19d2581d8c9ff8d22ccf81514a167284e5d4097bb24c9652
+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
 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 51f5ea054495..e6b170a05836 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,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit gnome2
 
@@ -21,17 +21,15 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd
 
 # 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
-COMMON_DEPEND="
-	>=x11-themes/hicolor-icon-theme-0.10
+DEPEND=">=x11-themes/hicolor-icon-theme-0.10"
+RDEPEND="${DEPEND}
 	gnome-base/librsvg:2
 "
-RDEPEND="${COMMON_DEPEND}
-	!<x11-themes/gnome-themes-standard-3.14
-"
-DEPEND="${COMMON_DEPEND}
-	x11-libs/gtk+:3
+BDEPEND="
+	gnome-base/librsvg:2
 	sys-devel/gettext
 	virtual/pkgconfig
+	x11-libs/gtk+:3
 "
 # This ebuild does not install any binaries
 RESTRICT="binchecks strip"
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-3.36.1-r1.ebuild
index 42cbbedd2a10..ec449ae6fa1a 100644
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.36.1-r1.ebuild
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.36.1-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit gnome2
 
@@ -21,14 +21,15 @@ 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
-RDEPEND="
-	>=x11-themes/hicolor-icon-theme-0.10
+DEPEND=">=x11-themes/hicolor-icon-theme-0.10"
+RDEPEND="${DEPEND}
 	>=gnome-base/librsvg-2.48:2
 "
-DEPEND="${RDEPEND}
-	x11-libs/gtk+:3
+BDEPEND="
+	>=gnome-base/librsvg-2.48:2
 	sys-devel/gettext
 	virtual/pkgconfig
+	x11-libs/gtk+:3
 "
 # This ebuild does not install any binaries
 RESTRICT="binchecks strip"
@@ -51,13 +52,5 @@ src_prepare() {
 }
 
 src_configure() {
-	# less than 2.45 being a problem is just a guess, but we didn't carry anything between 2.40 and 2.48 in main tree
-	if has_version '<gnome-base/librsvg-2.45:2'; then
-		ewarn "You are building ${CATEGORY}/${PN} against an older"
-		ewarn "gnome-base/librsvg, which will result in various broken symbolic icons until"
-		ewarn "rebuild with newer librsvg, and misrendering of scalable icons at runtime"
-		ewarn "until gnome-base/librsvg is upgraded!"
-	fi
-
 	gnome2_src_configure GTK_UPDATE_ICON_CACHE=$(type -P true)
 }
diff --git a/x11-themes/geany-themes/Manifest b/x11-themes/geany-themes/Manifest
index 6c070dd56967..8bce4b5e5383 100644
--- a/x11-themes/geany-themes/Manifest
+++ b/x11-themes/geany-themes/Manifest
@@ -1,3 +1,3 @@
 DIST geany-themes-1.22.2.tar.bz2 14694 BLAKE2B 2cac3e3170bdeb04d727574f5285da89c8a915a681e0fcebbd8217d2314c00d681b3113fa5ed8e00f0454c99725688a92350ecc9b2a7859d029914f940fb4eb3 SHA512 3759c687a06a7f933e40fde5c52dc10c36eebeb799a5c471c5ee31598f8c32496b1a3f326342494e33ae209bed66420147f85ebdbce771af2f27b0151dca9c84
-EBUILD geany-themes-1.22.2-r1.ebuild 483 BLAKE2B c51d860d66520448ecb10fa0939c1d13477602db0cf4b32f483d415bfac2abf9f9d4a746c2879aa51fda5cc915a2c428e131efc5052efd79d47c573ec7e1c80c SHA512 55c6db2e0321109e8d59b6d097385acdf129195a71589257e5c3d102a840c6db66dd214e836b115e87fab55a70ca68c0e5edc6fba21fff08c97c86b9da89b48c
+EBUILD geany-themes-1.22.2-r1.ebuild 480 BLAKE2B 448a9e2b8d290d7df7acc539e9b5a218a3f12acdcd5dddfd71c90f34b53e401edeb948a42a113c37359302cccde49214fb5c61725507a67b88285f687f1d8a63 SHA512 8f48b33e52b9071cfa4c0aa612549166a22b8a8291e890ac6c1f24e0aa1097f79d904240511ee952e6c6d12b0835524e4d17faa819dbbe61fd6d7a6a366e7168
 MISC metadata.xml 255 BLAKE2B 505d4b3cff4a1131376f1166c7d6c3494c68efa29f3b13d9aba351ad1847318c95883ad8dfb7baba0ed214ee8e5d394cbcefb11e0118c3c9c651b7a182bb117c SHA512 894c428e9ba202b7e0b66de02973b8e6df3efe93fe3446aa5ea342284ff8b247b5668c2e91c822b0792ff2fbda1a3e8a88159d7cfe25e437239ae5071514d89c
diff --git a/x11-themes/geany-themes/geany-themes-1.22.2-r1.ebuild b/x11-themes/geany-themes/geany-themes-1.22.2-r1.ebuild
index a86daf5c3ab2..3184f258c379 100644
--- a/x11-themes/geany-themes/geany-themes-1.22.2-r1.ebuild
+++ b/x11-themes/geany-themes/geany-themes-1.22.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/x11-themes/gnome-themes-standard/Manifest b/x11-themes/gnome-themes-standard/Manifest
index 50cbf680b610..55d3017c5ad2 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 1035 BLAKE2B b2756f1fe9c5d5630f663d9671f41a7ed2002b7bd423e2b3ab8c46481ccc743cd501399d05d2d5c7c6dae6dbec9103a27de9df6a57f65ee9e0fbca0a7bc09368 SHA512 b92526987613767c5e8bbb56621dacced6f278f792fcd6896dad4538d553c1e1018c7ec76947528fb86fd59eebe95fe50157ecc60b91bf8dfbe32f540e9b833b
+EBUILD gnome-themes-standard-3.28.ebuild 1008 BLAKE2B d26feab73bdf93497156a8d2f1beb5264742a715bdb1eb07c690eb5d4403106acb7ba2645adbb461a01c22046f4fd620ebdf2d65e7182de02a56d2de6d6b736c SHA512 d0b5aaf2c1a4f580766c34d83f0f1e11a4f81eec81cd628943042cdf6332c920c97fbe724b37e88aa3ce96b1da22f89dc088fbef7879f99ce05f03e1cf626eb5
 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 6752de6dbac2..ec1e7159a039 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,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 GNOME_ORG_MODULE="gnome-themes-extra"
 
 inherit autotools gnome.org xdg
@@ -11,7 +11,6 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-themes-extra"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE=""
 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
@@ -19,7 +18,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd6
 RDEPEND="
 	>=gnome-base/gsettings-desktop-schemas-3.4
 "
-DEPEND="
+BDEPEND="
 	>=dev-util/intltool-0.40
 	sys-devel/gettext
 	virtual/pkgconfig
@@ -36,7 +35,7 @@ src_prepare() {
 }
 
 src_configure() {
-	ECONF_SOURCE="${S}" econf \
+	econf \
 		--disable-static \
 		--disable-gtk2-engine \
 		--disable-gtk3-engine \
diff --git a/x11-themes/goddard-backgrounds/Manifest b/x11-themes/goddard-backgrounds/Manifest
index 7dceb76a9c9d..a9b470c33d88 100644
--- a/x11-themes/goddard-backgrounds/Manifest
+++ b/x11-themes/goddard-backgrounds/Manifest
@@ -1,3 +1,3 @@
 DIST goddard-backgrounds-13.0.0-3.fc15.src.rpm 3741339 BLAKE2B 592dcbdc548eee6d13fa31e7747d10e38fbdffe3afbdb4bdc5417908f11114f4b28db3387b4e9ab0a98a9d66571f522182486ff2ac7a018a7171375eb048cf79 SHA512 39ed95d1f00bf9c9fc351f5b335a3db22f4438dbf2a66559b1afcdd2c663821696f820e6f19e907aa2a2efd67bf49f154a68d2967dac8eec4c4ce1a19ad109df
-EBUILD goddard-backgrounds-13.0.0.3-r1.ebuild 876 BLAKE2B b5e83ec7859f07f0301baa81cc7ad4134007f305bdc13421a86e53512f4900d25b1d52ce945722c7091219c59ac3b5f19599eb77e2f4ef5e76ca881f1148a85a SHA512 eb2bd65724b37ad94b8adb813ab47747eb9cab06518d8913b7c7c5f472957d6d1b1f18daad47a9b3395abe07a382c67c1fa78f23173131e8896a7d6daef7ec98
+EBUILD goddard-backgrounds-13.0.0.3-r1.ebuild 873 BLAKE2B d5d940c2e63565c02c09b68ec9bd9217b684b4607c856128b45c536e101eabf535abc493f534f6c4d91d020a3ac1b8024b943ee8cbbf95f2b3630825b82e7cf3 SHA512 56d1779bf38d4fc626d00d25f37976224b71463885752effd628cd327dd8b175bd2a0a4ffba140d0dd2cba4ee06b347b343a2578347e01ad80d368a8adf20eee
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/x11-themes/goddard-backgrounds/goddard-backgrounds-13.0.0.3-r1.ebuild b/x11-themes/goddard-backgrounds/goddard-backgrounds-13.0.0.3-r1.ebuild
index f4944b17a904..d2d15d28bf0f 100644
--- a/x11-themes/goddard-backgrounds/goddard-backgrounds-13.0.0.3-r1.ebuild
+++ b/x11-themes/goddard-backgrounds/goddard-backgrounds-13.0.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/x11-themes/gtk-engines-adwaita/Manifest b/x11-themes/gtk-engines-adwaita/Manifest
index d3fa33eb8a13..5c6536ac95f9 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 1077 BLAKE2B 920f90dafdce64f9d6c716b4f00d6b1b1a346e2d909ec5af1b9f582f7027b68a8779fd20a5c62c20361e4edb68b280479ac519f7af0711b897e0f710c4dfa44f SHA512 7617471380b4638b7d4a1ee8411686d6bac3566274d857c471f694112baf384865edf111025befad727c2ccdbb4b5b2121fde2d88629410e8d32ad8d014eda11
+EBUILD gtk-engines-adwaita-3.28.ebuild 1046 BLAKE2B 199830836dc938eb2e658b4019360c6af54cbfcbabe156947e92ebe8bb2367d956e129ae0ae1f5337a68a4f7ade5de1fecec8e296c4117142661d9f56affe72f SHA512 bf888eddd0051d8ee24d493e0008b0ff55ac0cc458ad3f4cb1572865b598c15b469934724c1ed260db1c655fdd142d94526c9813b96a4017ce30f754b0c9f3ca
 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 4c09b1ff5d2a..eb94c0181f60 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,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 GNOME_ORG_MODULE="gnome-themes-extra"
 
 inherit gnome.org multilib-minimal
@@ -11,16 +11,13 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-themes-extra/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE=""
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
-COMMON_DEPEND="
+DEPEND="
 	>=x11-libs/gtk+-2.24.15:2[${MULTILIB_USEDEP}]
 "
-RDEPEND="${COMMON_DEPEND}
-	!<x11-themes/gnome-themes-standard-3.20.2-r1
-"
-DEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}"
+BDEPEND="
 	>=dev-util/intltool-0.40
 	sys-devel/gettext
 	virtual/pkgconfig
@@ -40,5 +37,9 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	emake -C themes/Adwaita/gtk-2.0 DESTDIR="${D}" install-engineLTLIBRARIES
-	find "${D}" -name '*.la' -delete || die
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
 }
diff --git a/x11-themes/gtk-engines/Manifest b/x11-themes/gtk-engines/Manifest
index 45a118e5cbc4..9f6fefe4219d 100644
--- a/x11-themes/gtk-engines/Manifest
+++ b/x11-themes/gtk-engines/Manifest
@@ -5,6 +5,6 @@ AUX gtk-engines-2.20.2-java-look.patch 602 BLAKE2B bd9625acae0c7ce7f81089c716b2d
 AUX gtk-engines-2.20.2-tooltips.patch 1116 BLAKE2B ad050dbff4bba6c7172a449eec7b001d3f9cffc0c79043356ad1fda851d94aac8c1322caa1aedde9cb8931e6f73ac8e1f411e17c9e363a420f7612c8a6ad3ecf SHA512 0e89d704f883f0dce086f83b4dc27decc3e022f1ad7ec46e9a0ca9d5ab2e3a997826c8ca3d1340e3e51ed3e4433c7e30eac833b02f76409f66a08b178cdd3b30
 AUX gtk-engines-2.20.2-window-dragging.patch 466 BLAKE2B 851f633db234986b9855dffae2cdda3b812f48e9e221f14b601c1f65764fac0d88f5dd70cc96a50949725da52e64fb60ba59ab491856279b468dc255201cdebb SHA512 4f3f20c007a1b3fc001485fdd0c84450f8bbf3c2e95decd058b552adfeecc75a84ae2be7da3984c058df940bcb87ce6cd149d24a5e86486befd085d339c65a77
 DIST gtk-engines-2.20.2.tar.bz2 688171 BLAKE2B 1eb80f1bfa7f58cdcde6d461bcd6a41d7fe8b7ca20e11f1f59b350b3b5ce8c196c5f35330ec027d0ff1d9de19f28d412e0e3c6460487ac7ea61284fc1858a90c SHA512 049ae20d47a28b60fe5b0484e3c11bc6cd62d6167478f1d83df3066d618827ca9204767ab1b7a9ca02f542c3fc7929efc1bb85f65d66aaf5d5b15718b6de19e9
-EBUILD gtk-engines-2.20.2-r100.ebuild 1707 BLAKE2B 28b7e80b99eac648a76bd06d5a66be8584a020d910839a9bab89da5420d927b54f326a55172d4fb6cf9309bd36cddcd9d25360f367b03a0abcd97e6b3d078af7 SHA512 ce67eb04c4381235d2cec6a59e8c9e3d7a1768806d8ee5c4880a5e4fb0b422117fe5329ad7c9271cdbf12ce0ce677cb3c58d0f34a8faf211cd6d503c7f5b69e8
+EBUILD gtk-engines-2.20.2-r100.ebuild 1749 BLAKE2B 87b4bd76524a2f2dd9d4125275d36a87fd8c784b5f08ecd4abaad7b06603567cd20571921966bc680e37848af1fec2151d0e09fd37c1f69219630f94578f9b91 SHA512 12576f9ac3bd36d4090786c37d4d9bbff956b010fa80ec100e59bdf637daf4f10b5aa3680606641d1467512e09354ae4c3596461cc0f4b63e6fcb705a12e9bbf
 EBUILD gtk-engines-2.20.2-r2.ebuild 1383 BLAKE2B ec1441c73870bf753c88cf555e238a1c00f56cc2ab071197eb13b8dbf8c048dc7434e9ffd8032c102695f55799d17b127c66b4c54c9f3fc522971234dd88b7d4 SHA512 4bb2d643f6be737ad0e91b5a1301aaa331e25acad5783d50d7abd7a063833cea074e23c9e6f5568eac0b1b26d0b78f294d4a1c8ed12f678a20b351ef8227b9b1
 MISC metadata.xml 667 BLAKE2B 4f110a2598845c8930ca8567655e34e87c9517cd68b41957d1450367b7e0ed783848bd7ce1213b407229fd7eea3b4a36760ddc7b921424821ae55fcb664e2788 SHA512 62bb1508fe80e89238a57dffb44b7e8951f5d5b8c50ddd412fdf84778e77a2e13c16bb6ff1045802fbd71a1dea038695b76febd024cb50b96258bfd67b32ad47
diff --git a/x11-themes/gtk-engines/gtk-engines-2.20.2-r100.ebuild b/x11-themes/gtk-engines/gtk-engines-2.20.2-r100.ebuild
index 597dc742bc9a..39c7e74458e0 100644
--- a/x11-themes/gtk-engines/gtk-engines-2.20.2-r100.ebuild
+++ b/x11-themes/gtk-engines/gtk-engines-2.20.2-r100.ebuild
@@ -42,25 +42,19 @@ PATCHES=(
 
 src_prepare() {
 	gnome2_src_prepare
+	# pkgconfig wrapper set up by lua-single.eclass is not multilib-compatible
+	# at present so point Autoconf directly to the correct implementation.
+	# We patch configure rather than configure.ac because running 'eautoreconf'
+	# results for some reason in corrupted test Makefiles.
+	sed -i -e "s|\"lua\"|\"${ELUA}\"|g" configure || die
 }
 
 multilib_src_configure() {
 	local confopts=(
 		--enable-animation
+		$(use_enable lua)
+		$(use_with lua system-lua)
 	)
-	# TODO: fix system-lua detection so that it works for non-native ABIs,
-	# native builds rely on the pkgconfig wrapper set up by lua-single.eclass
-	# but that wrapper is not multilib-compatible.
-	if multilib_is_native_abi; then
-		confopts+=(
-			$(use_enable lua)
-			$(use_with lua system-lua)
-		)
-	else
-		confopts+=(
-			--disable-lua
-		)
-	fi
 	ECONF_SOURCE=${S} gnome2_src_configure "${confopts[@]}"
 }
 
diff --git a/x11-themes/laughlin-backgrounds/Manifest b/x11-themes/laughlin-backgrounds/Manifest
index a6afd076b504..cfe17766f7f9 100644
--- a/x11-themes/laughlin-backgrounds/Manifest
+++ b/x11-themes/laughlin-backgrounds/Manifest
@@ -1,3 +1,3 @@
 DIST laughlin-backgrounds-14.1.0-3.fc15.src.rpm 52687935 BLAKE2B b8bbf3847a2524988fc8395cb33a5009209d49d5c648b021a0ab146e32ea7b8e54a4145a072d564ec55155cc3417c2e1126623103ef745c6b89e872396af1b2d SHA512 db03da2177bcd894a267366cdfb0ae9497872bd22ad7061fadc42d9bc1e2c2ce3015d8f85ed7fa58d1b82132ca350d7939ee20104b7a2e9e9d99bee197bc9e80
-EBUILD laughlin-backgrounds-14.1.0.3-r1.ebuild 876 BLAKE2B ad50068a33f49b6f40221c2d73639a2d01d54db35f0284f39a19dd84330cea804d316b0cd78e0cdd8beeca1b90e8a696e876e03af81be9059c2f2f27b712a927 SHA512 e0df24cbef2c5b905dd9bcf9c8e780f2ce3640e509d1b6bf122d236630795607080d2abb89f8a24e9e8be4a783a679b9a9d3577c1fbfa8484c6aae761ced59fb
+EBUILD laughlin-backgrounds-14.1.0.3-r1.ebuild 873 BLAKE2B a2cab4b7bb4204e846ecb70d6eff995ed505730523f8cc09035f8ef1175357ef934d7569fb2c942b37ca47c5759705167f8d5e3b3841353b97cf487bc1b193fa SHA512 769ceed35c84ae80a10a4d82ae8884ad2031d9415665d360433e17d62c334c1406f8cc811d69bf195754459c9a26a4cb042fe8000d51de3b9da4341306143912
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/x11-themes/laughlin-backgrounds/laughlin-backgrounds-14.1.0.3-r1.ebuild b/x11-themes/laughlin-backgrounds/laughlin-backgrounds-14.1.0.3-r1.ebuild
index 2ed8aa4e04fd..0fe9084619c1 100644
--- a/x11-themes/laughlin-backgrounds/laughlin-backgrounds-14.1.0.3-r1.ebuild
+++ b/x11-themes/laughlin-backgrounds/laughlin-backgrounds-14.1.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/x11-themes/leonidas-backgrounds/Manifest b/x11-themes/leonidas-backgrounds/Manifest
index b2e24b058729..53c494d83a4e 100644
--- a/x11-themes/leonidas-backgrounds/Manifest
+++ b/x11-themes/leonidas-backgrounds/Manifest
@@ -1,3 +1,3 @@
 DIST leonidas-backgrounds-11.0.0-2.fc12.src.rpm 30664585 BLAKE2B 07528accc0b004fd4404ce86fe38398e2aa8bae97a6f73432541dca4f5c4f048ca77639b08aa9bc2ba9d13ea9146ad1de1be2a84c4a9b83b3cc52156c6a1542f SHA512 c0ad0c2d5051fe2ca0711b46f1eb4be78ae265b9b6da469cdb37ff16b3c49c6576f8d94f3d625e4011f80a0b7b220a9cf245a1cf66cbd601517ce139a397e3c1
-EBUILD leonidas-backgrounds-11.0.0.2-r1.ebuild 910 BLAKE2B af4a33de520d61bdbcbb5d5dea0105e132f4c1a5833ddab19b07317cee06b04c9b156b3e657f052a8a5041f918741704794fb6d5ec33dad6dbf17959a160cfbc SHA512 ef6cee263147aa237bc7b716169f62d87fe8da98c0738cd00815029aa7e24c948152002e713d8a990bf07f6bd0b1fa827f6efd91f3c8c1afc374f7800def7d6b
+EBUILD leonidas-backgrounds-11.0.0.2-r1.ebuild 907 BLAKE2B bbb0c00bf0f7a4644e447b829bb070d9ec085c3f7fe3f73a9fca58982c6819411f15e89c2651f66cf75575af714b14d43ede08a8cbdaf70d35b89e97d7104ed6 SHA512 e08ee0ca7288db2236d2acfae0a5b59aed12cab6d718a88e6d15cf6c5ebd62d59324cafc9ed9ae1f0c9e4417e995abdb73d79cbd4ff5ba83403a0a5bf8af38f3
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/x11-themes/leonidas-backgrounds/leonidas-backgrounds-11.0.0.2-r1.ebuild b/x11-themes/leonidas-backgrounds/leonidas-backgrounds-11.0.0.2-r1.ebuild
index 989c9f96b616..f74bf6de6f94 100644
--- a/x11-themes/leonidas-backgrounds/leonidas-backgrounds-11.0.0.2-r1.ebuild
+++ b/x11-themes/leonidas-backgrounds/leonidas-backgrounds-11.0.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/x11-themes/neutral-xcursors/Manifest b/x11-themes/neutral-xcursors/Manifest
index f7f7adf8bd49..5e74a38130f3 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 2799 BLAKE2B a132f672fcbc255fc274b6309cccde1f78246c831d63daca99ba8e013534f830e462eab3f8e71da7b8519ee30229909cbc8fadddd3887b33a61b38a8101ebdd9 SHA512 10dd6e70eec8702d6e73b95d81d9c77e1d72ebd8401ce9dc530303d1d518652a1100483aa7f0453ef5eb7f80f3148c15748c55d04f53ff8daf445efc8bce25a6
+EBUILD neutral-xcursors-20150106.ebuild 2796 BLAKE2B 8b55bf5af02261f75b115b38d76a1ce6329dffe85931ae31b177ab8272a43f111875b7649e89971cfe0311f304ba68bb92f59e5e480fcb98227eacc342247204 SHA512 10d3f76aeaff140092753d43ea6b0a7d5569e54309345f31d5765f154d61463150277efaa90eabda189fd60416e02b290af8068a73b518300733651c7142eb9e
 MISC metadata.xml 168 BLAKE2B 95e3160d1d6abb3e5510581fe45ddcd9ad526f89bbc0d3ad226e2782d148a0c71e50426809a87fb45e6fc9356e597a1d271002764caebc79be8846301eb82d5e SHA512 5edd6cda32972ff5e53cf5f883928bd1887b4a45572657f99101284a909ea04ff906b8f4068d247d1b3367bde813dbb37ba11565aaff880d9b500685b0f5a33d
diff --git a/x11-themes/neutral-xcursors/neutral-xcursors-20150106.ebuild b/x11-themes/neutral-xcursors/neutral-xcursors-20150106.ebuild
index 6db3fa6f7dde..d60e6d4a9bb0 100644
--- a/x11-themes/neutral-xcursors/neutral-xcursors-20150106.ebuild
+++ b/x11-themes/neutral-xcursors/neutral-xcursors-20150106.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/x11-themes/solar-backgrounds/Manifest b/x11-themes/solar-backgrounds/Manifest
index 8ad05eb06064..83d67bb14b57 100644
--- a/x11-themes/solar-backgrounds/Manifest
+++ b/x11-themes/solar-backgrounds/Manifest
@@ -1,3 +1,3 @@
 DIST solar-backgrounds-0.92.0-5.fc15.src.rpm 100761686 BLAKE2B 9cb2304f30615545b76d55a816236519bf62b018d5170532b991e67f8edbc4495463f6352f0df42c9ad7bc6eccfa5d991099519a410338a82d0315ba82191675 SHA512 942105d469a88a2c03441b6ebfd74096164bd21be027b4c8eaa83ac320088de2a34745b29aa0458d73425f093944633e1527bb519cbe2f8bc1a4031c87275a95
-EBUILD solar-backgrounds-0.92.0.5-r1.ebuild 843 BLAKE2B 864ced7966f211f002ce342b618d6fe6cfeee4b5861a64922d0beaea769950895f1b17412a4f1b978cffd355c9a35a26cff309362818dd0ee3ad0aae6d98129e SHA512 f53de80801b64c546c108314863eb8c4160c2354d56c8edc6a790ca46e433879872d1925e3e560b7ab333e6d878acd03696b0b9057a8300d75bd05c0a973358a
+EBUILD solar-backgrounds-0.92.0.5-r1.ebuild 840 BLAKE2B c0fecdc0e82acbc4a9b07430904213901d3906e2b35f647c4190fdbfdf4fb140a7e8b24debba30bd8d0a7aa1c391fbb75d43dc00031440172756742bd68c3412 SHA512 6df5cfe30688074e8553a0e58f1eaf8481edff42049971b5aa4d42a32b05c6cd6a5b383893480b6efb1dc65f65fb32ac40b7bf6ff1bbf83c1f8876d6b11fea9f
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/x11-themes/solar-backgrounds/solar-backgrounds-0.92.0.5-r1.ebuild b/x11-themes/solar-backgrounds/solar-backgrounds-0.92.0.5-r1.ebuild
index 5c039deeebf8..502b4ab4eec5 100644
--- a/x11-themes/solar-backgrounds/solar-backgrounds-0.92.0.5-r1.ebuild
+++ b/x11-themes/solar-backgrounds/solar-backgrounds-0.92.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/x11-themes/verne-backgrounds/Manifest b/x11-themes/verne-backgrounds/Manifest
index e55f0e768c82..5a6168831439 100644
--- a/x11-themes/verne-backgrounds/Manifest
+++ b/x11-themes/verne-backgrounds/Manifest
@@ -1,3 +1,3 @@
 DIST verne-backgrounds-15.91.0-1.fc16.src.rpm 7360450 BLAKE2B 014ccfb323148a4c7a544b79c30405a6c7827b17f5780b75a01275d6827ecc52acb130fc904510b6246ab7483449c2f0ad55931c3a3bb2f02162dc6841771c3a SHA512 fb9b5de5df841dcccf6f7927c3a3b44e726be6d2c0eacd873c284605878d2ab1b88e4510db314d2a20e54221b9e393ca2c495c96154cea6e871f4e192ca75df2
-EBUILD verne-backgrounds-15.91.0.1-r1.ebuild 745 BLAKE2B d072b469a81b076caf6703d46fe2372e6c86f90e4fbe61ec5cefbca4b3ffcfa655dee8fef40bed82712c813b230ade3f4777d31071b322becf1ab2f8e1825ad3 SHA512 5d8609562e6956f606bf89141491ea0be3237b787827d77535eed05f067b885eb793a3f18a2a10df29b06368a7c8f026db00bfbbcd4051f97d58123051ef2436
+EBUILD verne-backgrounds-15.91.0.1-r1.ebuild 742 BLAKE2B 21412fb0f644b3866cee12016d0352355c564b1831c2f2e6cc2f02e70e48e869065179a76edff8048c86a5cfd5af9eff006e2b5cefe5cbfcc81b75b609448064 SHA512 f13139b01108bd49c412653e2c5df434576a1e40b839e1f7cff4e75ddd56fd2dd36265539c1aa341ea912ca9065ac95a613a432930fd4e1255a0003d82cf2e91
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/x11-themes/verne-backgrounds/verne-backgrounds-15.91.0.1-r1.ebuild b/x11-themes/verne-backgrounds/verne-backgrounds-15.91.0.1-r1.ebuild
index df072337e286..f33fc1ca9502 100644
--- a/x11-themes/verne-backgrounds/verne-backgrounds-15.91.0.1-r1.ebuild
+++ b/x11-themes/verne-backgrounds/verne-backgrounds-15.91.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-- 
cgit v1.2.3