From 8545ab97c7f72ed456ed1c1586c6e05a4227f477 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Fri, 2 Mar 2007 12:49:26 +0000 Subject: [PATCH] Fix startxfce4 script so it won't lose XDG_DATA_DIRS set by /etc/env.d. This allows KDE applications to show in Xfce Menu when kdelibs-3.5.6-r2 is installed. Big thanks to Arttu arse Hanhela for testing. Package-Manager: portage-2.1.2-r12 --- xfce-base/xfce-utils/ChangeLog | 11 ++++- xfce-base/xfce-utils/Manifest | 19 +++++++-- .../files/digest-xfce-utils-4.4.0-r3 | 3 ++ .../xfce-utils-4.4.0-xdg_data_dirs.patch | 18 ++++++++ .../xfce-utils/xfce-utils-4.4.0-r3.ebuild | 41 +++++++++++++++++++ 5 files changed, 87 insertions(+), 5 deletions(-) create mode 100644 xfce-base/xfce-utils/files/digest-xfce-utils-4.4.0-r3 create mode 100644 xfce-base/xfce-utils/files/xfce-utils-4.4.0-xdg_data_dirs.patch create mode 100644 xfce-base/xfce-utils/xfce-utils-4.4.0-r3.ebuild diff --git a/xfce-base/xfce-utils/ChangeLog b/xfce-base/xfce-utils/ChangeLog index dda59d1bc2b6..6756b2aa515c 100644 --- a/xfce-base/xfce-utils/ChangeLog +++ b/xfce-base/xfce-utils/ChangeLog @@ -1,6 +1,15 @@ # 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.87 2007/02/22 04:06:20 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.88 2007/03/02 12:49:26 drac Exp $ + +*xfce-utils-4.4.0-r3 (02 Mar 2007) + + 02 Mar 2007; Samuli Suominen + +files/xfce-utils-4.4.0-xdg_data_dirs.patch, +xfce-utils-4.4.0-r3.ebuild: + Fix startxfce4 script so it won't lose + /usr/share:/usr/local/share:/usr/kde/3.5/share:/usr/share set by /etc/env.d. + This allows KDE applications to show in Xfce Menu when kdelibs-3.5.6-r2 is + installed. Big thanks to Arttu arse Hanhela for testing. 22 Feb 2007; Joshua Nichols xfce-utils-4.4.0-r2.ebuild: diff --git a/xfce-base/xfce-utils/Manifest b/xfce-base/xfce-utils/Manifest index 07b45a4427c4..7154857c4c7a 100644 --- a/xfce-base/xfce-utils/Manifest +++ b/xfce-base/xfce-utils/Manifest @@ -6,6 +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 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 @@ -16,10 +20,14 @@ EBUILD xfce-utils-4.4.0-r2.ebuild 1008 RMD160 707a7c0d86d506aca2971eacf27dcea70a MD5 a3b829a453e527717488e496f9e324ae xfce-utils-4.4.0-r2.ebuild 1008 RMD160 707a7c0d86d506aca2971eacf27dcea70a97d051 xfce-utils-4.4.0-r2.ebuild 1008 SHA256 c074575d6b39768d33381c76b37ac27dd7011275cef2efda3234c313bce172a2 xfce-utils-4.4.0-r2.ebuild 1008 -MISC ChangeLog 10890 RMD160 29f991d8d87fc73fc0a5b0a57549acf48e8b14b2 SHA1 85f0afd28f313737b99d9abbde7c387851bdb4a1 SHA256 5471008f95e71065a5660323f9ca14bf522bb445530459f2638ce068daef7fd6 -MD5 442f5192673f4416c3dd967ce5c37430 ChangeLog 10890 -RMD160 29f991d8d87fc73fc0a5b0a57549acf48e8b14b2 ChangeLog 10890 -SHA256 5471008f95e71065a5660323f9ca14bf522bb445530459f2638ce068daef7fd6 ChangeLog 10890 +EBUILD xfce-utils-4.4.0-r3.ebuild 1102 RMD160 a9949db40f6e3949101d6bb5645257c60664539b SHA1 a834eca5df3f1622a5132302570dc360a2af179c SHA256 5e620ed56eca5d8765a75a5660693389b465f044789b83eaca5c1873cbc8c447 +MD5 995a3104f6469330edfaf4dc23abc85b xfce-utils-4.4.0-r3.ebuild 1102 +RMD160 a9949db40f6e3949101d6bb5645257c60664539b xfce-utils-4.4.0-r3.ebuild 1102 +SHA256 5e620ed56eca5d8765a75a5660693389b465f044789b83eaca5c1873cbc8c447 xfce-utils-4.4.0-r3.ebuild 1102 +MISC ChangeLog 11306 RMD160 fa20c90fa6f0058ab62c9c48d613cf0697d99a07 SHA1 c44439d972f2e004eadb053f42f85916ff655b38 SHA256 4bffeef35f1803d5a90b63062b8eac36d4b084f1237a1f562b9f4fecf9c59984 +MD5 9af4838ae66643b82e2f84c8c00388d0 ChangeLog 11306 +RMD160 fa20c90fa6f0058ab62c9c48d613cf0697d99a07 ChangeLog 11306 +SHA256 4bffeef35f1803d5a90b63062b8eac36d4b084f1237a1f562b9f4fecf9c59984 ChangeLog 11306 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157 @@ -30,3 +38,6 @@ SHA256 8fe6300e1ebc7c0212f2b10e66a8c4c1cdb05f1cfc2c558ba91c002336fe42ac files/di MD5 647e6fbc8e329f415a2b8c434d4e3970 files/digest-xfce-utils-4.4.0-r2 253 RMD160 6bcf776bab98f4c2a6a81425a1ccf5bcda4ae6ae files/digest-xfce-utils-4.4.0-r2 253 SHA256 ce45e806ecb968c9c13e4ef00b768a7bea71f0a9f46c2b6c246d739fa5bab939 files/digest-xfce-utils-4.4.0-r2 253 +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 diff --git a/xfce-base/xfce-utils/files/digest-xfce-utils-4.4.0-r3 b/xfce-base/xfce-utils/files/digest-xfce-utils-4.4.0-r3 new file mode 100644 index 000000000000..3032e3b43ebb --- /dev/null +++ b/xfce-base/xfce-utils/files/digest-xfce-utils-4.4.0-r3 @@ -0,0 +1,3 @@ +MD5 e90a98cf6de0610170c39a4eae36ad8f xfce-utils-4.4.0.tar.bz2 559900 +RMD160 4e7668bd6827cfd8ed60b6e2a3b60b70cc2f05a2 xfce-utils-4.4.0.tar.bz2 559900 +SHA256 37ab42beaeea0d846920ec805213fcf8987bd74ac1f78153493ae9af3d5b2441 xfce-utils-4.4.0.tar.bz2 559900 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 new file mode 100644 index 000000000000..665989b62505 --- /dev/null +++ b/xfce-base/xfce-utils/files/xfce-utils-4.4.0-xdg_data_dirs.patch @@ -0,0 +1,18 @@ +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 + 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"$DISPLAY" = x"" + then diff --git a/xfce-base/xfce-utils/xfce-utils-4.4.0-r3.ebuild b/xfce-base/xfce-utils/xfce-utils-4.4.0-r3.ebuild new file mode 100644 index 000000000000..06ef564e8fa3 --- /dev/null +++ b/xfce-base/xfce-utils/xfce-utils-4.4.0-r3.ebuild @@ -0,0 +1,41 @@ +# 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.0-r3.ebuild,v 1.1 2007/03/02 12:49:26 drac Exp $ + +inherit eutils xfce44 + +xfce44 + +DESCRIPTION="Collection of utils" +HOMEPAGE="http://www.xfce.org/projects/xfce-utils/" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +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