Add patch to show kde background colors thanks to Markus Lohse <mlohse@gmx.net> in bug 143925, also add note that gnome is crashing thanks to Sebastian Baldovino <sebabal@gmail.com> in bug 105092

Package-Manager: portage-2.1.1_pre5-r3

6 files changed, 96 insertions, 10 deletions

diff --git a/x11-themes/gtk-engines-qt/ChangeLog b/x11-themes/gtk-engines-qt/ChangeLog
index 7281465df31d..240c193b9b88 100644
--- a/x11-themes/gtk-engines-qt/ChangeLog
+++ b/x11-themes/gtk-engines-qt/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-themes/gtk-engines-qt
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qt/ChangeLog,v 1.10 2006/07/06 22:54:54 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qt/ChangeLog,v 1.11 2006/08/22 17:12:48 genstef Exp $
+
+*gtk-engines-qt-0.7-r1 (22 Aug 2006)
+
+  22 Aug 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/kcmgtk-write-good-bashrc.diff, gtk-engines-qt-0.7.ebuild,
+  +gtk-engines-qt-0.7-r1.ebuild:
+  Add patch to show kde background colors thanks to Markus Lohse
+  <mlohse@gmx.net> in bug 143925, also add note that gnome is crashing thanks
+  to Sebastian Baldovino <sebabal@gmail.com> in bug 105092
 
 *gtk-engines-qt-0.7 (06 Jul 2006)
 
diff --git a/x11-themes/gtk-engines-qt/Manifest b/x11-themes/gtk-engines-qt/Manifest
index 52c429c69e8b..7b35ede6675e 100644
--- a/x11-themes/gtk-engines-qt/Manifest
+++ b/x11-themes/gtk-engines-qt/Manifest
@@ -10,20 +10,28 @@ AUX gtk-qt-engine-0.6-kcm-fixinstallationdir.patch 657 RMD160 65b6a59ecf37a80033
 MD5 8f580df2eb803899e2f8a45a5d133d08 files/gtk-qt-engine-0.6-kcm-fixinstallationdir.patch 657
 RMD160 65b6a59ecf37a8003329b0ea29b4371e993600b3 files/gtk-qt-engine-0.6-kcm-fixinstallationdir.patch 657
 SHA256 aa84dc2e174075c60941a8510d550b7338ccf0b3efa0ec313002f52d38814d86 files/gtk-qt-engine-0.6-kcm-fixinstallationdir.patch 657
+AUX kcmgtk-write-good-bashrc.diff 813 RMD160 4b9091390cd3b1d1059f9317dd4e4b218b1b70df SHA1 53013bf090d35a6b3672c3cdc10f20237a9f842e SHA256 27ef1031724098724cc76bd9727168c6316e90b2477ffbb5f0d961f90548b14f
+MD5 acc187b85188f96c88861a94875064ec files/kcmgtk-write-good-bashrc.diff 813
+RMD160 4b9091390cd3b1d1059f9317dd4e4b218b1b70df files/kcmgtk-write-good-bashrc.diff 813
+SHA256 27ef1031724098724cc76bd9727168c6316e90b2477ffbb5f0d961f90548b14f files/kcmgtk-write-good-bashrc.diff 813
 DIST gtk-qt-engine-0.6.tar.bz2 435510 RMD160 bccd48ace5093681ac7094cbd354bf4c3fa310af SHA256 1e8aa85f03a4c57d28482aea5ce70b458483cc8d15cb36b5f38b499ecb4d0eff
 DIST gtk-qt-engine-0.7.tar.bz2 439794 RMD160 5030cd453b58e2f22976b383ebc1f6aec202910c SHA1 7e0df095171112e79b3bc8bee13287bb0e1cea2a SHA256 cfaac46c409984afbcf46979f728515535725e8c83bdf70277f23dde068daaee
 EBUILD gtk-engines-qt-0.6-r2.ebuild 1176 RMD160 5447992be3ace010ba34145e67336cc3c04603b9 SHA1 5e3f01508ce57354a08c9efbad8e6a65ec03c64c SHA256 543c9fd9f2470aa9b9f4a363814e1146fbbf0e7ec769a1524f03c2c0b45fc71f
 MD5 5849e93aa483d5fa897496601cc6f51d gtk-engines-qt-0.6-r2.ebuild 1176
 RMD160 5447992be3ace010ba34145e67336cc3c04603b9 gtk-engines-qt-0.6-r2.ebuild 1176
 SHA256 543c9fd9f2470aa9b9f4a363814e1146fbbf0e7ec769a1524f03c2c0b45fc71f gtk-engines-qt-0.6-r2.ebuild 1176
