Fix the installation path from /usr/kde/x.x to /usr, patch submitted to the author.

6 files changed, 76 insertions, 15 deletions

diff --git a/x11-themes/gtk-qt-engine/ChangeLog b/x11-themes/gtk-qt-engine/ChangeLog
index e0f9352506c2..fc4e7daef16b 100644
--- a/x11-themes/gtk-qt-engine/ChangeLog
+++ b/x11-themes/gtk-qt-engine/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-themes/gtk-qt-engine
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-qt-engine/ChangeLog,v 1.5 2005/01/05 06:25:53 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-qt-engine/ChangeLog,v 1.6 2005/01/15 13:34:23 motaboy Exp $
+
+*gtk-qt-engine-0.6-r1 (15 Jan 2005)
+
+  15 Jan 2005; Simone Gotti <motaboy@gentoo.org> metadata.xml,
+  +files/gtk-qt-engine-0.6-kcm-fixinstallationdir.patch,
+  +gtk-qt-engine-0.6-r1.ebuild:
+  Fix the installation path from /usr/kde/x.x to /usr, patch submitted to the
+  author. Also add myself to the mantainers as I have more changes for this
+  ebuild in the future.
 
   05 Jan 2005; Marcus Hanwell <cryos@gentoo.org> gtk-qt-engine-0.6.ebuild:
   Marked ~amd64, closing bug 70250.
diff --git a/x11-themes/gtk-qt-engine/Manifest b/x11-themes/gtk-qt-engine/Manifest
index d57a6dd7d1c9..eafc50d85e87 100644
--- a/x11-themes/gtk-qt-engine/Manifest
+++ b/x11-themes/gtk-qt-engine/Manifest
@@ -1,17 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 39114013edd48a022af1fda652a9dc47 ChangeLog 1012
-MD5 06b074a0c7262897d71f60504f39099f gtk-qt-engine-0.5.ebuild 770
 MD5 19f4dd63dfa307f30fd5e7a8e0c561ad gtk-qt-engine-0.6.ebuild 690
-MD5 0e79bc82b6162e7b6e378a4eb9845eed metadata.xml 203
+MD5 06b074a0c7262897d71f60504f39099f gtk-qt-engine-0.5.ebuild 770
+MD5 d7db8efb7d1cdbf534c210e8baad6781 ChangeLog 1380
+MD5 1cdea9d92f759ed6423e4ace9446da66 metadata.xml 266
+MD5 00e5d487f3a98956dc797c18445cd625 gtk-qt-engine-0.6-r1.ebuild 822
+MD5 5581455144e4c925a184778c26ba5b78 files/digest-gtk-qt-engine-0.6-r1 70
+MD5 e196ce1ba2450ad5143189c23599dea7 files/scrollbars.patch 590
+MD5 8f580df2eb803899e2f8a45a5d133d08 files/gtk-qt-engine-0.6-kcm-fixinstallationdir.patch 657
 MD5 c14fd0a50b68b19f5a9ad65022681cb1 files/digest-gtk-qt-engine-0.5 70
 MD5 5581455144e4c925a184778c26ba5b78 files/digest-gtk-qt-engine-0.6 70
