Fix bug 175398.

(Portage version: 2.1.2.4)

4 files changed, 70 insertions, 1 deletions

diff --git a/xfce-base/xfce-utils/ChangeLog b/xfce-base/xfce-utils/ChangeLog
index 8a713e6bfe6d..a3cc368ace1c 100644
--- 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/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
index 000000000000..da459313454e
--- /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
index 000000000000..4eca3323cc5a
--- /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
index 000000000000..42f431f79242
--- /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
+}