3 files changed, 93 insertions, 1 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/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."
+}