Added patches by Bo Ørsted Andresen to allow for co-existence of both KDE 3.5 and 4. Thanks, Bo!

Package-Manager: portage-2.1.4_rc7

6 files changed, 228 insertions, 5 deletions

diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog
index 31ec5baacaa8..d49789000780 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.95 2007/10/19 22:20:25 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.96 2007/12/09 23:11:59 philantrop Exp $
+
+*kdebase-startkde-3.5.8-r1 (09 Dec 2007)
+*kdebase-startkde-3.5.7-r1 (09 Dec 2007)
+
+  09 Dec 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +kdebase-startkde-3.5.7-r1.ebuild, +kdebase-startkde-3.5.8-r1.ebuild:
+  Added patches by Bo Ørsted Andresen to allow for co-existence of both KDE
+  3.5 and 4. Thanks, Bo!
 
 *kdebase-startkde-3.5.8 (19 Oct 2007)
 
diff --git a/kde-base/kdebase-startkde/Manifest b/kde-base/kdebase-startkde/Manifest
index d0e51cc8907e..0d62dd1f4bf7 100644
--- a/kde-base/kdebase-startkde/Manifest
+++ b/kde-base/kdebase-startkde/Manifest
@@ -9,6 +9,7 @@ SHA256 f43a591922dd5a2649cad7b3d42827ee56aa21c09564e5eebb0cf7fa2eeb5fc4 files/ag
 DIST kdebase-3.5-patchset-03.tar.bz2 21409 RMD160 941b919097d03347b10bccb51db2fa5e89d7ba16 SHA1 9ac59cdfc4cd8d43b6d0e6dbebc5b28d7a33e35f SHA256 59c691754627f78daf7693e82496d808cf1cc31e2d6f32af829ec4ccfd776574
 DIST kdebase-3.5-patchset-04.tar.bz2 8502 RMD160 419e527c8c2b00ca49eb395793374b3459989897 SHA1 f7549db15ffcf29fad372b00ab66f0b257225302 SHA256 e16b356bfa224f7c97b57f3a3bdec9ba0701209459a880bae81556d070b2a961
 DIST kdebase-3.5-patchset-05.tar.bz2 16068 RMD160 dc1572fbb3cf3ce9a8e424edd3408b8912c6bfd5 SHA1 ba4e667fe64e3095d8de0b4fa5813029557a2cac SHA256 d1d3c8b51c68610c76c61ba4923618a16609bb76af547d8d26bb9a3f6990bd4d
+DIST kdebase-3.5-patchset-08.tar.bz2 23090 RMD160 c78298981aa5d0a6295b40160860e10e9ade1ff8 SHA1 22715c39a1769a7cbdf3e0ff73425459eadab01d SHA256 2dc4cd3842f07644769555c821445f945262db62b51f92ba55610146d16c499a
 DIST kdebase-3.5.5.tar.bz2 23851886 RMD160 6cf804de0487347a3e1d4ea6e5ba5114d23d9806 SHA1 f9f1907ce71fd2f934cf7404f1db1d350c2b9544 SHA256 f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0
 DIST kdebase-3.5.6.tar.bz2 24155599 RMD160 d3cbdcd148ea4c08d254f48faa10fc693517394c SHA1 0b37cae9637692c123a28c405dea8540e6b935c5 SHA256 245b35f8b2e1533f9ae92b3b07bee5339a716dfb8db363d0126d2e7409b7bd7e
 DIST kdebase-3.5.7.tar.bz2 24395088 RMD160 f43070b5428c3099c0abceed56041e5b4ff3c656 SHA1 833a35e4bbec2852f0f5267e680590be0c986594 SHA256 3c6d739abefc55b6cb64e1cf37b79f5993b666a5b40492471754794416b5c28d
