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

Straight to stable.

Package-Manager: portage-2.2.0_alpha10/cvs/Linux x86_64
RepoMan-Options: --force

5 files changed, 306 insertions, 22 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/Manifest b/kde-base/kde-env/Manifest
index 40337ff2ea7c..22eeb804ee41 100644
--- a/kde-base/kde-env/Manifest
+++ b/kde-base/kde-env/Manifest
@@ -1,25 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+EBUILD kde-env-4.4.5-r1.ebuild 2235 RMD160 19c2ef0749692574ca5d92f5f7abc763ccce0c47 SHA1 61fc4d9281df90b2ce48bde7c95605c0bcaa3521 SHA256 8a375edcbdee799c65876f816f1e624837f8443fcc20b1fe143f1abb7b8747fc
 EBUILD kde-env-4.4.5.ebuild 2227 RMD160 b67b1789bae17db3d078009e67a2241b890e0f7b SHA1 6b928d98445bb26fef2d76cdba13842b0bca0817 SHA256 5a317f84d0095187eda4440278b8201cb0085b3c4e10ddc3797957972d4a6041
+EBUILD kde-env-4.5.3-r1.ebuild 2238 RMD160 a702636e825e8d4eb0c8d054fc686e8e15b2391a SHA1 9b73a1ce2a628f27e501da83a8dcd9240fac1938 SHA256 6d5a0c328f26535daf09331d0fcdaea1ced49b18cd322d0ec05fc1764fd270dc
 EBUILD kde-env-4.5.3.ebuild 2230 RMD160 3c1d2d54e91d00c5e8d6099ea054f5032ff2f91d SHA1 ac56695483940314e74b09b5645071a7ebf0db58 SHA256 52c0e4f77e5954db7bdc24ca32f284035fd9b2a3fd22804595718ff65b7d4714
+EBUILD kde-env-4.5.4-r1.ebuild 2238 RMD160 8d982069406f9d6848170bd4cdd017eaf64f8ef6 SHA1 a76cefa5383df74da37ff0f8f4c280b1008da08b SHA256 be5a6816c856150eeea500d26726f765ec9eeeb31e27368993aa791e88579d73
 EBUILD kde-env-4.5.4.ebuild 2227 RMD160 435910d36fd76e5bc741341339f9787fb02f82f4 SHA1 d53093b1059fe158f73f7cb57cf7612cc41d866d SHA256 c548188b52f086a687de7888261ea7499955ab8c7a1dbbfd610d2ed752e08bff
-MISC ChangeLog 7624 RMD160 bc8663c2152c0695b5adf2e46fce9a165aff4531 SHA1 7b6620ed4d2f995ddd1bcf2000f71f8b7e3d0a1f SHA256 37149f6410a9517975e6813d5e77c52efd6fcadff40dd7b8a0c763e93924fa42
+MISC ChangeLog 7940 RMD160 17c3b0e98e6ed62558e66d8e400be0ff2b525405 SHA1 1318cfe537ccc9c4363b5b7b82e923de3920cf83 SHA256 080c4d77aab73499f33e2c5e1d7cd5ef0100570b1f211b03f106d163593975e5
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQIcBAEBCAAGBQJM+A1hAAoJEOf+E+/4L5Lm73wP/1XF/ki+xUTPCmREE3O7AmMQ
-zahp+tKrND9QAILM76ktt9A6nMnHkmWxS1OxWehis5lq3TBEinkqf8ZRaWkLMowi
-3DmyPdZhTCPwcTT5iL6aD9B1P7AD5c692Iaxz7Q8QiUB/anlCShMmtpMGZigUvV7
-Bjh+WYXnqyGD/kK9vJc3PRbIymc1zJk2sIouQpu1leJ7aQgIIDObX6ouPMeTTsxg
-IMkB0d+wmsnOE+P3z81OeH6AV05PSCuIfNdzu/xr3xlIjpDc+abZmOH1+OdS/dPv
-H3CC4lhRpw+fJ9SgaNxRinK6tm/YVDbEGBu5+Mokvf5H1sAg5TK69p9ZgpxCs77p
-FfjQ06teFYEymdaXk5zpHVJmALoI59TPqFThxDcu5lbIlJSaXzNWEUBdfdnaXBuN
-7DzJOY3GsTifgGymZajVmDDGUJ9vvPGTMjla+Rjhffn1J0brrvR36Iv7yZ3+asyo
-iciyhWJWqufGsucL4CGg2hL5yNt0z0TPed6Y9K247z6x2jQeAT+njW56cS07c3Dp
-mYsNFMon129zEyzzQSqANveJMeW+viOc3x72eM65uLPic0eAyyx6ZV8K81eQmqx0
-IAxtusvusKopR6tvaLidm9UTBYaV8ZcOg43rRCNn6dKTi6y1m09k7xuO7JJmx47C
-tMUMRQES9coQJYu5Qmcz
-=8iY1
------END PGP SIGNATURE-----
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() {
+	:
+}