Fix bug 175398.

Package-Manager: portage-2.1.2.4

diff --git a/xfce-base/xfce-utils/ChangeLog b/xfce-base/xfce-utils/ChangeLog
index 8a713e6bfe6d53071875c256a549d4c2b7f51232..a3cc368ace1cdc320f0347ae597bdafb7f5c0d33 100644 (file)
--- a/xfce-base/xfce-utils/ChangeLog
+++ b/xfce-base/xfce-utils/ChangeLog
@@ -1,6 +1,13 @@
 # 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.102 2007/04/12 14:48:37 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.103 2007/04/21 12:52:28 drac Exp $
+
+*xfce-utils-4.4.1-r1 (21 Apr 2007)
+
+  21 Apr 2007; Samuli Suominen <drac@gentoo.org>
+  +files/xfce-utils-4.4.1-xdg_data_dirs.patch, +xfce-utils-4.4.1-r1.ebuild:
+  Fix XDG_DATA_DIRS again as per bug 175398. Thanks to Guido Imperiale for
+  reporting.
 
   12 Apr 2007; Samuli Suominen <drac@gentoo.org> xfce-utils-4.4.1.ebuild:
   Remove eutils from inherit, not used.

diff --git a/xfce-base/xfce-utils/Manifest b/xfce-base/xfce-utils/Manifest
index 032ed2b3a8908d638262249c92ecbe6a713cece5..af45529060ed48d84ca9355cca5b5c2f60fcd82c 100644 (file)
--- a/xfce-base/xfce-utils/Manifest
+++ b/xfce-base/xfce-utils/Manifest
@@ -10,6 +10,10 @@ AUX xfce-utils-4.4.0-xdg_data_dirs.patch 1410 RMD160 939fb237b8c02ab7ae38696466c
 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
+AUX xfce-utils-4.4.1-xdg_data_dirs.patch 558 RMD160 92caf2870718a3ca2fd225460b1cb5ddea37c676 SHA1 11ecbd5397973b5d6481eb894773cf94a1ecf459 SHA256 a25b288dd3b0ebd4f903b9ef6e335cadd8de140067f817a1201309b55d187140
+MD5 ae66765a949d129427073cbdec3f651f files/xfce-utils-4.4.1-xdg_data_dirs.patch 558
+RMD160 92caf2870718a3ca2fd225460b1cb5ddea37c676 files/xfce-utils-4.4.1-xdg_data_dirs.patch 558
+SHA256 a25b288dd3b0ebd4f903b9ef6e335cadd8de140067f817a1201309b55d187140 files/xfce-utils-4.4.1-xdg_data_dirs.patch 558
 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
 DIST xfce-utils-4.4.1.tar.bz2 608154 RMD160 65ed96acb6491829d0f97e8b1e4b5cba64a73e63 SHA1 69ab30d45bbe252993f783e2f4d7f184226cacbb SHA256 80355762effab1e47110ac411d705b3044326e3b2cc357afefdb51e2c6f76cae
@@ -21,14 +25,18 @@ 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
+EBUILD xfce-utils-4.4.1-r1.ebuild 1233 RMD160 b806bd71c8444e60ede4aa9e6032598680c854e7 SHA1 9839bbf8ff16e572016f89203422e7c6454869e6 SHA256 3af9def6182928d981bda64aaa561b19463602a96eb9c7217f1c52804b7c6b54
+MD5 763bf351e3ababbaac78dc06c72d5f97 xfce-utils-4.4.1-r1.ebuild 1233
+RMD160 b806bd71c8444e60ede4aa9e6032598680c854e7 xfce-utils-4.4.1-r1.ebuild 1233
+SHA256 3af9def6182928d981bda64aaa561b19463602a96eb9c7217f1c52804b7c6b54 xfce-utils-4.4.1-r1.ebuild 1233
 EBUILD xfce-utils-4.4.1.ebuild 1032 RMD160 0edaf02a9fb1fd2c40aa35ebc54344b340fe1441 SHA1 e43da3f45a211022f0fd7e6325686caa47126d6a SHA256 012bb60b64b8a2f4fc896fc2e77b16804eebebacad6d8972bcdcca8becbcd467
 MD5 92aa1d1d7876b0e65fe5bcb6cc174c67 xfce-utils-4.4.1.ebuild 1032
 RMD160 0edaf02a9fb1fd2c40aa35ebc54344b340fe1441 xfce-utils-4.4.1.ebuild 1032
 SHA256 012bb60b64b8a2f4fc896fc2e77b16804eebebacad6d8972bcdcca8becbcd467 xfce-utils-4.4.1.ebuild 1032
