Add missing gtk-doc, docbook-xml-dtd DEPEND. Keep dbus[X] from previous revisions that was forgotten in overlay.

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

4 files changed, 17 insertions, 121 deletions

diff --git a/media-video/cheese/ChangeLog b/media-video/cheese/ChangeLog
index 0e2ffd36507f..8222a415add0 100644
--- a/media-video/cheese/ChangeLog
+++ b/media-video/cheese/ChangeLog
@@ -1,6 +1,11 @@
 # 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.32 2010/09/11 18:58:57 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/ChangeLog,v 1.33 2010/09/13 20:18:53 eva Exp $
+
+  13 Sep 2010; Gilles Dartiguelongue <eva@gentoo.org> -cheese-2.24.3.ebuild,
+  -cheese-2.26.3.ebuild, cheese-2.30.1.ebuild:
+  Add missing gtk-doc, docbook-xml-dtd DEPEND. Keep dbus[X] from previous
+  revisions that was forgotten in overlay.
 
   11 Sep 2010; Joseph Jezak <josejx@gentoo.org> cheese-2.30.1.ebuild:
   Marked ppc for bug #324077.
diff --git a/media-video/cheese/cheese-2.24.3.ebuild b/media-video/cheese/cheese-2.24.3.ebuild
deleted file mode 100644
index 5d29f8d6958a..000000000000
--- a/media-video/cheese/cheese-2.24.3.ebuild
+++ /dev/null
@@ -1,53 +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.24.3.ebuild,v 1.7 2010/02/14 11:25:32 pacho Exp $
-
-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 ~ppc64 x86"
-IUSE="v4l"
-
-RDEPEND=">=dev-libs/dbus-glib-0.7
-	>=dev-libs/glib-2.16.0
-	>=gnome-base/gconf-2.16.0
-	>=gnome-base/gnome-vfs-2.18
-	>=gnome-base/libgnomeui-2.14.0
-	>=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
-	>=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
-	>=sys-apps/dbus-1
-	>=sys-apps/hal-0.5.9
-	>=x11-libs/cairo-1.4.0
-	>=x11-libs/gtk+-2.12
-	>=x11-libs/pango-1.18.0
-	v4l? ( >=media-plugins/gst-plugins-v4l-0.10 )
-	|| ( >=media-plugins/gst-plugins-x-0.10
-		>=media-plugins/gst-plugins-xvideo-0.10 )"
-
-DEPEND="${RDEPEND}
-	>=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"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-scrollkeeper --disable-hildon"
-}
diff --git a/media-video/cheese/cheese-2.26.3.ebuild b/media-video/cheese/cheese-2.26.3.ebuild
deleted file mode 100644
index cfb8c4e26de3..000000000000
--- a/media-video/cheese/cheese-2.26.3.ebuild
+++ /dev/null
@@ -1,61 +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.26.3.ebuild,v 1.4 2010/03/04 00:26:47 eva 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.14
-	>=x11-libs/cairo-1.4.0
-	>=x11-libs/pango-1.18.0
-	>=sys-apps/dbus-1[X]
-	>=sys-apps/hal-0.5.9
-	>=gnome-base/gconf-2.16.0
-	>=gnome-base/gnome-desktop-2.25.1
-	>=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"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-scrollkeeper --disable-hildon"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
-}
diff --git a/media-video/cheese/cheese-2.30.1.ebuild b/media-video/cheese/cheese-2.30.1.ebuild
index 13c4e2dba9ec..910dbf3d1edb 100644
--- a/media-video/cheese/cheese-2.30.1.ebuild
+++ b/media-video/cheese/cheese-2.30.1.ebuild
@@ -1,9 +1,9 @@
 # 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.30.1.ebuild,v 1.6 2010/09/11 18:58:57 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/cheese-2.30.1.ebuild,v 1.7 2010/09/13 20:18:53 eva Exp $
 
+EAPI="2"
 GCONF_DEBUG="no"
-EAPI=2
 
 inherit gnome2 eutils
 
@@ -13,14 +13,14 @@ HOMEPAGE="http://www.gnome.org/projects/cheese/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86"
-IUSE="v4l"
+IUSE="doc v4l"
 
 COMMON_DEPEND=">=dev-libs/dbus-glib-0.7
 	>=dev-libs/glib-2.16.0
 	>=x11-libs/gtk+-2.19.1
 	>=x11-libs/cairo-1.4.0
 	>=x11-libs/pango-1.18.0
-	>=sys-apps/dbus-1
+	>=sys-apps/dbus-1[X]
 	>=sys-fs/udev-145-r1[extras]
 	>=gnome-base/gconf-2.16.0
 	>=gnome-base/gnome-desktop-2.26
@@ -44,7 +44,12 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/pkgconfig
 	app-text/scrollkeeper
 	app-text/gnome-doc-utils
-	x11-proto/xf86vidmodeproto"
+	x11-proto/xf86vidmodeproto
+	app-text/docbook-xml-dtd:4.3
+	doc? ( >=dev-util/gtk-doc-1.11 )"
 
 DOCS="AUTHORS ChangeLog NEWS README"
-G2CONF="${G2CONF} --disable-scrollkeeper"
+
+pkg_setup() {
+	G2CONF="${G2CONF} --disable-scrollkeeper"
+}