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

Package-Manager: portage-2.1.1_rc1-r2

4 files changed, 67 insertions, 12 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/Manifest b/kde-misc/kgtk/Manifest
index 3c8eb2f49856..eb797aef9c69 100644
--- a/kde-misc/kgtk/Manifest
+++ b/kde-misc/kgtk/Manifest
@@ -1,12 +1,16 @@
+AUX kgtk-no-local.diff 1371 RMD160 e29cc4404fa858c31912cb5c2d74235ba9a5b060 SHA1 6a78ccacd16dbeb7ffe6586e563dd6e00538194c SHA256 c3880752c391cacbacf57f66f430b3dfc334aae963d6df467bd715869ad3b8d4
+MD5 2381a8c8f69b8767f16c34847df17d5f files/kgtk-no-local.diff 1371
+RMD160 e29cc4404fa858c31912cb5c2d74235ba9a5b060 files/kgtk-no-local.diff 1371
+SHA256 c3880752c391cacbacf57f66f430b3dfc334aae963d6df467bd715869ad3b8d4 files/kgtk-no-local.diff 1371
 DIST kgtk-0.7.tar.gz 581684 RMD160 5f5749609675976ca1cc0a7f43a94487556ec642 SHA1 90df695fcdadcb8087fb1ad3224e989158959fb7 SHA256 8cb9c391c67b5633009dabce28d5463bcb2c9fc2ab7c517e9cda6ac72f1b064e
-EBUILD kgtk-0.7.ebuild 842 RMD160 e998c6dcd7891aec0abf0b653e41bbdc9944a9e0 SHA1 4ebee31b33a94463b5809683fc6232e44ab9a949 SHA256 5b64e1f815d06ac2b1f0d4d5caa2e881847cd46c25a8ecf3eee0c1d83dd81811
-MD5 9c31e2bcc08e6acb4af845e69e6bd191 kgtk-0.7.ebuild 842
-RMD160 e998c6dcd7891aec0abf0b653e41bbdc9944a9e0 kgtk-0.7.ebuild 842
-SHA256 5b64e1f815d06ac2b1f0d4d5caa2e881847cd46c25a8ecf3eee0c1d83dd81811 kgtk-0.7.ebuild 842
-MISC ChangeLog 755 RMD160 b4757545f6f053581c6cbb038fddc6a62301a429 SHA1 4346725d49260026a0d2427341a9317f2b651d64 SHA256 0831949cbc39d2bdabb902bdacbb9aea11dcd79d99a290827dec2362100aa33e
-MD5 78a98ecb2e60088e83acda82749856c9 ChangeLog 755
-RMD160 b4757545f6f053581c6cbb038fddc6a62301a429 ChangeLog 755
-SHA256 0831949cbc39d2bdabb902bdacbb9aea11dcd79d99a290827dec2362100aa33e ChangeLog 755
+EBUILD kgtk-0.7.ebuild 929 RMD160 7ad77de1463328e10d06ccc43a793318f549f951 SHA1 a67e7c33e1979851b8abb2a27db22f2d4c99641b SHA256 2d61a507474f7688fceb4f642bb354ec9766696f7881e8f8ca79eda373a60623
+MD5 1d268fe668b044146bfc48229b83355f kgtk-0.7.ebuild 929
+RMD160 7ad77de1463328e10d06ccc43a793318f549f951 kgtk-0.7.ebuild 929
+SHA256 2d61a507474f7688fceb4f642bb354ec9766696f7881e8f8ca79eda373a60623 kgtk-0.7.ebuild 929
+MISC ChangeLog 932 RMD160 f192fdafce69d41488dbf09df5217545c0bdd204 SHA1 b239ed9ea0239638ffd208ba4fe79cf9a18e73a4 SHA256 b701058acb0f8353d8b517e1d2e53b39bdc2c9d2d3b4aee840e8367ce5027854
+MD5 71846cb49c85b30ee46699edbeeb69b6 ChangeLog 932
+RMD160 f192fdafce69d41488dbf09df5217545c0bdd204 ChangeLog 932
+SHA256 b701058acb0f8353d8b517e1d2e53b39bdc2c9d2d3b4aee840e8367ce5027854 ChangeLog 932
 MISC metadata.xml 227 RMD160 8f1a760375a8e55689e5bc336684eb2a0a1359ed SHA1 dc84bfe01b6e845c77d5f26b9bc588904315b161 SHA256 e082e24d9d4d2f8a5a431ae131f9521749796f3888329160e106c456f257bc36
 MD5 ab02bedef313ee7002139bda0286947e metadata.xml 227
 RMD160 8f1a760375a8e55689e5bc336684eb2a0a1359ed metadata.xml 227
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!"
 }