Add vala to DEPEND, bug #482416. Remove old revisions.

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

5 files changed, 13 insertions, 194 deletions

diff --git a/media-video/cheese/ChangeLog b/media-video/cheese/ChangeLog
index cc641ad1082a..456036318551 100644
--- a/media-video/cheese/ChangeLog
+++ b/media-video/cheese/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/cheese
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/ChangeLog,v 1.73 2013/08/01 02:43:12 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/ChangeLog,v 1.74 2013/08/25 15:28:40 eva Exp $
+
+  25 Aug 2013; Gilles Dartiguelongue <eva@gentoo.org> -cheese-3.6.2.ebuild,
+  -cheese-3.8.2.ebuild, cheese-3.8.3.ebuild:
+  Add vala to DEPEND, bug #482416. Remove old revisions.
 
   01 Aug 2013; Alexandre Rostovtsev <tetromino@gentoo.org> cheese-3.8.2.ebuild,
   cheese-3.8.3.ebuild:
diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
index 2cc5bbe10a8d..a9621179e197 100644
--- a/media-video/cheese/Manifest
+++ b/media-video/cheese/Manifest
@@ -2,23 +2,15 @@
 Hash: SHA256
 
 DIST cheese-2.32.0.tar.bz2 5303805 SHA256 8debc47113d9889247f411d256a8eca0d8da49e5ab5909c200923945b8d5e087 SHA512 c7332d436776698034013758d044f6f87e9eddd8e9bc5df90db323f61a680ff98fb4bc8c7375a2f10c74bb6961099035771a3282731b9f11b0369f5fc3b7c700 WHIRLPOOL e9a9d25c2d72b74d5f28d9eb1ceb38d34e765256e7db4df6cf1964dd9bb5111135b25aa31823e60ac14a070de5cd0e7e98136e3267ed92193ffdeb954d3e52b8
-DIST cheese-3.6.2.tar.xz 3709504 SHA256 745262a0db7d0dbe973497a4f36dd4d85b8a42426d8f431e4b6898351ad6459e SHA512 f360fad25802e5ab3813d091c0d8778fff5f2f9906c6f0da569433d13422bcb4f85e05bf6b738cfe6bae4d8a75e8937ce948ffb4522815494b067d038b1f1741 WHIRLPOOL 00086621fdd7ba2689b1310e303173e29a9e7e3af1f7e0670bb37afe5b3a4fdd3e48356f88c39bafbfcc5aa7926b9df651603f7b3cc6a1111ecf6c6219ba5a39
-DIST cheese-3.8.2.tar.xz 3730600 SHA256 79d21f2a7ebf1e91b2c2aa595f3a6dcf899258b1d2e307371440540c3d3a4ec3 SHA512 3e7efd664ddefc1199412acb6fb7acc285574e9526b7283b0ffda9d02487c82dcc8789ddec69a1d49a76aa15667d7f3a5f26a1da650a6850b4204ba48858c49c WHIRLPOOL 1c7435012b9f59ab2855dcc69959c2a5fbbe6934cb7a2b5ded60f05cd74aaf31e740d0892952b45ab02fb7f7ba484eb0e281952ece1986d5d0f1d397c5698de2
 DIST cheese-3.8.3.tar.xz 3730296 SHA256 5f08079b6ccaa6ea8de9163ff0e43554347c12e13f0a60eb6ad06d291c116937 SHA512 62933f9436e44a62935f309aef2af9ffe385524716696c1cd36fb03c10c9fa63c265027f0d282c2c9154d82cc283469ad824ee3b624ead218883354b95ff23b0 WHIRLPOOL e9e6fa6ac50dbd60c06e05efffff9cb5771808ebb75705a740ff1c44bb081aa83e2e2305897f3ac6f9e5465f9ca5779fcb920176839893d2f77f93af18a03ee5
 EBUILD cheese-2.32.0.ebuild 1801 SHA256 f89c035f3747a36fff6f07879dd12b2a5e9fefed8173a986d6958aa136961c54 SHA512 1d25fd7f77cc513b3c26f30d1387de59b3bc7071df46d875d41e945e8e2742763503b4d3828757c2e737dde3ed2371dd7e2b8907f835c325f9630ebe4aed9e30 WHIRLPOOL a514d623cfc3dd43a9118e2c3e8e98e56c8c0f507444f9883761a48a766914500e177076eda1c61a7f710da9d9d5e0b75a0012ff274d448759eaf0064b2edcc6
