Fix gtk+-3.8 compat (#469062 by Evgeny Bobkin), and fix colors for Gentoo variants.

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

5 files changed, 92 insertions, 15 deletions

diff --git a/x11-themes/light-themes/ChangeLog b/x11-themes/light-themes/ChangeLog
index 12166b188b8c..42f0507f278d 100644
--- a/x11-themes/light-themes/ChangeLog
+++ b/x11-themes/light-themes/ChangeLog
@@ -1,6 +1,15 @@
 # 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.17 2013/03/30 17:26:56 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/light-themes/ChangeLog,v 1.18 2013/05/09 18:27:38 pacho Exp $
+
+*light-themes-0.1.93-r1 (09 May 2013)
+
+  09 May 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/light-themes-0.1.93-gtk3.8-1.patch,
+  +files/light-themes-0.1.93-gtk3.8-2.patch, +light-themes-0.1.93-r1.ebuild,
+  -light-themes-0.1.11.ebuild:
+  Fix gtk+-3.8 compat (#469062 by Evgeny Bobkin), and fix colors for Gentoo
+  variants.
 
   30 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org>
   -light-themes-0.1.8.29.ebuild, -light-themes-0.1.9.1.ebuild,
@@ -97,4 +106,3 @@
   13 Nov 2011; Sebastian Pipping <sping@gentoo.org>
   +light-themes-0.1.8.25.ebuild, +metadata.xml:
   New package
-
diff --git a/x11-themes/light-themes/Manifest b/x11-themes/light-themes/Manifest
index 1102d149e286..f0976696d3ea 100644
--- a/x11-themes/light-themes/Manifest
+++ b/x11-themes/light-themes/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST light-themes_0.1.11-0ubuntu1.tar.gz 158791 SHA256 061e88c018a3326b75acac78d6a5a22aac43d958e60c88381c569d57827d73e3
+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
 DIST light-themes_0.1.8.32-0ubuntu1.tar.gz 176796 SHA256 72598a460223c7b321f52ee02b328a8c093689a82dd766f846b3e4f95a92049d SHA512 300fd2a96e882206665bc8d402cc66f6aef4b5f5766a94ed9752993ba80a1f7b45fd1a0721971dd7681951d83a1fab05e596758fc3cdf750821002280b665466 WHIRLPOOL 7bf3bef0b8b02f0b60d176c22336eab5a71c95b84017ee48fba3f6aff3eb3f05c6a57745debd7b85dd86a4b4f507a2fd8e04e6ceaf9d58c082e0dc5dcdb5307e
-DIST light-themes_0.1.93.tar.gz 333969 SHA256 f44bda89c7328e2cda9e4f26d4cd26091fe462d581e8d9b7b73b982533146c37
-EBUILD light-themes-0.1.11.ebuild 1453 SHA256 8fea7ae71908786746f4b77378545c3a7df26ba05dff37813c5dac6f8cd88b19 SHA512 430c676ca9e25fb5dd4b6f29a8ecbe5be25986e97172b87e68c6d2d79d0813e586e6b565f139e537fd763eaaa4bc05ca1668d1bb629fc18ebd2b73075187467d WHIRLPOOL b160235c7bc5fb2a8691028fd33f0d50fbb1d44c00cd89e9524d34c72a211a08c64a7a33dc1ffdf1010952b503448d10abdbe0c68ac231d71bc34a9b913a19f1
+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-r1.ebuild 1684 SHA256 74963d616b256c1f9b86e4e2fe3c169f055df9342ba73fccba168f2d3c40a024 SHA512 f6e01d1930f1045b7462c0ccfaf2f83ce0c0f5bea20ca5b6ae792944a50bdeffc7720071e0eba95fabdd616f4a776e5602b2b14a0ce130e481ce0f0e87e59479 WHIRLPOOL 6168068fdfccf8e9c99c161b84a462b2fc5062a470ea6a4a5b1dbda48285d17a1f3f547f7e410df347203bba5ae91c6f89bee3c0b270aa1e3ffc5018197db938
 EBUILD light-themes-0.1.93.ebuild 1444 SHA256 9774a97c1e6add48c9fd9a350fb4ddcc2b030a23fae5ba061624b9fac844e0d5 SHA512 34a1e8be31b85f66c72fade970a9541d390cb7136e9f22aca2fabfa5ca4d77f166e494304796ada9fc6f8a89d3e56624671e6f007ee5bdb7fc5571d40dd4c6c6 WHIRLPOOL e7520adc56ecfb63e77805b5f6264d95662b6939f43eb70a27f3335b1a8d08cb068c3c971d82586c0a7e19905b2542bd7671d41d4d42785533784d50a4a0a3a0
-MISC ChangeLog 3258 SHA256 1d67436dad6c5618e0a92f226b4ec1b474f3973b3f7751ca3ec0068c772ebb26 SHA512 d4e2cb20b3469e013a197185483a6d2194ecee04c88074e04b2582e5a59740066b87aa84bdd543f23a58ddbcbc0f77fe627cebef1ac0f4c73a99fd967dba064a WHIRLPOOL 2649763f72e2cdfe60ddaacedaece345d368a87f16ced0811416a01e3dba1ecee679acd7ed50d6462ed781b1df258544c47ca54fe24bbf72da1900cd2eea8013
+MISC ChangeLog 3586 SHA256 d3fc04e939c9f788ced8309a8aa8de6dd14e430f79e1cf3330629b2bfae0153b SHA512 8f26b525096af3997394f34ada0850d71f0713c4a2840a7bc7e98db1921ca5b9374b0bf5e0240d9974fc0275040af261e531f9c135bb585c8098dd2703157e6b WHIRLPOOL b5853b374e982767ace319f49ed9a7cea1e9ec2df0a717b4e45e33ee931a642541bd86a1c87dd91dc15052b25f533d6e75e06275c42061552e6bc20749068199
 MISC metadata.xml 408 SHA256 c0608720bca0d41e83b56740214f8a3f49a139771c3b4aa84c26a90fe8b3fa6e SHA512 778ac92591362816d472e03b41d89ed75e4a58f54552429bad7159b3d8af8380bf89fb798ed23d1b67a3ae10dfb6ee8231dd2da04b67230fdeef05cd2f46a777 WHIRLPOOL ff28cb6b5a3d1b7a1931c0b712b2ab81b0f23f202fc87f00579f5988bcfe8017e9a7f9206d93a4b055c5526b699075ac8c6ff1d6674fe762298f180fe9aa7162
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFXIGEACgkQ1fmVwcYIWAYA8wCgiJ5dcXq5gbdupwZfCeay3oC7
-FD8AoJU4GndvMFiVxkFUcqW9CFvXMmgO
-=MwCF
+iEYEAREIAAYFAlGL6psACgkQCaWpQKGI+9QeyACfU5YIcvEAV+7MiyOG4koGD7oE
+wt8AnAkrqGXB5FEZQY4hGA/YWmW/vxPJ
+=wuTy
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/light-themes/files/light-themes-0.1.93-gtk3.8-1.patch b/x11-themes/light-themes/files/light-themes-0.1.93-gtk3.8-1.patch
new file mode 100644
index 000000000000..f19ff261a197
--- /dev/null
+++ b/x11-themes/light-themes/files/light-themes-0.1.93-gtk3.8-1.patch
@@ -0,0 +1,30 @@
+=== modified file 'Ambiance/gtk-3.0/gtk-widgets.css'
+--- Ambiance/gtk-3.0/gtk-widgets.css	2013-02-10 12:59:27 +0000
++++ Ambiance/gtk-3.0/gtk-widgets.css	2013-02-19 12:56:19 +0000
+@@ -956,9 +956,8 @@
+ }*/
+ 
+ .menuitem {
++    background: transparent;
+     border-radius: 0;
+-    border-style: solid;
+-    border-width: 1px;
+     padding: 3px 2px 3px 2px;
+ 
+     text-shadow: none;
+
+=== modified file 'Radiance/gtk-3.0/gtk-widgets.css'
+--- Radiance/gtk-3.0/gtk-widgets.css	2013-02-10 12:59:27 +0000
++++ Radiance/gtk-3.0/gtk-widgets.css	2013-02-19 12:56:19 +0000
+@@ -956,9 +956,8 @@
+ }*/
+ 
+ .menuitem {
++    background: transparent;
+     border-radius: 0;
+-    border-style: solid;
+-    border-width: 1px;
+     padding: 3px 2px 3px 2px;
+ 
+     text-shadow: none;
+
diff --git a/x11-themes/light-themes/files/light-themes-0.1.93-gtk3.8-2.patch b/x11-themes/light-themes/files/light-themes-0.1.93-gtk3.8-2.patch
new file mode 100644
index 000000000000..b77202139677
--- /dev/null
+++ b/x11-themes/light-themes/files/light-themes-0.1.93-gtk3.8-2.patch
@@ -0,0 +1,32 @@
+=== modified file 'Ambiance/gtk-3.0/gtk-widgets.css'
+--- Ambiance/gtk-3.0/gtk-widgets.css	2013-02-19 12:56:19 +0000
++++ Ambiance/gtk-3.0/gtk-widgets.css	2013-02-19 13:06:53 +0000
+@@ -956,9 +956,10 @@
+ }*/
+ 
+ .menuitem {
++    -GtkMenuItem-horizontal-padding: 0;
+     background: transparent;
+     border-radius: 0;
+-    padding: 3px 2px 3px 2px;
++    padding: 3px 5px 3px 5px;
+ 
+     text-shadow: none;
+ }
+
+=== modified file 'Radiance/gtk-3.0/gtk-widgets.css'
+--- Radiance/gtk-3.0/gtk-widgets.css	2013-02-19 12:56:19 +0000
++++ Radiance/gtk-3.0/gtk-widgets.css	2013-02-19 13:06:53 +0000
+@@ -956,9 +956,10 @@
+ }*/
+ 
+ .menuitem {
++    -GtkMenuItem-horizontal-padding: 0;
+     background: transparent;
+     border-radius: 0;
+-    padding: 3px 2px 3px 2px;
++    padding: 3px 5px 3px 5px;
+ 
+     text-shadow: none;
+ }
+
diff --git a/x11-themes/light-themes/light-themes-0.1.11.ebuild b/x11-themes/light-themes/light-themes-0.1.93-r1.ebuild
index a86fdf40acff..2bfba69206ee 100644
--- a/x11-themes/light-themes/light-themes-0.1.11.ebuild
+++ b/x11-themes/light-themes/light-themes-0.1.93-r1.ebuild
@@ -1,12 +1,13 @@
 # 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.11.ebuild,v 1.2 2013/02/07 23:00:32 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/light-themes/light-themes-0.1.93-r1.ebuild,v 1.1 2013/05/09 18:27:38 pacho Exp $
 
-EAPI=4
+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}-0ubuntu1.tar.gz"
+SRC_URI="mirror://ubuntu/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
@@ -18,17 +19,22 @@ 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"
+
 	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' \
+	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/nbg_color:#F2F1F0/nbg_color:#f2f2f1f1f0f0/g' \
-		Ambiance-Gentoo/gtk-2.0/gtkrc Ambiance-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
 }
 
 src_install() {