diff options
| -rw-r--r-- | kde-base/kdebase-startkde/Manifest | 6 | ||||
| -rw-r--r-- | kde-base/kdebase-startkde/files/gentoo-startkde4.patch | 36 | ||||
| -rw-r--r-- | kde-base/kdebase-startkde/kdebase-startkde-4.1.67.ebuild | 47 |
3 files changed, 74 insertions, 15 deletions
diff --git a/kde-base/kdebase-startkde/Manifest b/kde-base/kdebase-startkde/Manifest index 0d3d2d516cf..d68f0e2bf7b 100644 --- a/kde-base/kdebase-startkde/Manifest +++ b/kde-base/kdebase-startkde/Manifest @@ -2,6 +2,7 @@ AUX agent-shutdown.sh 323 RMD160 9a0451c1e58e688c022ecd2b37f08cac433b187d SHA1 1 AUX agent-startup.sh 955 RMD160 bbe8abb4734bb7364edc45265b10ae2a2887db66 SHA1 f7dfd044b6f09e5ad0f04842e51c7f9e62fad718 SHA256 c63fd6233b1711ede4fbb5b30460c5b1ddee840f0f5123db953ee3ab298da8f9 <<<<<<< HEAD:kde-base/kdebase-startkde/Manifest <<<<<<< HEAD:kde-base/kdebase-startkde/Manifest +<<<<<<< HEAD:kde-base/kdebase-startkde/Manifest AUX gentoo-startkde4.patch 1631 RMD160 1e10f6184cd0daa5249bf4aa4396cf0d9537c121 SHA1 e6658fd41f3bfae229e6f39c97ad3b301b8b41df SHA256 631c9db91219bd6e716b2d9e514e24bb8f39a69521ccf48894913850adfa855a DIST kdebase-workspace-4.1.1.tar.bz2 47473442 RMD160 d6736a4c4f7be1e3d3c74911781f1454675910c8 SHA1 5ffc3ab2cf6a79fb577bda362783219b3859388a SHA256 47637b68405e75f13281bc88c94b7502c3d7b0097bf0a057625c76cc6e7233dd DIST kdebase-workspace-4.1.67.tar.bz2 48344468 RMD160 20b1b3c1ff336b9ab5bfb4d96c3744bdd06675fa SHA1 eed4b30575289289c095ac817aa6c61152865306 SHA256 2cadd7ddc8d7b5ffbeceeafcc918ac5531c6a30e2d617814b7a1a6ca4d448672 @@ -13,8 +14,11 @@ AUX gentoo-startkde4.patch 1569 RMD160 52c3a8b948b3a651e6c46de5f0ea5509f6f57c35 ======= AUX gentoo-startkde4.patch 1556 RMD160 d540f89a7677322e891782d7573ddbd1cf9ad367 SHA1 d47d0041138dae724e8e5161424d83b5ea35e225 SHA256 1c55320c6c3cdb498a8423d4f4a9d541290f37fe4bd05f972748bd961ea8c11f >>>>>>> cb1b53b... Improvements to the startkde script - thanks to Matthias Dahl for some of the improved sed commands.:kde-base/kdebase-startkde/Manifest +======= +AUX gentoo-startkde4.patch 2183 RMD160 2a60c1ca52d5a578bbe610b1912c76a37895da64 SHA1 bd78a9d592992adff4b0abbc4203a99375a617d8 SHA256 a1a7365b3d8b0a0438e8eca2d630ad037a89176fe8ee3e8d8b460efb9afc2bd5 +>>>>>>> fb29934... Use same fix on kdebase-startkde as in master branch:kde-base/kdebase-startkde/Manifest DIST kdebase-workspace-4.1.2.tar.bz2 47500082 RMD160 7491748580f3f40e4646a28af8f64caccc919bdd SHA1 46a2c14edfca05deb271a047bed292f7d71b8c5b SHA256 4d3273c7e1bb767136e9f4e8eb8717489d4d36eaa0fbd7d391515760d28cb804 -EBUILD kdebase-startkde-4.1.2.ebuild 3215 RMD160 afb96690be67d63442ab516b2c21012ae65594df SHA1 f57cbcc0543122be53aab3f9029cc3ecdc792a5c SHA256 f1c7d7739f0736914f61611edcfaeac0a5834984488feb390521f5c4a659e616 +EBUILD kdebase-startkde-4.1.2.ebuild 3777 RMD160 61fcde9a5cd5d59b7fe91feb2ad9401c572d99cf SHA1 20fef3aea74dfd542e293762827f47b7a09b46c3 SHA256 ca7284f14c4072ff318d901426cbfda3d1b71de8c96dd2cc73c06dd825107898 MISC ChangeLog 1823 RMD160 1f79f934354ec67a3423a224e5a708ff7177e6f1 SHA1 7128522d12f2c815c71ac320a8250b9897353daf SHA256 4e37be141177d7b9d5df496203a7624178faabfa76276bd6e9a4d4e4452b38cc >>>>>>> 09723ee... Update patch for kdebase-startkde.:kde-base/kdebase-startkde/Manifest MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/kdebase-startkde/files/gentoo-startkde4.patch b/kde-base/kdebase-startkde/files/gentoo-startkde4.patch index 244e1f28d3b..7526e39160b 100644 --- a/kde-base/kdebase-startkde/files/gentoo-startkde4.patch +++ b/kde-base/kdebase-startkde/files/gentoo-startkde4.patch @@ -1,15 +1,13 @@ --- startkde.cmake 2008-07-15 15:49:02.000000000 -0400 -+++ startkde.cmake.cryos 2008-09-01 16:42:04.000000000 -0400 ++++ startkde.cmake.cryos 2008-09-27 14:44:01.000000000 -0400 @@ -7,6 +7,33 @@ # because we still need to do some cleanup. trap 'echo GOT SIGHUP' HUP -+# Gentoo: setup environment, filter other slotted KDE installs from PATH +export KDEDIR=@REPLACE_PREFIX@ -+export KDEDIRS=/usr:/usr/local:${KDEDIR} +export PATH=${KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g') +export ROOTPATH=${KDEDIR}/sbin:${KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g') -+export LDPATH=@REPLACE_LIBS@:${LDPATH} ++@REPLACE_LDPATH@ +export STRIGI_PLUGIN_PATH="${KDEDIR}/@REPLACE_LIBDIR@/strigi:${STRIGI_PLUGIN_PATH}" +export XDG_DATA_DIRS=${KDEDIR}/share:$(echo ${XDG_DATA_DIRS} | sed 's/$/:/g;s#/usr/kde/[^/]*/share/\?:##g;s/:$//g') + @@ -19,6 +17,8 @@ +fi + +# Gentoo: handle the possible home directory layout for config directory ++# Note that we change the default KDEHOME in kdelibs to .kde4 or .kde${SLOT} ++# for -kdeprefix and +kdeprefix respectively. +if [ "${KDEDIR}" == "/usr" ]; then + # If the directory doesn't exist make it + [ -e "${HOME}/.kde4" ] || mkdir "$HOME/.kde4" @@ -34,3 +34,31 @@ # Check if a KDE session already is running and whether it's possible to connect to X kcheckrunning kcheckrunning_result=$? +@@ -209,6 +236,13 @@ + done + done + ++# Gentoo part for FHS installs ++if [ "${KDEDIR}" == "/usr" ]; then ++ for file in "/etc/kde/startup/"*.sh; do ++ test -r "${file}" && . "${file}" ++ done ++fi ++ + # Set the path for Qt plugins provided by KDE + if test -n "$QT_PLUGIN_PATH"; then + QT_PLUGIN_PATH="$QT_PLUGIN_PATH:`kde4-config --path qtplugins`" +@@ -420,6 +454,13 @@ + done + done + ++# Gentoo part for FHS installs ++if [ "${KDEDIR}" == "/usr" ]; then ++ for file in "/etc/kde/shutdown/"*.sh; do ++ test -r "${file}" && . "${file}" ++ done ++fi ++ + unset KDE_FULL_SESSION + xprop -root -remove KDE_FULL_SESSION + unset KDE_SESSION_VERSION diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.1.67.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.1.67.ebuild index cc6a46017f7..42d4810717e 100644 --- a/kde-base/kdebase-startkde/kdebase-startkde-4.1.67.ebuild +++ b/kde-base/kdebase-startkde/kdebase-startkde-4.1.67.ebuild @@ -49,9 +49,13 @@ PATCHES=("${FILESDIR}/gentoo-startkde4.patch") src_configure() { # Patch the startkde script to setup the environment for KDE 4.0 # Add our KDEDIR - sed -e "s#@REPLACE_PREFIX@#${PREFIX}#" \ - -i "${S}/startkde.cmake" || die "Sed for PREFIX failed." - + if use kdeprefix; then + sed -e "s#@REPLACE_LDFLAGS@#export LFFLAGS=${_libdirs}:\$LDFAGS#" \ + -i "${S}/startkde.cmake" || die "Sed for LDPATH failed." + else + sed -e "s#@REPLACE_LDFLAGS@##" -i "${S}/startkde.cmake" || \ + die "sed for LDPATH failed" + fi # List all the multilib libdirs local _libdir _libdirs for _libdir in $(get_all_libdirs); do @@ -72,10 +76,18 @@ src_install() { kde4-meta_src_install # startup and shutdown scripts - insinto "${KDEDIR}/env" + if use kdeprefix; then + insinto "${KDEDIR}/env" + else + insinto "/etc/kde/startup" + fi doins "${FILESDIR}/agent-startup.sh" || die "doexe agent-startup.sh failed" - exeinto "${KDEDIR}/shutdown" + if use kdeprefix; then + exeinto "${KDEDIR}/shutdown" + else + exeinto "/etc/kde/shutdown" + fi doexe "${FILESDIR}/agent-shutdown.sh" || die "doexe agent-shutdown.sh failed" # freedesktop environment variables @@ -83,7 +95,11 @@ src_install() { export XDG_DATA_DIRS="${KDEDIR}/share:/usr/share" export XDG_CONFIG_DIRS="${KDEDIR}/etc/xdg" EOF - insinto "${KDEDIR}/env" + if use kdeprefix; then + insinto "${KDEDIR}/env" + else + insinto "/etc/kde/startup" + fi doins "${T}/xdg.sh" || die "doins xdg.sh failed" # Set DIR to S{SLOT} for the kde-4 and kde-svn slot or kde-${SLOT} for all other slots @@ -101,10 +117,16 @@ src_install() { doexe "${T}/${DIR}" || die "doexe ${DIR} failed" # freedesktop compliant session script + local KDE_X + if use kdeprefix; then + KDE_X="KDE-${SLOT}" + else + KDE_X="KDE-4" + fi sed -e "s:\${KDE4_BIN_INSTALL_DIR}:${KDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \ - "${S}/kdm/kfrontend/sessions/kde.desktop.cmake" > "${T}/KDE-${SLOT}.desktop" + "${S}/kdm/kfrontend/sessions/kde.desktop.cmake" > "${T}/${KDE_X}.desktop" insinto /usr/share/xsessions - doins "${T}/KDE-${SLOT}.desktop" || die "doins ${SLOT}.desktop failed" + doins "${T}/${KDE_X}.desktop" || die "doins ${KDE_X}.desktop failed" } pkg_postinst () { @@ -112,7 +134,12 @@ pkg_postinst () { echo elog "To enable gpg-agent and/or ssh-agent in KDE sessions," - elog "edit ${KDEDIR}/env/agent-startup.sh and" - elog "${KDEDIR}/shutdown/agent-shutdown.sh" + if use kdeprefix; then + elog "edit ${KDEDIR}/env/agent-startup.sh and" + elog "${KDEDIR}/shutdown/agent-shutdown.sh" + else + elog "edit /etc/kde/startup/agent-startup.sh and" + elog "/etc/kde/shutdown/agent-shutdown.sh" + fi echo } |