Handle kdedirs gracefully, patch from flameeyes's git.

Package-Manager: portage-2.1.5_rc7

5 files changed, 97 insertions, 13 deletions

diff --git a/x11-misc/xdg-utils/ChangeLog b/x11-misc/xdg-utils/ChangeLog
index b44f8721ef8d..5446d391a9f2 100644
--- a/x11-misc/xdg-utils/ChangeLog
+++ b/x11-misc/xdg-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xdg-utils
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-utils/ChangeLog,v 1.45 2008/02/22 13:32:35 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-utils/ChangeLog,v 1.46 2008/05/12 10:44:59 drac Exp $
+
+*xdg-utils-1.0.2-r2 (12 May 2008)
+
+  12 May 2008; Samuli Suominen <drac@gentoo.org>
+  +files/xdg-utils-1.0.2-kdedirs.patch, +xdg-utils-1.0.2-r2.ebuild:
+  Handle kdedirs gracefully, patch from flameeyes's git.
 
   22 Feb 2008; Ulrich Mueller <ulm@gentoo.org> xdg-utils-1.0.2-r1.ebuild:
   Move desktop-file-utils to PDEPEND because of dependency cycle, bug 208043.
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index d6189878d71e..4111ec71aa40 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX xdg-utils-1.0.2-arb-comm-exec.patch 1529 RMD160 ebac9959e142b2cec088e58b7ce81e8bc714aeef SHA1 9bac70b8fe02ba0def6114c9339a99dcfcd25538 SHA256 f921450acf0158848e82a19a46bc2c9158f4b13cb1ef0c24dd5553253492792d
+AUX xdg-utils-1.0.2-kdedirs.patch 1585 RMD160 bdeac05b4f12227c265849a7eaab3d8a2e7f0712 SHA1 eb4835fa5ef1c2a81c7e6abd945a85234c4aeee3 SHA256 3b54b7aa26c383c0604a43c422cc26e8808bd2c1627825833114f27b4433b812
 DIST xdg-utils-1.0.2.tgz 282262 RMD160 344482917e8c780613ec20b103f8e51322540c04 SHA1 e41a04cbf9ff8d743397a2bc23c6ca82e8b59d2c SHA256 21aeb7d16b2529b8d3975118f59eec09953e09f9a68d718159e98c90474b01ac
 EBUILD xdg-utils-1.0.2-r1.ebuild 1064 RMD160 89a296c9eefbff310e805942422a9ead76bd57be SHA1 872bc351be2c461dcb8e5a0db6c80c2ce37c2b98 SHA256 5593ce5482f65f00704e3c514646f6126914f7d40131ca4997cdd12c5df7fdb2
+EBUILD xdg-utils-1.0.2-r2.ebuild 1114 RMD160 589dddae9346d1b25d9b5f5a5c998dc8f4dd4816 SHA1 b01ca150ef573aa51359e074c4d53a63a94ed5a0 SHA256 c63f1200b523e435ca8068216ca4bab23a4c5f6f4fe63b8aa661037fee2dbbfd
 EBUILD xdg-utils-1.0.2.ebuild 799 RMD160 6ac147eb9744987157897669ed505dae4631ed5b SHA1 82455838a4ece93e15f17b982b2ea6ddd6552db8 SHA256 f2ff413e3326cb95b0726a64b43b827bf39a7b21cdd5cd4283469b910cb7810e
