gentoo resync : 29.01.2021

4 files changed, 66 insertions, 11 deletions

diff --git a/x11-themes/light-themes/Manifest b/x11-themes/light-themes/Manifest
index c719e392a133..d6aaa9574eb5 100644
--- a/x11-themes/light-themes/Manifest
+++ b/x11-themes/light-themes/Manifest
@@ -1,7 +1,9 @@
 DIST Gentoo-Buttons-r1.tar.xz 80476 BLAKE2B 802ce2cc0d8dd3c639cbb1b8ca51732cfb87194ecc2bd0ca68c7945c8768b8662d206bf191f443f983e80e25a21ebf7d1909771b2f51b7825b763494a4edac81 SHA512 d1c093fe8ce905a409cd3ce85fde8490f26b918bb1dd3ccb6695eaa6c7a4908d7ba1e1d14a9443a16331168ca9b3fa58b5b28805fc583b4345932602f7c19168
 DIST ubuntu-themes_16.10+17.04.20170406.orig.tar.gz 13836108 BLAKE2B aeb2b33639c32c378b111c717099a79afb8688b48780bfa816a6ac9b4c0bfef5d1b475048f8c4906ee76787b503dcc207fbd617f1718883952917739012e2a11 SHA512 50d65dbe232237e1757b0d7a85ba7c2cafac18861211ca1b33a57de6a4961c325014851d1ee661adec57fac7472b7ae4f78439f30fa6f425eb751e94940d9f91
 DIST ubuntu-themes_19.04.orig.tar.gz 16081764 BLAKE2B f94545c5900c9eaab61f021d8a8f37ef6ee825045df88e5a5e51c5d7632109343ca0293ee9b590daa6edf3be109a05128803a8a2c787a333f6317f8dbe54529c SHA512 95b41c5d3a47fba9c4b5368b4e80d8924e09844783c66ca697ce0ff5d71f2b0fd4f56a9041dc142267e0eaf75fd5a8b47c0abae049fc3434b5e29f3f363d83e8
-EBUILD light-themes-17.04_p20170406-r1.ebuild 2110 BLAKE2B 30b7aed0ab3f8dd5f9bcceba134b9af679d21a673bf5a0a27de6052e079bb6baebd70035e56a3573e5b7523847242db21a4eeedb4b59e92eaef37b86df43f3a6 SHA512 64c2d15a88a1f0e240168981ea284f5a8269e86037443c01aa04a398f1defdc8ace8eaac4c574a562fa5ef2fe90a88a20228ff32a080ba4da911e6a423ad6d04
+DIST ubuntu-themes_20.10.orig.tar.gz 15679746 BLAKE2B bcb1bae746379fe26700b7e88db4e91b0220e7145f55c59b951a31d768c2311d843c5d92c989b049e1009afbfc6e918e65726408298858e8fd689d0bbab1ca42 SHA512 0118f7c2404856216ff2df0246ea2fa98d0d5b25973abc3df13a998f7a41f2eeb32ca08281ba41399a91fa16ab046e3b3292f504503958983a6488c1e3001ac4
+EBUILD light-themes-17.04_p20170406-r2.ebuild 2110 BLAKE2B 33431e6c09562aaf49c2f73abcbbe76aee1351d763b18e15d0beb433adf83d14d5797f25ab07409ce8f6b977fe8c72a82bbfe9402b0c2208af6a551aa2779d81 SHA512 662a50c42b4d239a0ff8cd302c2c5de75fd375a7655e912c6d0323e869ca8c26800e8b561bcfa4c0764241576a49275a7418553c658f8b3bc6ebbcc2633d2c6f
 EBUILD light-themes-17.04_p20170406.ebuild 2109 BLAKE2B 7047f793c2783c770b57ee7bf28846dda32ddf4d028aa6f128cc5a9578130f69bfa261e5eb18d927a1081e8a51ab3c96a7b484d1834ab2f902e887d7535ff17b SHA512 5f6421524dfe03c61803626f8cad5685c478f1b73c9ab04f505ad96db2f31d8e1d9f98ff4d3c66c73bf58b4b937aa920f9540273dae8512fe7b519fbf1635cd4
-EBUILD light-themes-19.04.ebuild 2099 BLAKE2B e047dde212ad6d32f90dab792eab2faa009d8f9809905f42aa13b350edb103c4c31cb74f3a25f1b7eaa4f795f1ba3057dc6a8f9289f0fa7ad65f7dc43df3753a SHA512 7d89e2e7559a535713906a1e2ad3432df8185489a2eb310e493b7586ca4218a826eb1c87a6baaa86a82ed2d693a62ddc8aaf2bb0978a6548fc366b65870d9ecb
+EBUILD light-themes-19.04-r2.ebuild 1987 BLAKE2B 131c10bf2c7b113edd1392bf45d12443058da8c12242a1b8df215c244c65e4b6191d4fbf639460605210e9334c49bdf94bfa69fdd94e3651198d36804b03d0d3 SHA512 60b424897d1df24fd090ff6590542d4c8e5af73a89dd998430d4aeced8e52b3993fa00e361cea8fefaeef5b1a615c2e536a3ba4475b571570a30a45413cf12ff
+EBUILD light-themes-20.10-r2.ebuild 1987 BLAKE2B 131c10bf2c7b113edd1392bf45d12443058da8c12242a1b8df215c244c65e4b6191d4fbf639460605210e9334c49bdf94bfa69fdd94e3651198d36804b03d0d3 SHA512 60b424897d1df24fd090ff6590542d4c8e5af73a89dd998430d4aeced8e52b3993fa00e361cea8fefaeef5b1a615c2e536a3ba4475b571570a30a45413cf12ff
 MISC metadata.xml 506 BLAKE2B 41dfe203ca428341cbd04463a7fd30725e8e24889be4561b21c4b765cc589b3a8659b318030aa11e2026ca8625eb450cc0f7f4e491216570a14b0aeab638f2e4 SHA512 dc5aadda298ca7f295a47b3c354f0a12b3560c76e920e4ce41a902ccc483e6e328eaf252da3ae2a2afb27f5269349a33c1ae075dfe81de3f6e7256e347de83fd
