From c39cb002dfbc0fe7f3bf4f9146a6e580b0f74c7e Mon Sep 17 00:00:00 2001 From: Peter Weller Date: Mon, 29 Jan 2007 18:44:53 +0000 Subject: [PATCH] A number of fixes Package-Manager: portage-2.1.2-r5 --- xfce-base/thunar/ChangeLog | 5 ++++- xfce-base/thunar/Manifest | 24 ++++++++++----------- xfce-base/thunar/thunar-0.5.0_rc2-r3.ebuild | 8 +++---- xfce-base/thunar/thunar-0.8.0.ebuild | 18 +++++++++++++--- 4 files changed, 35 insertions(+), 20 deletions(-) diff --git a/xfce-base/thunar/ChangeLog b/xfce-base/thunar/ChangeLog index d1f49417475f..99a7b58c7d03 100644 --- a/xfce-base/thunar/ChangeLog +++ b/xfce-base/thunar/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for xfce-base/thunar # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.14 2007/01/28 14:37:31 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.15 2007/01/29 18:44:53 welp Exp $ + + 29 Jan 2007; Peter Weller thunar-0.8.0.ebuild: + A number of fixes 28 Jan 2007; Peter Weller thunar-0.8.0.ebuild: Dep fixes, various other fixes diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest index 96b5058ff49e..69d0d6847f9b 100644 --- a/xfce-base/thunar/Manifest +++ b/xfce-base/thunar/Manifest @@ -1,17 +1,17 @@ DIST Thunar-0.5.0rc2.tar.bz2 1832838 RMD160 243d353cc64912cc30df1d44f2470baed9713284 SHA1 1770c8ac7bad83c2c052745e0f3ace2585885d69 SHA256 019b937e1cdbc3d554eea4230e10351355316dc4a3ffb65eaf0a927351e780cd DIST Thunar-0.8.0.tar.bz2 6205993 RMD160 95d29cca64c102b7d8bdcc0592f6fcab7198148b SHA1 1adcba7b86d9219b0bd7eb8c16d5719aa8393d98 SHA256 460484f8397a0e0e4115d1629d2ae027b5052dc2c564d4a4629a3557e4a055f9 -EBUILD thunar-0.5.0_rc2-r3.ebuild 2354 RMD160 6f1d15ed3ebbb6554407420bb403d02180a89c7e SHA1 5d0b5168c9bfccf905bce5a99c42bdc832ed87bf SHA256 6203c72919f4cbad4a03fded22378c8ff4f039ec3f1815b13168f564d6a83da6 -MD5 462557fc6bac6f0937d5f47ff29a6534 thunar-0.5.0_rc2-r3.ebuild 2354 -RMD160 6f1d15ed3ebbb6554407420bb403d02180a89c7e thunar-0.5.0_rc2-r3.ebuild 2354 -SHA256 6203c72919f4cbad4a03fded22378c8ff4f039ec3f1815b13168f564d6a83da6 thunar-0.5.0_rc2-r3.ebuild 2354 -EBUILD thunar-0.8.0.ebuild 1690 RMD160 f8f29b9ed9b0aca00db6f5153791ac427f531610 SHA1 26be75fea8fd806361a6fcae09ecf8d32a437e91 SHA256 d2ed26e5982c4f1d5503e64b9dbb7d1fe598a4f13ae90456e5ebac0ed9ac32fe -MD5 c6cba839774d0a162ef0098ad4879019 thunar-0.8.0.ebuild 1690 -RMD160 f8f29b9ed9b0aca00db6f5153791ac427f531610 thunar-0.8.0.ebuild 1690 -SHA256 d2ed26e5982c4f1d5503e64b9dbb7d1fe598a4f13ae90456e5ebac0ed9ac32fe thunar-0.8.0.ebuild 1690 -MISC ChangeLog 2755 RMD160 8b439f85372c61a4dcaafc38ba0758f127c5b173 SHA1 57bba766712b84e799e2e498be12966096e5f115 SHA256 d269173b0a971c46ff1a50aca97af99cac9eba650050be7e2f978e41869ce07b -MD5 3728e6ebfe8d69c4245bcfbd38e35ac6 ChangeLog 2755 -RMD160 8b439f85372c61a4dcaafc38ba0758f127c5b173 ChangeLog 2755 -SHA256 d269173b0a971c46ff1a50aca97af99cac9eba650050be7e2f978e41869ce07b ChangeLog 2755 +EBUILD thunar-0.5.0_rc2-r3.ebuild 2319 RMD160 8fd47adba65bd7fa92db6a77a43631d8c41f2cde SHA1 6f140ea07932263499b8d957553a02fd5414ec85 SHA256 912abb671032821d6ed599ce63be0fec1a04ab8fdc942ab2deed845822d4a9a3 +MD5 732a7dd0bea30b5d5147eb83c3116b4b thunar-0.5.0_rc2-r3.ebuild 2319 +RMD160 8fd47adba65bd7fa92db6a77a43631d8c41f2cde thunar-0.5.0_rc2-r3.ebuild 2319 +SHA256 912abb671032821d6ed599ce63be0fec1a04ab8fdc942ab2deed845822d4a9a3 thunar-0.5.0_rc2-r3.ebuild 2319 +EBUILD thunar-0.8.0.ebuild 2000 RMD160 9547f7711a0850c80e60ba48da3660d5c7cb5abd SHA1 751870c791ac38615ac0a29363dd33957e187c78 SHA256 c75ad74a9c9393d6bccb5f07bc1962059416e54f3af588d52137389f78f6e116 +MD5 cee0b78a3cad8f66d8ba0beca45f6bee thunar-0.8.0.ebuild 2000 +RMD160 9547f7711a0850c80e60ba48da3660d5c7cb5abd thunar-0.8.0.ebuild 2000 +SHA256 c75ad74a9c9393d6bccb5f07bc1962059416e54f3af588d52137389f78f6e116 thunar-0.8.0.ebuild 2000 +MISC ChangeLog 2843 RMD160 5469d75c3e94770116c32e6b34aa537be5b550b2 SHA1 4c34ed4993a35817ee7e3c4a02f0be8c51ae0aa9 SHA256 41b150e7706bbd44ff9e15564fce974aca6b12a1f9677890ea1a66eda356a12b +MD5 a81c628dc934acfe3592a486b5af70c5 ChangeLog 2843 +RMD160 5469d75c3e94770116c32e6b34aa537be5b550b2 ChangeLog 2843 +SHA256 41b150e7706bbd44ff9e15564fce974aca6b12a1f9677890ea1a66eda356a12b ChangeLog 2843 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/thunar/thunar-0.5.0_rc2-r3.ebuild b/xfce-base/thunar/thunar-0.5.0_rc2-r3.ebuild index 74b7b0f636bc..5b44d9de8466 100644 --- a/xfce-base/thunar/thunar-0.5.0_rc2-r3.ebuild +++ b/xfce-base/thunar/thunar-0.5.0_rc2-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-0.5.0_rc2-r3.ebuild,v 1.2 2007/01/06 19:10:50 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-0.5.0_rc2-r3.ebuild,v 1.3 2007/01/29 18:44:53 welp Exp $ inherit xfce44 versionator @@ -18,7 +18,7 @@ DESCRIPTION="Xfce 4 file manager" HOMEPAGE="http://thunar.xfce.org" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="doc dbus debug exif hal pcre startup-notification thumbnail trash-panel-plugin" +IUSE="doc dbus debug exif hal pcre startup-notification thumbnail plugins" # The order of RDEPEND is based on the list in README, by: # required packages @@ -50,7 +50,7 @@ RDEPEND=" >=media-libs/jpeg-6b startup-notification? ( >=x11-libs/startup-notification-0.4 ) pcre? ( >=dev-libs/libpcre-6.0 ) - trash-panel-plugin? ( >=xfce-base/xfce4-panel-${XFCE_MASTER_VERSION} ) + plugins? ( >=xfce-base/xfce4-panel-${XFCE_MASTER_VERSION} ) " DEPEND="${RDEPEND} @@ -68,7 +68,7 @@ XFCE_CONFIG=" $(use_enable pcre) \ $(use_enable startup-notification) \ $(use_enable thumbnail gnome-thumbnailers) \ - $(use_enable trash-panel-plugin tpa-plugin) + $(use_enable plugins tpa-plugin) " if use hal; then diff --git a/xfce-base/thunar/thunar-0.8.0.ebuild b/xfce-base/thunar/thunar-0.8.0.ebuild index 4e2c040e89e9..6dd77e339ef2 100644 --- a/xfce-base/thunar/thunar-0.8.0.ebuild +++ b/xfce-base/thunar/thunar-0.8.0.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-0.8.0.ebuild,v 1.3 2007/01/28 14:37:31 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-0.8.0.ebuild,v 1.4 2007/01/29 18:44:53 welp Exp $ -inherit xfce44 +inherit eutils xfce44 MY_P="${P/t/T}" S="${WORKDIR}/${MY_P}" @@ -39,16 +39,28 @@ DEPEND="${RDEPEND} doc? ( dev-util/gtk-doc )" XFCE_CONFIG="${XFCE_CONFIG} $(use_enable exif) $(use_enable gnome gnome-thumbnailers) \ - $(use_enable dbus) $(use_with hal volume-manager hal) $(use_enable pcre)" + $(use_enable dbus) $(use_enable pcre)" use plugins && use dbus || XFCE_CONFIG="${XFCE_CONFIG} --disable-tpa-plugin" +if use hal; then + XFCE_CONFIG="${XFCE_CONFIG} --with-volume-manager=hal" + else + XFCE_CONFIG="${XFCE_CONFIG} --with-volume-manager=none" +fi + pkg_setup() { if use plugins && ! use dbus ; then ewarn "Plugins requires ${PN} with dbus support. Enable dbus use flag" ewarn "and re-emerge this ebuild if you want this feature." epause 3 fi + + if use hal && ! use dbus ; then + ewarn "HAL requires ${PN} with dbus support. Enable dbus use flag" + ewarn "and re-emerge this ebuild if you want this feature." + die "re-emerge with USE dbus" + fi } DOCS="AUTHORS ChangeLog HACKING FAQ THANKS TODO README NEWS" -- 2.26.2