Rename XDG session script to avoid needing dispatch-conf. Fixes bug 336436.

Straight to stable.

(Portage version: 2.2.0_alpha10/cvs/Linux x86_64, RepoMan options: --force)

4 files changed, 302 insertions, 1 deletions

diff --git a/kde-base/kde-env/ChangeLog b/kde-base/kde-env/ChangeLog
index 28d6ce152637..34d3dc4024d1 100644
--- a/kde-base/kde-env/ChangeLog
+++ b/kde-base/kde-env/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for kde-base/kde-env
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/ChangeLog,v 1.92 2010/12/02 21:17:43 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/ChangeLog,v 1.93 2010/12/27 21:15:04 reavertm Exp $
+
+*kde-env-4.5.4-r1 (27 Dec 2010)
+*kde-env-4.5.3-r1 (27 Dec 2010)
+*kde-env-4.4.5-r1 (27 Dec 2010)
+
+  27 Dec 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  +kde-env-4.4.5-r1.ebuild, +kde-env-4.5.3-r1.ebuild,
+  +kde-env-4.5.4-r1.ebuild:
+  Rename XDG session script to avoid needing dispatch-conf. Fixes bug
+  336436.
 
 *kde-env-4.5.4 (02 Dec 2010)
 
diff --git a/kde-base/kde-env/kde-env-4.4.5-r1.ebuild b/kde-base/kde-env/kde-env-4.4.5-r1.ebuild
new file mode 100644
index 000000000000..b56a7178585a
--- /dev/null
+++ b/kde-base/kde-env/kde-env-4.4.5-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/kde-env-4.4.5-r1.ebuild,v 1.1 2010/12/27 21:15:04 reavertm Exp $
+
+EAPI="3"
+
+CMAKE_REQUIRED="never"
+KDE_REQUIRED="never"
+inherit kde4-base
+
+DESCRIPTION="Environment setting required for all KDE4 apps to run."
+HOMEPAGE="http://kde.org"
+[[ ${PV} = *9999* ]] && ESVN_REPO_URI="" || SRC_URI=""
+
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+LICENSE="as-is"
+IUSE="aqua"
+
+add_blocker kdelibs 4.2.2-r1 '<3.5.10-r3:3.5' 4.2.70:4.3
+
+S=${WORKDIR}
+
+src_unpack() {
+	:
+}
+
+src_prepare() {
+	:
+}
+
+src_install() {
+	if use kdeprefix; then
+		# List all the multilib libdirs
+		local _libdir _libdirs
+		for _libdir in $(get_all_libdirs); do
+			_libdirs+=":${EKDEDIR}/${_libdir}"
+		done
+		_libdirs=${_libdirs#:}
+
+		# number goes down with version
+		cat <<-EOF > 43kdepaths-${SLOT}
+PATH="${EKDEDIR}/bin"
+ROOTPATH="${EKDEDIR}/sbin:${EKDEDIR}/bin"
+LDPATH="${_libdirs}"
+MANPATH="${EKDEDIR}/share/man"
+CONFIG_PROTECT="${KDEDIR}/share/config ${KDEDIR}/env ${KDEDIR}/shutdown /usr/share/config"
+#KDE_IS_PRELINKED=1
+PKG_CONFIG_PATH="${EKDEDIR}/$(get_libdir)/pkgconfig"
+XDG_DATA_DIRS="${EKDEDIR}/share"
+EOF
+		doenvd 43kdepaths-${SLOT}
+		cat <<-EOF > 50-kde-${SLOT}
+SEARCH_DIRS="${EKDEDIR}/bin ${EKDEDIR}/lib*"
+EOF
+		insinto /etc/revdep-rebuild
+		doins 50-kde-${SLOT}
+
+		# kdeglobals needed to make third party apps installed in /usr work
+		cat <<-EOF > kdeglobals
+[Directories][\$i]
+prefixes=${EPREFIX}/usr
+EOF
+		insinto ${KDEDIR}/share/config
+		doins kdeglobals
+
+		KDE_X="KDE-${SLOT}"
+	else
+		# Much simpler for the FHS compliant -kdeprefix install
+		# number goes down with version
+		cat <<-EOF > 43kdepaths
+CONFIG_PROTECT="/usr/share/config"
+#KDE_IS_PRELINKED=1
+EOF
+		doenvd 43kdepaths
+
+		KDE_X="KDE-4"
+	fi
+
+	# Properly place xinitrc.d file that exports XDG_MENU_PREFIX to env
+	cat <<EOF > 11-xdg-menu-kde-${SLOT}
+#!/bin/sh
+
+if [ -z \${XDG_MENU_PREFIX} ] && [ "\${DESKTOP_SESSION}" = "${KDE_X}" ]; then
+	export XDG_MENU_PREFIX="kde-${SLOT}-"
+fi
+EOF
+	exeinto /etc/X11/xinit/xinitrc.d/
+	doexe 11-xdg-menu-kde-${SLOT} || die "doexe failed"
+}
+
+pkg_preinst() {
+	:
+}
+
+src_test() {
+	:
+}
diff --git a/kde-base/kde-env/kde-env-4.5.3-r1.ebuild b/kde-base/kde-env/kde-env-4.5.3-r1.ebuild
new file mode 100644
index 000000000000..b1f14778d31d
--- /dev/null
+++ b/kde-base/kde-env/kde-env-4.5.3-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/kde-env-4.5.3-r1.ebuild,v 1.1 2010/12/27 21:15:04 reavertm Exp $
+
+EAPI="3"
+
+CMAKE_REQUIRED="never"
+KDE_REQUIRED="never"
+inherit kde4-base
+
+DESCRIPTION="Environment setting required for all KDE4 apps to run."
+HOMEPAGE="http://kde.org"
+[[ ${PV} = *9999* ]] && ESVN_REPO_URI="" || SRC_URI=""
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+LICENSE="as-is"
+IUSE="aqua"
+
+add_blocker kdelibs 4.2.2-r1 '<3.5.10-r3:3.5' 4.2.70:4.3
+
+S=${WORKDIR}
+
+src_unpack() {
+	:
+}
+
+src_prepare() {
+	:
+}
+
+src_install() {
+	if use kdeprefix; then
+		# List all the multilib libdirs
+		local _libdir _libdirs
+		for _libdir in $(get_all_libdirs); do
+			_libdirs+=":${EKDEDIR}/${_libdir}"
+		done
+		_libdirs=${_libdirs#:}
+
+		# number goes down with version
+		cat <<-EOF > 43kdepaths-${SLOT}
+PATH="${EKDEDIR}/bin"
+ROOTPATH="${EKDEDIR}/sbin:${EKDEDIR}/bin"
+LDPATH="${_libdirs}"
+MANPATH="${EKDEDIR}/share/man"
+CONFIG_PROTECT="${KDEDIR}/share/config ${KDEDIR}/env ${KDEDIR}/shutdown /usr/share/config"
+#KDE_IS_PRELINKED=1
+PKG_CONFIG_PATH="${EKDEDIR}/$(get_libdir)/pkgconfig"
+XDG_DATA_DIRS="${EKDEDIR}/share"
+EOF
+		doenvd 43kdepaths-${SLOT}
+		cat <<-EOF > 50-kde-${SLOT}
+SEARCH_DIRS="${EKDEDIR}/bin ${EKDEDIR}/lib*"
+EOF
+		insinto /etc/revdep-rebuild
+		doins 50-kde-${SLOT}
+
+		# kdeglobals needed to make third party apps installed in /usr work
+		cat <<-EOF > kdeglobals
+[Directories][\$i]
+prefixes=${EPREFIX}/usr
+EOF
+		insinto ${KDEDIR}/share/config
+		doins kdeglobals
+
+		KDE_X="KDE-${SLOT}"
+	else
+		# Much simpler for the FHS compliant -kdeprefix install
+		# number goes down with version
+		cat <<-EOF > 43kdepaths
+CONFIG_PROTECT="/usr/share/config"
+#KDE_IS_PRELINKED=1
+EOF
+		doenvd 43kdepaths
+
+		KDE_X="KDE-4"
+	fi
+
+	# Properly place xinitrc.d file that exports XDG_MENU_PREFIX to env
+	cat <<EOF > 11-xdg-menu-kde-${SLOT}
+#!/bin/sh
+
+if [ -z \${XDG_MENU_PREFIX} ] && [ "\${DESKTOP_SESSION}" = "${KDE_X}" ]; then
+	export XDG_MENU_PREFIX="kde-${SLOT}-"
+fi
+EOF
+	exeinto /etc/X11/xinit/xinitrc.d/
+	doexe 11-xdg-menu-kde-${SLOT} || die "doexe failed"
+}
+
+pkg_preinst() {
+	:
+}
+
+src_test() {
+	:
+}
diff --git a/kde-base/kde-env/kde-env-4.5.4-r1.ebuild b/kde-base/kde-env/kde-env-4.5.4-r1.ebuild
new file mode 100644
index 000000000000..c980a41c67c6
--- /dev/null
+++ b/kde-base/kde-env/kde-env-4.5.4-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/kde-env-4.5.4-r1.ebuild,v 1.1 2010/12/27 21:15:04 reavertm Exp $
+
+EAPI="3"
+
+CMAKE_REQUIRED="never"
+KDE_REQUIRED="never"
+inherit kde4-base
+
+DESCRIPTION="Environment setting required for all KDE4 apps to run."
+HOMEPAGE="http://kde.org"
+[[ ${PV} = *9999* ]] && ESVN_REPO_URI="" || SRC_URI=""
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+LICENSE="as-is"
+IUSE="aqua"
+
+add_blocker kdelibs 4.2.2-r1 '<3.5.10-r3:3.5' 4.2.70:4.3
+
+S=${WORKDIR}
+
+src_unpack() {
+	:
+}
+
+src_prepare() {
+	:
+}
+
+src_install() {
+	if use kdeprefix; then
+		# List all the multilib libdirs
+		local _libdir _libdirs
+		for _libdir in $(get_all_libdirs); do
+			_libdirs+=":${EKDEDIR}/${_libdir}"
+		done
+		_libdirs=${_libdirs#:}
+
+		# number goes down with version
+		cat <<-EOF > 43kdepaths-${SLOT}
+PATH="${EKDEDIR}/bin"
+ROOTPATH="${EKDEDIR}/sbin:${EKDEDIR}/bin"
+LDPATH="${_libdirs}"
+MANPATH="${EKDEDIR}/share/man"
+CONFIG_PROTECT="${KDEDIR}/share/config ${KDEDIR}/env ${KDEDIR}/shutdown /usr/share/config"
+#KDE_IS_PRELINKED=1
+PKG_CONFIG_PATH="${EKDEDIR}/$(get_libdir)/pkgconfig"
+XDG_DATA_DIRS="${EKDEDIR}/share"
+EOF
+		doenvd 43kdepaths-${SLOT}
+		cat <<-EOF > 50-kde-${SLOT}
+SEARCH_DIRS="${EKDEDIR}/bin ${EKDEDIR}/lib*"
+EOF
+		insinto /etc/revdep-rebuild
+		doins 50-kde-${SLOT}
+
+		# kdeglobals needed to make third party apps installed in /usr work
+		cat <<-EOF > kdeglobals
+[Directories][\$i]
+prefixes=${EPREFIX}/usr
+EOF
+		insinto ${KDEDIR}/share/config
+		doins kdeglobals
+
+		KDE_X="KDE-${SLOT}"
+	else
+		# Much simpler for the FHS compliant -kdeprefix install
+		# number goes down with version
+		cat <<-EOF > 43kdepaths
+CONFIG_PROTECT="/usr/share/config"
+#KDE_IS_PRELINKED=1
+EOF
+		doenvd 43kdepaths
+
+		KDE_X="KDE-4"
+	fi
+
+	# Properly place xinitrc.d file that exports XDG_MENU_PREFIX to env
+	cat <<EOF > 11-xdg-menu-kde-${SLOT}
+#!/bin/sh
+
+if [ -z \${XDG_MENU_PREFIX} ] && [ "\${DESKTOP_SESSION}" = "${KDE_X}" ]; then
+	export XDG_MENU_PREFIX="kde-${SLOT}-"
+fi
+EOF
+	exeinto /etc/X11/xinit/xinitrc.d/
+	doexe 11-xdg-menu-kde-${SLOT} || die "doexe failed"
+}
+
+pkg_preinst() {
+	:
+}
+
+src_test() {
+	:
+}