-EBUILD cheese-3.6.2.ebuild 2500 SHA256 26825cf2ee968ff735fbc8fb8b11c7fdb4fc6394b7f266cc4d0b6d244c9603a0 SHA512 78e193f46bed752884b094d8d40924916fbb96b1f1461f3d769f3d69c5df7f8389e12b348533921e2a9449999e4ed1e900462f1ada273b084bba51bff40ccd29 WHIRLPOOL d69b1a007487403f1d4dbec57e05579c7dc30785e4f537530be514b4fd7d444616cf9f161836a9b961a428ba86de5ddee65f9a942efab8fa77a31f01da7bed16
-EBUILD cheese-3.8.2.ebuild 2236 SHA256 f0c8669ea517aa14d20bfd6f81da45679704e70c25a841c4a8b752b36308063d SHA512 67519adc8bd61a1782f63fd315f8eb26b09acc810afe69020dd185661d0c6c632c98513146b6d864f4e614e608592cdf30def2ea7bb7132f46e0fb88b6b95077 WHIRLPOOL 43183e767f80e29645aca8335394eb37fb1053431d50fc646f1041bf9a8626fcce192e630e19bed3f8d12c5c200859ee99d3c8cdb11064aec726e7d83db8b577
-EBUILD cheese-3.8.3.ebuild 2220 SHA256 8d7dabfd1d39a8d0ee977aa57448e96c039b2ddeaa728b0f33766c1612471c92 SHA512 f40d9bb4483a573d50e33e09ddbb8c9380dbc261280326b03c52c11ad5db00785682ccb4e7d8f8db7d9926f514fd6ac02687b74abb544e205e1c46d724e5f6f8 WHIRLPOOL 23b97ccfb193dc98ef69492c4712eb5ca326f7ada21a42ceea78010ecf3db4b7eaa3ac0af75cfa1fc0494342ac52c2ad6fce1f7396ae9adcf957cf0498817342
-MISC ChangeLog 11504 SHA256 aac2904e0af2f984ece76efc11ffd05c8258583dd10be8e043345b6c208bb8d0 SHA512 5253d487f4b0a4de837f694db86cde418f2c485e0d6452ce378df5e3580125c70828c147248c0cabfaf37a5218fd8237a0af524d0574ac452c8c266b910f75cd WHIRLPOOL d3afeb0d748b2a4a94a2396a15423a3b2a5a0ffff4753301b771c0161717ffed2a3d237125c2e0f65092ba036d5b21951c78fba7d50a4e1655b2eb83afe32e88
+EBUILD cheese-3.8.3.ebuild 2230 SHA256 7e766301bca385e9eae55420ff14b5ad837de268c9ebfe192a39abecf434c51e SHA512 aa306391d7848343d5a6a7448a137ae56b44e02297a379390effa6349f5c36543e215d9a55942fb23371c35050179e71d4344ff27b30bec8bbfc901a555cfaa6 WHIRLPOOL 93515756c10edac2a2177eea4b08f07fe3934c4c3aec16e499fe7d07cded7b85c2b6e3b1cfd17e8d865c6c620b4c4474b4dc027f16e8e4c96be4dfb93237698a
+MISC ChangeLog 11677 SHA256 3644e90dc27bf661c2c3649c8e7480e3f078cdf9d22b275235a6fdf750e79b33 SHA512 c7a9e6142c049324a77451b40fa6ebbcf9bf419371eeeb72ceef363ef3029baf65fcf46e93f8e5090bd1905b3ae6494574b0e512303ef878f2bce56df768d4cb WHIRLPOOL 795cd990b78830022f710a2a4d97ce3efc04f3df44d889e01a7e48f2aa513abb9326831f963183342230c7084e18c42f298826cf4635aabdef9a20a47fba293c
 MISC metadata.xml 438 SHA256 bff970b1531295b9f7dfd594adae7e0b19cbede8d60dda0ff5675c1ee91a9c46 SHA512 8f6c3904a083d3ced5110da6ba8705031c44a2f686b9d9afdd9949157ee2570b7d7171aa0c5bbbd7d0a869886d29f0955d0f14c0c6f78bcdaaaaf9318386dd38 WHIRLPOOL 813984d1cba77275380ab06ea75515ebae5297b5cc3db74b3ce8b79bf9907b05894a29c32e83660ed794dd1ec101e7c15a798cfef038372c2ae37f346377735b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR+ctGAAoJEJ0WA1zPCt1hqawH+gLheeZLyL+RAD9igbu9a3G8
