From ff19aa001dab02d835dacddc00db7abf21df31f2 Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Wed, 14 Dec 2011 04:51:37 +0000
Subject: [PATCH] Build fails if USE="jpeg -zlib" (bug #394611, thanks to Ben
 Kohler for reporting).

Package-Manager: portage-2.2.0_alpha80/cvs/Linux x86_64
---
 net-misc/vino/ChangeLog         |  6 +++++-
 net-misc/vino/Manifest          | 10 +++++-----
 net-misc/vino/vino-3.2.1.ebuild |  5 ++++-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/net-misc/vino/ChangeLog b/net-misc/vino/ChangeLog
index d514bd983088..89f754ab90fb 100644
--- a/net-misc/vino/ChangeLog
+++ b/net-misc/vino/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/vino
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.170 2011/11/07 05:02:34 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.171 2011/12/14 04:51:37 tetromino Exp $
+
+  14 Dec 2011; Alexandre Rostovtsev <tetromino@gentoo.org> vino-3.2.1.ebuild:
+  Build fails if USE="jpeg -zlib" (bug #394611, thanks to Ben Kohler for
+  reporting).
 
 *vino-3.2.1 (07 Nov 2011)
 
diff --git a/net-misc/vino/Manifest b/net-misc/vino/Manifest
index f4cd2bb83bfc..fdea740bb829 100644
--- a/net-misc/vino/Manifest
+++ b/net-misc/vino/Manifest
@@ -5,13 +5,13 @@ AUX vino-2.26.2-autorestart-loop.patch 588 RMD160 a0bba32d1416cfc36d67aea5db9b55
 DIST vino-2.32.2.tar.bz2 856440 RMD160 1de0923ef33a73dd6a9c4e761291728c552708e8 SHA1 e457d1c5705607c3cd18b7e6fbb8776b7483c733 SHA256 1260b1f7b647caff69db441dc13c992f843d9d75b9386ec07b724a5e30c6d4fa
 DIST vino-3.2.1.tar.xz 743336 RMD160 2eb9d27eb0c3ba168d91c56bd0fccb246659ddf6 SHA1 f5e15ba4817939e9c817a303389414f8c7e44d1e SHA256 b8c5a59914886b8676fb512da380114adb896264c46a36d3f123cf459ba799df
 EBUILD vino-2.32.2.ebuild 2223 RMD160 9115fba24b0010afefa1b88e6cb74cb57691a5b6 SHA1 34615352b97f623af64d36c7315b4da687af4a6d SHA256 d1945ac18f80a60848b268040d21b25d2fb621ac3329eab7d0127890bc03c3ef
-EBUILD vino-3.2.1.ebuild 1930 RMD160 9ec7bfc7d3d28960403e579973e83057964a749f SHA1 3d34b79ea44680d8814d7ed824e7b9aec9002c6b SHA256 f17e65eb309d2ad253e289703a24d77defe101a9e6e5f94db120adff725ca38d
-MISC ChangeLog 21304 RMD160 d54ca3b2d75235dce6cf30b807cbe2924e6cfe4b SHA1 ba0742565c6814fabe762d26a3db8dc3716a6f0f SHA256 da7bbcb61252c86812691d530e91291cc3ed3ad8e475cd593ead8969096a087a
+EBUILD vino-3.2.1.ebuild 2014 RMD160 fb6e24064c267ca8909046612fc1f5882a83ede7 SHA1 27b0c5bebc7930220911700c6446f9ce6f8abd81 SHA256 f036368b514f6fd44d2e44c77976e5c0d4e62853509d4726798834e1de0e79ba
+MISC ChangeLog 21470 RMD160 39ae26f89c6e8a5b8046c5f633917a0e79f5e86b SHA1 a1b942cb58366953cb44641c222e284d23ce700e SHA256 0521374b30449e2c58d93cfae6dfa5d1471d675cb65a59d9c87a5e60b30c1565
 MISC metadata.xml 252 RMD160 5b0b8374f7b039e12c213212494427ecd15387e2 SHA1 84868304c07b4f56d8acec522b1bc105bbaf350e SHA256 17ae8caf7ad8c64f98c45410f316d2dd6b3d12c822827fd34def79f7ee1f7602
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk63ZnAACgkQdjK8w9WeBnBYTAD/QkO0g4opD6gVj1GlCdNI92HJ
-uVSHgQ48OfukDJyY1dwA+wY+bsyFYKAtQS7xRMdAAiF430fKPpqLIsUsPnHLfPIz
-=7Jj9
+iF4EAREIAAYFAk7oK18ACgkQdjK8w9WeBnCpEQEAqZGGs+nH7oO8KakJcO0I+v1g
+yO79i62MpULAxC9FVpwA/inaJPEH4jm/YcB5PdY+Y65equROPmwm7EjwYj50ONZ3
+=FANP
 -----END PGP SIGNATURE-----
diff --git a/net-misc/vino/vino-3.2.1.ebuild b/net-misc/vino/vino-3.2.1.ebuild
index 09d5830255ae..1317b21ee3b6 100644
--- a/net-misc/vino/vino-3.2.1.ebuild
+++ b/net-misc/vino/vino-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-3.2.1.ebuild,v 1.1 2011/11/07 05:02:35 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-3.2.1.ebuild,v 1.2 2011/12/14 04:51:37 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -52,6 +52,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
-- 
2.26.2