Fix path mangling with USE="-kdeprefix" (bug #242360) Fix invalid

XDG_CONFIG_DIR with USE="-kdeprefix"
Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 177 insertions, 13 deletions

diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog
index fe61d01bb89e..76268ac5e078 100644
--- a/kde-base/kdebase-startkde/ChangeLog
+++ b/kde-base/kdebase-startkde/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdebase-startkde
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.142 2009/02/19 23:31:12 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.143 2009/02/21 19:07:48 dirtyepic Exp $
+
+*kdebase-startkde-4.2.0-r1 (21 Feb 2009)
+
+  21 Feb 2009; Ryan Hill <dirtyepic@gentoo.org>
+  files/gentoo-startkde4.patch, +kdebase-startkde-4.2.0-r1.ebuild:
+  Fix path mangling with USE="-kdeprefix" (bug #242360) Fix invalid
+  XDG_CONFIG_DIR with USE="-kdeprefix"
 
   19 Feb 2009; Alexey Shvetsov <alexxy@gentoo.org>
   -kdebase-startkde-4.1.4.ebuild:
diff --git a/kde-base/kdebase-startkde/Manifest b/kde-base/kdebase-startkde/Manifest
index e20639f16aae..0a1e15ff6da9 100644
--- a/kde-base/kdebase-startkde/Manifest
+++ b/kde-base/kdebase-startkde/Manifest
@@ -4,7 +4,7 @@ Hash: SHA1
 AUX agent-shutdown.sh 323 RMD160 9a0451c1e58e688c022ecd2b37f08cac433b187d SHA1 1abb7a1503a80d95e4db34fa7fe58accce6e8109 SHA256 6a2d645ef38d3db9d36166fac699848d07eb166f71a646d7f1466efeb394eb11
 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 2189 RMD160 6b357860b48432469548a6a93dbc9a38c693e82e SHA1 e509d836a1aee0853552b18a49bf80c4f0383579 SHA256 ea37b9082f0ff7bcc7787c6fd38f3c6b51d96b93ac17b6c43b5b6d0e9d206e52
+AUX gentoo-startkde4.patch 2367 RMD160 1a7641dbb6436841214c7acd303120be3272de8e SHA1 6d2415d6db4d31e02aae8936dc66b7d83131022f SHA256 1bae11d9b4e746d65df540676651f9330158165690bc500b72f85f584a29a2ff
 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.10.tar.bz2 24339704 RMD160 5845e94fbb8b5b64934d62dc9bd3b580d26d07bc SHA1 1a72e4170a0a953ed70c0693a034947d87b6efbd SHA256 77aa9d8f28c532f2e7a5157a7f4ba8df1001f00fa1cb72cb70b388b3d0e16b61
@@ -12,13 +12,14 @@ DIST kdebase-3.5.9.tar.bz2 24239563 RMD160 2552d850e62efd044c178e2eb04efdcce90e4
 DIST kdebase-workspace-4.2.0.tar.bz2 50724381 RMD160 752e727aaf0010e362f3c77190584fa8c6bd4761 SHA1 351eae9401ac6fb990950d1a5120505475abef05 SHA256 e5c550af7d655d62e37c51667f264b53eb9785166f3567960d91acd37b6f902b
 EBUILD kdebase-startkde-3.5.10-r5.ebuild 2652 RMD160 3ce015a75594ca8ce4f9caf626daa91a59a4c50e SHA1 990243f9d996f6506669da80f66cfa40ed85a67a SHA256 23deaed26146ed1b18dd1bd723637e19df85372b70ddece5b0739819ba9d9269
 EBUILD kdebase-startkde-3.5.9.ebuild 2655 RMD160 b94be06d7482e08542c16ff2809a8fdc4bf4a5a1 SHA1 400376a3fc0fc9456e01519beda9b257e8a3aa85 SHA256 3eda0945a65f82c11cb58c7d1231bdbdea8d4a63dfb86abe2dd7b6942a9b598a
+EBUILD kdebase-startkde-4.2.0-r1.ebuild 4143 RMD160 d829cedf3b00e5279bf32c4c7de59dd00df88610 SHA1 4aa2690659f8bcfc5049642fb1d4a2906dbe6690 SHA256 2935316a3f0ddce38b481a754edc295111f19c1e1e6d4565b06ccfc618a31f5d
 EBUILD kdebase-startkde-4.2.0.ebuild 4133 RMD160 93f55927795e5e0d53002f8c6f29f70175802a2b SHA1 b8ad155af8c5585506822c03388e2d806009bee2 SHA256 4ec44cbdce84903102f7f84972228cd1fa8761aadd3ea699014f3a571ce2e867
-MISC ChangeLog 22425 RMD160 b6dbb6ce17013d147f953d3f25cd0392eaeb6b15 SHA1 9f3d2cbf2d0c95f92e9f33d79e3cb942d5044821 SHA256 bc59fe034a6c46f6d200e4244080919fcc5568ecb06aed247784cae5d12e77a1
+MISC ChangeLog 22693 RMD160 ec87c45e05dda2efb70ac39d199713d9560d1034 SHA1 2d042fcb7deb6851ae1abef4cedae9e633c63b25 SHA256 958cc15bd24507d2345fdc31f0e7e34d189f638c2b1cc078b2cb386f92a7c5c6
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkmd68cACgkQ5BmOA85PVLgEUACgoA0Fe433RU4C/2/2c87KKlFV
-euAAni7iJG5sdYGyNEhNDp3mKJ+1oBu5
-=IV/I
+iEYEARECAAYFAkmgUV4ACgkQiqiDRvmkBmKOSQCg8OuHskNb+veYs03mKf70xQaN
+J1kAoMbz7Y72FbKpH8FKBvBzXzOqS5Yo
+=aMbL
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdebase-startkde/files/gentoo-startkde4.patch b/kde-base/kdebase-startkde/files/gentoo-startkde4.patch
index d43f51ca0c0b..2503b643a60c 100644
--- a/kde-base/kdebase-startkde/files/gentoo-startkde4.patch
+++ b/kde-base/kdebase-startkde/files/gentoo-startkde4.patch
@@ -1,12 +1,15 @@
---- startkde.cmake	2008-07-15 15:49:02.000000000 -0400
-+++ startkde.cmake.cryos	2008-09-27 14:44:01.000000000 -0400
-@@ -7,6 +7,33 @@
+diff -Naur kdebase-startkde-4.2.0-orig/startkde.cmake kdebase-startkde-4.2.0/startkde.cmake
+--- kdebase-startkde-4.2.0-orig/startkde.cmake	2009-01-17 05:00:28.000000000 -0600
++++ kdebase-startkde-4.2.0/startkde.cmake	2009-02-21 12:52:02.000000000 -0600
+@@ -7,6 +7,35 @@
  # because we still need to do some cleanup.
  trap 'echo GOT SIGHUP' HUP
  
 +_KDEDIR=@REPLACE_PREFIX@
-+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')
++if [ "$_KDEDIR" != "/usr" ]; then
++	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')
++fi
 +@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')
@@ -34,7 +37,7 @@
  # Check if a KDE session already is running and whether it's possible to connect to X
  kcheckrunning
  kcheckrunning_result=$?
-@@ -209,6 +236,13 @@
+@@ -214,6 +243,13 @@
    done
  done
  
@@ -48,7 +51,7 @@
  # 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 @@
+@@ -427,6 +463,13 @@
    done
  done
  
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.2.0-r1.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.2.0-r1.ebuild
new file mode 100644
index 000000000000..549fa944d776
--- /dev/null
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.2.0-r1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-4.2.0-r1.ebuild,v 1.1 2009/02/21 19:07:48 dirtyepic Exp $
+
+EAPI="2"
+
+KMNAME="kdebase-workspace"
+KMNOMODULE="true"
+inherit kde4-meta multilib
+
+DESCRIPTION="Startkde script, which starts a complete KDE session, and associated scripts"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=""
+# The KDE apps called from the startkde script.
+# These provide the most minimal KDE desktop.
+RDEPEND="${DEPEND}
+	>=kde-base/kcminit-${PV}:${SLOT}
+	>=kde-base/kdebase-desktoptheme-${PV}:${SLOT}
+	>=kde-base/kdebase-kioslaves-${PV}:${SLOT}
+	>=kde-base/kdedglobalaccel-${PV}:${SLOT}
+	>=kde-base/kde-wallpapers-${PV}:${SLOT}
+	>=kde-base/knotify-${PV}:${SLOT}
+	>=kde-base/kreadconfig-${PV}:${SLOT}
+	>=kde-base/krunner-${PV}:${SLOT}
+	>=kde-base/ksmserver-${PV}:${SLOT}
+	>=kde-base/ksplash-${PV}:${SLOT}
+	>=kde-base/kstartupconfig-${PV}:${SLOT}
+	>=kde-base/kstyles-${PV}:${SLOT}
+	>=kde-base/kwin-${PV}:${SLOT}
+	>=kde-base/plasma-apps-${PV}:${SLOT}
+	>=kde-base/plasma-workspace-${PV}:${SLOT}
+	>=kde-base/systemsettings-${PV}:${SLOT}
+	x11-apps/xmessage
+	x11-apps/xsetroot
+	x11-apps/xset
+	x11-apps/xrandr
+	x11-apps/mkfontdir
+	x11-apps/xprop
+"
+
+KMEXTRACTONLY="
+	startkde.cmake
+	ConfigureChecks.cmake
+	kdm/
+	safestartkde.cmake
+"
+KMCOMPILEONLY="kdm/kfrontend/sessions/"
+
+PATCHES=("${FILESDIR}/gentoo-startkde4.patch")
+
+src_configure() {
+	# Patch the startkde script to setup the environment for KDE SVN
+	# List all the multilib libdirs
+	local _libdir _libdirs
+	for _libdir in $(get_all_libdirs); do
+		_libdirs="${_libdirs}:${PREFIX}/${_libdir}"
+	done
+	_libdirs=${_libdirs#:}
+
+	# Sort the LDFLAGS out if necessary
+	if use kdeprefix; then
+		sed -e "s#@REPLACE_LDFLAGS@#export LDFLAGS=${_libdirs}:\$LDFLAGS#" \
+			-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
+
+	# Complete LDPATH
+	sed -e "s#@REPLACE_LIBDIR@#$(get_libdir)#" \
+		-i "${S}/startkde.cmake" || die "Sed for REPLACE_LIBDIR failed."
+	# Now fix the prefix
+	sed -e "s#@REPLACE_PREFIX@#${KDEDIR}#" \
+		-i "${S}/startkde.cmake" || die "Sed for REPLACE_PREFIX failed."
+
+	kde4-meta_src_configure
+}
+
+src_install() {
+	local DIR
+
+	kde4-meta_src_install
+
+	# startup and shutdown scripts
+	if use kdeprefix; then
+		insinto "${KDEDIR}/env"
+	else
+		insinto "/etc/kde/startup"
+	fi
+	doins "${FILESDIR}/agent-startup.sh" || die "doexe agent-startup.sh failed"
+
+	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
+	cat <<-EOF > "${T}/xdg.sh"
+	export XDG_DATA_DIRS="${KDEDIR}/share:/usr/share"
+	export XDG_CONFIG_DIRS="${KDEDIR}/etc/xdg:/etc/xdg"
+	EOF
+	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
+	case "${SLOT}" in
+		kde-4 | kde-svn) DIR="${SLOT}" ;;
+		*) DIR="kde-${SLOT}"
+	esac
+
+	# x11 session script
+	cat <<-EOF > "${T}/${DIR}"
+	#!/bin/sh
+	exec ${KDEDIR}/bin/startkde
+	EOF
+	exeinto /etc/X11/Sessions
+	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_X}.desktop"
+	insinto /usr/share/xsessions
+	doins "${T}/${KDE_X}.desktop" || die "doins ${KDE_X}.desktop failed"
+}
+
+pkg_postinst () {
+	kde4-meta_pkg_postinst
+
+	echo
+	elog "To enable gpg-agent and/or ssh-agent in KDE sessions,"
+	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
+}