diff options
author | 2008-10-04 20:39:37 +0000 | |
---|---|---|
committer | 2008-10-04 20:39:37 +0000 | |
commit | 0b664534624e243f30370b993d9a334ff3c55db6 (patch) | |
tree | d525f0801a6535c5006057df41157654b7144d73 /kde-base/kdebase-startkde | |
parent | Sparc stable, security Bug #239055 (tests good, one skipped). (diff) | |
download | historical-0b664534624e243f30370b993d9a334ff3c55db6.tar.gz historical-0b664534624e243f30370b993d9a334ff3c55db6.tar.bz2 historical-0b664534624e243f30370b993d9a334ff3c55db6.zip |
Version bump to remove KDEDIRS and add kdeglobals as discussed in bug 237718.
Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64
Diffstat (limited to 'kde-base/kdebase-startkde')
-rw-r--r-- | kde-base/kdebase-startkde/ChangeLog | 10 | ||||
-rw-r--r-- | kde-base/kdebase-startkde/Manifest | 5 | ||||
-rw-r--r-- | kde-base/kdebase-startkde/files/kdebase-startkde-3.5-gentoo.patch | 2 | ||||
-rw-r--r-- | kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r3.ebuild | 111 |
4 files changed, 124 insertions, 4 deletions
diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog index 8e4b6bfc8be1..109cf31689c4 100644 --- a/kde-base/kdebase-startkde/ChangeLog +++ b/kde-base/kdebase-startkde/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for kde-base/kdebase-startkde # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.128 2008/10/02 12:10:25 jmbsvicetto Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.129 2008/10/04 20:39:36 cryos Exp $ + +*kdebase-startkde-3.5.10-r3 (04 Oct 2008) + + 04 Oct 2008; Marcus D. Hanwell <cryos@gentoo.org> + files/kdebase-startkde-3.5-gentoo.patch, + +kdebase-startkde-3.5.10-r3.ebuild: + Version bump to remove KDEDIRS and add kdeglobals as discussed in bug + 237718. *kdebase-startkde-4.1.2 (02 Oct 2008) diff --git a/kde-base/kdebase-startkde/Manifest b/kde-base/kdebase-startkde/Manifest index 4aee3a4c7106..aec4207e2d2d 100644 --- a/kde-base/kdebase-startkde/Manifest +++ b/kde-base/kdebase-startkde/Manifest @@ -2,7 +2,7 @@ AUX agent-shutdown.sh 323 RMD160 9a0451c1e58e688c022ecd2b37f08cac433b187d SHA1 1 AUX agent-startup.sh 955 RMD160 bbe8abb4734bb7364edc45265b10ae2a2887db66 SHA1 f7dfd044b6f09e5ad0f04842e51c7f9e62fad718 SHA256 c63fd6233b1711ede4fbb5b30460c5b1ddee840f0f5123db953ee3ab298da8f9 AUX gentoo-startkde.patch 2117 RMD160 5905ab727f2d7e66733b459da2997707ff269396 SHA1 b425a63453116c1a68060548b4fab1fde29dad4e SHA256 0609638a4c1a67e2406b1a0d23a032e80791182e4bd4b632ee3949c19f516a97 AUX gentoo-startkde4.patch 2183 RMD160 2a60c1ca52d5a578bbe610b1912c76a37895da64 SHA1 bd78a9d592992adff4b0abbc4203a99375a617d8 SHA256 a1a7365b3d8b0a0438e8eca2d630ad037a89176fe8ee3e8d8b460efb9afc2bd5 -AUX kdebase-startkde-3.5-gentoo.patch 2015 RMD160 8df6061b9ad1275f094ad2c48cc734df674be983 SHA1 bcd376ddf1f64c464af6601bcd3114cef4fa8282 SHA256 136822535493ce883af17a210900652816fa04e172616f9a0c10662b4d8a3939 +AUX kdebase-startkde-3.5-gentoo.patch 2016 RMD160 54c6fb0270747b82ec4eeba0f44b6b6f9dc422a6 SHA1 cf6dc0c158618620fcf79e63706abe7c04d5388c SHA256 2b7ddff127a7b41cf363cfda2609b3874e6e11cd9239ca9af1d4769553ed67f9 DIST kdebase-3.5-patchset-08.tar.bz2 23090 RMD160 c78298981aa5d0a6295b40160860e10e9ade1ff8 SHA1 22715c39a1769a7cbdf3e0ff73425459eadab01d SHA256 2dc4cd3842f07644769555c821445f945262db62b51f92ba55610146d16c499a DIST kdebase-3.5-patchset-13.tar.bz2 26504 RMD160 b723ba39de234131c3081be714d2919c5e5e38b5 SHA1 77d04b90d92ada8078263f2720f5e30d5ffdaa6e SHA256 78dc069a6d007d1dbf97147c368e7a4fda0dee5d41b15c471fde0589f0c377e0 DIST kdebase-3.5.10.tar.bz2 24339704 RMD160 5845e94fbb8b5b64934d62dc9bd3b580d26d07bc SHA1 1a72e4170a0a953ed70c0693a034947d87b6efbd SHA256 77aa9d8f28c532f2e7a5157a7f4ba8df1001f00fa1cb72cb70b388b3d0e16b61 @@ -11,10 +11,11 @@ DIST kdebase-workspace-4.0.4.tar.bz2 29604848 RMD160 df9868f650138dc77d6d7f87666 DIST kdebase-workspace-4.0.5.tar.bz2 29690232 RMD160 bf234c0633dc3c2ae22d59c0d51234bcb829eb50 SHA1 702236af68f60f43fb07a9289ebee71f1626cc53 SHA256 2c59ed8884d5adf09f84a4f295aecf86cb381d5a3f72bed13ab0c3889f765e3e DIST kdebase-workspace-4.1.2.tar.bz2 47500082 RMD160 7491748580f3f40e4646a28af8f64caccc919bdd SHA1 46a2c14edfca05deb271a047bed292f7d71b8c5b SHA256 4d3273c7e1bb767136e9f4e8eb8717489d4d36eaa0fbd7d391515760d28cb804 EBUILD kdebase-startkde-3.5.10-r2.ebuild 2658 RMD160 dd904522b679dc428ac361789b64bbc780ca36f9 SHA1 dce513c7195100ccabcd51320d49d8f42e77b46a SHA256 2c03954a64535e6104e6f7d8da589d94d0863034875ae0dda24babd1ed43b1db +EBUILD kdebase-startkde-3.5.10-r3.ebuild 3196 RMD160 25fbd44ddc05235f04533d363dfbb84523f486c8 SHA1 c8425dc89c5a5f3d8cf5f4ef9cb0259545ae9c26 SHA256 7029f24ad0e90a142c56cf356a4b7bd5fe30bb741d1fcc816f56ec057e1aabfd EBUILD kdebase-startkde-3.5.10.ebuild 2676 RMD160 129bed36c79475cc6fa1ad2bcccbf8fe2301b500 SHA1 510e24a5bed17cf5bbc58eb92b81b84639b4ade5 SHA256 f00386eac6ed5fc751b59b358be1e746d025f874cb36d0dbadd4047a7b67cca7 EBUILD kdebase-startkde-3.5.9.ebuild 2655 RMD160 b94be06d7482e08542c16ff2809a8fdc4bf4a5a1 SHA1 400376a3fc0fc9456e01519beda9b257e8a3aa85 SHA256 3eda0945a65f82c11cb58c7d1231bdbdea8d4a63dfb86abe2dd7b6942a9b598a EBUILD kdebase-startkde-4.0.4.ebuild 2887 RMD160 a7312c58372b89d84a23e13a2af73da529e43993 SHA1 08e3e12e2aadcb3d6afa7d6c6aca5d4229443baa SHA256 92603ed36d974ed00288039041299b0d28a363294e566c326a7f0a460c6f54a0 EBUILD kdebase-startkde-4.0.5.ebuild 2891 RMD160 ec208da6e2574b9c8467c4812c27f79bef38b887 SHA1 bfd9375af217c7eb7a64ad134d56efc4ae7b99a3 SHA256 37fb8fd8e38605e0a6b86c6994922158f5969f05a48b9ac5c0996aa3ba8807c7 EBUILD kdebase-startkde-4.1.2.ebuild 3899 RMD160 671d8ac35dc249b0f2c88ab1ea3df52230c381ab SHA1 0368abeca00b946468408e659682d39e01e6fc31 SHA256 1b607e64065b956a35e98d8a032c3a756d2aa1c0d5f30cb546c98143d155709c -MISC ChangeLog 19859 RMD160 02118040e5712d7f1082de077b68a48bfd116d17 SHA1 c2bdbc5e1b9f72420ad9f588c97e7f48c0e252b9 SHA256 f4a4f9a3eeb23a31a3f9417fb64b1be25c51f6158319d681d2583c079dd8b013 +MISC ChangeLog 20112 RMD160 e16ad678880c70d5f02ce001d12da02a0a933d7b SHA1 47338c1419c41492f36b8aa146444288a21a301d SHA256 c8c839f4c309fec14e26a063aaab73affb968a15c3d2bf5344e43b99131812e9 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/kdebase-startkde/files/kdebase-startkde-3.5-gentoo.patch b/kde-base/kdebase-startkde/files/kdebase-startkde-3.5-gentoo.patch index 17373e56c76a..7a2d0c39f2a1 100644 --- a/kde-base/kdebase-startkde/files/kdebase-startkde-3.5-gentoo.patch +++ b/kde-base/kdebase-startkde/files/kdebase-startkde-3.5-gentoo.patch @@ -6,7 +6,7 @@ +# Gentoo: setup environment, filter other slotted KDE installs from PATH +_KDEDIR=@REPLACE_PREFIX@ -+export KDEDIRS=${_KDEDIR}:/usr:/usr/local ++#export KDEDIRS=${_KDEDIR}:/usr:/usr/local +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} diff --git a/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r3.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r3.ebuild new file mode 100644 index 000000000000..f47fdc02b7f1 --- /dev/null +++ b/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r3.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r3.ebuild,v 1.1 2008/10/04 20:39:36 cryos Exp $ + +KMNAME=kdebase +KMNOMODULE=true +KMEXTRACTONLY="kdm/kfrontend/sessions/kde.desktop.in startkde" +EAPI="1" +inherit multilib kde-meta eutils + +DESCRIPTION="startkde script, which starts a complete KDE session, and associated scripts" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="" + +# The kde apps called from the startkde script. +# kdesktop, kicker etc are started because they put files in $KDEDIR/share/autostart +# and so in theory they aren't strictly necessary deps. +RDEPEND="x11-apps/xmessage + x11-apps/xsetroot + x11-apps/xset + x11-apps/xrandr + x11-apps/mkfontdir + x11-apps/xprop + >=kde-base/kdesktop-${PV}:${SLOT} + >=kde-base/kcminit-${PV}:${SLOT} + >=kde-base/ksmserver-${PV}:${SLOT} + >=kde-base/kwin-${PV}:${SLOT} + >=kde-base/kpersonalizer-${PV}:${SLOT} + >=kde-base/kreadconfig-${PV}:${SLOT} + >=kde-base/ksplashml-${PV}:${SLOT}" + +PATCHES=( "${FILESDIR}/${PN}-3.5-gentoo.patch" ) + +src_compile() { + # Patch the startkde script to setup the environment for KDE 4.0 + # Add our KDEDIR + sed -i -e "s#@REPLACE_PREFIX@#${PREFIX}#" \ + "${S}/startkde" || die "Sed for PREFIX failed." + + # List all the multilib libdirs + local _libdir _libdirs + for _libdir in $(get_all_libdirs); do + _libdirs="${_libdirs}:${PREFIX}/${_libdir}" + done + _libdirs=${_libdirs#:} + + # Complete LDPATH + sed -i -e "s#@REPLACE_LIBS@#${_libdirs}#" \ + "${S}/startkde" || die "Sed for LDPATH failed." +} + +src_install() { + # startkde script + exeinto "${KDEDIR}/bin" + doexe startkde + + # startup and shutdown scripts + insinto "${KDEDIR}/env" + doins "${WORKDIR}/patches/agent-startup.sh" + + exeinto "${KDEDIR}/shutdown" + doexe "${WORKDIR}/patches/agent-shutdown.sh" + + # freedesktop environment variables + cat <<EOF > "${T}/xdg.sh" +export XDG_CONFIG_DIRS="${KDEDIR}/etc/xdg" +EOF + insinto "${KDEDIR}/env" + doins "${T}/xdg.sh" + + # x11 session script + cat <<EOF > "${T}/kde-${SLOT}" +#!/bin/sh +exec ${KDEDIR}/bin/startkde +EOF + exeinto /etc/X11/Sessions + doexe "${T}/kde-${SLOT}" + + # (not really) freedesktop compliant session script + sed -e "s:@KDE_BINDIR@:${KDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \ + "${S}/kdm/kfrontend/sessions/kde.desktop.in" > "${T}/kde-${SLOT}.desktop" + insinto /usr/share/xsessions + doins "${T}/kde-${SLOT}.desktop" + + # kdeglobals needed to make third party apps installed in /usr work + cat <<EOF > "${T}/kdeglobals" +[Directories][\$i] +dir_lib=/usr/$(get_libdir) +dir_apps=/usr/share/applnk +dir_data=/usr/share/apps +dir_icon=/usr/share/icons +dir_module=/usr/$(get_libdir)/kde3 +dir_config=/usr/share/config +dir_kcfg=/usr/share/config.kcfg +dir_exe=/usr/bin +dir_mime=/usr/share/mimelnk +dir_services=/usr/share/services +dir_servicetypes=/usr/share/servicetypes +dir_templates=/usr/share/templates +EOF + insinto ${KDEDIR}/share/config + doins "${T}/kdeglobals" +} + +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" + echo +} |