summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--kde-base/kde-env/ChangeLog5
-rw-r--r--kde-base/kde-env/Manifest10
-rw-r--r--kde-base/kde-env/kde-env-4.2.2.ebuild38
-rw-r--r--kde-base/kde-env/kde-env-4.2.70.ebuild38
-rw-r--r--kde-base/kde-env/kde-env-4.2.9999.ebuild38
-rw-r--r--kde-base/kde-env/kde-env-9999.ebuild38
6 files changed, 154 insertions, 13 deletions
diff --git a/kde-base/kde-env/ChangeLog b/kde-base/kde-env/ChangeLog
index 2657ce33dd7..667ec8eec07 100644
--- a/kde-base/kde-env/ChangeLog
+++ b/kde-base/kde-env/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 22 Apr 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+ kde-env-4.2.2.ebuild, kde-env-4.2.70.ebuild, kde-env-4.2.9999.ebuild,
+ kde-env-9999.ebuild:
+ Added kdeglobals file instead of KDEDIRS
+
21 Apr 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
kde-env-4.2.2.ebuild, kde-env-4.2.70.ebuild, kde-env-4.2.9999.ebuild,
kde-env-9999.ebuild:
diff --git a/kde-base/kde-env/Manifest b/kde-base/kde-env/Manifest
index 5152fd3a207..7f9c6a4195e 100644
--- a/kde-base/kde-env/Manifest
+++ b/kde-base/kde-env/Manifest
@@ -1,6 +1,6 @@
-EBUILD kde-env-4.2.2.ebuild 1553 RMD160 853ee8dbc94e3ed4604b4ec442f41144e2a807d2 SHA1 2a9decff68016bc8c2723ec19af2d70ab0a91110 SHA256 97b1a6a700031d6d284883befbc087536e42a4854c7c48fea0e30696997aa74c
-EBUILD kde-env-4.2.70.ebuild 1553 RMD160 853ee8dbc94e3ed4604b4ec442f41144e2a807d2 SHA1 2a9decff68016bc8c2723ec19af2d70ab0a91110 SHA256 97b1a6a700031d6d284883befbc087536e42a4854c7c48fea0e30696997aa74c
-EBUILD kde-env-4.2.9999.ebuild 1548 RMD160 a376517a0e13c80253821e500c1bfbcc3d575d87 SHA1 8b0877b1bcf05867037f63703eac50d2d9af22b2 SHA256 6c84fe2650b18dca766b7ef6a66570a5022677c9f626788105394f92225fb6d2
-EBUILD kde-env-9999.ebuild 1548 RMD160 a376517a0e13c80253821e500c1bfbcc3d575d87 SHA1 8b0877b1bcf05867037f63703eac50d2d9af22b2 SHA256 6c84fe2650b18dca766b7ef6a66570a5022677c9f626788105394f92225fb6d2
-MISC ChangeLog 691 RMD160 cd5cd97fad7ed715bde13c5f7524608b2a702a8a SHA1 2d657ba816d8e7f95ccf76f87b4c8770b0040673 SHA256 143022832d4db862a251869524b62b6085cadb7c3a0320f41a8167cae2bdd0ea
+EBUILD kde-env-4.2.2.ebuild 2913 RMD160 fd9e74b282681eaee02b3422627e759ff9d9a7a5 SHA1 947408ae4da96d8e36bfbb4cf9ba3f993ab7a0fb SHA256 bf9c1a61fdf9dc45b6a79e8ea020e65b037fac2da86e57bd01cfbaefbe254bd7
+EBUILD kde-env-4.2.70.ebuild 2913 RMD160 fd9e74b282681eaee02b3422627e759ff9d9a7a5 SHA1 947408ae4da96d8e36bfbb4cf9ba3f993ab7a0fb SHA256 bf9c1a61fdf9dc45b6a79e8ea020e65b037fac2da86e57bd01cfbaefbe254bd7
+EBUILD kde-env-4.2.9999.ebuild 2908 RMD160 46dc560aadc56ebd0fb36fe1db78e6d25e57733a SHA1 b4ca5e4f5fbcb466df62b3c002c29ac5c87eccc4 SHA256 345533da13a17df2c72553aa56892bf1f0e2bb634f93a7192cfff0098bf2ba58
+EBUILD kde-env-9999.ebuild 2908 RMD160 46dc560aadc56ebd0fb36fe1db78e6d25e57733a SHA1 b4ca5e4f5fbcb466df62b3c002c29ac5c87eccc4 SHA256 345533da13a17df2c72553aa56892bf1f0e2bb634f93a7192cfff0098bf2ba58
+MISC ChangeLog 894 RMD160 599fc3178c130e15b29774c4f03ea8a9889efdfd SHA1 5ede58ca730cea262a461fb79f1d20a8e10cea1b SHA256 ecb680a91a07401ee8eb37c795acd67b53f1ceb94b92ec1aab9b842644a5ef84
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kde-env/kde-env-4.2.2.ebuild b/kde-base/kde-env/kde-env-4.2.2.ebuild
index 2c2404cce5c..182e8496044 100644
--- a/kde-base/kde-env/kde-env-4.2.2.ebuild
+++ b/kde-base/kde-env/kde-env-4.2.2.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
}
diff --git a/kde-base/kde-env/kde-env-4.2.70.ebuild b/kde-base/kde-env/kde-env-4.2.70.ebuild
index 2c2404cce5c..182e8496044 100644
--- a/kde-base/kde-env/kde-env-4.2.70.ebuild
+++ b/kde-base/kde-env/kde-env-4.2.70.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
}
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
}
diff --git a/kde-base/kde-env/kde-env-9999.ebuild b/kde-base/kde-env/kde-env-9999.ebuild
index cff7cdafa3e..fb11fc4e470 100644
--- a/kde-base/kde-env/kde-env-9999.ebuild
+++ b/kde-base/kde-env/kde-env-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
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-12 20:42:11 +0000