Overhaul

9 files changed, 36 insertions, 65 deletions

diff --git a/xfce-extra/thunar-vfs/Manifest b/xfce-extra/thunar-vfs/Manifest
index a840a6f..9b933e4 100644
--- a/xfce-extra/thunar-vfs/Manifest
+++ b/xfce-extra/thunar-vfs/Manifest
@@ -1,2 +1,2 @@
-EBUILD thunar-vfs-9999.ebuild 1370 RMD160 0749b67541786116e69ff157f8ed506c9a7abdd1 SHA1 f5943b0e25eceaa647af34483e53f8e0d2af9925 SHA256 4b90ae2bcc26d97c2ff225acb9b6c6f637474c4f58aa11047f450a099ce672e6
+EBUILD thunar-vfs-9999.ebuild 1387 RMD160 b36be3f9c5b9d05ec07530b6bae360ffdb1e8a42 SHA1 0e572ab91e07db363faeaeab3b585e2d90c63c15 SHA256 40da80cf62945e1477e62d83f33a72571f35eab5a45da1349d4774c16c255ff3
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-extra/thunar-vfs/thunar-vfs-9999.ebuild b/xfce-extra/thunar-vfs/thunar-vfs-9999.ebuild
index bee766a..de330a4 100644
--- a/xfce-extra/thunar-vfs/thunar-vfs-9999.ebuild
+++ b/xfce-extra/thunar-vfs/thunar-vfs-9999.ebuild
@@ -38,12 +38,12 @@ WANT_GTKDOCIZE="yes"
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
 
-	XFCE_CONFIG="--enable-maintainer-mode
+	XFCE_CONFIG+=" --disable-dependency-tracking
 		$(use_enable dbus)
 		$(use_enable gnome gnome-thumbnailers)
 		$(use_enable doc xsltproc)
 		$(use_enable debug)
-		--with-html-dir=/usr/share/doc/${PF}/html"
+		--with-html-dir=${EPREFIX}/usr/share/doc/${PF}/html"
 
 	if use hal; then
 		XFCE_CONFIG+=" --enable-dbus --with-volume-manager=hal"
diff --git a/xfce-extra/tumbler/Manifest b/xfce-extra/tumbler/Manifest
deleted file mode 100644
index 2d97e6f..0000000
--- a/xfce-extra/tumbler/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD tumbler-9999.ebuild 451 RMD160 14eb6896654dcfc158f2bbfd8dbe8085d3f8634a SHA1 0255713876bf68b317e72ca2e13e23b5cb09aea5 SHA256 31554b518a852a3172fdbc6e15d16875cc62f9383823dee0ffe2a35f53512377
-MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-extra/tumbler/metadata.xml b/xfce-extra/tumbler/metadata.xml
deleted file mode 100644
index 826e2ca..0000000
--- a/xfce-extra/tumbler/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>xfce</herd>
-</pkgmetadata>
diff --git a/xfce-extra/tumbler/tumbler-9999.ebuild b/xfce-extra/tumbler/tumbler-9999.ebuild
deleted file mode 100644
index c60e9b5..0000000
--- a/xfce-extra/tumbler/tumbler-9999.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=1
-
-inherit xfce4
-
-xfce4_apps
-
-DESCRIPTION="Application finder"
-HOMEPAGE="http://git.xfce.org/apps/tumbler/tree/"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/glib-2.16:2
-	dev-libs/dbus-glib"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc
-	dev-util/intltool"
-
-WANT_GTKDOCIZE="yes"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
diff --git a/xfce-extra/xfce4-appfinder/Manifest b/xfce-extra/xfce4-appfinder/Manifest
index 4e760e2..2e678ef 100644
--- a/xfce-extra/xfce4-appfinder/Manifest
+++ b/xfce-extra/xfce4-appfinder/Manifest
@@ -1,2 +1,2 @@
-EBUILD xfce4-appfinder-9999.ebuild 693 RMD160 b1c59298972eb42d0ea0a4f9728aca1d7f999b11 SHA1 b3e5f7807473b3eaf6e74f366bdb83981cbc71f3 SHA256 c0e4c26f658f27ae574b2c3adb8eac93db9adaada65e908239c27e72a97b0477
+EBUILD xfce4-appfinder-9999.ebuild 761 RMD160 e25ddfe0d1c3cdb0087ce6a40845bbaed3be11d6 SHA1 96f58562e0f5670dd9ef13e97c717ffbd0ed6727 SHA256 00677019d4c86d3ae4948313c0e954883317b6059fbf43fec2a7c359b68fbd2b
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-extra/xfce4-appfinder/xfce4-appfinder-9999.ebuild b/xfce-extra/xfce4-appfinder/xfce4-appfinder-9999.ebuild
index 8b64561..17e17d0 100644
--- a/xfce-extra/xfce4-appfinder/xfce4-appfinder-9999.ebuild
+++ b/xfce-extra/xfce4-appfinder/xfce4-appfinder-9999.ebuild
@@ -1,30 +1,29 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=1
-
+EAPI=2
 inherit xfce4
 
 xfce4_core
 
 DESCRIPTION="Application finder"
 HOMEPAGE="http://www.xfce.org/projects/xfce4-appfinder"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug"
 
