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

(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 84 insertions, 8 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/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() {