[kde-base/kde-env] - properly set kdeglobals so that exporting KDEDIRS is no longer needed

6 files changed, 10 insertions, 120 deletions

diff --git a/kde-base/kde-env/Manifest b/kde-base/kde-env/Manifest
index dbbebcd93fb..3c2b1066c6c 100644
--- a/kde-base/kde-env/Manifest
+++ b/kde-base/kde-env/Manifest
@@ -1,7 +1,7 @@
-EBUILD kde-env-4.2.3-r1.ebuild 3318 RMD160 8b50c5fd15b43fecc755595165f89282780298ed SHA1 56fb3b7caedd6fd28a67e92c960afa60c5790350 SHA256 3914e2f8ff5bdcfe146a71e5737c8a00db70dd885f3fdd59095d98037c0c062d
-EBUILD kde-env-4.2.85-r1.ebuild 3185 RMD160 40f2c1007e49e559e29bcb0fa3cc961a3841cb72 SHA1 6158fbb3cddf1292ba97a7e706efa32c6bad45e1 SHA256 ae8d3415c6e656b4b5612a467129407e73d8e0b087eae836e1deed4590617af8
-EBUILD kde-env-4.2.87-r1.ebuild 3185 RMD160 40f2c1007e49e559e29bcb0fa3cc961a3841cb72 SHA1 6158fbb3cddf1292ba97a7e706efa32c6bad45e1 SHA256 ae8d3415c6e656b4b5612a467129407e73d8e0b087eae836e1deed4590617af8
-EBUILD kde-env-4.2.9999.ebuild 3180 RMD160 f34fa72ec4094864ce008507d017535b1669d162 SHA1 d2ea7664dd31c64679454f372ebd2d7d46726a9c SHA256 dbac85f65314d05ef8886126e5df18c5d93756ff95df3d8f0c8d28312df28878
-EBUILD kde-env-9999.ebuild 3180 RMD160 f34fa72ec4094864ce008507d017535b1669d162 SHA1 d2ea7664dd31c64679454f372ebd2d7d46726a9c SHA256 dbac85f65314d05ef8886126e5df18c5d93756ff95df3d8f0c8d28312df28878
+EBUILD kde-env-4.2.3-r1.ebuild 1976 RMD160 9c2e5bc21637e197b182d63660b67a30d5a50fd0 SHA1 8f9b6f2b3f962dcbe962ae8f3cd6ff62500f8189 SHA256 ffd6f0f16198f3030a00820c8c3b4328a44f16af1a7609534dcc19e50127ec4a
+EBUILD kde-env-4.2.85-r1.ebuild 1843 RMD160 2b0afa14afbf6d25342d7ef580f95c5d3a1061ef SHA1 abdf3b0cdeee2c5179c4007740765b8177bede99 SHA256 d43a678a4428c9f7ac863fa7c60fb3786bccdd57b5df5eee4df98bcc3d377372
+EBUILD kde-env-4.2.87-r1.ebuild 1843 RMD160 2b0afa14afbf6d25342d7ef580f95c5d3a1061ef SHA1 abdf3b0cdeee2c5179c4007740765b8177bede99 SHA256 d43a678a4428c9f7ac863fa7c60fb3786bccdd57b5df5eee4df98bcc3d377372
+EBUILD kde-env-4.2.9999.ebuild 1838 RMD160 04e93fc5403179c64dfdc0e3c5fd38bfe15a5876 SHA1 e2ae593968c6d0227379b5e3fe56283d618adf66 SHA256 d59dd09f2a24b3c9572bcf7639d3265f7eb8d20eeb4886e9b6919ad10ad5cd56
+EBUILD kde-env-9999.ebuild 1838 RMD160 04e93fc5403179c64dfdc0e3c5fd38bfe15a5876 SHA1 e2ae593968c6d0227379b5e3fe56283d618adf66 SHA256 d59dd09f2a24b3c9572bcf7639d3265f7eb8d20eeb4886e9b6919ad10ad5cd56
 MISC ChangeLog 2491 RMD160 abbef3b8a8887c164067c3c0ac35c5f33c33ce93 SHA1 b255058b9ae08d9e4e74dcfb7280ea9aaccf4be4 SHA256 30d661c7dc219b7f68d06e77439a18986aa1438c5eab0925c82b386639578bd9
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kde-env/kde-env-4.2.3-r1.ebuild b/kde-base/kde-env/kde-env-4.2.3-r1.ebuild
index 9033f1446ad..8eef53124bf 100644
--- a/kde-base/kde-env/kde-env-4.2.3-r1.ebuild
+++ b/kde-base/kde-env/kde-env-4.2.3-r1.ebuild
@@ -64,7 +64,6 @@ CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/sha
 #KDE_IS_PRELINKED=1
 PKG_CONFIG_PATH="${PREFIX}/$(get_libdir)/pkgconfig"
 XDG_DATA_DIRS="${PREFIX}/share"
