Deal a bit more selective with KDE legacy desktop entry path handling.

diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass
index 61ad43f7e380069f8cf5f7d5a63e9d7c4f8f5e9d..638017a9c36c50fd320bd1a97e347f4f9646ba92 100644 (file)
--- a/eclass/kde-functions.eclass
+++ b/eclass/kde-functions.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.151 2007/04/23 19:35:05 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.152 2007/05/01 12:29:25 carlo Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 #
@@ -911,10 +911,10 @@ postprocess_desktop_entries() {
        [[ $EBUILD_PHASE != preinst ]] && [[ $EBUILD_PHASE != install ]] && \
                die "postprocess_desktop_entries() has to be called in src_install() or pkg_preinst()."
 
-       # Only third party apps, KDE 3.x isn't so basedir spec compliant...
-       if [[ -z ${KDEBASE} ]] ; then
-               local desktop_entries="$(find "${D}${PREFIX}/share/applnk" -name '*.desktop' \
-                       -not -path '*.hidden*' 2>/dev/null)"
+       if [[ -d ${D}${PREFIX}/share/applnk ]] ; then
+               # min/max depth is _important_ as it excludes legacy KDE stuff. Moving it would cause breakage.
+               local desktop_entries="$(find "${D}${PREFIX}/share/applnk" -mindepth 2 -maxdepth 2 \
+                                                                       -name '*\.desktop' -not -path '*.hidden*' 2>/dev/null)"
 
                if [[ -n ${desktop_entries} ]]; then
                        for entry in ${desktop_entries} ; do