@@ -25,18 +26,26 @@ EBUILD kdebase-startkde-3.5.6-r2.ebuild 2301 RMD160 7e07cfbd746cf898dd0ca4dd5942
 MD5 f5bb0808b5467d58a705bec0d2c4dcb4 kdebase-startkde-3.5.6-r2.ebuild 2301
 RMD160 7e07cfbd746cf898dd0ca4dd594209656ab8d5b6 kdebase-startkde-3.5.6-r2.ebuild 2301
 SHA256 27ae933b862cda05773a0cbb25d98299f403238d152e96cb6f081e137fe351f9 kdebase-startkde-3.5.6-r2.ebuild 2301
+EBUILD kdebase-startkde-3.5.7-r1.ebuild 2779 RMD160 e811ce8fce14767583fa22114fd2a56c16c27b42 SHA1 b343857d56906849aee15a58154f703be066000e SHA256 2a5afa56b55b1c4a771c786925e35f1ddec50fa329cb5edc8f5450d146776819
+MD5 537a374159bc77db47825c09d5893bff kdebase-startkde-3.5.7-r1.ebuild 2779
+RMD160 e811ce8fce14767583fa22114fd2a56c16c27b42 kdebase-startkde-3.5.7-r1.ebuild 2779
+SHA256 2a5afa56b55b1c4a771c786925e35f1ddec50fa329cb5edc8f5450d146776819 kdebase-startkde-3.5.7-r1.ebuild 2779
 EBUILD kdebase-startkde-3.5.7.ebuild 2293 RMD160 9d88b1e417d8e3facc53fa371ca1751545143076 SHA1 d99a18d4961c4d7a79f6685519cbbd7d3b210ba5 SHA256 2c7e2d6a22941958d71a5483e6265b153fffee61356ef436cfea1b511f0bf33f
 MD5 e0f0be2f28ae2be17ff300f0e2c93446 kdebase-startkde-3.5.7.ebuild 2293
 RMD160 9d88b1e417d8e3facc53fa371ca1751545143076 kdebase-startkde-3.5.7.ebuild 2293
 SHA256 2c7e2d6a22941958d71a5483e6265b153fffee61356ef436cfea1b511f0bf33f kdebase-startkde-3.5.7.ebuild 2293
+EBUILD kdebase-startkde-3.5.8-r1.ebuild 2775 RMD160 7b2168b2b7f0e857b0760b136e6cceed5e6f85ff SHA1 9c6f7bb4dfb91c20b61731f47256fee9f173893d SHA256 44a839a6cad569cee6d4a7bea2672f157458f09053110ed11b0eb6218f6064bb
+MD5 064608c25c1fea9b7a6fba9e8cedead4 kdebase-startkde-3.5.8-r1.ebuild 2775
+RMD160 7b2168b2b7f0e857b0760b136e6cceed5e6f85ff kdebase-startkde-3.5.8-r1.ebuild 2775
+SHA256 44a839a6cad569cee6d4a7bea2672f157458f09053110ed11b0eb6218f6064bb kdebase-startkde-3.5.8-r1.ebuild 2775
 EBUILD kdebase-startkde-3.5.8.ebuild 2303 RMD160 0d09595303cf411f8510054c578e3ba7d1dcc4ee SHA1 10d69559fe47a487844d6c2629e28cca4a959cfe SHA256 a1f04eb9f596079eb9b8da097c0fca404c5e7e2e8fca7bb7fdca8371fcf71d27
 MD5 54335a12640a7c2423e632f5534ea176 kdebase-startkde-3.5.8.ebuild 2303
 RMD160 0d09595303cf411f8510054c578e3ba7d1dcc4ee kdebase-startkde-3.5.8.ebuild 2303
 SHA256 a1f04eb9f596079eb9b8da097c0fca404c5e7e2e8fca7bb7fdca8371fcf71d27 kdebase-startkde-3.5.8.ebuild 2303
