From: Carsten Lohrke <carlo@gentoo.org>
Date: Fri, 6 Apr 2007 12:14:19 +0000 (+0000)
Subject: call validate_desktop_entries()
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4271f4ee13dd46e6273a929cc7c169cf841e2546;p=gentoo.git

call validate_desktop_entries()
---

diff --git a/eclass/kde.eclass b/eclass/kde.eclass
index 7b63e7f4dc3e..2b4e281856b9 100644
--- a/eclass/kde.eclass
+++ b/eclass/kde.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.eclass,v 1.193 2007/03/17 14:52:03 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.194 2007/04/06 12:14:19 carlo Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 #
@@ -446,20 +446,12 @@ slot_rebuild() {
 }
 
 kde_pkg_preinst() {
-	if [[ $(find "${D}/${PREFIX}/share/applnk" -name '*.desktop' \
+	validate_desktop_entries ${PREFIX}/share/appl{nk,ications}
+	if [[ $(find "${D}${PREFIX}/share/applnk" -name '*.desktop' \
 		-not -path '*.hidden*' 2>/dev/null | wc -l) != "0" ]]; then
-		ewarn "KDE Team warning: this package (${PF}) is installing"
-		ewarn "	 .desktop files in the obsolete applnk path:"
-		ewarn "	 ${PREFIX}/share/applnk. It won't be shown on non-KDE"
-		ewarn "	 menus and applications."
-	fi
-
-	if [[ $(egrep -q -r --include '*.desktop' --files-without-match \
-		'^Categories' "${D}/${PREFIX}/share/applications" 2>/dev/null \
-		| wc -l) != "0" ]] ; then
-		ewarn "KDE Team warning: this package (${PF}) is installing"
-		ewarn "	 .desktop files without the Categories attribute; it will"
-		ewarn "	 be shown in the Lost & Found menu."
+		ewarn "This ebuild is installing .desktop files in the deprecated path"
+		ewarn "${PREFIX}/share/applnk/. They will only be visible within KDE."
+		echo ""
 	fi
 }