[gentoo-commits] proj/gnome:master commit in: net-misc/vino/

["Alexandre Restovtsev" <tetromino@gmail.com>]

commit:     978201ac41a5aaf472a1378324ea4114ee26cc6a
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu May 24 09:03:19 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu May 24 09:03:19 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=978201ac

net-misc/vino: update

---
 net-misc/vino/vino-9999.ebuild |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/net-misc/vino/vino-9999.ebuild b/net-misc/vino/vino-9999.ebuild
index da7d222..d9b8172 100644
--- a/net-misc/vino/vino-9999.ebuild
+++ b/net-misc/vino/vino-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-2.32.1.ebuild,v 1.1 2010/12/31 18:17:32 pacho Exp $
+# $Header: $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -59,6 +59,9 @@ DEPEND="${RDEPEND}
 		<gnome-base/gnome-keyring-2.29.4 )"
 # keyring is always required at build time per bug 322763
 
+# bug #394611; tight encoding requires zlib encoding
+REQUIRED_USE="jpeg? ( zlib )"
+
 pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-schemas-compile
@@ -76,3 +79,11 @@ pkg_setup() {
 		$(use_with zlib)"
 	DOCS="AUTHORS ChangeLog* NEWS README"
 }
+
+src_prepare() {
+	# <glib-2.31 compatibility
+	if [[ ${PV} != 9999 ]]; then
+		rm -v server/vino-marshal.{c,h} || die
+	fi
+	gnome2_src_prepare
+}