Needs USE=X on dbus, bug #307665.

(Portage version: 2.2_rc63/cvs/Linux x86_64)

4 files changed, 9 insertions, 55 deletions

diff --git a/media-video/cheese/ChangeLog b/media-video/cheese/ChangeLog
index d1fc0542dad2..8cf9959d10e9 100644
--- a/media-video/cheese/ChangeLog
+++ b/media-video/cheese/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/cheese
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/ChangeLog,v 1.20 2010/02/14 11:25:32 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/ChangeLog,v 1.21 2010/03/04 00:26:47 eva Exp $
+
+  04 Mar 2010; Gilles Dartiguelongue <eva@gentoo.org> cheese-2.26.3.ebuild,
+  -cheese-2.28.1.ebuild, cheese-2.28.1-r1.ebuild:
+  Needs USE=X on dbus, bug #307665.
 
   14 Feb 2010; Pacho Ramos <pacho@gentoo.org> cheese-2.24.3.ebuild,
   cheese-2.26.3.ebuild, cheese-2.28.1.ebuild, cheese-2.28.1-r1.ebuild:
diff --git a/media-video/cheese/cheese-2.26.3.ebuild b/media-video/cheese/cheese-2.26.3.ebuild
index e4ef024b9093..cfb8c4e26de3 100644
--- a/media-video/cheese/cheese-2.26.3.ebuild
+++ b/media-video/cheese/cheese-2.26.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/cheese-2.26.3.ebuild,v 1.3 2010/02/14 11:25:32 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/cheese-2.26.3.ebuild,v 1.4 2010/03/04 00:26:47 eva Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -20,7 +20,7 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.7
 	>=x11-libs/gtk+-2.14
 	>=x11-libs/cairo-1.4.0
 	>=x11-libs/pango-1.18.0
-	>=sys-apps/dbus-1
+	>=sys-apps/dbus-1[X]
 	>=sys-apps/hal-0.5.9
 	>=gnome-base/gconf-2.16.0
 	>=gnome-base/gnome-desktop-2.25.1
diff --git a/media-video/cheese/cheese-2.28.1-r1.ebuild b/media-video/cheese/cheese-2.28.1-r1.ebuild
index 3f89df7f54b6..ce1922fcb931 100644
--- a/media-video/cheese/cheese-2.28.1-r1.ebuild
+++ b/media-video/cheese/cheese-2.28.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/cheese-2.28.1-r1.ebuild,v 1.2 2010/02/14 11:25:32 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/cheese-2.28.1-r1.ebuild,v 1.3 2010/03/04 00:26:47 eva Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -20,7 +20,7 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.7
 	>=x11-libs/gtk+-2.18
 	>=x11-libs/cairo-1.4.0
 	>=x11-libs/pango-1.18.0
-	>=sys-apps/dbus-1
+	>=sys-apps/dbus-1[X]
 	>=sys-apps/hal-0.5.9
 	>=gnome-base/gconf-2.16.0
 	>=gnome-base/gnome-desktop-2.26
diff --git a/media-video/cheese/cheese-2.28.1.ebuild b/media-video/cheese/cheese-2.28.1.ebuild
deleted file mode 100644
index 691ea03b3a7d..000000000000
--- a/media-video/cheese/cheese-2.28.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/cheese-2.28.1.ebuild,v 1.2 2010/02/14 11:25:32 pacho Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit gnome2 eutils
-
-DESCRIPTION="A cheesy program to take pictures and videos from your webcam"
-HOMEPAGE="http://www.gnome.org/projects/cheese/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="v4l"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.7
-	>=dev-libs/glib-2.16.0
-	>=x11-libs/gtk+-2.18
-	>=x11-libs/cairo-1.4.0
-	>=x11-libs/pango-1.18.0
-	>=sys-apps/dbus-1
-	>=sys-apps/hal-0.5.9
-	>=gnome-base/gconf-2.16.0
-	>=gnome-base/gnome-desktop-2.26
-	>=gnome-base/librsvg-2.18.0
-	>=gnome-extra/evolution-data-server-1.12
-
-	>=media-libs/gstreamer-0.10.16
-	>=media-libs/gst-plugins-base-0.10.16"
-RDEPEND="${COMMON_DEPEND}
-	>=media-plugins/gst-plugins-gconf-0.10
-	>=media-plugins/gst-plugins-ogg-0.10.16
-	>=media-plugins/gst-plugins-pango-0.10.16
-	>=media-plugins/gst-plugins-theora-0.10.16
-	>=media-plugins/gst-plugins-v4l2-0.10
-	>=media-plugins/gst-plugins-vorbis-0.10.16
-	v4l? ( >=media-plugins/gst-plugins-v4l-0.10 )
-	|| ( >=media-plugins/gst-plugins-x-0.10
-		>=media-plugins/gst-plugins-xvideo-0.10 )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40
-	dev-util/pkgconfig
-	app-text/scrollkeeper
-	app-text/gnome-doc-utils
-	x11-proto/xf86vidmodeproto
-	app-text/docbook-xml-dtd:4.3"
-
-DOCS="AUTHORS ChangeLog NEWS README"