Pin gstreamer dependencies to slot 0.10. Drop old revision.

(Portage version: 2.2.0_alpha141/cvs/Linux x86_64, signed Manifest commit with key C6085806)

4 files changed, 18 insertions, 110 deletions

diff --git a/media-video/cheese/ChangeLog b/media-video/cheese/ChangeLog
index abdbf62f6ed3..452e3d072d2c 100644
--- a/media-video/cheese/ChangeLog
+++ b/media-video/cheese/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/cheese
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/ChangeLog,v 1.61 2012/09/23 06:16:00 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/ChangeLog,v 1.62 2012/10/25 20:48:15 eva Exp $
+
+  25 Oct 2012; Gilles Dartiguelongue <eva@gentoo.org> cheese-3.2.2.ebuild,
+  -cheese-3.4.1.ebuild, cheese-3.4.2.ebuild:
+  Pin gstreamer dependencies to slot 0.10. Drop old revision.
 
   23 Sep 2012; Anthony G. Basile <blueness@gentoo.org> cheese-3.4.2.ebuild:
   keyword ~ppc, bug #379651
diff --git a/media-video/cheese/cheese-3.2.2.ebuild b/media-video/cheese/cheese-3.2.2.ebuild
index 3e274ce2b3f1..b3802bbbdab0 100644
--- a/media-video/cheese/cheese-3.2.2.ebuild
+++ b/media-video/cheese/cheese-3.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/cheese-3.2.2.ebuild,v 1.4 2012/07/09 14:54:12 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/cheese-3.2.2.ebuild,v 1.5 2012/10/25 20:48:15 eva Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -41,16 +41,16 @@ COMMON_DEPEND="
 
 	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )"
 RDEPEND="${COMMON_DEPEND}
-	>=media-libs/gst-plugins-bad-0.10.19
-	>=media-libs/gst-plugins-good-0.10.16
-	media-plugins/gst-plugins-jpeg
-	>=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-plugins/gst-plugins-vorbis-0.10.20
-	|| ( >=media-plugins/gst-plugins-x-0.10
-		>=media-plugins/gst-plugins-xvideo-0.10 )"
+	>=media-libs/gst-plugins-bad-0.10.19:0.10
+	>=media-libs/gst-plugins-good-0.10.16:0.10
+	media-plugins/gst-plugins-jpeg:0.10
+	>=media-plugins/gst-plugins-ogg-0.10.20:0.10
+	>=media-plugins/gst-plugins-pango-0.10.20:0.10
+	>=media-plugins/gst-plugins-theora-0.10.20:0.10
+	media-plugins/gst-plugins-v4l2:0.10
+	>=media-plugins/gst-plugins-vorbis-0.10.20:0.10
+	|| ( media-plugins/gst-plugins-x:0.10
+		media-plugins/gst-plugins-xvideo:0.10 )"
 DEPEND="${COMMON_DEPEND}
 	>=dev-lang/vala-0.13.2:0.14
 	>=app-text/gnome-doc-utils-0.20
diff --git a/media-video/cheese/cheese-3.4.1.ebuild b/media-video/cheese/cheese-3.4.1.ebuild
deleted file mode 100644
index 11c790339776..000000000000
--- a/media-video/cheese/cheese-3.4.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/cheese-3.4.1.ebuild,v 1.1 2012/05/13 23:39:43 tetromino Exp $
-
-EAPI="4"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 virtualx
-
-DESCRIPTION="A cheesy program to take pictures and videos from your webcam"
-HOMEPAGE="http://www.gnome.org/projects/cheese/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc +introspection sendto test"
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.28.0:2
-	>=dev-libs/libgee-0.6.3:0
-	>=x11-libs/gtk+-2.99.4:3[introspection?]
-	>=x11-libs/cairo-1.10
-	>=x11-libs/pango-1.28.0
-	>=sys-fs/udev-171[gudev]
-	>=gnome-base/gnome-desktop-2.91.6:3
-	>=gnome-base/librsvg-2.32.0:2
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=media-libs/clutter-1.6.1:1.0[introspection?]
-	>=media-libs/clutter-gtk-0.91.8:1.0
-	>=media-libs/clutter-gst-1.0.0:1.0
-
-	media-video/gnome-video-effects
-	x11-libs/gdk-pixbuf:2[jpeg,introspection?]
-	x11-libs/mx
-	x11-libs/libX11
-	x11-libs/libXtst
-
-	>=media-libs/gstreamer-0.10.32:0.10[introspection?]
-	>=media-libs/gst-plugins-base-0.10.32:0.10[introspection?]
-
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )"
-RDEPEND="${COMMON_DEPEND}
-	>=media-libs/gst-plugins-bad-0.10.19
-	>=media-libs/gst-plugins-good-0.10.16:0.10
-	>=media-plugins/gst-plugins-ogg-0.10.20:0.10
-	>=media-plugins/gst-plugins-pango-0.10.20:0.10
-	>=media-plugins/gst-plugins-theora-0.10.20:0.10
-	>=media-plugins/gst-plugins-vorbis-0.10.20:0.10
-
-	media-plugins/gst-plugins-jpeg:0.10
-	media-plugins/gst-plugins-v4l2:0.10
-	media-plugins/gst-plugins-vp8:0.10
-
-	|| ( media-plugins/gst-plugins-x:0.10
-		media-plugins/gst-plugins-xvideo:0.10 )
-
-	sendto? ( >=gnome-extra/nautilus-sendto-2.91 )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/vala-0.13.2:0.14
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxml2:2
-	dev-util/itstool
-	x11-proto/xf86vidmodeproto
-
-	doc? ( >=dev-util/gtk-doc-1.14 )
-	test? ( dev-libs/glib:2[utils] )"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		VALAC=$(type -p valac-0.14)
-		$(use_enable introspection)
-		--disable-lcov
-		--disable-static"
-	DOCS="AUTHORS ChangeLog NEWS README"
-}
-
-src_configure() {
-	# Work around sandbox violations when FEATURES=-userpriv caused by
-	# gst-inspect-0.10 (bug #410061)
-	unset DISPLAY
-	gnome2_src_configure
-}
-
-src_compile() {
-	# Clutter-related sandbox violations when USE="doc introspection" and
-	# FEATURES="-userpriv" (see bug #385917).
-	unset DISPLAY
-	gnome2_src_compile
-}
-
-src_test() {
-	Xemake check
-}
diff --git a/media-video/cheese/cheese-3.4.2.ebuild b/media-video/cheese/cheese-3.4.2.ebuild
index a221a3817255..6c0e27f28044 100644
--- a/media-video/cheese/cheese-3.4.2.ebuild
+++ b/media-video/cheese/cheese-3.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/cheese-3.4.2.ebuild,v 1.3 2012/09/23 06:16:00 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/cheese-3.4.2.ebuild,v 1.4 2012/10/25 20:48:15 eva Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -40,7 +40,7 @@ COMMON_DEPEND="
 
 	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )"
 RDEPEND="${COMMON_DEPEND}
-	>=media-libs/gst-plugins-bad-0.10.19
+	>=media-libs/gst-plugins-bad-0.10.19:0.10
 	>=media-libs/gst-plugins-good-0.10.16:0.10
 	>=media-plugins/gst-plugins-ogg-0.10.20:0.10
 	>=media-plugins/gst-plugins-pango-0.10.20:0.10