summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--kde-base/kde-env/ChangeLog10
-rw-r--r--kde-base/kde-env/Manifest11
-rw-r--r--kde-base/kde-env/kde-env-4.2.3-r1.ebuild120
-rw-r--r--kde-base/kde-env/kde-env-4.2.85-r1.ebuild (renamed from kde-base/kde-env/kde-env-4.2.85.ebuild)29
-rw-r--r--kde-base/kde-env/kde-env-4.2.87-r1.ebuild (renamed from kde-base/kde-env/kde-env-4.2.87.ebuild)29
-rw-r--r--kde-base/kde-env/kde-env-4.2.9999.ebuild29
-rw-r--r--kde-base/kde-env/kde-env-9999.ebuild29
7 files changed, 196 insertions, 61 deletions
diff --git a/kde-base/kde-env/ChangeLog b/kde-base/kde-env/ChangeLog
index bb41c589593..fb41641e398 100644
--- a/kde-base/kde-env/ChangeLog
+++ b/kde-base/kde-env/ChangeLog
@@ -2,6 +2,16 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*kde-env-4.2.87-r1 (24 May 2009)
+*kde-env-4.2.85-r1 (24 May 2009)
+*kde-env-4.2.3-r1 (24 May 2009)
+
+ 24 May 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+ +kde-env-4.2.3-r1.ebuild, -kde-env-4.2.85.ebuild,
+ +kde-env-4.2.85-r1.ebuild, -kde-env-4.2.87.ebuild,
+ +kde-env-4.2.87-r1.ebuild, kde-env-4.2.9999.ebuild, kde-env-9999.ebuild:
+ Fixed duplicated menu entries in kmenuedit
+
*kde-env-4.2.87 (20 May 2009)
20 May 2009; Alexey Shvetsov <alexxy@gentoo.org> +kde-env-4.2.87.ebuild:
diff --git a/kde-base/kde-env/Manifest b/kde-base/kde-env/Manifest
index 12aa1ee2502..dbbebcd93fb 100644
--- a/kde-base/kde-env/Manifest
+++ b/kde-base/kde-env/Manifest
@@ -1,6 +1,7 @@
-EBUILD kde-env-4.2.85.ebuild 2999 RMD160 79fd15dcf1526dadf8dbbb531c4286ee37d07884 SHA1 789286fd712a9579213895827c2f3c676523ab1b SHA256 d837b39a2c23c05dff738314fc8eaa5272601458abe7c61a7b1b6ea3847c6bfe
-EBUILD kde-env-4.2.87.ebuild 2999 RMD160 79fd15dcf1526dadf8dbbb531c4286ee37d07884 SHA1 789286fd712a9579213895827c2f3c676523ab1b SHA256 d837b39a2c23c05dff738314fc8eaa5272601458abe7c61a7b1b6ea3847c6bfe
-EBUILD kde-env-4.2.9999.ebuild 2994 RMD160 9713c32c1a0b0dac389dd72585b8bc8bbe89247d SHA1 c1919ee973772a42a48419c05a7de1fad8cd5d73 SHA256 8c489f1631e9f2f1af7b978e332eb26fd217e80cef734c621574b6e03fbc7591
-EBUILD kde-env-9999.ebuild 2994 RMD160 9713c32c1a0b0dac389dd72585b8bc8bbe89247d SHA1 c1919ee973772a42a48419c05a7de1fad8cd5d73 SHA256 8c489f1631e9f2f1af7b978e332eb26fd217e80cef734c621574b6e03fbc7591
-MISC ChangeLog 2102 RMD160 01fcf0ebbf24f7cb23196529edb47c9ac730c47b SHA1 81ac9220b64025ab7d17345d2303e80c0fc07c0c SHA256 025245be7a4d825758a0f53b2c14326115f173395594abcd8122c47e2ab436f9
+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
+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
new file mode 100644
index 00000000000..9033f1446ad
--- /dev/null
+++ b/kde-base/kde-env/kde-env-4.2.3-r1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/kde-env-4.2.3.ebuild,v 1.4 2009/05/09 13:41:20 scarabeus Exp $
+
+EAPI="2"
+
+inherit kde4-base
+
+DESCRIPTION="Environment setting required for all KDE4 apps to run."
+HOMEPAGE="http://kde.org"
+SRC_URI=""
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+LICENSE="as-is"
+IUSE=""
+
+RDEPEND="
+ !<kde-base/kdelibs-3.5.10-r3
+ !kdeprefix? (
+ !kde-base/kdelibs:4.1
+ !<=kde-base/kdelibs-4.2.2-r1:4.2
+ !<=kde-base/kdelibs-4.2.70:4.3
+ )
+ kdeprefix? ( !<kde-base/kdelibs-${PV}:${SLOT} )
+"
+
+src_unpack() {
+ :
+}
+
+src_prepare() {
+ :
+}
+
+src_configure() {
+ :
+}
+
+src_compile() {
+ :
+}
+
+src_install() {
+ dodir /etc/env.d
+ dodir /etc/revdep-rebuild
+ dodir "${PREFIX}/share/config"
+
+ # List all the multilib libdirs
+ local _libdir _libdirs
+ for _libdir in $(get_all_libdirs); do
+ _libdirs="${_libdirs}:${PREFIX}/${_libdir}"
+ done
+ _libdirs=${_libdirs#:}
+
+ if use kdeprefix; then
+
+ # number goes down with version
+ cat <<-EOF > "${T}/43kdepaths-${SLOT}"
+PATH="${PREFIX}/bin"
+ROOTPATH="${PREFIX}/sbin:${PREFIX}/bin"
+LDPATH="${_libdirs}"
+MANPATH="${PREFIX}/share/man"
+CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
+#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}"
+SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
+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
+EOF
+
+ else
+
+ # Much simpler for the FHS compliant -kdeprefix install
+ # number goes down with version
+ cat <<-EOF > "${T}/43kdepaths"
+CONFIG_PROTECT="/usr/share/config"
+#KDE_IS_PRELINKED=1
+EOF
+ doenvd "${T}/43kdepaths"
+
+ fi
+}
+
+pkg_preinst() {
+ :
+}
+
+src_test() {
+ :
+}
diff --git a/kde-base/kde-env/kde-env-4.2.85.ebuild b/kde-base/kde-env/kde-env-4.2.85-r1.ebuild
index b5bfdbde660..f1c69b022a6 100644
--- a/kde-base/kde-env/kde-env-4.2.85.ebuild
+++ b/kde-base/kde-env/kde-env-4.2.85-r1.ebuild
@@ -15,6 +15,7 @@ LICENSE="as-is"
IUSE=""
RDEPEND="
+ !<kde-base/kdelibs-3.5.10-r3
!kdeprefix? (
!kde-base/kdelibs:4.1
!<=kde-base/kdelibs-4.2.2-r1:4.2
@@ -42,7 +43,7 @@ src_compile() {
src_install() {
dodir /etc/env.d
dodir /etc/revdep-rebuild
- dodir "${PREFIX}"/share/config
+ dodir "${PREFIX}/share/config"
# List all the multilib libdirs
local _libdir _libdirs
@@ -53,7 +54,8 @@ src_install() {
if use kdeprefix; then
- cat <<-EOF > "${T}"/43kdepaths-${SLOT} # number goes down with version
+ # number goes down with version
+ cat <<-EOF > "${T}/43kdepaths-${SLOT}"
PATH="${PREFIX}/bin"
ROOTPATH="${PREFIX}/sbin:${PREFIX}/bin"
LDPATH="${_libdirs}"
@@ -64,7 +66,7 @@ PKG_CONFIG_PATH="${PREFIX}/$(get_libdir)/pkgconfig"
XDG_DATA_DIRS="${PREFIX}/share"
KDEDIRS="/usr"
EOF
- doenvd "${T}"/43kdepaths-${SLOT}
+ doenvd "${T}/43kdepaths-${SLOT}"
cat <<-EOF > "${D}/etc/revdep-rebuild/50-kde-${SLOT}"
SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
EOF
@@ -77,35 +79,34 @@ 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_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/mime:/usr/share/mime
+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
EOF
else
# Much simpler for the FHS compliant -kdeprefix install
- cat <<-EOF > "${T}"/43kdepaths # number goes down with version
+ # number goes down with version
+ cat <<-EOF > "${T}/43kdepaths"
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
+ doenvd "${T}/43kdepaths"
fi
}
diff --git a/kde-base/kde-env/kde-env-4.2.87.ebuild b/kde-base/kde-env/kde-env-4.2.87-r1.ebuild
index b5bfdbde660..f1c69b022a6 100644
--- a/kde-base/kde-env/kde-env-4.2.87.ebuild
+++ b/kde-base/kde-env/kde-env-4.2.87-r1.ebuild
@@ -15,6 +15,7 @@ LICENSE="as-is"
IUSE=""
RDEPEND="
+ !<kde-base/kdelibs-3.5.10-r3
!kdeprefix? (
!kde-base/kdelibs:4.1
!<=kde-base/kdelibs-4.2.2-r1:4.2
@@ -42,7 +43,7 @@ src_compile() {
src_install() {
dodir /etc/env.d
dodir /etc/revdep-rebuild
- dodir "${PREFIX}"/share/config
+ dodir "${PREFIX}/share/config"
# List all the multilib libdirs
local _libdir _libdirs
@@ -53,7 +54,8 @@ src_install() {
if use kdeprefix; then
- cat <<-EOF > "${T}"/43kdepaths-${SLOT} # number goes down with version
+ # number goes down with version
+ cat <<-EOF > "${T}/43kdepaths-${SLOT}"
PATH="${PREFIX}/bin"
ROOTPATH="${PREFIX}/sbin:${PREFIX}/bin"
LDPATH="${_libdirs}"
@@ -64,7 +66,7 @@ PKG_CONFIG_PATH="${PREFIX}/$(get_libdir)/pkgconfig"
XDG_DATA_DIRS="${PREFIX}/share"
KDEDIRS="/usr"
EOF
- doenvd "${T}"/43kdepaths-${SLOT}
+ doenvd "${T}/43kdepaths-${SLOT}"
cat <<-EOF > "${D}/etc/revdep-rebuild/50-kde-${SLOT}"
SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
EOF
@@ -77,35 +79,34 @@ 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_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/mime:/usr/share/mime
+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
EOF
else
# Much simpler for the FHS compliant -kdeprefix install
- cat <<-EOF > "${T}"/43kdepaths # number goes down with version
+ # number goes down with version
+ cat <<-EOF > "${T}/43kdepaths"
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
+ doenvd "${T}/43kdepaths"
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 f03bd4483b3..bfc7f3d391f 100644
--- a/kde-base/kde-env/kde-env-4.2.9999.ebuild
+++ b/kde-base/kde-env/kde-env-4.2.9999.ebuild
@@ -15,6 +15,7 @@ LICENSE="as-is"
IUSE=""
RDEPEND="
+ !<kde-base/kdelibs-3.5.10-r3
!kdeprefix? (
!kde-base/kdelibs:4.1
!<=kde-base/kdelibs-4.2.2-r1:4.2
@@ -42,7 +43,7 @@ src_compile() {
src_install() {
dodir /etc/env.d
dodir /etc/revdep-rebuild
- dodir "${PREFIX}"/share/config
+ dodir "${PREFIX}/share/config"
# List all the multilib libdirs
local _libdir _libdirs
@@ -53,7 +54,8 @@ src_install() {
if use kdeprefix; then
- cat <<-EOF > "${T}"/43kdepaths-${SLOT} # number goes down with version
+ # number goes down with version
+ cat <<-EOF > "${T}/43kdepaths-${SLOT}"
PATH="${PREFIX}/bin"
ROOTPATH="${PREFIX}/sbin:${PREFIX}/bin"
LDPATH="${_libdirs}"
@@ -64,7 +66,7 @@ PKG_CONFIG_PATH="${PREFIX}/$(get_libdir)/pkgconfig"
XDG_DATA_DIRS="${PREFIX}/share"
KDEDIRS="/usr"
EOF
- doenvd "${T}"/43kdepaths-${SLOT}
+ doenvd "${T}/43kdepaths-${SLOT}"
cat <<-EOF > "${D}/etc/revdep-rebuild/50-kde-${SLOT}"
SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
EOF
@@ -77,35 +79,34 @@ 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_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/mime:/usr/share/mime
+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
EOF
else
# Much simpler for the FHS compliant -kdeprefix install
- cat <<-EOF > "${T}"/43kdepaths # number goes down with version
+ # number goes down with version
+ cat <<-EOF > "${T}/43kdepaths"
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
+ doenvd "${T}/43kdepaths"
fi
}
diff --git a/kde-base/kde-env/kde-env-9999.ebuild b/kde-base/kde-env/kde-env-9999.ebuild
index f03bd4483b3..bfc7f3d391f 100644
--- a/kde-base/kde-env/kde-env-9999.ebuild
+++ b/kde-base/kde-env/kde-env-9999.ebuild
@@ -15,6 +15,7 @@ LICENSE="as-is"
IUSE=""
RDEPEND="
+ !<kde-base/kdelibs-3.5.10-r3
!kdeprefix? (
!kde-base/kdelibs:4.1
!<=kde-base/kdelibs-4.2.2-r1:4.2
@@ -42,7 +43,7 @@ src_compile() {
src_install() {
dodir /etc/env.d
dodir /etc/revdep-rebuild
- dodir "${PREFIX}"/share/config
+ dodir "${PREFIX}/share/config"
# List all the multilib libdirs
local _libdir _libdirs
@@ -53,7 +54,8 @@ src_install() {
if use kdeprefix; then
- cat <<-EOF > "${T}"/43kdepaths-${SLOT} # number goes down with version
+ # number goes down with version
+ cat <<-EOF > "${T}/43kdepaths-${SLOT}"
PATH="${PREFIX}/bin"
ROOTPATH="${PREFIX}/sbin:${PREFIX}/bin"
LDPATH="${_libdirs}"
@@ -64,7 +66,7 @@ PKG_CONFIG_PATH="${PREFIX}/$(get_libdir)/pkgconfig"
XDG_DATA_DIRS="${PREFIX}/share"
KDEDIRS="/usr"
EOF
- doenvd "${T}"/43kdepaths-${SLOT}
+ doenvd "${T}/43kdepaths-${SLOT}"
cat <<-EOF > "${D}/etc/revdep-rebuild/50-kde-${SLOT}"
SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
EOF
@@ -77,35 +79,34 @@ 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_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/mime:/usr/share/mime
+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
EOF
else
# Much simpler for the FHS compliant -kdeprefix install
- cat <<-EOF > "${T}"/43kdepaths # number goes down with version
+ # number goes down with version
+ cat <<-EOF > "${T}/43kdepaths"
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
+ doenvd "${T}/43kdepaths"
fi
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-07 22:17:11 +0000