add patch to make kdelibs also providing XDG_MENU_PREFIX to env, useful to have kde XDG libraries working outside KDE desktop

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

4 files changed, 26 insertions, 4 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 97b6fe394c48..8a02ee4b0b1c 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.672 2010/02/20 10:19:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.673 2010/03/01 18:57:59 lxnay Exp $
+
+  01 Mar 2010; Fabio Erculiani <lxnay@gentoo.org>
+  +files/dist/11-xdg-menu-kde, kdelibs-4.4.0.ebuild:
+  add patch to make kdelibs also providing XDG_MENU_PREFIX to env, useful to
+  have kde XDG libraries working outside KDE desktop
 
   20 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> kdelibs-4.3.5.ebuild:
   amd64/x86 stable wrt #300393
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index c503d5b55471..be1dcc7b2ac8 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,5 +1,6 @@
 AUX dist/01_gentoo_set_xdg_menu_prefix.patch 606 RMD160 37290ce06adf1cf43b0006c02804d7fe762ed609 SHA1 8e86e06a70438c12085a595fd66e2354141fb056 SHA256 9c64b093340d7d25ce6c28d298cd62f3f4da141b762c663df9cd9b5b7722f7d3
 AUX dist/02_gentoo_append_xdg_config_dirs.patch 919 RMD160 1406b23f317710bf039aa6020f55781b6f2c2f6a SHA1 cc589b31277e5bb6322df0240389fa8423d8d942 SHA256 e0be8da02ea48eb6ad4dcb0d723bf2a619cc7ed57dd41f456018116fb05162f6
+AUX dist/11-xdg-menu-kde 130 RMD160 c66489d9b9d390adc37c0bca05456d052204945b SHA1 f172d66838c1fb6754d44f24f8a45c5a344ccc38 SHA256 c190fc9e5bfa873d03995683ba0a3474e56c7b82c3bed717ac7b76ae9ec96aa7
 AUX dist/23_solid_no_double_build.patch 838 RMD160 24bea0cd76edd2709edcdc654b74ebf1566e7ef7 SHA1 534aef07069b9b89ff3ff80619eb35f0fd588b61 SHA256 1ef6f6e7fe4b31b79126fd0cefaadab03f0e6a4bd9194fc8f4bee4750620c4ad
 AUX kdelibs-4.3.1-kdeui_util_kkeyserver_mac.patch 2405 RMD160 abac7f17176246ad3f2b36b6c6ff9d19bd914e7f SHA1 525d5947c9ba5d341da216f4b517931d97591b26 SHA256 2f30e3b82989caf5d3d30ef27af565093856b145fe9976d643c975b762b6600c
 AUX kdelibs-4.3.1-macos-kinit-fork.patch 1361 RMD160 9f60caf379991e9490c32a79e54680ed929af6e5 SHA1 acee0ffc11013bee8b80c16225a88b28cebde5c2 SHA256 a47b8469e5d6c8f763d385b0bdbaf541f5affdabb787bda8e5a56b8693d29857
@@ -22,6 +23,6 @@ DIST kdelibs-4.4.0.tar.bz2 14084441 RMD160 43a39d6edd6549fadf39c9a2b89987805955f
 EBUILD kdelibs-4.3.3-r1.ebuild 6388 RMD160 957b2e5a91398d7a1d6be8807c75a93a80776f87 SHA1 69e1d08d6ecff21083c1487f004147b4bc631eea SHA256 3fbbfe5cd7d764faa68e89d2b838d35096920a9155f247f491711f50d6a3d446
 EBUILD kdelibs-4.3.4.ebuild 9033 RMD160 f1f16bcbc8e9685feeedda511bdd2275e52d0871 SHA1 82f49ba7690d1b368095a51683a1847ac5adba4a SHA256 4a3352c0dafdfe519fc695e55b525a2f4d7324b82147e51b11198d5210e1b8f0
 EBUILD kdelibs-4.3.5.ebuild 8951 RMD160 430edda9ea257584f1422e4d6a6ea13471ea7dc3 SHA1 e1d45d4fee4c3fe06d65ae9f2947eea16703b977 SHA256 281526b695c1d6050dae56c899603a5fcb4e7618ec82d2d2858fe543a1bbc502