-KDEDIRS="/usr"
 EOF
 		doenvd "${T}/43kdepaths-${SLOT}"
 		cat <<-EOF > "${D}/etc/revdep-rebuild/50-kde-${SLOT}"
@@ -74,28 +73,7 @@ EOF
 		# 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/applnk:/usr/share/applnk
-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/mimelnk:/usr/share/mimelnk
-dir_wallpapers=${PREFIX}/share/wallpapers:/usr/share/wallpapers
-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)
-dir_emoticons=${PREFIX}/share/emoticons:/usr/share/emoticons
-dir_xdgdata-apps=${PREFIX}/share/applications:/usr/share/applications
-dir_xdgdata-icons=${PREFIX}/share/icons:/usr/share/icons
-dir_xdgdata-pixmaps=${PREFIX}/share/pixmaps:/usr/share/pixmaps
+prefixes=/usr
 EOF
 
 	else
diff --git a/kde-base/kde-env/kde-env-4.2.85-r1.ebuild b/kde-base/kde-env/kde-env-4.2.85-r1.ebuild
index f1c69b022a6..75d40f11fe2 100644
--- a/kde-base/kde-env/kde-env-4.2.85-r1.ebuild
+++ b/kde-base/kde-env/kde-env-4.2.85-r1.ebuild
@@ -64,7 +64,6 @@ CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/sha
 #KDE_IS_PRELINKED=1
 PKG_CONFIG_PATH="${PREFIX}/$(get_libdir)/pkgconfig"
 XDG_DATA_DIRS="${PREFIX}/share"
-KDEDIRS="/usr"
 EOF
 		doenvd "${T}/43kdepaths-${SLOT}"
 		cat <<-EOF > "${D}/etc/revdep-rebuild/50-kde-${SLOT}"
@@ -74,28 +73,7 @@ EOF
 		# 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/applnk:/usr/share/applnk
-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/mimelnk:/usr/share/mimelnk
-dir_wallpapers=${PREFIX}/share/wallpapers:/usr/share/wallpapers
-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)
-dir_emoticons=${PREFIX}/share/emoticons:/usr/share/emoticons
-dir_xdgdata-apps=${PREFIX}/share/applications:/usr/share/applications
-dir_xdgdata-icons=${PREFIX}/share/icons:/usr/share/icons
-dir_xdgdata-pixmaps=${PREFIX}/share/pixmaps:/usr/share/pixmaps
+prefixes=/usr
 EOF
 
 	else
diff --git a/kde-base/kde-env/kde-env-4.2.87-r1.ebuild b/kde-base/kde-env/kde-env-4.2.87-r1.ebuild
index f1c69b022a6..75d40f11fe2 100644
--- a/kde-base/kde-env/kde-env-4.2.87-r1.ebuild
+++ b/kde-base/kde-env/kde-env-4.2.87-r1.ebuild
@@ -64,7 +64,6 @@ CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/sha
 #KDE_IS_PRELINKED=1
 PKG_CONFIG_PATH="${PREFIX}/$(get_libdir)/pkgconfig"
 XDG_DATA_DIRS="${PREFIX}/share"
