From: Peter Weller <welp@gentoo.org>
Date: Wed, 31 Jan 2007 14:40:53 +0000 (+0000)
Subject: Cleanup
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5e7c94d99cc9d2b2c5c85eacf80e0805d6d282ec;p=gentoo.git

Cleanup
Package-Manager: portage-2.1.2-r5
---

diff --git a/xfce-base/thunar/ChangeLog b/xfce-base/thunar/ChangeLog
index 99a7b58c7d03..4bc37c5f0306 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.15 2007/01/29 18:44:53 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.16 2007/01/31 14:40:53 welp Exp $
+
+  31 Jan 2007; Peter Weller <welp@gentoo.org> thunar-0.8.0.ebuild:
+  Cleanup
 
   29 Jan 2007; Peter Weller <welp@gentoo.org> thunar-0.8.0.ebuild:
   A number of fixes
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index 69d0d6847f9b..50d5b36ddaf4 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -4,14 +4,14 @@ EBUILD thunar-0.5.0_rc2-r3.ebuild 2319 RMD160 8fd47adba65bd7fa92db6a77a43631d8c4
 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
+EBUILD thunar-0.8.0.ebuild 1953 RMD160 20473960299dffceb94b467f2092108c174f2808 SHA1 aab77894530ba3c69cbbce9378906cbd2cd06dcf SHA256 d999a479bc13ba2bac0f10cb24cc2129c937c4e12fe0e8c11f9ebd1895e58607
+MD5 66806a8c19ee739f302a924e3e75de96 thunar-0.8.0.ebuild 1953
+RMD160 20473960299dffceb94b467f2092108c174f2808 thunar-0.8.0.ebuild 1953
+SHA256 d999a479bc13ba2bac0f10cb24cc2129c937c4e12fe0e8c11f9ebd1895e58607 thunar-0.8.0.ebuild 1953
+MISC ChangeLog 2921 RMD160 bff5d1653873abdc7ae88ee32f6b3815334a1c7b SHA1 980e882e3344502148a1f34f5357127750f622f9 SHA256 5df1726a22f3b6ab0aca4bdb50467e7f53df082d6fc6272f8355388d004e1b16
+MD5 c2c092fb2da980d5d576f820ad26b1cc ChangeLog 2921
+RMD160 bff5d1653873abdc7ae88ee32f6b3815334a1c7b ChangeLog 2921
+SHA256 5df1726a22f3b6ab0aca4bdb50467e7f53df082d6fc6272f8355388d004e1b16 ChangeLog 2921
 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.8.0.ebuild b/xfce-base/thunar/thunar-0.8.0.ebuild
index 6dd77e339ef2..ac3dd7e118e0 100644
--- a/xfce-base/thunar/thunar-0.8.0.ebuild
+++ b/xfce-base/thunar/thunar-0.8.0.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.8.0.ebuild,v 1.4 2007/01/29 18:44:53 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-0.8.0.ebuild,v 1.5 2007/01/31 14:40:53 welp Exp $
 
 inherit eutils xfce44
 
@@ -41,27 +41,24 @@ DEPEND="${RDEPEND}
 XFCE_CONFIG="${XFCE_CONFIG} $(use_enable exif) $(use_enable gnome gnome-thumbnailers) \
 	$(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
+if use plugins && ! use dbus ; then
+	XFCE_CONFIG="${XFCE_CONFIG} --disable-tpa-plugin"
 	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
+fi
 
-	if use hal && ! use dbus ; then
+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
-}
+fi
 
 DOCS="AUTHORS ChangeLog HACKING FAQ THANKS TODO README NEWS"