-EBUILD gtk-engines-qt-0.7.ebuild 845 RMD160 685975f0430554e3981ebc040787ab80f74aff9a SHA1 48d500beb69be77c2c4817bb4366f32c50b4dfca SHA256 e963aeaee7d9a15a58caca83fffd6d7a2c39c032b916d72c7c86d85964d96c8d
-MD5 e512dfea4c5634bcfe67386bc3300f4a gtk-engines-qt-0.7.ebuild 845
-RMD160 685975f0430554e3981ebc040787ab80f74aff9a gtk-engines-qt-0.7.ebuild 845
-SHA256 e963aeaee7d9a15a58caca83fffd6d7a2c39c032b916d72c7c86d85964d96c8d gtk-engines-qt-0.7.ebuild 845
-MISC ChangeLog 3177 RMD160 31110ed82394c3537c72e5507ac07df5d76c22a6 SHA1 d01c25ede33f890c8ccc3f07cc396b55f3eabfcc SHA256 042a25309eaa2218d8ac2fc1eea6a4f8d020cce4c860af462f137cabbb55ebf0
-MD5 c44faa23bf4659d6ab5eb5f965995fb5 ChangeLog 3177
-RMD160 31110ed82394c3537c72e5507ac07df5d76c22a6 ChangeLog 3177
-SHA256 042a25309eaa2218d8ac2fc1eea6a4f8d020cce4c860af462f137cabbb55ebf0 ChangeLog 3177
+EBUILD gtk-engines-qt-0.7-r1.ebuild 1184 RMD160 7d7a1f04ef866ee9b9ce69911cc8f6bccd259c6c SHA1 d4c171672aab8f093385afe9508c45050273337c SHA256 e853035ce96ec23acd53d0ca8811afb04a94f41e8838510fa778753f308554be
+MD5 f008c4f44108f29438b82a6fd4925da0 gtk-engines-qt-0.7-r1.ebuild 1184
+RMD160 7d7a1f04ef866ee9b9ce69911cc8f6bccd259c6c gtk-engines-qt-0.7-r1.ebuild 1184
+SHA256 e853035ce96ec23acd53d0ca8811afb04a94f41e8838510fa778753f308554be gtk-engines-qt-0.7-r1.ebuild 1184
+EBUILD gtk-engines-qt-0.7.ebuild 921 RMD160 1052f80ee1b6bc2411efdbc53cb6292f2c6c8853 SHA1 8b613aa719a7a5ea0a0fa1ae25f2ce3dd715186c SHA256 b08cc5a012a07c18c264e02d16037c5a69bfd75fe72ce201ded745597ce7b98b
+MD5 9c61cc9bf6366952d10c4ff0e87ba287 gtk-engines-qt-0.7.ebuild 921
+RMD160 1052f80ee1b6bc2411efdbc53cb6292f2c6c8853 gtk-engines-qt-0.7.ebuild 921
+SHA256 b08cc5a012a07c18c264e02d16037c5a69bfd75fe72ce201ded745597ce7b98b gtk-engines-qt-0.7.ebuild 921
+MISC ChangeLog 3571 RMD160 37cbdcb78572da219055fec1cf66734302ce2e17 SHA1 7d443c05c2b8bffbf74d96a95171f112c5fa0242 SHA256 8e3e0acbc3dbc86a11ea1431cad459ad72f1f4c3691198524a39f4897da9e475
+MD5 ee66702450e95955dac5464b646cff68 ChangeLog 3571
+RMD160 37cbdcb78572da219055fec1cf66734302ce2e17 ChangeLog 3571
+SHA256 8e3e0acbc3dbc86a11ea1431cad459ad72f1f4c3691198524a39f4897da9e475 ChangeLog 3571
 MISC metadata.xml 202 RMD160 75345465bb5794b30965e4674f0269f134e920ee SHA1 a174ba2f788b85cd991e2295c22b72feb185026b SHA256 9cb2f3c693eec8648c11c76441dd7840340753bd4e31c2e1d45b412b23150c84
 MD5 d102d93b9c48e7510b853ebca5891654 metadata.xml 202
 RMD160 75345465bb5794b30965e4674f0269f134e920ee metadata.xml 202
