Provide icons with a Gentoo-style coloring by David Abbott (#499506), thanks to Ulrich Muller for his help with licensing. Drop old.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 71 insertions, 87 deletions

diff --git a/x11-themes/light-themes/ChangeLog b/x11-themes/light-themes/ChangeLog
index a11760bddd9f..0181d890f49a 100644
--- a/x11-themes/light-themes/ChangeLog
+++ b/x11-themes/light-themes/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-themes/light-themes
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/light-themes/ChangeLog,v 1.21 2013/12/08 19:54:09 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/light-themes/ChangeLog,v 1.22 2014/02/02 08:40:54 pacho Exp $
+
+*light-themes-0.1.93-r3 (02 Feb 2014)
+
+  02 Feb 2014; Pacho Ramos <pacho@gentoo.org> +light-themes-0.1.93-r3.ebuild,
+  -light-themes-0.1.8.32.ebuild, -light-themes-0.1.93.ebuild:
+  Provide icons with a Gentoo-style coloring by David Abbott (#499506), thanks
+  to Ulrich Muller for his help with licensing. Drop old.
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> light-themes-0.1.93-r2.ebuild:
   x86 stable, bug #478252
diff --git a/x11-themes/light-themes/Manifest b/x11-themes/light-themes/Manifest
index 617a5916f881..265961fc72ee 100644
--- a/x11-themes/light-themes/Manifest
+++ b/x11-themes/light-themes/Manifest
@@ -4,17 +4,16 @@ Hash: SHA256
 AUX light-themes-0.1.93-gtk3.8-1.patch 760 SHA256 34cdbcee6a2503ab250e3daf0322b3950cb50e01a88bbf4ae88422029e30df60 SHA512 3c72fdca8d314402a947aaeae7ec35a8fd667dfefe626b193989d791f3e7b3c7d92c2f14c9997e65b70cea1f45efd4fd00b3e524df1d01af04e5a9140c5545b4 WHIRLPOOL d42c792fbd2cd5ed0dce913a12e1b5d85dcdf988e945c2d5941f3308711ea907a0b53a7bdd132a02a8a618879bf673e2d2269e793b622c63e3e42863c2ead5ce
 AUX light-themes-0.1.93-gtk3.8-2.patch 812 SHA256 e55847ec659b797807e1fc5b370820913efa02ffa528b2b55803504c4a4dde44 SHA512 4f7a2c2c66a598946c7283826f211c3800d634b03e072af4482226efe54ef6ca4f49c068e34e7fffd72dfd6c99406fa075a51dc11636b670f71ecc0c8da8d1d1 WHIRLPOOL 728cd5f0dbe397f3874f8a3f04088f90d992e5940de9075fcceb84f1dcb5353080c92f1a23abd81d63b8a55c1d2d5ce39b05425f3bb987d7eb452fd4f84fbf66
 AUX light-themes-0.1.93-gtk3.8-3.patch 1266 SHA256 9aca95766ee1c4b5cca0535fdc17f714fa9d57f1e738fd7f8ba674f3f23db958 SHA512 b4e0791e492ec397c47f71e8ca6c6684731c8fb1952b1c6de412e70693f1e5ec15d208e49471aa20f805c5ad4d1e6c43572e19de69f9f77317ec6dda3dfcde6a WHIRLPOOL 2f90d0653038df3e4610500dadc8e6bcb72a11c824fb0bb9400a7d85ec1e4518e76f38dae5ae4f4fe24cccb344f84ef8f0e79679ecba149200ca62e864beb005
-DIST light-themes_0.1.8.32-0ubuntu1.tar.gz 176796 SHA256 72598a460223c7b321f52ee02b328a8c093689a82dd766f846b3e4f95a92049d SHA512 300fd2a96e882206665bc8d402cc66f6aef4b5f5766a94ed9752993ba80a1f7b45fd1a0721971dd7681951d83a1fab05e596758fc3cdf750821002280b665466 WHIRLPOOL 7bf3bef0b8b02f0b60d176c22336eab5a71c95b84017ee48fba3f6aff3eb3f05c6a57745debd7b85dd86a4b4f507a2fd8e04e6ceaf9d58c082e0dc5dcdb5307e
+DIST Gentoo-Buttons.tar.xz 3396 SHA256 289446ce163906b9fe522fcd3f6120b82d4f8ccaaf8a86b17022ceda81c5c4b5 SHA512 a7c2f6fae0c5fef088b10ae2330ec72baf5d6c2dadf474d8c3b16e1161c4bea467c73c509b60b1dc050221fbfbf8526b4deda6feb15a4187961292b572ccecff WHIRLPOOL 8fdb401f7edc2ae66c161fec8f83346a65ca4e24e5af4492593dc82719603fe3bc619e1260fc9031702c295da5ba4c2d887f253d52e57980a615bcb22e6c93e3
 DIST light-themes_0.1.93.tar.gz 333969 SHA256 f44bda89c7328e2cda9e4f26d4cd26091fe462d581e8d9b7b73b982533146c37 SHA512 c59a0c3451d91a3e19cdfb91e67dbbfb7ff3f804d586383281fb9b2ad261953eb8549670ef0aaf87f6f0d497eec6cca8d78d19d4c8107b807fb768a1e155ed7e WHIRLPOOL 267e7e570f5b1d614a8a55067a5cef646a60e2e71bb0d96f197bbee429ed8adbe34237358c5011ca735ad07b3997dad0d43e49bd811028166179ef2bfc14d711
-EBUILD light-themes-0.1.8.32.ebuild 1385 SHA256 144ca4c0e893c317ec988d7c3ec3b05e373a6152db978f980281f6a3140dbb1b SHA512 4bfce1968017e7ef214f2c06cac8f5ce9b2e44f137ea6f5744f300613937135372da8093086fcb8a6c74686438294b8e19d2afc34023f9933609cfcaa6ad7629 WHIRLPOOL a5a4396ff8f6d9c1ba396b37a7fa1d66ef9b0240f2f61abeafe63bacd8f9a4971c893882be8bfc8e1b5ce404c693b50b45120d7ad5ff7f9baf126096cee1c96b
 EBUILD light-themes-0.1.93-r2.ebuild 1724 SHA256 578f179451df30433bc8e57b9a73b9e414dddc8b02b5825dc83225b46d274d18 SHA512 d7736c75a0ba1a8ba275a3d6d1360f81cbbf9ac3673ae196e6a2a3c0682ec08b80590832e45d92a2c1693f5f89263af1e1226f26074e9a257a0e01d3d6f84853 WHIRLPOOL 8f2608417d188d52612775b5c2fa51dd01a0526544a85b60bd953323f15b3046adf88d7ee0a23aa4371eb97203abb23ae97208b54ea91e1f4c9ac11ae5695aee
-EBUILD light-themes-0.1.93.ebuild 1444 SHA256 9774a97c1e6add48c9fd9a350fb4ddcc2b030a23fae5ba061624b9fac844e0d5 SHA512 34a1e8be31b85f66c72fade970a9541d390cb7136e9f22aca2fabfa5ca4d77f166e494304796ada9fc6f8a89d3e56624671e6f007ee5bdb7fc5571d40dd4c6c6 WHIRLPOOL e7520adc56ecfb63e77805b5f6264d95662b6939f43eb70a27f3335b1a8d08cb068c3c971d82586c0a7e19905b2542bd7671d41d4d42785533784d50a4a0a3a0
-MISC ChangeLog 4051 SHA256 f688c1cfd8362034e5dd63b6549b920512b5c626dcf81122ccd30e938a72c6b4 SHA512 9374f924aeff04aa85b867ecba6e32d3d4edf73fd2efdef2fd8eaf990e534bee66505927d9712a571a3e219422a7c95b45e09a1a9b74f5a6c7cab2b640479e97 WHIRLPOOL 01a01b16f44a389416387ce936740452bdf1baa2fd5447a7f78333ac7a4f9f4839a9feb3f000e687b5d65596d6233b1b31c5a40739de7ea6f422278351d67571
+EBUILD light-themes-0.1.93-r3.ebuild 1989 SHA256 e6e96624b67c3e55a75cc6cf52412516c6fe6643ce748e324018bf775231abe1 SHA512 5cc6614cc149571b563b7aa38e0d43bbc4aff525260ff0a76912f9abe0b20a2a66edf82b8196cb1ffb17d9557720af461aa24906a4029414dbbd8fba061d540b WHIRLPOOL 97f6e4096ce0a1f8bef5aa65306b438ae09ce10d70cb3fed90bc9eb89e1e09d610381a3cc72c9a19546924d059940a34c8a45fe8b5c220c09615f75f107bc996
+MISC ChangeLog 4368 SHA256 d0b0c87db05cb1552628f9ea428a7e43a457d82bde281ccfb12d433bcf3367b4 SHA512 6eeb5a19e4b15513be23de0d354f2142778d94e30718625bdd98ae2dee38b2e7d44179234b7219a90c4ef21bd75123f0ec6e4abe215897262f7b256355733ae1 WHIRLPOOL 998db9adb0d8a4293151b24cb1ba4bad84ec52d12213325a5e976d91e2c1f0a14d4d2c4a4b2b8a11b0952f1f21c593dc339d92d5d4389d95d6dd6c4d6d8c653a
 MISC metadata.xml 408 SHA256 c0608720bca0d41e83b56740214f8a3f49a139771c3b4aa84c26a90fe8b3fa6e SHA512 778ac92591362816d472e03b41d89ed75e4a58f54552429bad7159b3d8af8380bf89fb798ed23d1b67a3ae10dfb6ee8231dd2da04b67230fdeef05cd2f46a777 WHIRLPOOL ff28cb6b5a3d1b7a1931c0b712b2ab81b0f23f202fc87f00579f5988bcfe8017e9a7f9206d93a4b055c5526b699075ac8c6ff1d6674fe762298f180fe9aa7162
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKkzmIACgkQCaWpQKGI+9Ru9gCffMZJfhZv+g1JG8NYdFixlVak
-qnAAn1GUDfv+AJ3gvL/SsLUe2tZITib8
-=3T6f
+iEYEAREIAAYFAlLuBJcACgkQCaWpQKGI+9TT2wCcCO3z8LYMfJpsxTJcbFTd/sB0
+8MYAoIQgZ7G7fjP/NtEL4hJrDN36maND
+=mopn
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/light-themes/light-themes-0.1.8.32.ebuild b/x11-themes/light-themes/light-themes-0.1.8.32.ebuild
deleted file mode 100644
index 8ba8df94ae53..000000000000
--- a/x11-themes/light-themes/light-themes-0.1.8.32.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/light-themes/light-themes-0.1.8.32.ebuild,v 1.4 2013/02/07 23:00:32 ulm Exp $
-
-EAPI=4
-
-DESCRIPTION="GTK2/GTK3 Ambiance and Radiance themes from Ubuntu"
-HOMEPAGE="https://launchpad.net/light-themes"
-SRC_URI="mirror://ubuntu/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-0ubuntu1.tar.gz"
-
-LICENSE="CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk3"
-
-DEPEND=""
-RDEPEND="x11-themes/gtk-engines-murrine
-	gtk3? ( x11-themes/gtk-engines-unico )"
-
-src_prepare() {
-	cp -r Ambiance/ Ambiance-Gentoo || die
-	cp -r 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:#75755f5fbbbb/g' \
-		Ambiance-Gentoo/gtk-2.0/gtkrc Ambiance-Gentoo/gtk-3.0/settings.ini \
-		Radiance-Gentoo/gtk-2.0/gtkrc Radiance-Gentoo/gtk-3.0/settings.ini || die
-	sed -i -e 's/nbg_color:#F2F1F0/nbg_color:#f2f2f1f1f0f0/g' \
-		Ambiance-Gentoo/gtk-2.0/gtkrc Ambiance-Gentoo/gtk-3.0/settings.ini || die
-}
-
-src_install() {
-	insinto /usr/share/themes
-	doins -r Radiance* Ambiance*
-}
diff --git a/x11-themes/light-themes/light-themes-0.1.93-r3.ebuild b/x11-themes/light-themes/light-themes-0.1.93-r3.ebuild
new file mode 100644
index 000000000000..a204f1ce962c
--- /dev/null
+++ b/x11-themes/light-themes/light-themes-0.1.93-r3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/light-themes/light-themes-0.1.93-r3.ebuild,v 1.1 2014/02/02 08:40:54 pacho Exp $
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="GTK2/GTK3 Ambiance and Radiance themes from Ubuntu"
+HOMEPAGE="https://launchpad.net/light-themes"
+SRC_URI="
+	mirror://ubuntu/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz
+	http://dev.gentoo.org/~pacho/${PN}/Gentoo-Buttons.tar.xz
+"
+
+LICENSE="CC-BY-SA-3.0 CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk3"
+
+DEPEND="app-arch/xz-utils"
+RDEPEND="
+	x11-themes/gtk-engines-murrine
+	gtk3? ( x11-themes/gtk-engines-unico )
+"
+
+src_prepare() {
+	# Apply upstream fixes for gtk+-3.8 compat, bug #469062
+	# upstream: https://bugs.launchpad.net/ubuntu-themes/+bug/1130183
+	epatch "${FILESDIR}/${P}-gtk3.8-1.patch"
+	epatch "${FILESDIR}/${P}-gtk3.8-2.patch"
+	epatch "${FILESDIR}/${P}-gtk3.8-3.patch"
+
+	cp -r Ambiance/ Ambiance-Gentoo || die
+	cp -r 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.0/settings.ini \
+		Radiance-Gentoo/gtk-2.0/gtkrc Radiance-Gentoo/gtk-3.0/settings.ini || die
+	sed -i -e 's/selected_bg_color #f07746/selected_bg_color #755fbb/g' \
+		Ambiance-Gentoo/gtk-3.0/gtk-main.css Radiance-Gentoo/gtk-3.0/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
+}
+
+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-0.1.93.ebuild b/x11-themes/light-themes/light-themes-0.1.93.ebuild
deleted file mode 100644
index 12e19c169af6..000000000000
--- a/x11-themes/light-themes/light-themes-0.1.93.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/light-themes/light-themes-0.1.93.ebuild,v 1.2 2013/02/07 23:00:31 ulm Exp $
-
-EAPI=4
-
-DESCRIPTION="GTK2/GTK3 Ambiance and Radiance themes from Ubuntu"
-HOMEPAGE="https://launchpad.net/light-themes"
-SRC_URI="mirror://ubuntu/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk3"
-
-DEPEND=""
-RDEPEND="x11-themes/gtk-engines-murrine
-	gtk3? ( x11-themes/gtk-engines-unico )"
-
-src_prepare() {
-	cp -r Ambiance/ Ambiance-Gentoo || die
-	cp -r 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:#75755f5fbbbb/g' \
-		Ambiance-Gentoo/gtk-2.0/gtkrc Ambiance-Gentoo/gtk-3.0/settings.ini \
-		Radiance-Gentoo/gtk-2.0/gtkrc Radiance-Gentoo/gtk-3.0/settings.ini || die
-	sed -i -e 's/nbg_color:#F2F1F0/nbg_color:#f2f2f1f1f0f0/g' \
-		Ambiance-Gentoo/gtk-2.0/gtkrc Ambiance-Gentoo/gtk-3.0/settings.ini || die
-}
-
-src_install() {
-	insinto /usr/share/themes
-	doins -r Radiance* Ambiance*
-
-	use gtk3 || {
-		rm -R "${D}"/usr/share/themes/*/gtk-3.0 || die
-	}
-}