-MD5 e196ce1ba2450ad5143189c23599dea7 files/scrollbars.patch 590
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB24mfntT9W3vfTuoRAkwBAKCpqz8k5+h4PZiyDUwzBtOxR3boKwCeIYc0
-8Elu3JdEBkXXRxrFt1Uovhs=
-=UGjM
------END PGP SIGNATURE-----
diff --git a/x11-themes/gtk-qt-engine/files/digest-gtk-qt-engine-0.6-r1 b/x11-themes/gtk-qt-engine/files/digest-gtk-qt-engine-0.6-r1
new file mode 100644
index 000000000000..11074064dfba
--- /dev/null
+++ b/x11-themes/gtk-qt-engine/files/digest-gtk-qt-engine-0.6-r1
@@ -0,0 +1 @@
+MD5 9c02c95a6e8d304b1f2801429759e1c0 gtk-qt-engine-0.6.tar.bz2 435510
diff --git a/x11-themes/gtk-qt-engine/files/gtk-qt-engine-0.6-kcm-fixinstallationdir.patch b/x11-themes/gtk-qt-engine/files/gtk-qt-engine-0.6-kcm-fixinstallationdir.patch
new file mode 100644
index 000000000000..4a5aca4a2974
--- /dev/null
+++ b/x11-themes/gtk-qt-engine/files/gtk-qt-engine-0.6-kcm-fixinstallationdir.patch
@@ -0,0 +1,21 @@
+--- kcm_gtk/Makefile.am.orig	2005-01-14 10:52:16.000000000 +0000
++++ kcm_gtk/Makefile.am	2005-01-15 10:44:20.006738856 +0000
+@@ -2,8 +2,7 @@
+ METASOURCES = AUTO
+ 
+ # Install this plugin in the KDE modules directory
+-kcmgtkmoduledir = $(KDE_PREFIX)/lib/kde3/
+-kcmgtkmodule_LTLIBRARIES = kcm_kcmgtk.la
++kde_module_LTLIBRARIES = kcm_kcmgtk.la
+ 
+ kcm_kcmgtk_la_SOURCES = kcmgtkwidget.ui kcmgtk.cpp
+ kcm_kcmgtk_la_LIBADD = $(LIB_KDEUI)
+@@ -11,7 +10,7 @@
+ 
+ 
+ kcmgtk_DATA = kcmgtk.desktop
+-kcmgtkdir = $(KDE_PREFIX)/share/applnk/Settings/LookNFeel
++kcmgtkdir = $(kde_appsdir)/Settings/LookNFeel
+ 
+ kcmgtkdebian_DATA = kcmgtk.menu
+ kcmgtkdebiandir = /usr/lib/menu
diff --git a/x11-themes/gtk-qt-engine/gtk-qt-engine-0.6-r1.ebuild b/x11-themes/gtk-qt-engine/gtk-qt-engine-0.6-r1.ebuild
new file mode 100644
index 000000000000..5f488ee486aa
--- /dev/null
+++ b/x11-themes/gtk-qt-engine/gtk-qt-engine-0.6-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-qt-engine/gtk-qt-engine-0.6-r1.ebuild,v 1.1 2005/01/15 13:34:23 motaboy Exp $
+
+inherit gtk-engines2 eutils kde-functions
+
+DESCRIPTION="GTK+2 Qt Theme Engine"
+HOMEPAGE="http://www.freedesktop.org/Software/gtk-qt"
+SRC_URI="http://www.freedesktop.org/~davidsansome/${P}.tar.bz2"
+LICENSE="GPL-2"
+
+IUSE="arts debug"
+SLOT="2"
+KEYWORDS="~x86 ~ppc ~amd64"
+
+DEPEND="${DEPEND}
+	>=x11-libs/gtk+-2.2.0
+	arts? ( kde-base/arts )"
+
+need-kde 3
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-kcm-fixinstallationdir.patch
+}
+
+src_compile() {
+	make -f ${S}/admin/Makefile.common
+
+	local myconf="$(use_with arts) $(use_enable debug)"
+	econf ${myconf} || die
+	emake || die
+}
diff --git a/x11-themes/gtk-qt-engine/metadata.xml b/x11-themes/gtk-qt-engine/metadata.xml
index e34af9cb380c..4d6d1992da71 100644
--- a/x11-themes/gtk-qt-engine/metadata.xml
+++ b/x11-themes/gtk-qt-engine/metadata.xml
@@ -4,4 +4,7 @@
 <maintainer>
   <email>pkdawson@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>motaboy@gentoo.org</email>
+</maintainer>
 </pkgmetadata>