New patch from upstream bug 2967.

Package-Manager: portage-2.1.2-r13

3 files changed, 59 insertions, 20 deletions

diff --git a/xfce-base/xfce-utils/ChangeLog b/xfce-base/xfce-utils/ChangeLog
index 7e2a5156fe62..348934406e2d 100644
--- a/xfce-base/xfce-utils/ChangeLog
+++ b/xfce-base/xfce-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-base/xfce-utils
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.91 2007/03/02 23:07:47 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.92 2007/03/03 15:44:49 drac Exp $
+
+  03 Mar 2007; Samuli Suominen <drac@gentoo.org>
+  files/xfce-utils-4.4.0-xdg_data_dirs.patch:
+  New patch from upstream bug 2967.
 
   02 Mar 2007; Peter Weller <welp@gentoo.org> xfce-utils-4.4.0-r3.ebuild:
   Keyworded on x86-fbsd. Removed older version
diff --git a/xfce-base/xfce-utils/Manifest b/xfce-base/xfce-utils/Manifest
index 1cdbfd72e9c8..0abe9d49b9cb 100644
--- a/xfce-base/xfce-utils/Manifest
+++ b/xfce-base/xfce-utils/Manifest
@@ -6,10 +6,10 @@ AUX nolisten-tcp.patch 706 RMD160 0994332b0a4d18264854aea1fa825078692981f3 SHA1
 MD5 c7cda86a7c9669a99b24300667da0f37 files/nolisten-tcp.patch 706
 RMD160 0994332b0a4d18264854aea1fa825078692981f3 files/nolisten-tcp.patch 706
 SHA256 d37d7974c6194d40ce408bd752f49dd92a14e3a091b0e4ae7c983d0f9c5f0170 files/nolisten-tcp.patch 706
-AUX xfce-utils-4.4.0-xdg_data_dirs.patch 598 RMD160 653d54ec9e3ddd1de7a2b3510d36fc41db177224 SHA1 7193b3f6c0fc813176cf1b53a2c324cbc16093de SHA256 a7fbb7aee743ea1e0322a0f906fb428ea7c272146cefc5d49f57e1dd72366ae6
-MD5 b2d405b55df6c29961e31816b13286b6 files/xfce-utils-4.4.0-xdg_data_dirs.patch 598
-RMD160 653d54ec9e3ddd1de7a2b3510d36fc41db177224 files/xfce-utils-4.4.0-xdg_data_dirs.patch 598
-SHA256 a7fbb7aee743ea1e0322a0f906fb428ea7c272146cefc5d49f57e1dd72366ae6 files/xfce-utils-4.4.0-xdg_data_dirs.patch 598
+AUX xfce-utils-4.4.0-xdg_data_dirs.patch 1255 RMD160 7cd467d39ef5cc13335da9968272792b5ffd4108 SHA1 7bcff405c20751c1bda65d23ca619924073109d6 SHA256 21d6aacd711382322ce0f2dad44d88af01203d817b2d9beda6e926daadf92f6c
+MD5 95ee1ce057859bcc292bbb1831add32d files/xfce-utils-4.4.0-xdg_data_dirs.patch 1255
+RMD160 7cd467d39ef5cc13335da9968272792b5ffd4108 files/xfce-utils-4.4.0-xdg_data_dirs.patch 1255
+SHA256 21d6aacd711382322ce0f2dad44d88af01203d817b2d9beda6e926daadf92f6c files/xfce-utils-4.4.0-xdg_data_dirs.patch 1255
 DIST xfce-utils-4.2.3.tar.gz 1303388 RMD160 acbe18beeac5a2b6d4866ec98343d4fc98b4dd12 SHA1 a19e68dd676743636dec80d9ce2b0d6149c7a315 SHA256 64ce3cb12a05fe1a4173baf18748b44af8c282d8b93849a39ab1a1174af438aa
 DIST xfce-utils-4.4.0.tar.bz2 559900 RMD160 4e7668bd6827cfd8ed60b6e2a3b60b70cc2f05a2 SHA1 181dadd737a7ff4f7085729318d3b7a3aebb9a69 SHA256 37ab42beaeea0d846920ec805213fcf8987bd74ac1f78153493ae9af3d5b2441
 EBUILD xfce-utils-4.2.3.ebuild 740 RMD160 89f5c1ad5599352b213fef2bc1e1ebace4259f9e SHA1 d1d4ef35ffa1129c0041d296bb838d427a368547 SHA256 6c4e904b45f9c0c470b5ce4e2766ab134e07a014ac814cb3bc1b29c29586158e
@@ -20,10 +20,10 @@ EBUILD xfce-utils-4.4.0-r3.ebuild 1112 RMD160 be3f37b4ab592ac9471ae25543898900f4
 MD5 a3e081dd6a266b728ea9d985df0db2ea xfce-utils-4.4.0-r3.ebuild 1112
 RMD160 be3f37b4ab592ac9471ae25543898900f4d8498c xfce-utils-4.4.0-r3.ebuild 1112
 SHA256 34ed0a2087b704b607be8e45150b7217304a02ee7fc9de40ca01cc22608a56ed xfce-utils-4.4.0-r3.ebuild 1112
