Pin gstreamer dependencies to slot 0.10. Drop old revision.

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

5 files changed, 25 insertions, 119 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/Manifest b/media-video/cheese/Manifest
index a9dbaf6c88d6..b40cd25b77a9 100644
--- a/media-video/cheese/Manifest
+++ b/media-video/cheese/Manifest
@@ -3,18 +3,16 @@ Hash: SHA256
 
 DIST cheese-2.32.0.tar.bz2 5303805 SHA256 8debc47113d9889247f411d256a8eca0d8da49e5ab5909c200923945b8d5e087 SHA512 c7332d436776698034013758d044f6f87e9eddd8e9bc5df90db323f61a680ff98fb4bc8c7375a2f10c74bb6961099035771a3282731b9f11b0369f5fc3b7c700 WHIRLPOOL e9a9d25c2d72b74d5f28d9eb1ceb38d34e765256e7db4df6cf1964dd9bb5111135b25aa31823e60ac14a070de5cd0e7e98136e3267ed92193ffdeb954d3e52b8
 DIST cheese-3.2.2.tar.xz 3486624 SHA256 8f050b03365310d739c54e48c8c62f8e2d6d9a028fed3eb3c8da4c7654a9009a
-DIST cheese-3.4.1.tar.xz 3702172 SHA256 b7a07c45217bdea6b9bc3ad56c19b5b7de4ddf939074efe94add7afb66a26dd0
-DIST cheese-3.4.2.tar.xz 3702892 SHA256 730083e1fb7da1fc8c38978cbb957ff2128d6f132132b3863bd60c0963a120e0
+DIST cheese-3.4.2.tar.xz 3702892 SHA256 730083e1fb7da1fc8c38978cbb957ff2128d6f132132b3863bd60c0963a120e0 SHA512 15c9148d9b2c1f9c5216332857342bf986b0f6582811def6cc35799ad836fbb5734ab45f0598c0e8042e7a1fa2bb3e0b522efd1dd1f4076618ca377692e361c0 WHIRLPOOL 002d4af931a1e66285df45f3e948c1e51368e35e8ef0d4541c45dc2585c91dcb45741ea47903f93ac379a8e0faa0b2a9c0db4d8f1ab956ee9a96fc3497007cc4
 EBUILD cheese-2.32.0.ebuild 1816 SHA256 7f75f8a13f98de36f66cfcb3b5da51dc377e4702ff56d9adb64df17808e2bc62 SHA512 a3d02187c316a7376ffa1c4f2fab025e8b812e1e9eb8d61e9840e6a46a219b662d7ffef83e38ffa3e78c995be24a4acfa3c9d0017bf5642390b0d4a55eaf146a WHIRLPOOL 042585f26e79eac505ca476780066009fb91007724a4f09871ddba8dec21d47881d64cfc9111d98c577bbb20b437a8898161a948d0730664acf3f1f7fb7aa25f