-MISC ChangeLog 14220 RMD160 13c90f8c17680ed0b6e3a2e522c6f5ac0a3bdca5 SHA1 8c9518d2b48d4d349a391b6d46f05f8ab7d34e52 SHA256 511678f14ecc83389b29efded67314e2e950a3886446a0731550bb95e1743d81
-MD5 ea6360f0e89f7cf43cf37b4273e13854 ChangeLog 14220
-RMD160 13c90f8c17680ed0b6e3a2e522c6f5ac0a3bdca5 ChangeLog 14220
-SHA256 511678f14ecc83389b29efded67314e2e950a3886446a0731550bb95e1743d81 ChangeLog 14220
+MISC ChangeLog 14533 RMD160 5fe40a944bc3961d2f8c9c527cd26cb5212ff678 SHA1 dac674419c9c9baf740a6c13bb8a2be46b220d2b SHA256 c1de5bc220d30cc842ba5f6358344560079fa4105c3ae4ac7ea7a0ba58d95d8b
+MD5 dd9b4d658ceec57c26ea686e75f2ad20 ChangeLog 14533
+RMD160 5fe40a944bc3961d2f8c9c527cd26cb5212ff678 ChangeLog 14533
+SHA256 c1de5bc220d30cc842ba5f6358344560079fa4105c3ae4ac7ea7a0ba58d95d8b ChangeLog 14533
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -53,6 +62,12 @@ SHA256 f5d1e7033a5c901ecfdd5db86217faa7c593376a302b1bc2d7862420c014383a files/di
 MD5 82b7ea4779ba9576547630f3a00909a4 files/digest-kdebase-startkde-3.5.7 521
 RMD160 e3b42129f398e63f64671bb8e55a7f76f7f450e7 files/digest-kdebase-startkde-3.5.7 521
 SHA256 6a5a2b865af05be7ff99dde4fa36a42340da5fdce36b8c595f4563bfb9a5f3e4 files/digest-kdebase-startkde-3.5.7 521
+MD5 428ebe8a023095f118c181ce56be1a51 files/digest-kdebase-startkde-3.5.7-r1 521
+RMD160 5723cf66b4f32bc3cd30afd4954f578895be3971 files/digest-kdebase-startkde-3.5.7-r1 521
+SHA256 0c0c868e60ad8c0f6aa2f73c50061cf31fa37539c4d63bbd9ba898454f909610 files/digest-kdebase-startkde-3.5.7-r1 521
 MD5 c6f0691e4ca45cec8d122aa754894aef files/digest-kdebase-startkde-3.5.8 521
 RMD160 fb9914d157b5d875b8457b06a2bc2b6366554d4b files/digest-kdebase-startkde-3.5.8 521
 SHA256 d44230bf759c4658e191373f2cfcfa5b3565b9bce3bed7ccaf0828656be9aeb4 files/digest-kdebase-startkde-3.5.8 521