-MISC ChangeLog 11481 RMD160 a3107987ced695a188902ef810f1b3a1070da8fd SHA1 efe36181008c3285467e2f5e66af2e28a812d72f SHA256 595482820117cd78a4d9cd2b759c3d37807d1511cc43bf59f4402b639727d374
-MD5 5d91d33ce90b022ee13931c4307ef38f ChangeLog 11481
-RMD160 a3107987ced695a188902ef810f1b3a1070da8fd ChangeLog 11481
-SHA256 595482820117cd78a4d9cd2b759c3d37807d1511cc43bf59f4402b639727d374 ChangeLog 11481
+MISC ChangeLog 11613 RMD160 39f7346f6412149fcf1f7615c89590316b7e5f3c SHA1 9e0451e98285b591033c83869f82ed63b437e4b8 SHA256 be203b5315d99f574f0d79a1a95fb1ab28ab6ea60aaffce50cef00c0588b5736
+MD5 01cbaa1cec06db7f303322a0a35dd0c0 ChangeLog 11613
+RMD160 39f7346f6412149fcf1f7615c89590316b7e5f3c ChangeLog 11613
+SHA256 be203b5315d99f574f0d79a1a95fb1ab28ab6ea60aaffce50cef00c0588b5736 ChangeLog 11613
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157
diff --git a/xfce-base/xfce-utils/files/xfce-utils-4.4.0-xdg_data_dirs.patch b/xfce-base/xfce-utils/files/xfce-utils-4.4.0-xdg_data_dirs.patch
index 665989b62505..ed99e9f51928 100644
--- a/xfce-base/xfce-utils/files/xfce-utils-4.4.0-xdg_data_dirs.patch
+++ b/xfce-base/xfce-utils/files/xfce-utils-4.4.0-xdg_data_dirs.patch
@@ -1,18 +1,53 @@
 diff -ur xfce-utils-4.4.0.orig/scripts/startxfce4.in xfce-utils-4.4.0/scripts/startxfce4.in
 --- xfce-utils-4.4.0.orig/scripts/startxfce4.in	2007-01-20 19:02:51.000000000 +0200
-+++ xfce-utils-4.4.0/scripts/startxfce4.in	2007-03-02 14:33:40.000000000 +0200
-@@ -26,13 +26,7 @@
-   BASEDIR=$XDG_CONFIG_HOME/xfce4
++++ xfce-utils-4.4.0/scripts/startxfce4.in	2007-03-03 17:32:41.000000000 +0200
+@@ -19,14 +19,14 @@
+ #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ #
+ 
+-if test x"$XDG_CONFIG_HOME" = x""
++if test "x$XDG_CONFIG_HOME" = "x"
+ then
+-  BASEDIR=$HOME/.config/xfce4/
++  BASEDIR="$HOME/.config/xfce4/"
+ else
+-  BASEDIR=$XDG_CONFIG_HOME/xfce4
++  BASEDIR="$XDG_CONFIG_HOME/xfce4"
  fi
  
 -if test x"$XDG_DATA_DIRS" = x""
--then
--  XDG_DATA_DIRS="/usr/share:/usr/local/share:@datadir@"
--else
--  XDG_DATA_DIRS="$XDG_DATA_DIRS:@datadir@"
--fi
--export XDG_DATA_DIRS
-+export XDG_DATA_DIRS="/usr/share:/usr/local/share:$XDG_DATA_DIRS:@datadir@"
++if test "x$XDG_DATA_DIRS" = "x"
+ then
+   XDG_DATA_DIRS="/usr/share:/usr/local/share:@datadir@"
+ else
+@@ -34,7 +34,7 @@
+ fi
+ export XDG_DATA_DIRS
  
- if test x"$DISPLAY" = x""
+-if test x"$DISPLAY" = x""
++if test "x$DISPLAY" = "x"
  then
+   echo "$0: Starting X server"
+   prog=xinit
+@@ -43,10 +43,10 @@
+   prog=/bin/sh
+ fi
+ 
+-if test ! x"$*" = x""
++if test ! "x$*" = "x"
+ then
+   OPT=$*
+-  if test x"${OPT#*--}" = x"${OPT}"
++  if test "x${OPT#*--}" = "x${OPT}"
+   then
+     CLIENTRC=${OPT}
+   else
+@@ -61,7 +61,7 @@
+   SERVERRC="/etc/X11/xinit/xserverrc $SERVERRC"
+ fi
+ 
+-if ! test x"$SERVERRC" = x""
++if ! test "x$SERVERRC" = "x"
+ then
+   SERVERRC="-- $SERVERRC"
+ fi