-MISC ChangeLog 5709 RMD160 a6a8c6f4bc36fc36f3734252ee6e167a861b07cd SHA1 a8eda8ad9a1b91e78918238a8930e0193f934273 SHA256 0e919cc4c830639df9b161da62a7721dfe1af66c183ede5c60d4d86e7ec68b5e
+MISC ChangeLog 5920 RMD160 cc8a66f68135fabd97ce4f89a21887b8f248afc5 SHA1 13a3ebc0c17e9080c594b51b5383a431b80b2bc4 SHA256 28c72d90f07ac93a45e665e437f03408a6621fd112e7eb8ffaa4618dd9b821ae
 MISC metadata.xml 234 RMD160 bd496dac30573bf707591b2b2ad497860e5aa029 SHA1 4641c1e70e35e944e7019aeae967deb1d2c28186 SHA256 3018e3b31ed690a57bfc14e35699dd20ea3b352fc28b918f699e6955b57a2d97
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.8 (GNU/Linux)
-
-iEYEARECAAYFAke+zt8ACgkQOeoy/oIi7uwA4gCdGThUk6TZb3jghWw0NtnBhx+n
-SxgAoNcfEto7FRAfeQ+/C8y+KEN1STvu
-=cAej
------END PGP SIGNATURE-----
diff --git a/x11-misc/xdg-utils/files/xdg-utils-1.0.2-kdedirs.patch b/x11-misc/xdg-utils/files/xdg-utils-1.0.2-kdedirs.patch
new file mode 100644
index 000000000000..69c92d7fe062
--- /dev/null
+++ b/x11-misc/xdg-utils/files/xdg-utils-1.0.2-kdedirs.patch
@@ -0,0 +1,47 @@
+Index: xdg-utils-1.0.2/scripts/xdg-mime
+===================================================================
+--- xdg-utils-1.0.2.orig/scripts/xdg-mime
++++ xdg-utils-1.0.2/scripts/xdg-mime
+@@ -840,17 +840,11 @@ DEBUG 3 "xdg_user_dir: $xdg_user_dir"
+ DEBUG 3 "xdg_global_dir: $xdg_global_dir"
+ 
+ # Find KDE3 mimelnk directory
+-kde_user_dir=
++kde_user_dir=${KDEHOME:-${HOME}/.kde}/share/mimelnk/
+ kde_global_dir=
+-kde_global_dirs=`kde-config --path mime 2> /dev/null`
+-DEBUG 3 "kde_global_dirs: $kde_global_dirs"
+-first=
+-for x in `echo $kde_global_dirs | sed 's/:/ /g'` ; do
+-    if [ -z "$first" ] ; then
+-        first=false
+-        kde_user_dir="$x"
+-    elif [ -w $x ] ; then
+-        kde_global_dir="$x"
++for x in `echo $KDEDIRS | tr ':' ' '` ; do
++    if [ -w $x/share/mimelnk ] ; then
++        kde_global_dir="$x/share/mimelnk"
+     fi
+ done
+ DEBUG 3 "kde_user_dir: $kde_user_dir"
+Index: xdg-utils-1.0.2/scripts/xdg-desktop-menu
+===================================================================
+--- xdg-utils-1.0.2.orig/scripts/xdg-desktop-menu
++++ xdg-utils-1.0.2/scripts/xdg-desktop-menu
+@@ -1178,9 +1178,13 @@ for x in `echo $xdg_system_dirs | sed 's
+     fi
+ done
+ 
+-kde_user_dir="$HOME/.kde/share/applnk"
+-kde_global_dir="/usr/share/applnk"
+-[ -w $kde_global_dir ] || kde_global_dir=
++kde_user_dir=${KDEHOME:-${HOME}/.kde}/share/mimelnk/
++kde_global_dir=
++for x in `echo $KDEDIRS | tr ':' ' '` ; do
++    if [ -w $x/share/applnk ] ; then
++        kde_global_dir="$x/share/applnk"
++    fi
++done
+ 
+ gnome_user_dir="$HOME/.gnome/apps"
+ gnome_global_dir="/usr/share/gnome/apps"
diff --git a/x11-misc/xdg-utils/xdg-utils-1.0.2-r2.ebuild b/x11-misc/xdg-utils/xdg-utils-1.0.2-r2.ebuild
new file mode 100644
index 000000000000..c998f13753c4
--- /dev/null
+++ b/x11-misc/xdg-utils/xdg-utils-1.0.2-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-utils/xdg-utils-1.0.2-r2.ebuild,v 1.1 2008/05/12 10:44:59 drac Exp $
+
+inherit eutils
+
+DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability"
+HOMEPAGE="http://portland.freedesktop.org/wiki"
+SRC_URI="http://portland.freedesktop.org/download/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+RESTRICT="test"
+
+RDEPEND="x11-apps/xprop
+	x11-misc/shared-mime-info"
+PDEPEND="dev-util/desktop-file-utils"
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"/scripts
+	epatch "${FILESDIR}"/${P}-arb-comm-exec.patch \
+		"${FILESDIR}"/${P}-kdedirs.patch
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc ChangeLog README RELEASE_NOTES TODO
+	newdoc scripts/README README.scripts
+	use doc && dohtml -r scripts/html
+}
+
+pkg_postinst() {
+	elog "Install >=x11-libs/gtk+-2 if you need command gtk-update-icon-cache."
+}
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index a752302b379b..53e57cd6de70 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -1,5 +1,5 @@
 AUX zim-0.20-disable-update-desktop-database.patch 430 RMD160 b637fe0c857a49b03c06161152aacf7cbdbe1f31 SHA1 91e683e8f201ff7fab19f42842c45a419308f058 SHA256 db421d2df42bc9f45f0cd4cceba4da851dce57b7cc479ef7c5e640ee991a7cfc
 DIST Zim-0.23.tar.gz 461917 RMD160 7440cf787d23c6df27d4c97480f5ac272687f2ed SHA1 ce981952aba6548ddb0d7c9cc5c42fe7f2ccaf24 SHA256 8375494d71222ab73865123ef9065be83ddba86e843fa388df21d7d392b14088
 EBUILD zim-0.23.ebuild 1184 RMD160 52235b53d30e6c24bf6c23fa55c61aa63134efa1 SHA1 ab4d4d4749495f4d330401fd027767f54eb83774 SHA256 a2d0e45d6dce2f8af104fdd7c5d79bdf8e91771039baeaa0b4a9f667c9e0c607
-MISC ChangeLog 1108 RMD160 119610942e301644d90093f2652d76546245fa70 SHA1 ad2cc9fdfc425ee548de1b2da722bf75cadf5719 SHA256 19964a5ad30489f94edfe2159ebe949f2deeded3e09a9298b81121d5f7de9d2c
+MISC ChangeLog 1105 RMD160 bdebda6d8016a1ab333d20e82e959002cf357a3b SHA1 a57f31c6568c4c44d901e7149e3e1453bb73cb8b SHA256 1ab964960dcdbb816479235cd576cef2a7a7e8468f6544c548318a8ed23de5dc
 MISC metadata.xml 699 RMD160 6dfffa9c87b78439f43bfe14881d1aa69a7e030b SHA1 7cde14f22afddfb795bd65986b917472ac639a07 SHA256 4d20373720f89e31a3b6af5f0036e0880dca8e3cb9f836b653145fe749b86e17