diff --git a/x11-themes/light-themes/light-themes-17.04_p20170406-r1.ebuild b/x11-themes/light-themes/light-themes-17.04_p20170406-r2.ebuild
index 4a33d8bcdb60..3db72c12aeaf 100644
--- a/x11-themes/light-themes/light-themes-17.04_p20170406-r1.ebuild
+++ b/x11-themes/light-themes/light-themes-17.04_p20170406-r2.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
@@ -59,6 +59,6 @@ src_install() {
 	doins -r Radiance* Ambiance*
 
 	use gtk3 || {
-		rm -R "${D}"/usr/share/themes/*/gtk-3.0 || die
+		rm -R "${D}"/usr/share/themes/*/gtk-3.* || die
 	}
 }
diff --git a/x11-themes/light-themes/light-themes-19.04.ebuild b/x11-themes/light-themes/light-themes-19.04-r2.ebuild
index 91b109330db3..115ed1fee18b 100644
--- a/x11-themes/light-themes/light-themes-19.04.ebuild
+++ b/x11-themes/light-themes/light-themes-19.04-r2.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
@@ -15,12 +15,11 @@ SRC_URI="
 LICENSE="CC-BY-SA-3.0 CC-BY-SA-4.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gtk3"
+IUSE=""
 
 DEPEND="app-arch/xz-utils"
 RDEPEND="
 	x11-themes/gtk-engines-murrine
-	gtk3? ( x11-themes/gtk-engines-unico )
 "
 
 S="${WORKDIR}"/${MY_PN}-${PV}
@@ -56,8 +55,4 @@ src_compile() {
 src_install() {
 	insinto /usr/share/themes
 	doins -r Radiance* Ambiance*
-
-	use gtk3 || {
-		rm -R "${D}"/usr/share/themes/*/gtk-3.0 || die
-	}
 }
diff --git a/x11-themes/light-themes/light-themes-20.10-r2.ebuild b/x11-themes/light-themes/light-themes-20.10-r2.ebuild
new file mode 100644
index 000000000000..115ed1fee18b
--- /dev/null
+++ b/x11-themes/light-themes/light-themes-20.10-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=ubuntu-themes
+
+DESCRIPTION="GTK2/GTK3 Ambiance and Radiance themes from Ubuntu"
+HOMEPAGE="https://packages.ubuntu.com/zesty/light-themes"
+SRC_URI="
+	mirror://ubuntu/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz
+	https://dev.gentoo.org/~pacho/${PN}/Gentoo-Buttons-r1.tar.xz
+"
+
+LICENSE="CC-BY-SA-3.0 CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-arch/xz-utils"
+RDEPEND="
+	x11-themes/gtk-engines-murrine
+"
+
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+src_prepare() {
+	cp -RL Ambiance/ Ambiance-Gentoo || die
+	cp -RL Radiance/ Radiance-Gentoo || die
+	sed -i -e 's/Ambiance/Ambiance-Gentoo/g' Ambiance-Gentoo/index.theme \
+		Ambiance-Gentoo/metacity-1/metacity-theme-1.xml || die
+	sed -i -e 's/Radiance/Radiance-Gentoo/g' Radiance-Gentoo/index.theme \
+		Radiance-Gentoo/metacity-1/metacity-theme-1.xml || die
+	sed -i -e 's/nselected_bg_color:#f07746/nselected_bg_color:#755fbb/g' \
+		Ambiance-Gentoo/gtk-2.0/gtkrc Ambiance-Gentoo/gtk-3.*/settings.ini \
+		Radiance-Gentoo/gtk-2.0/gtkrc Radiance-Gentoo/gtk-3.*/settings.ini || die
+	sed -i -e 's/selected_bg_color #f07746/selected_bg_color #755fbb/g' \
+		Ambiance-Gentoo/gtk-3.*/gtk-main.css \
+		Radiance-Gentoo/gtk-3.*/gtk-main.css || die
+
+	cp -f "${WORKDIR}"/Gentoo-Buttons/*.png "${S}"/Ambiance-Gentoo/metacity-1/. || die
+	cp -f "${WORKDIR}"/Gentoo-Buttons/*.png "${S}"/Radiance-Gentoo/metacity-1/. || die
+	cp -f "${WORKDIR}"/Gentoo-Buttons/assets/*.png "${S}"/Ambiance-Gentoo/gtk-3.0/assets/. || die
+	cp -f "${WORKDIR}"/Gentoo-Buttons/assets/*.png "${S}"/Ambiance-Gentoo/gtk-3.20/assets/. || die
+	cp -f "${WORKDIR}"/Gentoo-Buttons/assets/*.png "${S}"/Radiance-Gentoo/gtk-3.0/assets/. || die
+	cp -f "${WORKDIR}"/Gentoo-Buttons/assets/*.png "${S}"/Radiance-Gentoo/gtk-3.20/assets/. || die
+
+	eapply_user
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	insinto /usr/share/themes
+	doins -r Radiance* Ambiance*
+}