-EBUILD kdelibs-4.4.0.ebuild 8994 RMD160 792a2629b77fa3f64e45fd52cb4378f504fa9ff9 SHA1 3eb6d72d4510db68e5d23f5f1f54dc1c82f72d06 SHA256 3ebf548729a0657825e203c3ff612db5ef3f5b5242f5a41cc0a1f23f19095e7d
-MISC ChangeLog 112284 RMD160 f4fa86f8910dfbf08d2f33658992e922ca1beebe SHA1 69240169df1deb004519321b1ad6e2220b21fa7b SHA256 ada274c94671d8dd84338f58ba5814d1a6977050f3b576ca081ed1983592a31f
+EBUILD kdelibs-4.4.0.ebuild 9334 RMD160 e8e8e1cd71a5bffb86705504eea622d7d71ce3a5 SHA1 745784120df34c7c0ee3af49b432e0164e1a2488 SHA256 89afdc4b6df6bc7258cfc306f2710261d64eef46700ebaebf44abfdf23cfe7b2
+MISC ChangeLog 112514 RMD160 61fad010a0ab37a8c7e007dd2caffd363ad75ecf SHA1 e0537baffa890c368b7084f8920c60e247e63917 SHA256 daf73f5686d49540e7e7b1937cd9e7a8de3f8d401ca9b741fed3d6cf335dbcfe
 MISC metadata.xml 310 RMD160 29952f07b1829170319534936d11d39f1f7896bb SHA1 90ad5d77993322d4c25338f4005aaa4b642961c3 SHA256 1ce0cd7403862637e6e913bee33bf9f54a176bd1466d168be748e997a663095a
diff --git a/kde-base/kdelibs/files/dist/11-xdg-menu-kde b/kde-base/kdelibs/files/dist/11-xdg-menu-kde
new file mode 100755
index 000000000000..1360fc371c36
--- /dev/null
+++ b/kde-base/kdelibs/files/dist/11-xdg-menu-kde
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ -z "$XDG_MENU_PREFIX" ] && [ "$DESKTOP_SESSION" = "KDE-4" ]
+then
+	export XDG_MENU_PREFIX=@REPLACE_MENU_PREFIX@
+fi
diff --git a/kde-base/kdelibs/kdelibs-4.4.0.ebuild b/kde-base/kdelibs/kdelibs-4.4.0.ebuild
index a5f8b563f5fb..c7d3d5162a6c 100644
--- a/kde-base/kdelibs/kdelibs-4.4.0.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.4.0.ebuild,v 1.1 2010/02/09 00:23:45 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.4.0.ebuild,v 1.2 2010/03/01 18:57:59 lxnay Exp $
 
 EAPI="2"
 
@@ -137,6 +137,11 @@ src_prepare() {
 	sed -e "s|@REPLACE_MENU_PREFIX@|${menu_prefix}|" \
 		-i kded/vfolder_menu.cpp || die "Sed on vfolder_menu.cpp failed."
 
+	# Properly place xinitrc.d file that exports XDG_MENU_PREFIX to env
+	cp "${FILESDIR}"/dist/11-xdg-menu-kde .
+	sed -e "s|@REPLACE_MENU_PREFIX@|${menu_prefix}|" \
+		-i 11-xdg-menu-kde || die "Sed on vfolder_menu.cpp failed."
+
 	if use aqua; then
 		sed -i -e \
 			"s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \
@@ -262,6 +267,11 @@ src_install() {
 			"${ED}"/${KDEDIR}/share/apps/cmake/modules/FindXKB.cmake \
 			|| die "failed fixing FindXKB.cmake"
 	fi
+
+	# Install xinitrc.d entry
+	exeinto /etc/X11/xinit/xinitrc.d/
+	doexe "${S}/11-xdg-menu-kde" || die "doexe failed"
+
 }
 
 pkg_postinst() {