+MD5 b420ce10e320b3d5451fb61954698685 files/digest-kdebase-startkde-3.5.8-r1 521
+RMD160 62dd57f98dc8270a39b119dade2cbfe695812128 files/digest-kdebase-startkde-3.5.8-r1 521
+SHA256 7818ae28b4d508e14ddc0c228871bd8aecc3418dd6b07a86fba272ea0e489c65 files/digest-kdebase-startkde-3.5.8-r1 521
diff --git a/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.5.7-r1 b/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.5.7-r1
new file mode 100644
index 000000000000..9a29fedd92d6
--- /dev/null
+++ b/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.5.7-r1
@@ -0,0 +1,6 @@
+MD5 797a625808480ab00f699fac88fc43df kdebase-3.5-patchset-08.tar.bz2 23090
+RMD160 c78298981aa5d0a6295b40160860e10e9ade1ff8 kdebase-3.5-patchset-08.tar.bz2 23090
+SHA256 2dc4cd3842f07644769555c821445f945262db62b51f92ba55610146d16c499a kdebase-3.5-patchset-08.tar.bz2 23090
+MD5 b421e01b3ee712549ee967f58ed24de0 kdebase-3.5.7.tar.bz2 24395088
+RMD160 f43070b5428c3099c0abceed56041e5b4ff3c656 kdebase-3.5.7.tar.bz2 24395088
+SHA256 3c6d739abefc55b6cb64e1cf37b79f5993b666a5b40492471754794416b5c28d kdebase-3.5.7.tar.bz2 24395088
diff --git a/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.5.8-r1 b/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.5.8-r1
new file mode 100644
index 000000000000..ca3879dec39b
--- /dev/null
+++ b/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.5.8-r1
@@ -0,0 +1,6 @@
+MD5 797a625808480ab00f699fac88fc43df kdebase-3.5-patchset-08.tar.bz2 23090
+RMD160 c78298981aa5d0a6295b40160860e10e9ade1ff8 kdebase-3.5-patchset-08.tar.bz2 23090
+SHA256 2dc4cd3842f07644769555c821445f945262db62b51f92ba55610146d16c499a kdebase-3.5-patchset-08.tar.bz2 23090
+MD5 9990c669229daaaa8fca4c5e354441fd kdebase-3.5.8.tar.bz2 24200172
+RMD160 6441b5eaead5fff5c42c532fb11c0d37001cb6ea kdebase-3.5.8.tar.bz2 24200172
+SHA256 0f1876d1c68f01ed8fee346c1bae4f53dd2c1dc56db94e309b3d1adfc6138493 kdebase-3.5.8.tar.bz2 24200172
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-3.5.7-r1.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-3.5.7-r1.ebuild
new file mode 100644
index 000000000000..0dc29a2a0bd5
--- /dev/null
+++ b/kde-base/kdebase-startkde/kdebase-startkde-3.5.7-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2007 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.7-r1.ebuild,v 1.1 2007/12/09 23:11:59 philantrop Exp $
+
+KMNAME=kdebase
+KMNOMODULE=true
+KMEXTRACTONLY="kdm/kfrontend/sessions/kde.desktop.in startkde"
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit multilib kde-meta eutils
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdebase-3.5-patchset-08.tar.bz2"
+
+DESCRIPTION="startkde script, which starts a complete KDE session, and associated scripts"
+KEYWORDS="~alpha ~amd64 ~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
+$(deprange $PV $MAXKDEVER kde-base/kdesktop)
+$(deprange 3.5.6 $MAXKDEVER kde-base/kcminit)
+$(deprange $PV $MAXKDEVER kde-base/ksmserver)
+$(deprange $PV $MAXKDEVER kde-base/kwin)
+$(deprange $PV $MAXKDEVER kde-base/kpersonalizer)
+$(deprange 3.5.6 $MAXKDEVER kde-base/kreadconfig)
+$(deprange $PV $MAXKDEVER kde-base/ksplashml)"
+
+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}"
+
+	# 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"
+}
+
+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
+}
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-3.5.8-r1.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-3.5.8-r1.ebuild
new file mode 100644
index 000000000000..439257b1ab4b
--- /dev/null
+++ b/kde-base/kdebase-startkde/kdebase-startkde-3.5.8-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2007 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.8-r1.ebuild,v 1.1 2007/12/09 23:11:59 philantrop Exp $
+
+KMNAME=kdebase
+KMNOMODULE=true
+KMEXTRACTONLY="kdm/kfrontend/sessions/kde.desktop.in startkde"
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit multilib kde-meta eutils
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdebase-3.5-patchset-08.tar.bz2"
+
+DESCRIPTION="startkde script, which starts a complete KDE session, and associated scripts"
+KEYWORDS="~alpha ~amd64 ~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
+$(deprange $PV $MAXKDEVER kde-base/kdesktop)
+$(deprange $PV $MAXKDEVER kde-base/kcminit)
+$(deprange $PV $MAXKDEVER kde-base/ksmserver)
+$(deprange $PV $MAXKDEVER kde-base/kwin)
+$(deprange $PV $MAXKDEVER kde-base/kpersonalizer)
+$(deprange $PV $MAXKDEVER kde-base/kreadconfig)
+$(deprange $PV $MAXKDEVER kde-base/ksplashml)"
+
+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}"
+
+	# 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"
+}
+
+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
+}