Address bug #220273 and some minor issues.

Package-Manager: portage-2.1.4.4

4 files changed, 60 insertions, 2 deletions

diff --git a/x11-themes/gtk-engines-qt/ChangeLog b/x11-themes/gtk-engines-qt/ChangeLog
index 9a93aa27a550..1455a93f092c 100644
--- a/x11-themes/gtk-engines-qt/ChangeLog
+++ b/x11-themes/gtk-engines-qt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-themes/gtk-engines-qt
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qt/ChangeLog,v 1.29 2008/01/19 14:57:34 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qt/ChangeLog,v 1.30 2008/05/19 00:03:48 carlo Exp $
+
+*gtk-engines-qt-0.8-r1 (19 May 2008)
+
+  19 May 2008; Carsten Lohrke <carlo@gentoo.org>
+  +files/gtk-engines-qt-0.8-konq-flash.patch, +gtk-engines-qt-0.8-r1.ebuild:
+  Address bug #220273 and some minor issues.
 
   19 Jan 2008; Stefan Schweizer <genstef@gentoo.org>
   gtk-engines-qt-0.8.ebuild:
diff --git a/x11-themes/gtk-engines-qt/Manifest b/x11-themes/gtk-engines-qt/Manifest
index a3491f5e1dd5..2636d97a6c7d 100644
--- a/x11-themes/gtk-engines-qt/Manifest
+++ b/x11-themes/gtk-engines-qt/Manifest
@@ -1,4 +1,6 @@
+AUX gtk-engines-qt-0.8-konq-flash.patch 953 RMD160 9f7e840d577a3db28d31f2cb94cc114138e51e54 SHA1 2cff12bc4aebca210ac5e05aa8f98520c0c22c98 SHA256 cc39a430b167f9ac5d54c2629e80985fa099702c3cebfe45464f6e395cfbd31a
 DIST gtk-qt-engine-0.8.tar.bz2 59472 RMD160 05a825ff51180ee70a85338a970d40509aae16eb SHA1 0d22143068dda220fd6f4c98a3f750114f282803 SHA256 6658bdbd3f2120d34f5c59b5bc3cfed5ef83a2aa8572d775483aa304396b0d45
+EBUILD gtk-engines-qt-0.8-r1.ebuild 955 RMD160 aaffa773fcebe15109adb309f4c2c5505cd2967f SHA1 ad1e4bb3f4a0b521c5fc0ef7f9dd9bdd772ecf0e SHA256 162e0795da711d45210df9560df5e9cba0a8631e6579c4bf419084c0e8950ef2
 EBUILD gtk-engines-qt-0.8.ebuild 811 RMD160 7da0ccd18f2a0498e1bae61a17a0eac43142756a SHA1 64d26ee5e58c05e2330733c5d29f3d1a981f49e2 SHA256 e0dd8ed73a85c1461fd4a9c0024149e37782828a7f8a9d854aababe7634158b6
-MISC ChangeLog 6555 RMD160 b69927b09fd8e7c1ed9b45b4bc9142bf0c056966 SHA1 4b31d02c961a77eea9011047f7efc255ee866936 SHA256 be89ec326fe08579b8992334e8b00c2b40def312cde920eba599138660b7974e
+MISC ChangeLog 6763 RMD160 dfe3bbef39edf7eb64d02764bf697f62637b38c0 SHA1 b38813c8b007964208786fd9e2fcf65ce2b80e6a SHA256 d787f362779e87686a7df4a07139afbe7e476ae09a1279f37bc6d93017570ec6
 MISC metadata.xml 223 RMD160 7429359358271402627b1b14eefee1114caa1154 SHA1 0e14ab85bd427902302b78e7e3cd74f602f74a5f SHA256 17048562e880070e1742f7570a13b4e9539b8ae86363be0f2f9f43e1c7265676
diff --git a/x11-themes/gtk-engines-qt/files/gtk-engines-qt-0.8-konq-flash.patch b/x11-themes/gtk-engines-qt/files/gtk-engines-qt-0.8-konq-flash.patch
new file mode 100644
index 000000000000..ed135a257ae6
--- /dev/null
+++ b/x11-themes/gtk-engines-qt/files/gtk-engines-qt-0.8-konq-flash.patch
@@ -0,0 +1,16 @@
+diff -ur gtk-qt-engine.org/src/qt_qt_wrapper.cpp gtk-qt-engine/src/qt_qt_wrapper.cpp
+--- gtk-qt-engine.org/src/qt_qt_wrapper.cpp	2007-08-28 21:30:38.000000000 +0100
++++ gtk-qt-engine/src/qt_qt_wrapper.cpp	2008-05-04 19:59:46.000000000 +0100
+@@ -334,8 +334,10 @@
+ 		printf("createQApp()\n");
+ 	
+ 	char* sessionEnv = getenv("SESSION_MANAGER");
+-	if (QString(sessionEnv).endsWith(QString::number(getpid())) || cmdLine.contains("gnome-wm") || cmdLine.contains("metacity") || cmdLine.contains("xfwm4") || (getenv("GTK_QT_ENGINE_DISABLE") != NULL) ||
+-	((qApp) && (qApp->type() == QApplication::Tty)))
++	if (QString(sessionEnv).endsWith(QString::number(getpid())) || cmdLine.contains("gnome-wm")
++		|| cmdLine.contains("metacity") || cmdLine.contains("xfwm4")
++		|| cmdLine.contains("nspluginviewer")  || (getenv("GTK_QT_ENGINE_DISABLE")
++		|| ((qApp) && (qApp->type() == QApplication::Tty))))
+ 	{
+ 		printf("Not initializing the Gtk-Qt theme engine\n");
+ 	}
diff --git a/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r1.ebuild b/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r1.ebuild
new file mode 100644
index 000000000000..c41e5bf883ef
--- /dev/null
+++ b/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2008 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.8-r1.ebuild,v 1.1 2008/05/19 00:03:48 carlo Exp $
+
+ARTS_REQUIRED="never"
+
+inherit kde
+
+MY_PN="gtk-qt-engine"
+DESCRIPTION="GTK+2 Qt 3 Theme Engine"
+HOMEPAGE="http://gtk-qt.ecs.soton.ac.uk"
+SRC_URI="http://gtk-qt.ecs.soton.ac.uk/files/${PV}/${MY_PN}-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+DEPEND=">=x11-libs/gtk+-2.2
+	dev-util/cmake"
+# the little gnome_apps.png...
+RDEPEND="|| ( =kde-base/kdebase-data-3.5* =kde-base/kdebase-3.5* )
+	>=x11-libs/gtk+-2.2"
+need-kde 3.5
+
+# Set slot after the need-kde. Fixes bug #78455.
+SLOT="2"
+
+S="${WORKDIR}/${MY_PN}"
+
+PATCHES="${FILESDIR}/gtk-engines-qt-0.8-konq-flash.patch"
+
+src_install() {
+	kde_src_install
+	mv "${D}"/usr/local/share/{locale,applications} "${D}"/usr/share/ || die
+}