Version bump for gnome-3.4, now with nautilus-sendto support. Forced to drop alpha keyword due to gst-plugins-vp8 and nautilus-sendto; bug will be filed later. Drop old.

(Portage version: 2.2.0_alpha104/cvs/Linux x86_64)

3 files changed, 52 insertions, 24 deletions

diff --git a/media-video/cheese/ChangeLog b/media-video/cheese/ChangeLog
index 99b6ce3875ae..8bc09475a8a6 100644
--- a/media-video/cheese/ChangeLog
+++ b/media-video/cheese/ChangeLog
@@ -1,6 +1,14 @@
 # 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.56 2012/05/05 08:58:50 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cheese/ChangeLog,v 1.57 2012/05/13 23:39:43 tetromino Exp $
+
+*cheese-3.4.1 (13 May 2012)
+
+  13 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -cheese-3.2.1.ebuild, +cheese-3.4.1.ebuild, metadata.xml:
+  Version bump for gnome-3.4, now with nautilus-sendto support. Forced to drop
+  alpha keyword due to gst-plugins-vp8 and nautilus-sendto; bug will be filed
+  later. Drop old.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> cheese-2.32.0.ebuild,
   cheese-3.2.1.ebuild, cheese-3.2.2.ebuild:
diff --git a/media-video/cheese/cheese-3.2.1.ebuild b/media-video/cheese/cheese-3.4.1.ebuild
index cf8d38103327..11c790339776 100644
--- a/media-video/cheese/cheese-3.2.1.ebuild
+++ b/media-video/cheese/cheese-3.4.1.ebuild
@@ -1,28 +1,27 @@
 # 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.1.ebuild,v 1.2 2012/05/05 08:58:50 jdhore Exp $
+# $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"
-GCONF_DEBUG="no"
 
-inherit gnome2
+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"
+IUSE="doc +introspection sendto test"
 KEYWORDS="~amd64 ~x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.28.0:2
-	>=dev-libs/libgee-0.6.0:0
+	>=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] >=sys-fs/udev-145-r1[extras] )
+	>=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]
@@ -42,37 +41,56 @@ 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-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.11.6:0.12
-	>=app-text/gnome-doc-utils-0.20
+	>=dev-lang/vala-0.13.2:0.14
 	>=dev-util/intltool-0.40
 	virtual/pkgconfig
-	x11-proto/xf86vidmodeproto
+
 	app-text/docbook-xml-dtd:4.3
-	doc? ( >=dev-util/gtk-doc-1.14 )"
+	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.12)
+		VALAC=$(type -p valac-0.14)
 		$(use_enable introspection)
-		--disable-scrollkeeper
+		--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).
-	# Work around the issue with the same horrible hack as in bug #385433.
-	DISPLAY="999invalid"
+	unset DISPLAY
 	gnome2_src_compile
 }
+
+src_test() {
+	Xemake check
+}
diff --git a/media-video/cheese/metadata.xml b/media-video/cheese/metadata.xml
index 94b87f296470..c0696aee6bfe 100644
--- a/media-video/cheese/metadata.xml
+++ b/media-video/cheese/metadata.xml
@@ -9,6 +9,8 @@
 	<use>
 		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
 			for introspection</flag>
+		<flag name="sendto">Build the <pkg>gnome-extra/nautilus-sendto</pkg>
+			plugin</flag>
 	</use>
 </pkgmetadata>