-EBUILD cheese-3.2.2.ebuild 2329 SHA256 c1dde7e1e69f5bba2eb86ffab950f7eaa04cda3a4e5a8bb39f70f874eefa9d6d SHA512 bd4b54f16e8ff870e4b02124636154706b85af776362e7699695d5a0d272e8a66a6bc46a6bab86a5b026b112e62fe25ab1afe9282046503a02f4e7f6ef2c371b WHIRLPOOL 151acdd37b00ad739153ea0d0bc6e6cdeb8ad0c061b2d668eb422905dc1c38a678e36bb6ab81d5c71563e4751cd276c385fdc65e6ec7da25aea880e91dc7a181
-EBUILD cheese-3.4.1.ebuild 2543 SHA256 83b341b1863a142c212f8692562a82f9c007f3dd399db26de52829e81b6f4463 SHA512 668581bd557d33caf2f9cb990c9ec115d0e4a19403a62cecf4f1b549c14050d5a29c3ec0671557420643d171d08685912a76eaf7f08e60ee37c92fef0182baef WHIRLPOOL cc17e4f08f549e0b01099c8be88602c52352017e2cec9bfef573dc27e5d8a3d6b177bec6322eba612762c91f2c4e6392dd50ab1fa24ee0ebd0dad3e2cfebd250
-EBUILD cheese-3.4.2.ebuild 2554 SHA256 68f105aefe4a470329af545b3d102850b677c59b7196cd8104d85fe00a0ee8ed SHA512 2d0355787df2b98f479724fbd210af0dc81dd9cea4c48f0f6cab638ca3a933002e6cc33a2fb63140e5af65c8537c5fae2c3ee61caa13adb87d2b736ce5baec4f WHIRLPOOL c25cc843ef942ee18b45a8b25aa15790076f9fca3852f6d4cd945d1a2670d93becac6ce1a9454c84123fac6700ccdb2d344cbf2e4b5275662948989aaa45374e
-MISC ChangeLog 9710 SHA256 9207c5d41ba85aada780b318f5de363201ee434c0c4ad9774414f4778258372f SHA512 ce4efd2e338c75b8811df817f30253136662f2dd4b21edf475789a88dd526494c0d93c60099bf0807316cb33bce63b1a4d5a7dff7f93346e02262a1b1724a0bf WHIRLPOOL 61d551a428c9c99c34dae5170001d8215ffd7c44b13bbd5d66fb6b7a793ffa6a813ad072af5bbeedd4e76291b8f79e430fd33f7a19b924be145f2f5116176795
+EBUILD cheese-3.2.2.ebuild 2355 SHA256 fccdf11a9f87cf0af70ddede261c3393569256e95793fca654654b5a23ac4562 SHA512 a0d212929f343ceff2991619809ba69ade3615d6bb2825ba92a53603ba0e669500dbe27230a4e1d5a1f4729a3da1383e13a5393f1ddb524af59619c40aa8c1e9 WHIRLPOOL 0087a6996ff92819252b2d615bf037c305d197e277b47522a932f28bb13cbf014fb93960acb3cfbf729751b6201d0d164b74951ec993c838c1aee43ec9142d3e
+EBUILD cheese-3.4.2.ebuild 2554 SHA256 f1db6a63d43518c6a63ff0b908e0d958803af414880dc853d944857772eb7cc4 SHA512 b201761cd96f2032777a43591662dae27f46b91b4fe4ab408a37319c8bd93c7e71efc9d7e6c40f7604e9490ad920053387636b7e37cdd11b5d5e58dcc7ea0193 WHIRLPOOL fedf270b12e1d810e7710f9e1db3985b58f04e922a9a5f9a4d118b15d3f28252b902b06299d974c779a6d46d39190b21e30d747145101ae2339daf60160175fc
+MISC ChangeLog 9888 SHA256 5c751a41438623e6f566e28f98c31e1b0287e6596783ceb60f703890972546bd SHA512 4474c10a52eae67bf144eab77b34acf0b4d5269f4372e65e152f010e8ee4f8f0952e1d6a2fc529798b14919e7f313e66ab99036ae1997233e02aaa88ecc7ac79 WHIRLPOOL 43e49738812cd7effe58944319b5bfcabccfde974e10b446d8d5bab42eab159f4629fe9c8dd268cf5b6102b6ece86a887b686282e7d0726e1d21bc6882efa20e
 MISC metadata.xml 541 SHA256 2a352797577358d84a64284c8e00d8bdb98310ceeb6e279587445a0574a66618 SHA512 e8648fb14d590542450a114b7abec019b13b35f3d5ce49207931b78f07f9554acaf6b3fc527bcc03b206b39e6b08a7e976f16064a6088b8041b100ad249c5bf9 WHIRLPOOL c0199e673fe2f44d2f7df195db43a4b1100b0b1920292c85d12c65b72e50e81227a0be247ef087df888e6871098d2c71c748fb0b0fd36d396c7d187cb80e75c8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBeqSgACgkQl5yvQNBFVTU61ACgirZzzr1kmywLw37bJdY79npB
-Pc8An1lx/gj6XvbB29fJ0EKrN9+kdhE+
-=JkBM
+iEYEAREIAAYFAlCJpZAACgkQ1fmVwcYIWAZHYQCgoeVxiYaRkvhyCq7maPdAeiZk
+OFoAn3RpbUrtHIgRocaYdZwLwT50jj3H
+=kFq2
 -----END PGP SIGNATURE-----
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