Update XDG_DATA_DIRS patch so that it allways includes /usr/local as per freedesktop...

Package-Manager: portage-2.1.2.2

diff --git a/xfce-base/xfce-utils/ChangeLog b/xfce-base/xfce-utils/ChangeLog
index f4245e3d5c5e1f586e981d483290be8d2d31ad01..8da0851f51d0ed944bd1cda1a25bf22fa085672b 100644 (file)
--- 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.99 2007/03/15 13:30:17 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.100 2007/03/21 14:38:38 drac Exp $
+
+  21 Mar 2007; Samuli Suominen <drac@gentoo.org>
+  files/xfce-utils-4.4.0-xdg_data_dirs.patch:
+  Make XDG_DATA_DIRS allways include /usr/local as per f.d.o basedir spec.
 
   15 Mar 2007; Markus Rothe <corsair@gentoo.org> xfce-utils-4.4.0-r3.ebuild:
   Stable on ppc64; bug #169987

diff --git a/xfce-base/xfce-utils/Manifest b/xfce-base/xfce-utils/Manifest
index 97b23b122ca2cfcecc15e9e0916ed3bb0be8d6fb..8d6c84aca2c28583476b26d080b784f1baab8b93 100644 (file)
--- a/xfce-base/xfce-utils/Manifest
+++ b/xfce-base/xfce-utils/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX Gentoo 644 RMD160 29853c59779a2eb685aa4082bf5c312588fbe633 SHA1 01f2135774ead9534fb374cfbeb7eb123d9aff55 SHA256 1ddff80be5707ff8eb888d8f41d9cd0df5c7e0e1bd84c28ed962b4c71028efc1
 MD5 930471c0f790dbd6ba87c44e21dfd801 files/Gentoo 644
 RMD160 29853c59779a2eb685aa4082bf5c312588fbe633 files/Gentoo 644
@@ -9,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 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
+AUX xfce-utils-4.4.0-xdg_data_dirs.patch 1410 RMD160 939fb237b8c02ab7ae38696466cdd99fe0b120e0 SHA1 a603accada17f787042de04907bb066dfa240026 SHA256 a01d7595ebd9c0a42101ef88f44a1d37b57d5441af0bf5cc92604fdce5488a25
+MD5 82899bfaed4b9cb7b648ff4422dae5d5 files/xfce-utils-4.4.0-xdg_data_dirs.patch 1410
+RMD160 939fb237b8c02ab7ae38696466cdd99fe0b120e0 files/xfce-utils-4.4.0-xdg_data_dirs.patch 1410
+SHA256 a01d7595ebd9c0a42101ef88f44a1d37b57d5441af0bf5cc92604fdce5488a25 files/xfce-utils-4.4.0-xdg_data_dirs.patch 1410
 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
@@ -23,10 +20,10 @@ EBUILD xfce-utils-4.4.0-r3.ebuild 1106 RMD160 ffc2196867a880e5b6fe861dbf191550ed
 MD5 0a9bd57a2dfa73f63140d0146a3f6988 xfce-utils-4.4.0-r3.ebuild 1106
 RMD160 ffc2196867a880e5b6fe861dbf191550ed21e33b xfce-utils-4.4.0-r3.ebuild 1106
 SHA256 8298854de770599bdd4cc93630c7009d1d0cfcfde06bcf902284f1178a799311 xfce-utils-4.4.0-r3.ebuild 1106
-MISC ChangeLog 12381 RMD160 afa6f71ae1bb1b3f3a1c727d4c57fc59636fd9c2 SHA1 1c0b4075202b2ba5a3a5923722ba8bfdbba6d3ad SHA256 b13a0986709ac5a594ab566351f4d01196ae07b97d59a3decac9953631248f5f
-MD5 59efc9fb6a6bee88fa4bc811b973a223 ChangeLog 12381
-RMD160 afa6f71ae1bb1b3f3a1c727d4c57fc59636fd9c2 ChangeLog 12381
-SHA256 b13a0986709ac5a594ab566351f4d01196ae07b97d59a3decac9953631248f5f ChangeLog 12381
+MISC ChangeLog 12550 RMD160 8680360afdb5dbb468bc97a813f20a28c749886d SHA1 a0d3db88da70a5b2edc954da635f9b06fc20f3a1 SHA256 daf53bb2f0af3aeb79d9b616ec4ebc387affdb0f449058986ea4d2ac7b873269
+MD5 cf2a48c89f012bf0140e0bcaffeed163 ChangeLog 12550
+RMD160 8680360afdb5dbb468bc97a813f20a28c749886d ChangeLog 12550
+SHA256 daf53bb2f0af3aeb79d9b616ec4ebc387affdb0f449058986ea4d2ac7b873269 ChangeLog 12550
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157
@@ -37,10 +34,3 @@ SHA256 8fe6300e1ebc7c0212f2b10e66a8c4c1cdb05f1cfc2c558ba91c002336fe42ac files/di
 MD5 647e6fbc8e329f415a2b8c434d4e3970 files/digest-xfce-utils-4.4.0-r3 253
 RMD160 6bcf776bab98f4c2a6a81425a1ccf5bcda4ae6ae files/digest-xfce-utils-4.4.0-r3 253
 SHA256 ce45e806ecb968c9c13e4ef00b768a7bea71f0a9f46c2b6c246d739fa5bab939 files/digest-xfce-utils-4.4.0-r3 253
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFF/F488bi6rjpTunYRAtUsAJ4l2Y/JgAd7vsWnK2nU7n4IkAXVGACg31C0
-U/C4MB5/IyOJknoWp00DqL0=
-=2GJd
------END PGP SIGNATURE-----

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 ed99e9f5192833ccd34b738bf84ed59de822e69b..80d7392dce74bbda89b3f0f8e6e4e9bf7bc862ba 100644 (file)
--- 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,7 +1,7 @@
 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-03 17:32:41.000000000 +0200
-@@ -19,14 +19,14 @@
++++ xfce-utils-4.4.0/scripts/startxfce4.in     2007-03-21 16:28:55.000000000 +0200
+@@ -19,22 +19,22 @@
  #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  #
  
@@ -18,9 +18,11 @@ diff -ur xfce-utils-4.4.0.orig/scripts/startxfce4.in xfce-utils-4.4.0/scripts/st
 -if test x"$XDG_DATA_DIRS" = x""
 +if test "x$XDG_DATA_DIRS" = "x"
  then
-   XDG_DATA_DIRS="/usr/share:/usr/local/share:@datadir@"
+-  XDG_DATA_DIRS="/usr/share:/usr/local/share:@datadir@"
++  XDG_DATA_DIRS="/usr/local/share:/usr/share:@datadir@"
  else
-@@ -34,7 +34,7 @@
+-  XDG_DATA_DIRS="$XDG_DATA_DIRS:@datadir@"
++  XDG_DATA_DIRS="$XDG_DATA_DIRS:/usr/local/share:/usr/share:@datadir@"
  fi
  export XDG_DATA_DIRS