Move checks inside pkg_setup and adjust dbus dep.

Package-Manager: portage-2.1.2-r7

4 files changed, 88 insertions, 5 deletions

diff --git a/xfce-base/thunar/ChangeLog b/xfce-base/thunar/ChangeLog
index 1e76219d6b0e..caf28e7f1177 100644
--- a/xfce-base/thunar/ChangeLog
+++ b/xfce-base/thunar/ChangeLog
@@ -1,6 +1,11 @@
 # 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.17 2007/02/03 02:34:13 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.18 2007/02/04 17:11:37 drac Exp $
+
+*thunar-0.8.0-r1 (04 Feb 2007)
+
+  04 Feb 2007; Samuli Suominen <drac@gentoo.org> +thunar-0.8.0-r1.ebuild:
+  Move checks to local scope and adjust dbus dep.
 
   03 Feb 2007; Joshua Nichols <nichoj@gentoo.org>
   -thunar-0.5.0_rc2-r3.ebuild:
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index 844f60e841f8..797cdd96d72c 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -1,12 +1,16 @@
 DIST Thunar-0.8.0.tar.bz2 6205993 RMD160 95d29cca64c102b7d8bdcc0592f6fcab7198148b SHA1 1adcba7b86d9219b0bd7eb8c16d5719aa8393d98 SHA256 460484f8397a0e0e4115d1629d2ae027b5052dc2c564d4a4629a3557e4a055f9
+EBUILD thunar-0.8.0-r1.ebuild 2010 RMD160 856e9453d5edc2152adb84a85d84319411be6258 SHA1 620ed173e3b8e1faeea933e97c9f34505fffbf98 SHA256 00515fa7e81157cf6b844ba7ddb1386662be60bc5fa0fdd288f6dd4e601a1733
+MD5 fe7b407871ea9691ad024f36d51b5f9f thunar-0.8.0-r1.ebuild 2010
+RMD160 856e9453d5edc2152adb84a85d84319411be6258 thunar-0.8.0-r1.ebuild 2010
+SHA256 00515fa7e81157cf6b844ba7ddb1386662be60bc5fa0fdd288f6dd4e601a1733 thunar-0.8.0-r1.ebuild 2010
 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 3029 RMD160 47d3253d42f10b34f3433f97d0dd940035d1d00b SHA1 7efa3e6911b1d615e98d16fcd357806b572235fb SHA256 8cecfcdeb179c54d4e6d144494cf1e63e529b5ed2ed95969969fa352eabcc89a
-MD5 46ba09f9f21686282ea12ab2ce20ae09 ChangeLog 3029
-RMD160 47d3253d42f10b34f3433f97d0dd940035d1d00b ChangeLog 3029
-SHA256 8cecfcdeb179c54d4e6d144494cf1e63e529b5ed2ed95969969fa352eabcc89a ChangeLog 3029
+MISC ChangeLog 3184 RMD160 86517904c6747f7d2881c18442e4fe4c55eab96f SHA1 17ae980113d7cb55fb37b05f5b49675cbaeed6e1 SHA256 41d07eff2427f807209adcc9a27535ea08835f572ae4d2cfa0dec87ee2ad6b77
+MD5 335ba821fc1d6c7d32b6b37b203453c9 ChangeLog 3184
+RMD160 86517904c6747f7d2881c18442e4fe4c55eab96f ChangeLog 3184
+SHA256 41d07eff2427f807209adcc9a27535ea08835f572ae4d2cfa0dec87ee2ad6b77 ChangeLog 3184
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157
@@ -14,3 +18,6 @@ SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61 metadata
 MD5 74e9028d343ebeba2b70ba51d274d7a5 files/digest-thunar-0.8.0 244
 RMD160 bd56683dc3e760f2695e8074cc355370154722d7 files/digest-thunar-0.8.0 244
 SHA256 002305cb4a3dcc120b84a79088f3fb013fcd2cf5262fa6e5c1fb80a40d1583f2 files/digest-thunar-0.8.0 244
+MD5 74e9028d343ebeba2b70ba51d274d7a5 files/digest-thunar-0.8.0-r1 244
+RMD160 bd56683dc3e760f2695e8074cc355370154722d7 files/digest-thunar-0.8.0-r1 244
+SHA256 002305cb4a3dcc120b84a79088f3fb013fcd2cf5262fa6e5c1fb80a40d1583f2 files/digest-thunar-0.8.0-r1 244
diff --git a/xfce-base/thunar/files/digest-thunar-0.8.0-r1 b/xfce-base/thunar/files/digest-thunar-0.8.0-r1
new file mode 100644
index 000000000000..36154971d4f9
--- /dev/null
+++ b/xfce-base/thunar/files/digest-thunar-0.8.0-r1
@@ -0,0 +1,3 @@
+MD5 9f7b0945d6a235391049f6818fb4d188 Thunar-0.8.0.tar.bz2 6205993
+RMD160 95d29cca64c102b7d8bdcc0592f6fcab7198148b Thunar-0.8.0.tar.bz2 6205993
+SHA256 460484f8397a0e0e4115d1629d2ae027b5052dc2c564d4a4629a3557e4a055f9 Thunar-0.8.0.tar.bz2 6205993
diff --git a/xfce-base/thunar/thunar-0.8.0-r1.ebuild b/xfce-base/thunar/thunar-0.8.0-r1.ebuild
new file mode 100644
index 000000000000..74113da04e7a
--- /dev/null
+++ b/xfce-base/thunar/thunar-0.8.0-r1.ebuild
@@ -0,0 +1,68 @@
+# 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-r1.ebuild,v 1.1 2007/02/04 17:11:37 drac Exp $
+
+inherit eutils xfce44
+
+MY_P="${P/t/T}"
+S="${WORKDIR}/${MY_P}"
+
+xfce44
+
+DESCRIPTION="File manager"
+HOMEPAGE="http://thunar.xfce.org"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc dbus debug exif gnome hal plugins pcre startup-notification"
+
+RDEPEND=">=dev-lang/perl-5.6
+	x11-libs/libSM
+	>=x11-libs/gtk+-2.6
+	>=dev-libs/glib-2.6
+	>=xfce-extra/exo-0.3.2
+	>=x11-misc/shared-mime-info-0.15
+	>=dev-util/desktop-file-utils-0.10
+	>=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
+	virtual/fam
+	dbus? ( || ( dev-libs/dbus-glib <sys-apps/dbus-1 ) )
+	hal? ( sys-apps/hal )
+	>=media-libs/freetype-2
+	gnome? ( gnome-base/gconf )
+	exif? ( >=media-libs/libexif-0.6 )
+	>=media-libs/jpeg-6b
+	startup-notification? ( x11-libs/startup-notification )
+	pcre? ( >=dev-libs/libpcre-6 )
+	plugins? ( dbus? ( >=xfce-base/xfce4-panel-${XFCE_MASTER_VERSION} ) )
+	gnome-base/librsvg"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool
+	doc? ( dev-util/gtk-doc )"
+
+XFCE_CONFIG="${XFCE_CONFIG} $(use_enable exif) $(use_enable gnome gnome-thumbnailers) \
+	$(use_enable dbus) $(use_enable pcre)"
+
+pkg_setup() {
+	if use hal; then
+		XFCE_CONFIG="${XFCE_CONFIG} --with-volume-manager=hal"
+	else
+		XFCE_CONFIG="${XFCE_CONFIG} --with-volume-manager=none"
+	fi
+
+	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
+
+	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"
+
+xfce44_extra_package