Version bump for Gnome 2.32 and remove old.

(Portage version: 2.1.9.23/cvs/Linux x86_64)

3 files changed, 70 insertions, 52 deletions

diff --git a/media-video/cheese/ChangeLog b/media-video/cheese/ChangeLog
index 90425a4ad373..79be31b57162 100644
--- a/media-video/cheese/ChangeLog
+++ b/media-video/cheese/ChangeLog
@@ -1,6 +1,13 @@
 # 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.36 2010/10/17 16:19:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/ChangeLog,v 1.37 2010/10/29 21:33:44 pacho Exp $
+
+*cheese-2.32.0 (29 Oct 2010)
+
+  29 Oct 2010; Pacho Ramos <pacho@gentoo.org> -cheese-2.28.1-r1.ebuild,
+  +cheese-2.32.0.ebuild:
+  Version bump for Gnome 2.32 with bugfixes and translation updates. Also
+  require gtk+ with jpeg support (bug #338198 by klondike).
 
   17 Oct 2010; Raúl Porcel <armin76@gentoo.org> cheese-2.30.1.ebuild:
   alpha/ia64/sparc stable wrt #324077
diff --git a/media-video/cheese/cheese-2.28.1-r1.ebuild b/media-video/cheese/cheese-2.28.1-r1.ebuild
deleted file mode 100644
index 6d491cf2a9ee..000000000000
--- a/media-video/cheese/cheese-2.28.1-r1.ebuild
+++ /dev/null
@@ -1,51 +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-r1.ebuild,v 1.9 2010/08/14 19:04:00 armin76 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="alpha amd64 ia64 ~ppc ~ppc64 sparc 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[X]
-	>=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
-	>=media-libs/gst-plugins-good-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"
diff --git a/media-video/cheese/cheese-2.32.0.ebuild b/media-video/cheese/cheese-2.32.0.ebuild
new file mode 100644
index 000000000000..439f42504f50
--- /dev/null
+++ b/media-video/cheese/cheese-2.32.0.ebuild
@@ -0,0 +1,62 @@
+# 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.32.0.ebuild,v 1.1 2010/10/29 21:33:44 pacho Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+PYTHON_DEPEND="2"
+
+inherit gnome2 python
+
+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="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc v4l"
+
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.7
+	>=dev-libs/glib-2.16:2
+	>=x11-libs/gtk+-2.19.1:2[jpeg]
+	>=x11-libs/cairo-1.4
+	>=x11-libs/pango-1.18
+	>=sys-apps/dbus-1[X]
+	>=sys-fs/udev-145-r1[extras]
+	>=gnome-base/gconf-2.16
+	>=gnome-base/gnome-desktop-2.26
+	>=gnome-base/librsvg-2.18
+	>=media-libs/libcanberra-0.11[gtk]
+
+	>=media-libs/gstreamer-0.10.23
+	>=media-libs/gst-plugins-base-0.10.23"
+RDEPEND="${COMMON_DEPEND}
+	>=media-plugins/gst-plugins-gconf-0.10
+	>=media-plugins/gst-plugins-ogg-0.10.20
+	>=media-plugins/gst-plugins-pango-0.10.20
+	>=media-plugins/gst-plugins-theora-0.10.20
+	>=media-plugins/gst-plugins-v4l2-0.10
+	>=media-libs/gst-plugins-good-0.10.16
+	>=media-plugins/gst-plugins-vorbis-0.10.20
+	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
+	doc? ( >=dev-util/gtk-doc-1.11 )"
+
+pkg_setup() {
+	G2CONF="${G2CONF} --disable-scrollkeeper --disable-static"
+	DOCS="AUTHORS ChangeLog NEWS README"
+	python_set_active_version 2
+}
+
+src_install() {
+	gnome2_src_install
+	find "${ED}" -name "*.la" -delete || die "la files removal failed"
+}