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

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

4 files changed, 7 insertions, 180 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/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