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

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

5 files changed, 22 insertions, 130 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/Manifest b/media-video/cheese/Manifest
index 61acbc498df6..1ca6be920dbb 100644
--- a/media-video/cheese/Manifest
+++ b/media-video/cheese/Manifest
@@ -1,20 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST cheese-2.24.3.tar.bz2 3056191 RMD160 f1df3afb10d3bf37285b8b3c9508f1bdf0810425 SHA1 171443a32fd65d038197f6026c81bf960f299b79 SHA256 b8f2823a534d8f0f3b4178c55bff84b6244b7b2d45cfc4dace58651579d948f7
-DIST cheese-2.26.3.tar.bz2 3213208 RMD160 030b1de35beb964fccb13ff5f44764ad2931d225 SHA1 808cc424b0f19ab8d94373cc03eea18589a23d37 SHA256 4abcc6c34530b19a477e9431a120b0b2a296f4f4cbc20d5cb9e5ddad50347003
 DIST cheese-2.28.1.tar.bz2 4852259 RMD160 1dc697770c3af8bc567c5c21affc9e69874a2f0b SHA1 80d869706a1856a5d90c5babac0a768e07bd14ae SHA256 a1a2bb43c161829cbd1f87753abf26ed6d5fb79cd1ab9723dd65865d33950df4
 DIST cheese-2.30.1.tar.bz2 5266128 RMD160 897d1cb16c2dc14f475f4615ba95626d8af65a7e SHA1 4247c52ef130aec4eb49410a3519daffe985e552 SHA256 48f03470c6f527caa0e3b269d3afcff86ae0939a74f66ce030d4eed3bc3cbd9a
-EBUILD cheese-2.24.3.ebuild 1527 RMD160 22b41fe7bdc7a67c5385dee636aa88b5e4e60b72 SHA1 05eb86e02e7a6e1d73a4e21d8355f5898ce25a00 SHA256 22dbe583c724e708f1f7e7bef7bfd94e781733e1e8e894af5c14f064f2c823e8
-EBUILD cheese-2.26.3.ebuild 1721 RMD160 59f2e7cbcd40569cc1bc664f71a1b99d7eb13ce2 SHA1 a8e9b6164546f62e1f885c27ab4f420720e7d606 SHA256 b7e22e6790d70dfa36e7e6fc1e75375b141e23a24961733653e1f44999b3dfaf
 EBUILD cheese-2.28.1-r1.ebuild 1538 RMD160 195cb674759b98fd7642254ec1b9e30011c3bf88 SHA1 48e1bda3313729fc353b20dec36d8cf0c0ad1e6e SHA256 efd7288a2e26697a2bc39686a628e6765c928dc4334e11f0617a174d4743b27a
-EBUILD cheese-2.30.1.ebuild 1508 RMD160 57a281cda1591af831fa44331e527d33dd0bab02 SHA1 4890483e2d2cc1fa5df334aa06d5816e366ed93c SHA256 07592151367deb7aad886e19c67030d510e26111a0e2e061209fcb578d670de9
-MISC ChangeLog 5311 RMD160 feafba972afb3efa561cd59e537567a0d3f9c4dd SHA1 96c5670b80a320c41d2e0ec08775a2923f27d7c3 SHA256 7565dbb269a7dd69a08b2a0a6d0570ec1d05f057cc385563f3ae0a57f5aa72bc
+EBUILD cheese-2.30.1.ebuild 1596 RMD160 037aa3ccc4f997a04ef80b884ecd93bdfe9ffb1a SHA1 0b41f848ce517077a253f41fad893b932ec052b2 SHA256 31fedc77bb47b921a24eb34a98dbe582f6bf8d713a235676b30841f69a35f94c
+MISC ChangeLog 5550 RMD160 dbb3ac425102dd391093f3f2ccb371e910662f06 SHA1 07d73387939339f784a99dba3c1eea6090cb530c SHA256 414a3f91b8e8c2f51e8ffc421da34d0287f5303f7809ad7ec218008ae22bb89d
 MISC metadata.xml 327 RMD160 268d592c31ba814f607002d14ce24e23c5a57e79 SHA1 c14a18cd951d749c88ad9d6b09bfd942e3eb0a35 SHA256 d01ed77f4fec70b249e7df85f015d7f8e4afd11ed5e77de4e98565ff230cb091
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyL0IQACgkQcsIHjyDViGR14wCgxyGYHPGSa2vtZKHDQfVtN0NH
-97AAniD0Z/MyZc0UkKWTGP6U2g0bLCHP
-=pnho
+iEYEARECAAYFAkyOhzIACgkQ1fmVwcYIWAYY3QCg4O0gsha5uSuxJL4GXVKH0GfP
+cPkAoL60XS/KD3DqJkxAJcC0j3TD6l94
+=5OLo
 -----END PGP SIGNATURE-----
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"
+}