Only run xdg-user-dirs-update under Gnome to prevent conflicts with XFCE, bug #382685 by Samuli Suominen.

Package-Manager: portage-2.1.10.14/cvs/Linux x86_64

5 files changed, 27 insertions, 18 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index b052b0b5b640..44fc636c1102 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-session
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.296 2011/09/12 10:01:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.297 2011/09/12 10:35:55 pacho Exp $
+
+  12 Sep 2011; Pacho Ramos <pacho@gentoo.org> +files/10-user-dirs-update-gnome,
+  -files/10-user-dirs-update, gnome-session-2.32.1-r3.ebuild,
+  gnome-session-3.0.2.ebuild:
+  Only run xdg-user-dirs-update under Gnome to prevent conflicts with XFCE, bug
+  #382685 by Samuli Suominen.
 
 *gnome-session-2.32.1-r3 (12 Sep 2011)
 
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 09dae26e5c29..c3690de457a9 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 10-user-dirs-update 215 RMD160 0ec078acddb6ee758cdc9f29f35ef83000024874 SHA1 3fe8f927240426cb772288caf920291fc0ecd571 SHA256 fe1dd00944d2651e80e588b60530531b67da6ed9c01fbf9e3edfa803f9d0f89f
+AUX 10-user-dirs-update-gnome 264 RMD160 92eba5fafd59d6cf051138acd247127b7afcc32b SHA1 8a75d6f0cc0a2ab05ee0542cf0ed921c761c9fca SHA256 f060f401bf0e3f7dad91ce675666853de062d8523a3749f1040c4895bc3db931
 AUX 15-xdg-data-gnome 227 RMD160 b42bf6342d18a00fe38b49264ef8a43c8ce87af9 SHA1 a365c288d94015e55c36bd25623b516ed27db352 SHA256 dca4022749bd9a7657dc077546ce0bc65312e87054e6f98761a7f1dd5f6a88cd
 AUX Gnome 2391 RMD160 dee0875327352ae70f71b73257deb8ccc5bbc3ba SHA1 9d6f5c7c4f7aee36ea64b30c57b9cb9818664c42 SHA256 ffc912945278c88ef854c8988b0042675ffa78525592f34580ee76c1f25309d3
 AUX defaults.list 14505 RMD160 1e15a5166728493f21987b530fafcae735a47a3c SHA1 927a883d98b7dbbed75f4480c284e0b0431ab000 SHA256 efe30d8f5be448661870fec6a5e49ae98ecfb73f06ee4ab0926990cb15223354
@@ -14,14 +14,14 @@ AUX gnome-session-2.32.1-idle-transition.patch 1802 RMD160 aec519f8b0bfff589c079
 DIST gnome-session-2.32.1.tar.bz2 774842 RMD160 c579bf197b38c8df7df14c751c056be86695a287 SHA1 7d4c7652247606a972a2f1e50a6a6339809a5b9e SHA256 22d93ce433fcf9c7ce6b5f36dd81f64e692ea0e41faaa0f61159ddac28c3686a
 DIST gnome-session-3.0.2.tar.bz2 805690 RMD160 58268528a627ffe9be96e8d168ea278b98c5e693 SHA1 5559a71ef3134f3aaa48b7f06e2123714f71756f SHA256 4801a0cfdf351a1184780cc1c2bdd5cea6cd1ad31505d5fa8de4e56aa766ab96
 EBUILD gnome-session-2.32.1-r2.ebuild 2181 RMD160 62ce137f70d6fabe0531cc10c8e5a66b884edafc SHA1 29e676cd69295adca01f209f7ed751a3690d1445 SHA256 1a0b4219a56f9e944d7badbc96769cc474058a7fc521b7a787060c72caf54c4f
