dont use /usr/local thanks to Hanno Boeck <hanno@gentoo.org> in bug 143500

(Portage version: 2.1.1_rc1-r2)

3 files changed, 55 insertions, 4 deletions

diff --git a/kde-misc/kgtk/ChangeLog b/kde-misc/kgtk/ChangeLog
index 81ca06c7e2eb..2e8b91ff4436 100644
--- a/kde-misc/kgtk/ChangeLog
+++ b/kde-misc/kgtk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/kgtk
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kgtk/ChangeLog,v 1.3 2006/08/05 20:25:19 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kgtk/ChangeLog,v 1.4 2006/09/01 15:00:16 genstef Exp $
+
+  01 Sep 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/kgtk-no-local.diff, kgtk-0.7.ebuild:
+  dont use /usr/local thanks to Hanno Boeck <hanno@gentoo.org> in bug 143500
 
 *kgtk-0.7 (05 Aug 2006)
 
diff --git a/kde-misc/kgtk/files/kgtk-no-local.diff b/kde-misc/kgtk/files/kgtk-no-local.diff
new file mode 100644
index 000000000000..ac1a64122d3b
--- /dev/null
+++ b/kde-misc/kgtk/files/kgtk-no-local.diff
@@ -0,0 +1,41 @@
+diff -ur kgtk-0.7.orig/gtk/Makefile.am kgtk-0.7/gtk/Makefile.am
+--- kgtk-0.7.orig/gtk/Makefile.am	2006-09-01 16:38:30.000000000 +0200
++++ kgtk-0.7/gtk/Makefile.am	2006-09-01 16:37:35.000000000 +0200
+@@ -6,7 +6,7 @@
+ 
+ EXTRA_DIST=kgtk-wrapper.sh.in
+ 
+-wrapperdir = /usr/local/bin
++wrapperdir = $(bindir)
+ wrapper_SCRIPTS = kgtk-wrapper.sh
+ 
+ kgtk-wrapper.sh : kgtk-wrapper.sh.in Makefile
+diff -ur kgtk-0.7.orig/qt/Makefile.am kgtk-0.7/qt/Makefile.am
+--- kgtk-0.7.orig/qt/Makefile.am	2006-09-01 16:38:17.000000000 +0200
++++ kgtk-0.7/qt/Makefile.am	2006-09-01 16:38:46.000000000 +0200
+@@ -7,7 +7,7 @@
+ 
+ EXTRA_DIST=kqt-wrapper.sh.in
+ 
+-wrapperdir = /usr/local/bin
++wrapperdir = $(bindir)
+ wrapper_SCRIPTS = kqt-wrapper.sh
+ 
+ kqt-wrapper.sh : kqt-wrapper.sh.in Makefile
+diff -ur kgtk-0.7.orig/README kgtk-0.7/README
+--- kgtk-0.7.orig/README	2006-09-01 16:38:17.000000000 +0200
++++ kgtk-0.7/README	2006-09-01 16:39:26.000000000 +0200
+@@ -13,11 +13,11 @@
+ As an example for running Kino with KDE dialogs:
+ 
+ Either:
+-a. /usr/local/bin/kgtk-wrapper.sh /usr/bin/kino
++a. /usr/bin/kgtk-wrapper.sh /usr/bin/kino
+ 
+ Or:
+ b:
+-  1. ln -s /usr/local/bin/kgtk-wrapper.sh /usr/local/bin/kino
++  1. ln -s /usr/bin/kgtk-wrapper.sh /usr/local/bin/kino
+   2. When starting Kino, call /usr/local/bin/kino instead
+   3. Alter /usr/share/applications/Kino.desktop to call /usr/local/bin/kino
+ 
diff --git a/kde-misc/kgtk/kgtk-0.7.ebuild b/kde-misc/kgtk/kgtk-0.7.ebuild
index 03de50421dfa..52f39ce76f5b 100644
--- a/kde-misc/kgtk/kgtk-0.7.ebuild
+++ b/kde-misc/kgtk/kgtk-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/kde-misc/kgtk/kgtk-0.7.ebuild,v 1.1 2006/08/05 20:25:19 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kgtk/kgtk-0.7.ebuild,v 1.2 2006/09/01 15:00:15 genstef Exp $
 
 inherit kde
 
@@ -16,11 +16,17 @@ IUSE=""
 DEPEND=">=x11-libs/gtk+-2.6"
 need-kde 3.4
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/kgtk-no-local.diff
+}
+
 pkg_postinst() {
 	einfo "To see the kde-file-selector in a gtk-application, just do:"
 	echo "cd /usr/local/bin"
-	echo "ln -s kgtk-wrapper.sh application(eg. firefox)"
+	echo "ln -s /usr/bin/kgtk-wrapper.sh application(eg. firefox)"
 	einfo "Make sure that /usr/local/bin is before /usr/bin in your \$PATH"
 	einfo
-	ewarn "Kded needs to be running, to get this working!"
+	ewarn "Kded needs to be running to get this working!"
 }