-MISC ChangeLog 12801 RMD160 922e7355f2aedd89a53ee0d45f59f055379d7efd SHA1 126554fe08bfcd98389a7c769e9cf3ff599fc4dc SHA256 1d1e017de6c9d6104bee82e0781685c8dfdf756f26c26234c1979412902b29b2
-MD5 32f6fbab72e1419c947127a61f9b265f ChangeLog 12801
-RMD160 922e7355f2aedd89a53ee0d45f59f055379d7efd ChangeLog 12801
-SHA256 1d1e017de6c9d6104bee82e0781685c8dfdf756f26c26234c1979412902b29b2 ChangeLog 12801
+MISC ChangeLog 13051 RMD160 82785a1248ef5f96fa12343f83da8a0ed43a8d49 SHA1 c760229b8974cd07dec716dc34aefd39918718c6 SHA256 d542240389fe80a1e6f7618f16462137a3b2ee6a0590cde848a8267fa03a041c
+MD5 87726eb1c6f8aacb9797e50996f9c9c5 ChangeLog 13051
+RMD160 82785a1248ef5f96fa12343f83da8a0ed43a8d49 ChangeLog 13051
+SHA256 d542240389fe80a1e6f7618f16462137a3b2ee6a0590cde848a8267fa03a041c ChangeLog 13051
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157
@@ -42,3 +50,6 @@ SHA256 ce45e806ecb968c9c13e4ef00b768a7bea71f0a9f46c2b6c246d739fa5bab939 files/di
 MD5 c43c810897ba7b4b82f9a3b0b6d669a2 files/digest-xfce-utils-4.4.1 253
 RMD160 ac5c698c978b4379382ea5b3eb813aeed1144637 files/digest-xfce-utils-4.4.1 253
 SHA256 63e872c24850434e986cf46833cd1d42100f8ae83096dce411fdfc96208588d2 files/digest-xfce-utils-4.4.1 253
+MD5 c43c810897ba7b4b82f9a3b0b6d669a2 files/digest-xfce-utils-4.4.1-r1 253
+RMD160 ac5c698c978b4379382ea5b3eb813aeed1144637 files/digest-xfce-utils-4.4.1-r1 253
+SHA256 63e872c24850434e986cf46833cd1d42100f8ae83096dce411fdfc96208588d2 files/digest-xfce-utils-4.4.1-r1 253

diff --git a/xfce-base/xfce-utils/files/digest-xfce-utils-4.4.1-r1 b/xfce-base/xfce-utils/files/digest-xfce-utils-4.4.1-r1
new file mode 100644 (file)
index 0000000..da45931
--- /dev/null
+++ b/xfce-base/xfce-utils/files/digest-xfce-utils-4.4.1-r1
@@ -0,0 +1,3 @@
+MD5 f7d95088e327bd8a64164696d39a1966 xfce-utils-4.4.1.tar.bz2 608154
+RMD160 65ed96acb6491829d0f97e8b1e4b5cba64a73e63 xfce-utils-4.4.1.tar.bz2 608154
+SHA256 80355762effab1e47110ac411d705b3044326e3b2cc357afefdb51e2c6f76cae xfce-utils-4.4.1.tar.bz2 608154

diff --git a/xfce-base/xfce-utils/files/xfce-utils-4.4.1-xdg_data_dirs.patch b/xfce-base/xfce-utils/files/xfce-utils-4.4.1-xdg_data_dirs.patch
new file mode 100644 (file)
index 0000000..4eca332
--- /dev/null
+++ b/xfce-base/xfce-utils/files/xfce-utils-4.4.1-xdg_data_dirs.patch
@@ -0,0 +1,15 @@
+diff -ur xfce-utils-4.4.1.orig/scripts/startxfce4.in xfce-utils-4.4.1/scripts/startxfce4.in
+--- xfce-utils-4.4.1.orig/scripts/startxfce4.in        2007-04-02 08:34:54.000000000 +0300
++++ xfce-utils-4.4.1/scripts/startxfce4.in     2007-04-21 15:38:21.000000000 +0300
+@@ -28,9 +28,9 @@
+ 
+ if test "x$XDG_DATA_DIRS" = "x"
+ then
+-  XDG_DATA_DIRS="usr/local/share:/usr/share:/@datadir@"
++  XDG_DATA_DIRS="/usr/local/share:/usr/share"
+ else
+-  XDG_DATA_DIRS="$XDG_DATA_DIRS:@datadir@"
++  XDG_DATA_DIRS="$XDG_DATA_DIRS:/usr/local/share:/usr/share"
+ fi
+ export XDG_DATA_DIRS
+ 

diff --git a/xfce-base/xfce-utils/xfce-utils-4.4.1-r1.ebuild b/xfce-base/xfce-utils/xfce-utils-4.4.1-r1.ebuild
new file mode 100644 (file)
index 0000000..42f431f
--- /dev/null
+++ b/xfce-base/xfce-utils/xfce-utils-4.4.1-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/xfce-utils-4.4.1-r1.ebuild,v 1.1 2007/04/21 12:52:28 drac Exp $
+
+inherit autotools eutils xfce44
+
+XFCE_VERSION=4.4.1
+xfce44
+
+DESCRIPTION="Collection of utils"
+HOMEPAGE="http://www.xfce.org/projects/xfce-utils/"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="dbus debug"
+
+RDEPEND="x11-apps/xrdb
+       x11-libs/libX11
+       >=dev-libs/glib-2.6
+       >=x11-libs/gtk+-2.6
+       >=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}
+       >=xfce-base/libxfce4mcs-${XFCE_MASTER_VERSION}
+       >=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}
+       dbus? ( || ( dev-libs/dbus-glib <sys-apps/dbus-1 ) )"
+DEPEND="${RDEPEND}
+       dev-util/pkgconfig
+       >=xfce-extra/xfce4-dev-tools-4.4"
+
+XFCE_CONFIG="${XFCE_CONFIG} $(use_enable dbus) --enable-gdm --with-vendor-info=Gentoo"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+xfce44_core_package
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       epatch "${FILESDIR}"/${P}-xdg_data_dirs.patch
+       AT_M4DIR=/usr/share/xfce4/dev-tools/m4macros eautoreconf
+}
+
+src_install() {
+       xfce44_src_install
+       insinto /usr/share/xfce4
+       newins ${FILESDIR}/Gentoo Gentoo
+}