Clean up old revision. Add docbook-xml-dtd-4.3 to DEPEND per bug #281839.

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

5 files changed, 25 insertions, 63 deletions

diff --git a/media-video/cheese/ChangeLog b/media-video/cheese/ChangeLog
index 01c15295094f..bae0f7968d73 100644
--- a/media-video/cheese/ChangeLog
+++ b/media-video/cheese/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/cheese
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/ChangeLog,v 1.14 2009/07/19 20:05:00 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/ChangeLog,v 1.15 2009/08/23 02:01:48 eva Exp $
+
+  23 Aug 2009; Gilles Dartiguelongue <eva@gentoo.org> cheese-2.24.3.ebuild,
+  -cheese-2.26.2.ebuild, cheese-2.26.3.ebuild:
+  Clean up old revision. Add docbook-xml-dtd-4.3 to DEPEND per bug #281839.
 
 *cheese-2.26.3 (19 Jul 2009)
 
diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
index f917818d9615..d94aa07990db 100644
--- a/media-video/cheese/Manifest
+++ b/media-video/cheese/Manifest
@@ -2,17 +2,15 @@
 Hash: SHA1
 
 DIST cheese-2.24.3.tar.bz2 3056191 RMD160 f1df3afb10d3bf37285b8b3c9508f1bdf0810425 SHA1 171443a32fd65d038197f6026c81bf960f299b79 SHA256 b8f2823a534d8f0f3b4178c55bff84b6244b7b2d45cfc4dace58651579d948f7
-DIST cheese-2.26.2.tar.bz2 3239592 RMD160 82a47d93feb8dc768f82ea285c6301c8e6af6391 SHA1 cb5b951e69061f61d1381d9bcb7c1ab4c21d2ea0 SHA256 b211582271eaf5158cdd06d5c12926d98b8cd02fc1c65b485e35e9b6c3a12c45
 DIST cheese-2.26.3.tar.bz2 3213208 RMD160 030b1de35beb964fccb13ff5f44764ad2931d225 SHA1 808cc424b0f19ab8d94373cc03eea18589a23d37 SHA256 4abcc6c34530b19a477e9431a120b0b2a296f4f4cbc20d5cb9e5ddad50347003
-EBUILD cheese-2.24.3.ebuild 1405 RMD160 33e0a4a3dc54dfd5d80452e1951103ae246e532a SHA1 bc04b29ff40af156ae15256c7cf24bf231b5e8f8 SHA256 d3fd50be6553e2fe61db24ccae6d0dab8f871ffd9ef3bebc0a5bc067918377e4
-EBUILD cheese-2.26.2.ebuild 1417 RMD160 a10d2ba1a2bbaee3a760f87461aeea271740e1f9 SHA1 ca8f4bf085ee09172e5ea24d5716140929002aa4 SHA256 e5ebb97b24d7dd41685f3bb60b05764675917263f3bdbed120c076dd7123ce75
-EBUILD cheese-2.26.3.ebuild 1498 RMD160 9f1d3750978a853185c4e23f1783b3f41c0ee6ac SHA1 4c0e646071ab91c3d726599dddd203f023251500 SHA256 d875b46374bbd650af090e6b6d8004fedcfbb2ba05da6665728dba2ff04bb2af
-MISC ChangeLog 2916 RMD160 b38b9f50120a51dcaa32ec3350f2ec8f72fd33d5 SHA1 2208ed54db021e79ace4b8b36a4542bc6489822a SHA256 e6ff58a786112e792b5f7ba1a75da6157b5e7e19cf8fce378d6095e63457b6a5
+EBUILD cheese-2.24.3.ebuild 1433 RMD160 4f6c85d4d280f34fcf2683578d8b77871bd0ede5 SHA1 d77aa14c67e69c191796a33f44fbe4459dd1633a SHA256 7af2be611561206b6e9c082e7c6a21d96d00caee055721c11d37a92b64b78577
+EBUILD cheese-2.26.3.ebuild 1714 RMD160 2c9fe21231f68f9af195d4b357d7c22cba02a15b SHA1 19e57627290dd701d890c10530bc4ec03c8c9f2c SHA256 9672c777f5dc026e399d22d14f568ca4ff8e45665272a7793091ee5c44e4438b
+MISC ChangeLog 3116 RMD160 7c735e9c46abde121db3d945a5bbee39d21c3f78 SHA1 c164e0507dfa9a17ae5b7297b3b7f02b9ec78839 SHA256 f9e20b030c5be84b3e32833303363a95fe5ea02872ce171966217c2c026d33f2
 MISC metadata.xml 327 RMD160 268d592c31ba814f607002d14ce24e23c5a57e79 SHA1 c14a18cd951d749c88ad9d6b09bfd942e3eb0a35 SHA256 d01ed77f4fec70b249e7df85f015d7f8e4afd11ed5e77de4e98565ff230cb091
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpjfHEACgkQ1fmVwcYIWAYXWQCcDuvaH61GJxcXFXqBRLBqy5X0
-b6YAn3wbGnTYLT2FqmycXAiVcbgDKT/b
-=13zj
+iEYEARECAAYFAkqQoxgACgkQ1fmVwcYIWAaGDQCeL8YUfNXaTzV3lL1dmYdApGvT
+jQcAn0+48XO0RhSsw8s2gBbQAUfkEGmn
+=A0xW
 -----END PGP SIGNATURE-----
diff --git a/media-video/cheese/cheese-2.24.3.ebuild b/media-video/cheese/cheese-2.24.3.ebuild
index 21c47151bba6..b80f717eaa92 100644
--- a/media-video/cheese/cheese-2.24.3.ebuild
+++ b/media-video/cheese/cheese-2.24.3.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/media-video/cheese/cheese-2.24.3.ebuild,v 1.3 2009/03/15 22:09:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/cheese-2.24.3.ebuild,v 1.4 2009/08/23 02:01:48 eva Exp $
 
 GCONF_DEBUG="no"
 
@@ -41,7 +41,8 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	app-text/scrollkeeper
 	app-text/gnome-doc-utils
-	x11-proto/xf86vidmodeproto"
+	x11-proto/xf86vidmodeproto
+	~app-text/docbook-xml-dtd-4.3"
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
diff --git a/media-video/cheese/cheese-2.26.2.ebuild b/media-video/cheese/cheese-2.26.2.ebuild
deleted file mode 100644
index e9a7ee9fdeb1..000000000000
--- a/media-video/cheese/cheese-2.26.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/cheese-2.26.2.ebuild,v 1.1 2009/05/18 21:32:54 eva 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 ~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
-	>=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 )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40
-	dev-util/pkgconfig
-	app-text/scrollkeeper
-	app-text/gnome-doc-utils
-	x11-proto/xf86vidmodeproto"
-
-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
index fd22c5f7ee67..eca5922c5187 100644
--- a/media-video/cheese/cheese-2.26.3.ebuild
+++ b/media-video/cheese/cheese-2.26.3.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2009 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.1 2009/07/19 20:05:00 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/cheese-2.26.3.ebuild,v 1.2 2009/08/23 02:01:48 eva Exp $
 
+EAPI="2"
 GCONF_DEBUG="no"
 
 inherit gnome2 eutils
@@ -43,10 +44,18 @@ 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"
 
 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"
+}