Remove mentions of kdeprefix

Package-Manager: portage-2.2.0_alpha38/cvs/Linux x86_64

3 files changed, 39 insertions, 99 deletions

diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog
index 364fd9934d97..73137fc4cf8b 100644
--- a/kde-base/kdebase-startkde/ChangeLog
+++ b/kde-base/kdebase-startkde/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase-startkde
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.230 2011/06/02 21:57:50 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.231 2011/06/06 20:28:22 abcd Exp $
+
+  06 Jun 2011; Jonathan Callen <abcd@gentoo.org> kdebase-startkde-4.6.2.ebuild,
+  kdebase-startkde-4.6.3.ebuild:
+  Remove mentions of kdeprefix
 
   02 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kdebase-startkde-4.4.5.ebuild:
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.6.2.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.6.2.ebuild
index 650ac35d2fca..f8f4339d67d5 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.6.2.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.6.2.ebuild,v 1.4 2011/06/01 18:05:13 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-4.6.2.ebuild,v 1.5 2011/06/06 20:28:22 abcd Exp $
 
 EAPI=3
 
@@ -50,28 +50,15 @@ PATCHES=("${FILESDIR}/gentoo-startkde4-3.patch")
 src_prepare() {
 	kde4-meta_src_prepare
 
-	# Patch the startkde script to setup the environment for KDE
-	# List all the multilib libdirs
-	local _libdir _libdirs=
-	for _libdir in $(get_all_libdirs); do
-		_libdirs+=":${EKDEDIR}/${_libdir}"
-	done
-	_libdirs=${_libdirs#:}
-
 	# Sort the LDFLAGS out if necessary
-	if use kdeprefix; then
-		sed -e "s#@REPLACE_LDFLAGS@#export LDFLAGS=${_libdirs}:\$LDFLAGS#" \
-			-i startkde.cmake || die "Sed for LDPATH failed."
-	else
-		sed -e "s#@REPLACE_LDFLAGS@##" \
-			-i startkde.cmake || die "sed for LDPATH failed"
-	fi
+	sed -e "s#@REPLACE_LDFLAGS@##" \
+		-i startkde.cmake || die "sed for LDPATH failed"
 
 	# Complete LDPATH
 	sed -e "s#@REPLACE_LIBDIR@#$(get_libdir)#" \
 		-i startkde.cmake || die "Sed for REPLACE_LIBDIR failed."
 	# Now fix the prefix
-	sed -e "s#@REPLACE_PREFIX@#${KDEDIR}#" \
+	sed -e "s#@REPLACE_PREFIX@#/usr#" \
 		-i startkde.cmake || die "Sed for REPLACE_PREFIX failed."
 	# ... and fix ${EPREFIX}
 	eprefixify startkde.cmake
@@ -81,39 +68,25 @@ src_install() {
 	kde4-meta_src_install
 
 	# startup and shutdown scripts
-	if use kdeprefix; then
-		insinto "${KDEDIR}/env"
-	else
-		insinto "/etc/kde/startup"
-	fi
+	insinto "/etc/kde/startup"
 	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"
-
-	if use kdeprefix; then
-		KDE_X="KDE-${SLOT}"
-	else
-		KDE_X="KDE-4"
-	fi
+	insinto "/etc/kde/shutdown"
+	doins "${FILESDIR}/agent-shutdown.sh" || die "doexe agent-shutdown.sh failed"
 
 	# x11 session script
-	cp "${FILESDIR}/sessionfile" "${T}/${KDE_X}" || die
-	cat <<-EOF >> "${T}/${KDE_X}"
-	exec "${EKDEDIR}/bin/startkde"
+	cp "${FILESDIR}/sessionfile" "${T}/KDE-4" || die
+	cat <<-EOF >> "${T}/KDE-4"
+	exec "${EPREFIX}/usr/bin/startkde"
 	EOF
 	exeinto /etc/X11/Sessions
-	doexe "${T}/${KDE_X}" || die "doexe ${KDE_X} failed"
+	doexe "${T}/KDE-4" || die "doexe KDE-4 failed"
 
 	# freedesktop compliant session script
-	sed -e "s:\${KDE4_BIN_INSTALL_DIR}:${EKDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \
-		"${S}/kdm/kfrontend/sessions/kde-plasma.desktop.cmake" > "${T}/${KDE_X}.desktop"
+	sed -e "s:\${KDE4_BIN_INSTALL_DIR}:${EPREFIX}/usr/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \
+		"${S}/kdm/kfrontend/sessions/kde-plasma.desktop.cmake" > "${T}/KDE-4.desktop"
 	insinto /usr/share/xsessions
-	doins "${T}/${KDE_X}.desktop" || die "doins ${KDE_X}.desktop failed"
+	doins "${T}/KDE-4.desktop" || die "doins KDE-4.desktop failed"
 }
 
 pkg_postinst () {
@@ -121,16 +94,11 @@ pkg_postinst () {
 
 	echo
 	elog "To enable gpg-agent and/or ssh-agent in KDE sessions,"
-	if use kdeprefix; then
-		elog "edit ${EKDEDIR}/env/agent-startup.sh and"
-		elog "${EKDEDIR}/shutdown/agent-shutdown.sh"
-	else
-		elog "edit ${EPREFIX}/etc/kde/startup/agent-startup.sh and"
-		elog "${EPREFIX}/etc/kde/shutdown/agent-shutdown.sh"
-	fi
+	elog "edit ${EPREFIX}/etc/kde/startup/agent-startup.sh and"
+	elog "${EPREFIX}/etc/kde/shutdown/agent-shutdown.sh"
 	echo
 	elog "The name of the session script has changed."
 	elog "If you currently have XSESSION=\"kde-${SLOT}\" in your"
 	elog "configuration files, you will need to change it to"
-	elog "XSESSION=\"${KDE_X}\""
+	elog "XSESSION=\"KDE-4\""
 }
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.6.3.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.6.3.ebuild
index 9d8d39bfea1b..321597d2f639 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.6.3.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.6.3.ebuild,v 1.1 2011/05/07 10:47:36 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-4.6.3.ebuild,v 1.2 2011/06/06 20:28:22 abcd Exp $
 
 EAPI=4
 
@@ -50,28 +50,15 @@ PATCHES=("${FILESDIR}/gentoo-startkde4-3.patch")
 src_prepare() {
 	kde4-meta_src_prepare
 
-	# Patch the startkde script to setup the environment for KDE
-	# List all the multilib libdirs
-	local _libdir _libdirs=
-	for _libdir in $(get_all_libdirs); do
-		_libdirs+=":${EKDEDIR}/${_libdir}"
-	done
-	_libdirs=${_libdirs#:}
-
 	# Sort the LDFLAGS out if necessary
-	if use kdeprefix; then
-		sed -e "s#@REPLACE_LDFLAGS@#export LDFLAGS=${_libdirs}:\$LDFLAGS#" \
-			-i startkde.cmake || die "Sed for LDPATH failed."
-	else
-		sed -e "s#@REPLACE_LDFLAGS@##" \
-			-i startkde.cmake || die "sed for LDPATH failed"
-	fi
+	sed -e "s#@REPLACE_LDFLAGS@##" \
+		-i startkde.cmake || die "sed for LDPATH failed"
 
 	# Complete LDPATH
 	sed -e "s#@REPLACE_LIBDIR@#$(get_libdir)#" \
 		-i startkde.cmake || die "Sed for REPLACE_LIBDIR failed."
 	# Now fix the prefix
-	sed -e "s#@REPLACE_PREFIX@#${KDEDIR}#" \
+	sed -e "s#@REPLACE_PREFIX@#/usr#" \
 		-i startkde.cmake || die "Sed for REPLACE_PREFIX failed."
 	# ... and fix ${EPREFIX}
 	eprefixify startkde.cmake
@@ -81,39 +68,25 @@ src_install() {
 	kde4-meta_src_install
 
 	# startup and shutdown scripts
-	if use kdeprefix; then
-		insinto "${KDEDIR}/env"
-	else
-		insinto "/etc/kde/startup"
-	fi
+	insinto "/etc/kde/startup"
 	doins "${FILESDIR}/agent-startup.sh"
 
-	if use kdeprefix; then
-		exeinto "${KDEDIR}/shutdown"
-	else
-		exeinto "/etc/kde/shutdown"
-	fi
-	doexe "${FILESDIR}/agent-shutdown.sh"
-
-	if use kdeprefix; then
-		KDE_X="KDE-${SLOT}"
-	else
-		KDE_X="KDE-4"
-	fi
+	insinto "/etc/kde/shutdown"
+	doins "${FILESDIR}/agent-shutdown.sh"
 
 	# x11 session script
-	cp "${FILESDIR}/sessionfile" "${T}/${KDE_X}" || die
-	cat <<-EOF >> "${T}/${KDE_X}"
-	exec "${EKDEDIR}/bin/startkde"
+	cp "${FILESDIR}/sessionfile" "${T}/KDE-4" || die
+	cat <<-EOF >> "${T}/KDE-4"
+	exec "${EPREFIX}/usr/bin/startkde"
 	EOF
 	exeinto /etc/X11/Sessions
-	doexe "${T}/${KDE_X}"
+	doexe "${T}/KDE-4"
 
 	# freedesktop compliant session script
-	sed -e "s:\${KDE4_BIN_INSTALL_DIR}:${EKDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \
-		"${S}/kdm/kfrontend/sessions/kde-plasma.desktop.cmake" > "${T}/${KDE_X}.desktop"
+	sed -e "s:\${KDE4_BIN_INSTALL_DIR}:${EPREFIX}/usr/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \
+		"${S}/kdm/kfrontend/sessions/kde-plasma.desktop.cmake" > "${T}/KDE-4.desktop"
 	insinto /usr/share/xsessions
-	doins "${T}/${KDE_X}.desktop"
+	doins "${T}/KDE-4.desktop"
 }
 
 pkg_postinst () {
@@ -121,16 +94,11 @@ pkg_postinst () {
 
 	echo
 	elog "To enable gpg-agent and/or ssh-agent in KDE sessions,"
-	if use kdeprefix; then
-		elog "edit ${EKDEDIR}/env/agent-startup.sh and"
-		elog "${EKDEDIR}/shutdown/agent-shutdown.sh"
-	else
-		elog "edit ${EPREFIX}/etc/kde/startup/agent-startup.sh and"
-		elog "${EPREFIX}/etc/kde/shutdown/agent-shutdown.sh"
-	fi
+	elog "edit ${EPREFIX}/etc/kde/startup/agent-startup.sh and"
+	elog "${EPREFIX}/etc/kde/shutdown/agent-shutdown.sh"
 	echo
 	elog "The name of the session script has changed."
 	elog "If you currently have XSESSION=\"kde-${SLOT}\" in your"
 	elog "configuration files, you will need to change it to"
-	elog "XSESSION=\"${KDE_X}\""
+	elog "XSESSION=\"KDE-4\""
 }