-RDEPEND=">=dev-libs/glib-2.6:2
-	>=x11-libs/gtk+-2.6:2
-	xfce-base/garcon
-	>=xfce-base/libxfce4util-${XFCE_VERSION}
-	>=xfce-base/libxfce4ui-${XFCE_VERSION}
-	>=xfce-base/thunar-${XFCE_VERSION}"
+RDEPEND=">=dev-libs/glib-2.12:2
+	>=x11-libs/gtk+-2.10:2
+	>=xfce-base/libxfce4menu-4.6
+	>=xfce-base/libxfce4util-4.6
+	>=xfce-base/libxfcegui4-4.6
+	>=xfce-base/xfconf-4.6
+	|| ( <xfce-base/thunar-1.1.0 xfce-extra/thunar-vfs )"
 DEPEND="${RDEPEND}
 	dev-util/intltool"
 
-src_unpack() {
-	xfce4_src_unpack
-	echo "src/appfinder.c" >> "${S}"/po/POTFILES.in
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+	XFCONF="--disable-dependency-tracking"
 }
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
diff --git a/xfce-extra/xfce4-mixer/Manifest b/xfce-extra/xfce4-mixer/Manifest
index 1c5f45f..00de2d4 100644
--- a/xfce-extra/xfce4-mixer/Manifest
+++ b/xfce-extra/xfce4-mixer/Manifest
@@ -1,2 +1,2 @@
-EBUILD xfce4-mixer-9999.ebuild 799 RMD160 1347d2446af782da1efaab85cc001b2dd5a56dfe SHA1 79384c562c14c13dd6447685a24fcd675c34b88b SHA256 c50751110fc453a6dd8de17720413cbdaf4127c1c13f5207021add69f059238b
+EBUILD xfce4-mixer-9999.ebuild 874 RMD160 ed224692b5f1a913a077157895f95b559658e900 SHA1 c9049bca0a208843893ebca5f924e25980589497 SHA256 8e651e630bed9db4d89ffb4af071b6f7691fffb77415009853c535a4ceb18894
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-extra/xfce4-mixer/xfce4-mixer-9999.ebuild b/xfce-extra/xfce4-mixer/xfce4-mixer-9999.ebuild
index f2efe57..4a3d64d 100644
--- a/xfce-extra/xfce4-mixer/xfce4-mixer-9999.ebuild
+++ b/xfce-extra/xfce4-mixer/xfce4-mixer-9999.ebuild
@@ -1,29 +1,32 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=1
-
+EAPI=2
 inherit xfce4
 
 xfce4_apps
 
 DESCRIPTION="Volume control application using gstreamer"
 HOMEPAGE="http://www.xfce.org/projects/xfce4-mixer"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 IUSE="alsa debug oss"
 
-RDEPEND=">=dev-libs/glib-2.12:2
-	>=media-libs/gst-plugins-base-0.10.2
+COMMON_DEPEND=">=dev-libs/glib-2.12:2
+	>=media-libs/gst-plugins-base-0.10.14
 	>=x11-libs/gtk+-2.10:2
-	>=xfce-base/libxfce4util-${XFCE_VERSION}
-	>=xfce-base/libxfcegui4-${XFCE_VERSION}
-	>=xfce-base/xfce4-panel-${XFCE_VERSION}
-	>=xfce-base/xfconf-${XFCE_VERSION}
-	alsa? ( media-plugins/gst-plugins-alsa )
-	oss? ( media-plugins/gst-plugins-oss )"
-DEPEND="${RDEPEND}
+	>=xfce-base/libxfce4util-4.6
+	>=xfce-base/libxfcegui4-4.6
+	>=xfce-base/xfce4-panel-4.6
+	>=xfce-base/xfconf-4.6"
+RDEPEND="${COMMON_DEPEND}
+	alsa? ( >=media-plugins/gst-plugins-alsa-0.10 )
+	oss? ( >=media-plugins/gst-plugins-oss-0.10 )"
+DEPEND="${COMMON_DEPEND}
 	dev-util/intltool"
 
-DOCS="AUTHORS ChangeLog HACKING NEWS README THANKS TODO"
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+	XFCONF="--disable-dependency-tracking"
+}