-KDEDIRS="/usr"
 EOF
 		doenvd "${T}/43kdepaths-${SLOT}"
 		cat <<-EOF > "${D}/etc/revdep-rebuild/50-kde-${SLOT}"
@@ -74,28 +73,7 @@ EOF
 		# 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/applnk:/usr/share/applnk
-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/mimelnk:/usr/share/mimelnk
-dir_wallpapers=${PREFIX}/share/wallpapers:/usr/share/wallpapers
-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)
-dir_emoticons=${PREFIX}/share/emoticons:/usr/share/emoticons
-dir_xdgdata-apps=${PREFIX}/share/applications:/usr/share/applications
-dir_xdgdata-icons=${PREFIX}/share/icons:/usr/share/icons
-dir_xdgdata-pixmaps=${PREFIX}/share/pixmaps:/usr/share/pixmaps
+prefixes=/usr
 EOF
 
 	else
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 bfc7f3d391f..249157078ec 100644
--- a/kde-base/kde-env/kde-env-4.2.9999.ebuild
+++ b/kde-base/kde-env/kde-env-4.2.9999.ebuild
@@ -64,7 +64,6 @@ CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/sha
 #KDE_IS_PRELINKED=1
 PKG_CONFIG_PATH="${PREFIX}/$(get_libdir)/pkgconfig"
 XDG_DATA_DIRS="${PREFIX}/share"
-KDEDIRS="/usr"
 EOF
 		doenvd "${T}/43kdepaths-${SLOT}"
 		cat <<-EOF > "${D}/etc/revdep-rebuild/50-kde-${SLOT}"
@@ -74,28 +73,7 @@ EOF
 		# 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/applnk:/usr/share/applnk
-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/mimelnk:/usr/share/mimelnk
-dir_wallpapers=${PREFIX}/share/wallpapers:/usr/share/wallpapers
-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)
-dir_emoticons=${PREFIX}/share/emoticons:/usr/share/emoticons
-dir_xdgdata-apps=${PREFIX}/share/applications:/usr/share/applications
-dir_xdgdata-icons=${PREFIX}/share/icons:/usr/share/icons
-dir_xdgdata-pixmaps=${PREFIX}/share/pixmaps:/usr/share/pixmaps
+prefixes=/usr
 EOF
 
 	else
diff --git a/kde-base/kde-env/kde-env-9999.ebuild b/kde-base/kde-env/kde-env-9999.ebuild
index bfc7f3d391f..249157078ec 100644
--- a/kde-base/kde-env/kde-env-9999.ebuild
+++ b/kde-base/kde-env/kde-env-9999.ebuild
@@ -64,7 +64,6 @@ CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/sha
 #KDE_IS_PRELINKED=1
 PKG_CONFIG_PATH="${PREFIX}/$(get_libdir)/pkgconfig"
 XDG_DATA_DIRS="${PREFIX}/share"
-KDEDIRS="/usr"
 EOF
 		doenvd "${T}/43kdepaths-${SLOT}"
 		cat <<-EOF > "${D}/etc/revdep-rebuild/50-kde-${SLOT}"
@@ -74,28 +73,7 @@ EOF
 		# 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/applnk:/usr/share/applnk
-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/mimelnk:/usr/share/mimelnk
-dir_wallpapers=${PREFIX}/share/wallpapers:/usr/share/wallpapers
-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)
-dir_emoticons=${PREFIX}/share/emoticons:/usr/share/emoticons
-dir_xdgdata-apps=${PREFIX}/share/applications:/usr/share/applications
-dir_xdgdata-icons=${PREFIX}/share/icons:/usr/share/icons
-dir_xdgdata-pixmaps=${PREFIX}/share/pixmaps:/usr/share/pixmaps
+prefixes=/usr
 EOF
 
 	else