@@ -34,3 +42,6 @@ SHA256 3d0baba2e92d41deb70026339b67715e1b97c9f7b696fdaaae6856380b00c1b2 files/di
 MD5 ea817b696943f4a74042c4c4ccf58f14 files/digest-gtk-engines-qt-0.7 256
 RMD160 8c68d26a969b65e106c8b4722f0d30d766b80515 files/digest-gtk-engines-qt-0.7 256
 SHA256 e978ee25d4ce3f4c4b3af5257a02645066777a435a9a2ab0dba879b78e884da4 files/digest-gtk-engines-qt-0.7 256
+MD5 ea817b696943f4a74042c4c4ccf58f14 files/digest-gtk-engines-qt-0.7-r1 256
+RMD160 8c68d26a969b65e106c8b4722f0d30d766b80515 files/digest-gtk-engines-qt-0.7-r1 256
+SHA256 e978ee25d4ce3f4c4b3af5257a02645066777a435a9a2ab0dba879b78e884da4 files/digest-gtk-engines-qt-0.7-r1 256
diff --git a/x11-themes/gtk-engines-qt/files/digest-gtk-engines-qt-0.7-r1 b/x11-themes/gtk-engines-qt/files/digest-gtk-engines-qt-0.7-r1
new file mode 100644
index 000000000000..e742471cdbe0
--- /dev/null
+++ b/x11-themes/gtk-engines-qt/files/digest-gtk-engines-qt-0.7-r1
@@ -0,0 +1,3 @@
+MD5 27ca211621f38c45b1c4c9e9ef1f84b0 gtk-qt-engine-0.7.tar.bz2 439794
+RMD160 5030cd453b58e2f22976b383ebc1f6aec202910c gtk-qt-engine-0.7.tar.bz2 439794
+SHA256 cfaac46c409984afbcf46979f728515535725e8c83bdf70277f23dde068daaee gtk-qt-engine-0.7.tar.bz2 439794
diff --git a/x11-themes/gtk-engines-qt/files/kcmgtk-write-good-bashrc.diff b/x11-themes/gtk-engines-qt/files/kcmgtk-write-good-bashrc.diff
new file mode 100644
index 000000000000..73c323515f82
--- /dev/null
+++ b/x11-themes/gtk-engines-qt/files/kcmgtk-write-good-bashrc.diff
@@ -0,0 +1,20 @@
+--- gtk-qt-engine/kcm_gtk/kcmgtk.cpp.orig	2006-08-16 11:41:56.000000000 +0200
++++ gtk-qt-engine/kcm_gtk/kcmgtk.cpp	2006-08-16 11:42:00.000000000 +0200
+@@ -314,7 +314,7 @@
+ 		if (line.isNull())
+ 			break;
+ 		
+-		if (line.stripWhiteSpace().startsWith("export GTK2_RC_FILES=$HOME/.gtkrc-2.0"))
++		if (line.stripWhiteSpace().startsWith("export GTK2_RC_FILES=\"$HOME/.gtkrc-2.0:$HOME/.kde/share/config/gtkrc-2.0:/etc/gtk-2.0/gtkrc\""))
+ 		{
+ 			found = true;
+ 			break;
+@@ -326,7 +326,7 @@
+ 		stream << "\n";
+ 		stream << "# This line was appended by KDE\n";
+ 		stream << "# Make sure our customised gtkrc file is loaded.\n";
+-		stream << "export GTK2_RC_FILES=$HOME/.gtkrc-2.0\n";
++		stream << "export GTK2_RC_FILES=\"$HOME/.gtkrc-2.0:$HOME/.kde/share/config/gtkrc-2.0:/etc/gtk-2.0/gtkrc\"\n";
+ 	}
+ 	file.close();
+ 	
diff --git a/x11-themes/gtk-engines-qt/gtk-engines-qt-0.7-r1.ebuild b/x11-themes/gtk-engines-qt/gtk-engines-qt-0.7-r1.ebuild
new file mode 100644
index 000000000000..6139c036038e
--- /dev/null
+++ b/x11-themes/gtk-engines-qt/gtk-engines-qt-0.7-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qt/gtk-engines-qt-0.7-r1.ebuild,v 1.1 2006/08/22 17:12:48 genstef Exp $
+
+inherit kde eutils
+
+MY_PN="gtk-qt-engine"
+DESCRIPTION="GTK+2 Qt Theme Engine"
+HOMEPAGE="http://www.freedesktop.org/Software/gtk-qt"
+SRC_URI="http://www.freedesktop.org/~davidsansome/${MY_PN}-${PV}.tar.bz2"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+
+DEPEND="${DEPEND}
+	>=x11-libs/gtk+-2.2"
+
+need-kde 3
+# Set slot after the need-kde. Fixes bug #78455.
+SLOT="2"
+
+S=${WORKDIR}/${MY_PN}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/gtk-engines-qt-0.7-implicit.patch
+	epatch ${FILESDIR}/kcmgtk-write-good-bashrc.diff
+}
+
+src_install() {
+	kde_src_install
+	# remove duplicate .desktop
+	rm ${D}/usr/share/applnk/Settings/LookNFeel/kcmgtk.desktop
+	# Add environment variable
+	dodir /etc/X11/xinit/xinitrc.d
+	echo 'export GTK2_RC_FILES="$HOME/.gtkrc-2.0:$HOME/.kde/share/config/gtkrc-2.0:/etc/gtk-2.0/gtkrc"' \
+		>> ${D}/etc/X11/xinit/xinitrc.d/${PN}
+}
+
+pkg_postinst() {
+	ewarn "This crashes gnome, see http://bugs.gentoo.org/105092"
+}
diff --git a/x11-themes/gtk-engines-qt/gtk-engines-qt-0.7.ebuild b/x11-themes/gtk-engines-qt/gtk-engines-qt-0.7.ebuild
index 2ea619c62764..3f9d6b5f3d9c 100644
--- a/x11-themes/gtk-engines-qt/gtk-engines-qt-0.7.ebuild
+++ b/x11-themes/gtk-engines-qt/gtk-engines-qt-0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qt/gtk-engines-qt-0.7.ebuild,v 1.1 2006/07/06 22:54:54 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qt/gtk-engines-qt-0.7.ebuild,v 1.2 2006/08/22 17:12:48 genstef Exp $
 
 inherit kde eutils
 
@@ -30,4 +30,5 @@ src_install() {
 	kde_src_install
 	# remove duplicate .desktop
 	rm ${D}/usr/share/applnk/Settings/LookNFeel/kcmgtk.desktop
+	echo gtk-icon-theme-name="gnome" >> ${D}/usr/share/themes/Qt/gtk-2.0/gtkrc
 }