-n7O53R+cmf2D7mDL67pWzGtioPP8M6jNLDVX03bSlW36JCqxEV2dsOx+0rN+7ZY4
-kk+aPYrFRXdoaAO/v7mykiBm4o+fsZNO0/82x31+twYsO9f/ulCaS37diRswRgOb
-r+9ecbGpQHYyD1ry1RrZ9AICcXR5w0shsTYTVF69MAU5bOzUBQyLcIlU5eKgTfEU
-WPuPqgcDGBGw1zIxoCEyqHefscWSJgkNn6s3bYH145JEy7R7WIsQgXncHZPr0U5h
-WdkPod7GUd89w06hbX1h1Q7j17/Z1Byn7tFyrmmQd3uNuMhTZf3jekJBnhLJ5fY=
-=Pqtl
+iEYEAREIAAYFAlIaIqgACgkQ1fmVwcYIWAbm4gCeL0JSmCsnCzP2N8vX1eK+xm4/
+7lEAoKEeN817AX7nQ+BzBaoYuoKpue7a
+=aoJv
 -----END PGP SIGNATURE-----
diff --git a/media-video/cheese/cheese-3.6.2.ebuild b/media-video/cheese/cheese-3.6.2.ebuild
deleted file mode 100644
index d3d94ea32d30..000000000000
--- a/media-video/cheese/cheese-3.6.2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/cheese-3.6.2.ebuild,v 1.5 2013/02/02 22:59:02 ago Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 multilib 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/7" # subslot = libcheese soname version
-IUSE="+introspection sendto test"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.28:2
-	>=dev-libs/libgee-0.6.3:0
-	>=x11-libs/gtk+-3.4.4:3[introspection?]
-	>=x11-libs/cairo-1.10:=
-	>=x11-libs/pango-1.28.0
-	>=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.10:1.0[introspection?]
-	>=media-libs/clutter-gtk-0.91.8:1.0
-	>=media-libs/clutter-gst-1.9:2.0
-	media-libs/cogl:1.0=[introspection?]
-
-	media-video/gnome-video-effects
-	x11-libs/gdk-pixbuf:2[jpeg,introspection?]
-	x11-libs/libX11
-	x11-libs/libXtst
-
-	media-libs/gstreamer:1.0[introspection?]
-	media-libs/gst-plugins-base:1.0[introspection?,ogg,pango,theora,vorbis,X]
-
-	>=virtual/udev-171:=[gudev]
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )"
-RDEPEND="${COMMON_DEPEND}
-	media-libs/gst-plugins-bad:1.0
-	media-libs/gst-plugins-good:1.0
-
-	media-plugins/gst-plugins-jpeg:1.0
-	media-plugins/gst-plugins-v4l2:1.0
-	media-plugins/gst-plugins-vpx:1.0
-
-	sendto? ( >=gnome-extra/nautilus-sendto-2.91 )"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxml2:2
-	>=dev-util/gtk-doc-1.14
-	>=dev-util/intltool-0.50
-	dev-util/itstool
-	virtual/pkgconfig
-	x11-proto/xf86vidmodeproto
-	test? ( dev-libs/glib:2[utils] )"
-
-src_configure() {
-	G2CONF="${G2CONF}
-		GST_INSPECT=$(type -P true)
-		VALAC=$(type -P valac-0.18)
-		$(use_enable introspection)
-		--disable-lcov
-		--disable-static
-		ITSTOOL=$(type -P true)"
-
-	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
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-	preserve_old_lib /usr/$(get_libdir)/libcheese.so.3 \
-		/usr/$(get_libdir)/libcheese-gtk.so.21
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	preserve_old_lib_notify /usr/$(get_libdir)/libcheese.so.3 \
-		/usr/$(get_libdir)/libcheese-gtk.so.21
-}
diff --git a/media-video/cheese/cheese-3.8.2.ebuild b/media-video/cheese/cheese-3.8.2.ebuild
deleted file mode 100644
index e3a2db616ae4..000000000000
--- a/media-video/cheese/cheese-3.8.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/cheese-3.8.2.ebuild,v 1.2 2013/08/01 02:43:12 tetromino Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.18"
-
-inherit eutils gnome2 multilib vala virtualx
-
-DESCRIPTION="A cheesy program to take pictures and videos from your webcam"
-HOMEPAGE="http://projects.gnome.org/cheese/"
-
-LICENSE="GPL-2+"
-SLOT="0/7" # subslot = libcheese soname version
-IUSE="+introspection sendto test"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# using clutter-gst-2.0.0 results in GLSL errors; bug #478702
-COMMON_DEPEND="
-	>=dev-libs/glib-2.28:2
-	>=x11-libs/gtk+-3.4.4:3[introspection?]
-	>=x11-libs/cairo-1.10:=
-	>=x11-libs/pango-1.28.0
-	>=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.10:1.0[introspection?]
-	>=media-libs/clutter-gtk-0.91.8:1.0
-	>=media-libs/clutter-gst-2.0.6:2.0
-	media-libs/cogl:1.0=[introspection?]
-
-	media-video/gnome-video-effects
-	x11-libs/gdk-pixbuf:2[jpeg,introspection?]
-	x11-libs/libX11
-	x11-libs/libXtst
-
-	media-libs/gstreamer:1.0[introspection?]
-	media-libs/gst-plugins-base:1.0[introspection?,ogg,pango,theora,vorbis,X]
-
-	>=virtual/udev-171:=[gudev]
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
-"
-RDEPEND="${COMMON_DEPEND}
-	media-libs/gst-plugins-bad:1.0
-	media-libs/gst-plugins-good:1.0
-
-	media-plugins/gst-plugins-jpeg:1.0
-	media-plugins/gst-plugins-v4l2:1.0
-	media-plugins/gst-plugins-vpx:1.0
-
-	sendto? ( >=gnome-extra/nautilus-sendto-2.91 )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxml2:2
-	>=dev-util/gtk-doc-1.14
-	>=dev-util/intltool-0.50
-	dev-util/itstool
-	virtual/pkgconfig
-	x11-proto/xf86vidmodeproto
-	test? ( dev-libs/glib:2[utils] )
-"
-
-src_configure() {
-	gnome2_src_configure \
-		GST_INSPECT=$(type -P true) \
-		$(use_enable introspection) \
-		--disable-lcov \
-		--disable-static \
-		ITSTOOL=$(type -P true)
-}
-
-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.8.3.ebuild b/media-video/cheese/cheese-3.8.3.ebuild
index a21bf8d50596..9e9be3c95bef 100644
--- a/media-video/cheese/cheese-3.8.3.ebuild
+++ b/media-video/cheese/cheese-3.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/cheese-3.8.3.ebuild,v 1.2 2013/08/01 02:43:12 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/cheese-3.8.3.ebuild,v 1.3 2013/08/25 15:28:40 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -52,6 +52,7 @@ RDEPEND="${COMMON_DEPEND}
 	sendto? ( >=gnome-extra/nautilus-sendto-2.91 )
 "
 DEPEND="${COMMON_DEPEND}
+	$(vala_depend)
 	app-text/docbook-xml-dtd:4.3
 	dev-libs/libxml2:2
 	>=dev-util/gtk-doc-1.14