xfce-base/exo

Package-Manager: portage-2.2_rc39/cvs/Linux x86_64

6 files changed, 21 insertions, 28 deletions

diff --git a/xfce-extra/thunar-volman/thunar-volman-0.2.0.ebuild b/xfce-extra/thunar-volman/thunar-volman-0.2.0.ebuild
index 2da6fbfad07a..b24469b5693a 100644
--- a/xfce-extra/thunar-volman/thunar-volman-0.2.0.ebuild
+++ b/xfce-extra/thunar-volman/thunar-volman-0.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-volman/thunar-volman-0.2.0.ebuild,v 1.9 2008/12/21 12:40:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-volman/thunar-volman-0.2.0.ebuild,v 1.10 2009/08/23 17:56:55 ssuominen Exp $
 
 inherit eutils xfce44
 
@@ -15,23 +15,22 @@ IUSE="debug"
 
 RDEPEND="dev-libs/dbus-glib
 	sys-apps/hal
-	>=xfce-extra/exo-0.3.2
-	>=xfce-base/thunar-${THUNAR_MASTER_VERSION}"
+	>=xfce-base/exo-0.3.2
+	>=xfce-base/thunar-1"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 pkg_setup() {
-	if ! built_with_use xfce-extra/exo hal; then
+	if ! built_with_use xfce-base/exo hal; then
 		ewarn "Volume management requires xfce-extra/exo with hal support. Enable"
 		ewarn "hal USE flag and re-emerge xfce-extra/exo."
-		die "re-emerge xfce-extra/exo with USE hal"
+		die "re-emerge xfce-base/exo with USE hal"
 	fi
 }
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	# Fix make check.
 	echo thunar-volman-settings.desktop.in.in >> po/POTFILES.skip
 }
 
diff --git a/xfce-extra/thunar-volman/thunar-volman-0.3.80.ebuild b/xfce-extra/thunar-volman/thunar-volman-0.3.80.ebuild
index c8920f7b06af..d7b1d9e7cbe8 100644
--- a/xfce-extra/thunar-volman/thunar-volman-0.3.80.ebuild
+++ b/xfce-extra/thunar-volman/thunar-volman-0.3.80.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-volman/thunar-volman-0.3.80.ebuild,v 1.1 2009/03/10 14:15:39 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-volman/thunar-volman-0.3.80.ebuild,v 1.2 2009/08/23 17:56:55 ssuominen Exp $
 
 EAPI=2
 
@@ -16,7 +16,7 @@ IUSE="debug"
 
 RDEPEND="dev-libs/dbus-glib
 	sys-apps/hal
-	>=xfce-extra/exo-0.3.8[hal]
-	>=xfce-base/thunar-${THUNAR_VERSION}"
+	>=xfce-base/exo-0.3.8[hal]
+	>=xfce-base/thunar-1"
 
 DOCS="AUTHORS ChangeLog NEWS README THANKS"
diff --git a/xfce-extra/xfce4-verve/xfce4-verve-0.3.6.ebuild b/xfce-extra/xfce4-verve/xfce4-verve-0.3.6.ebuild
index d12837b412fe..9362db0c4ed7 100644
--- a/xfce-extra/xfce4-verve/xfce4-verve-0.3.6.ebuild
+++ b/xfce-extra/xfce4-verve/xfce4-verve-0.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-verve/xfce4-verve-0.3.6.ebuild,v 1.1 2009/02/09 19:52:46 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-verve/xfce4-verve-0.3.6.ebuild,v 1.2 2009/08/23 17:54:30 ssuominen Exp $
 
 inherit xfce44
 
@@ -11,7 +11,7 @@ DESCRIPTION="Command line panel plugin"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="dbus debug"
 
-RDEPEND=">=xfce-extra/exo-0.3.2
+RDEPEND=">=xfce-base/exo-0.3.2
 	dev-libs/libpcre
 	dbus? ( dev-libs/dbus-glib )"
 DEPEND="${RDEPEND}
diff --git a/xfce-extra/xfce4-volstatus-icon/metadata.xml b/xfce-extra/xfce4-volstatus-icon/metadata.xml
index 826e2ca93209..d56729e92f8e 100644
--- a/xfce-extra/xfce4-volstatus-icon/metadata.xml
+++ b/xfce-extra/xfce4-volstatus-icon/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>xfce</herd>
+  <herd>xfce</herd>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-volstatus-icon/xfce4-volstatus-icon-0.1.0-r1.ebuild b/xfce-extra/xfce4-volstatus-icon/xfce4-volstatus-icon-0.1.0-r1.ebuild
index 2dd7c2d26ee8..8cba8c330d45 100644
--- a/xfce-extra/xfce4-volstatus-icon/xfce4-volstatus-icon-0.1.0-r1.ebuild
+++ b/xfce-extra/xfce4-volstatus-icon/xfce4-volstatus-icon-0.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-volstatus-icon/xfce4-volstatus-icon-0.1.0-r1.ebuild,v 1.1 2009/08/01 01:38:14 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-volstatus-icon/xfce4-volstatus-icon-0.1.0-r1.ebuild,v 1.2 2009/08/23 17:54:10 ssuominen Exp $
 
 EAPI="2"
 
@@ -14,9 +14,9 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
 IUSE="debug"
 
 RDEPEND=">=x11-libs/gtk+-2.10
-	>=xfce-base/libxfce4util-${XFCE_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_VERSION}
-	>=xfce-extra/exo-0.3.2[hal]
+	>=xfce-base/libxfce4util-4.4
+	>=xfce-base/libxfcegui4-4.4
+	>=xfce-base/exo-0.3.2[hal]
 	>=sys-apps/hal-0.5.9
 	dev-libs/dbus-glib"
 DEPEND="${RDEPEND}
diff --git a/xfce-extra/xfce4-volstatus-icon/xfce4-volstatus-icon-0.1.0.ebuild b/xfce-extra/xfce4-volstatus-icon/xfce4-volstatus-icon-0.1.0.ebuild
index eb526f222c1b..22328cc4602e 100644
--- a/xfce-extra/xfce4-volstatus-icon/xfce4-volstatus-icon-0.1.0.ebuild
+++ b/xfce-extra/xfce4-volstatus-icon/xfce4-volstatus-icon-0.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-volstatus-icon/xfce4-volstatus-icon-0.1.0.ebuild,v 1.10 2008/03/26 02:06:41 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-volstatus-icon/xfce4-volstatus-icon-0.1.0.ebuild,v 1.11 2009/08/23 17:54:10 ssuominen Exp $
 
 inherit eutils xfce44
 
@@ -14,19 +14,13 @@ KEYWORDS="alpha amd64 ia64 ppc x86"
 IUSE="debug"
 
 RDEPEND=">=x11-libs/gtk+-2.10
-	>=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}
-	>=xfce-extra/exo-0.3.2
+	>=xfce-base/libxfce4util-4.4
+	>=xfce-base/libxfcegui4-4.4
+	>=xfce-base/exo-0.3.2
 	>=sys-apps/hal-0.5.9
 	dev-libs/dbus-glib"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-util/intltool"
 
-pkg_setup() {
-	if ! built_with_use xfce-extra/exo hal; then
-		die "Re-emerge xfce-extra/exo with USE hal."
-	fi
-}
-
 DOCS="AUTHORS ChangeLog NEWS README TODO"