kdeglobals file instead of KDEDIRS (kde-env)

1 files changed, 36 insertions, 2 deletions

diff --git a/kde-base/kde-env/kde-env-4.2.9999.ebuild b/kde-base/kde-env/kde-env-4.2.9999.ebuild
index cff7cdafa3e..fb11fc4e470 100644
--- a/kde-base/kde-env/kde-env-4.2.9999.ebuild
+++ b/kde-base/kde-env/kde-env-4.2.9999.ebuild
@@ -30,6 +30,7 @@ src_unpack() {
 src_install() {
 	dodir /etc/env.d
 	dodir /etc/revdep-rebuild
+	dodir "${PREFIX}"/share/config
 
 	# List all the multilib libdirs
 	local _libdir _libdirs
@@ -39,6 +40,7 @@ src_install() {
 	_libdirs=${_libdirs#:}
 
 	if use kdeprefix; then
+
 		cat <<-EOF > "${T}"/43kdepaths-${SLOT} # number goes down with version
 PATH="${PREFIX}/bin"
 ROOTPATH="${PREFIX}/sbin:${PREFIX}/bin"
@@ -47,18 +49,50 @@ MANPATH="${PREFIX}/share/man"
 CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
 #KDE_IS_PRELINKED=1
 XDG_DATA_DIRS="${PREFIX}/share"
-KDEDIRS="/usr"
 EOF
 		doenvd "${T}"/43kdepaths-${SLOT}
 		cat <<-EOF > "${D}/etc/revdep-rebuild/50-kde-${SLOT}"
 SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
 EOF
-	else # Much simpler for the FHS compliant -kdeprefix install
+
+		# kdeglobals needed to make third party apps installed in /usr work
+		cat <<-EOF > "${D}/${PREFIX}/share/config/kdeglobals"
+[Directories][\$i]
+dir_data=${PREFIX}/share/apps:/usr/share/apps
+dir_html=${PREFIX}/share/doc/HTML:/usr/share/doc/HTML
+dir_icon=${PREFIX}/share/icons:/usr/share/icons
+dir_config=${PREFIX}/share/config:/usr/share/config
+dir_pixmap=${PREFIX}/share/pixmaps:/usr/share/pixmaps
+dir_apps=${PREFIX}/share/applications:/usr/share/applications
+dir_sound=${PREFIX}/share/sounds:/usr/share/sounds
+dir_locale=${PREFIX}/share/locale:/usr/share/locale
+dir_services=${PREFIX}/share/kde4/services:/usr/share/kde4/services
+dir_servicetypes=${PREFIX}/share/kde4/servicetypes:/usr/share/kde4/servicetypes
+dir_mime=${PREFIX}/share/mime:/usr/share/mime
+dir_templates=${PREFIX}/share/templates:/usr/share/templates
+dir_exe=${PREFIX}/$(get_libdir)/kde4/libexec:${PREFIX}/bin:/usr/$(get_libdir)/kde4/libexec:/usr/bin
+dir_module=${PREFIX}/$(get_libdir)/kde4:/usr/$(get_libdir)/kde4
+dir_qtplugins=${PREFIX}/$(get_libdir)/kde4/plugins:/usr/$(get_libdir)/kde4/plugins
+dir_kcfg=${PREFIX}/share/config.kcfg:/usr/share/config.kcfg
+dir_lib=${PREFIX}/$(get_libdir):/usr/$(get_libdir)
+EOF
+
+	else
+
+		# Much simpler for the FHS compliant -kdeprefix install
 		cat <<-EOF > "${T}"/43kdepaths # number goes down with version
 CONFIG_PROTECT="/usr/share/config"
 #KDE_IS_PRELINKED=1
 		EOF
 		doenvd "${T}"/43kdepaths
+
+		# Simpler kdeglobals
+		cat <<-EOF > "${D}/usr/share/config/kdeglobals"
+[Directories][\$i]
+dir_apps=/usr/share/applications
+dir_mime=/usr/share/mime
+EOF
+
 	fi
 }