-EBUILD gnome-session-2.32.1-r3.ebuild 2883 RMD160 695d2f1b4f3b341fc6b741bcd7edf06e4b6a4221 SHA1 6c9f03bd143d0f39ffd2be36b5acc80b38fec904 SHA256 784b3a46f5626a230d5247e19b36d0124d2e6cc01e46fa7052247e5efce6cb54
-EBUILD gnome-session-3.0.2.ebuild 3008 RMD160 90605703cc0e6a6e83987714de0e9a53efb93658 SHA1 be7a5ea68af2605fc2cfafc1efd13a7e19294f6d SHA256 3ddabe923a9abd8bddcfef5a807f92532337cca125531f2b686f7aec051323bf
-MISC ChangeLog 43155 RMD160 ba1da7cbafe72874c39b6fc328582d7c3ad2af1a SHA1 ef08eddf30b3d53ba9fbe67097c67f255185c018 SHA256 fa33d1e10d5fd393f4756549dd2ccdd7ef2e6a8b25a95d7958b0a87d6dab050a
+EBUILD gnome-session-2.32.1-r3.ebuild 2895 RMD160 1aba2065e1b9f5b848c91d6af244c6ef3720f940 SHA1 3eefb0b4e80f10d73f0c4f6997353e83f8ecabd5 SHA256 86fc3b4672097d60eded1d91c21bc4ab88b579e868f28dbe554fc3c266c31384
+EBUILD gnome-session-3.0.2.ebuild 2995 RMD160 589224ec7c509bf17b14a427dddb7da2665550b9 SHA1 1ec7136add9906b033faa45bc52a6e8e6999b6cb SHA256 3d1268edb8276503c5867f18797a8182ad5515efe59cf87c9a8f14a375b22246
+MISC ChangeLog 43438 RMD160 01d797d20f7c265d4c1e519ff8897d62ab5f5a4f SHA1 ecf14b2c58c97d14c03a20c1402a7fbcf231a3a1 SHA256 eec729f40f0f13bd3b50507079fc459cb2ee1220cfd75afd5fede47425aab12c
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5t2JgACgkQCaWpQKGI+9RLcwCdETRgywLUFl4A+tfJDrjy4HLq
-UoMAnRmNlOT2yEHXpoRykh1qJu+7v/2X
-=no22
+iEYEARECAAYFAk5t4JEACgkQCaWpQKGI+9ShOACfYpxfgWpm9RgN2Ovxe3kl1O5b
+JD4An2XXVKaR/pfaUepIcflpVtAkvFEM
+=ASy5
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-session/files/10-user-dirs-update b/gnome-base/gnome-session/files/10-user-dirs-update-gnome
index 317f095e0bcc..f909d44dacdf 100644..100755
--- a/gnome-base/gnome-session/files/10-user-dirs-update
+++ b/gnome-base/gnome-session/files/10-user-dirs-update-gnome
@@ -2,6 +2,9 @@
 
 # Create various XDG directories, and write ~/.config/user-dirs.dirs, etc.
 # That file is read by glib to get XDG_PICTURES_DIR, etc
-if type xdg-user-dirs-update &>/dev/null; then
-	xdg-user-dirs-update
+
+if [ "$DESKTOP_SESSION" = "gnome" ]; then
+	if type xdg-user-dirs-update &>/dev/null; then
+		xdg-user-dirs-update
+	fi
 fi
diff --git a/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild b/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild
index 2e9424e5a04e..a10d7fe80e41 100644
--- a/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild
+++ b/gnome-base/gnome-session/gnome-session-2.32.1-r3.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/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild,v 1.1 2011/09/12 10:01:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild,v 1.2 2011/09/12 10:35:55 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -19,7 +19,7 @@ IUSE="doc ipv6 elibc_FreeBSD"
 
 # x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
 # create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update below).
+# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
 RDEPEND=">=dev-libs/glib-2.16:2
 	>=x11-libs/gtk+-2.22.0:2
 	>=dev-libs/dbus-glib-0.76
@@ -98,6 +98,6 @@ src_install() {
 	exeinto /etc/X11/xinit/xinitrc.d/
 	doexe "${FILESDIR}/15-xdg-data-gnome"
 
-	# FIXME: this should be done by x11-misc/xdg-user-dirs
-	doexe "${FILESDIR}/10-user-dirs-update"
+	# This should be done here as discussed in bug #270852
+	doexe "${FILESDIR}/10-user-dirs-update-gnome"
 }
diff --git a/gnome-base/gnome-session/gnome-session-3.0.2.ebuild b/gnome-base/gnome-session/gnome-session-3.0.2.ebuild
index a797ed9679fd..0c25e356fbc4 100644
--- a/gnome-base/gnome-session/gnome-session-3.0.2.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.0.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/gnome-base/gnome-session/gnome-session-3.0.2.ebuild,v 1.3 2011/08/19 12:07:06 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-3.0.2.ebuild,v 1.4 2011/09/12 10:35:55 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -17,7 +17,7 @@ IUSE="doc ipv6 elibc_FreeBSD"
 
 # x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
 # create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update below).
+# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
 COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
 	>=x11-libs/gtk+-2.90.7:3
 	>=dev-libs/dbus-glib-0.76
@@ -86,8 +86,8 @@ src_install() {
 	exeinto /etc/X11/xinit/xinitrc.d/
 	doexe "${FILESDIR}/15-xdg-data-gnome" || die
 
-	# FIXME: this should be done by x11-misc/xdg-user-dirs
-	doexe "${FILESDIR}/10-user-dirs-update" || die "doexe failed"
+	# This should be done here as discussed in bug #270852
+	doexe "${FILESDIR}/10-user-dirs-update-gnome"
 }
 
 pkg_postinst() {