net-misc/vino: Bump version to 3.20.0

Package-Manager: portage-2.2.28
Manifest-Sign-Key: 0xE9E568677E8B4D42

4 files changed, 85 insertions, 6 deletions

diff --git a/net-misc/vino/Manifest b/net-misc/vino/Manifest
new file mode 100644
index 00000000..68d4eab0
--- /dev/null
+++ b/net-misc/vino/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST vino-3.20.0.tar.xz 768460 SHA256 ed61d0ba18d9b21a4151c23dd76f17d45d6e66b621a9389578daf88a9266a367 SHA512 2a6dc2aa8e0d509a727e44391ab07478ed8f993394510977aef30c5312b64aaa199f65da8d03b71cc1ce9180652314bc0cc9bad780924faf3fdee8133bfcd918 WHIRLPOOL 0526be33b351f5273d0edf7d0d4a09d3063a17a2f7be0cfdfc3ebd0bc85ce1096feed5da18c5a251256743436d9e448780af8e3e28cde363ebb4e0913615d23d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJW/+uVAAoJEOnlaGd+i01Cf0EH/iZVxQj+qTR8RK4/wbSOzHp1
+9hI4yv3oicuHPf73d341eOTvvvgD6LwzmzbuDcStyw4WBmiK+qwJo1Trdf/LV3f/
+8/yuFrfOjUIJc0SL/tfenvx5durxcT0ZQrm5bL5k2T/XkE+uGUc592Mf+8So+Hcr
+d4P8FEEz71nZza3xjyP4aeE5bM6lY1yxPhLIVA4UF1AprHksRgMG2LQXlYNt6FgR
+V0EUwLjbX73IiDquTlrBDN024JXOxNlJtsMpuAt0CH5BUOCxFhM/iMnlH4XqIeDV
+MU6U/rlji8ugyYEBWQq3IkAF8TLLDIyQuAz0K6YftaKTiB2FWHq8TUZxtFo+34I=
+=ttVg
+-----END PGP SIGNATURE-----
diff --git a/net-misc/vino/metadata.xml b/net-misc/vino/metadata.xml
index a35da3ee..1208299a 100644
--- a/net-misc/vino/metadata.xml
+++ b/net-misc/vino/metadata.xml
@@ -6,7 +6,6 @@
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
 <use>
-	<flag name="libsecret">Enable <pkg>app-crypt/libsecret</pkg> support to store login credentials.</flag>
 	<flag name="telepathy">Enable desktop sharing through a telepathy client</flag>
 </use>
 </pkgmetadata>
diff --git a/net-misc/vino/vino-3.20.0.ebuild b/net-misc/vino/vino-3.20.0.ebuild
new file mode 100644
index 00000000..5dbeac9a
--- /dev/null
+++ b/net-misc/vino/vino-3.20.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit gnome2
+
+DESCRIPTION="An integrated VNC server for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vino"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="crypt gnome-keyring ipv6 jpeg ssl +telepathy zeroconf +zlib"
+# bug #394611; tight encoding requires zlib encoding
+REQUIRED_USE="jpeg? ( zlib )"
+
+# cairo used in vino-fb
+# libSM and libICE used in eggsmclient-xsmp
+RDEPEND="
+	>=dev-libs/glib-2.26:2
+	>=dev-libs/libgcrypt-1.1.90:0=
+	>=x11-libs/gtk+-3:3
+
+	dev-libs/dbus-glib
+	x11-libs/cairo:=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXtst
+	x11-libs/pango[X]
+
+	>=x11-libs/libnotify-0.7.0:=
+
+	crypt? ( >=dev-libs/libgcrypt-1.1.90:0= )
+	gnome-keyring? ( app-crypt/libsecret )
+	jpeg? ( virtual/jpeg:0= )
+	ssl? ( >=net-libs/gnutls-2.2.0:= )
+	telepathy? ( >=net-libs/telepathy-glib-0.18 )
+	zeroconf? ( >=net-dns/avahi-0.6:=[dbus] )
+	zlib? ( sys-libs/zlib:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	>=dev-util/intltool-0.50
+	virtual/pkgconfig
+	app-crypt/libsecret
+"
+# libsecret is always required at build time per bug 322763
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable ipv6) \
+		$(use_with crypt gcrypt) \
+		$(use_with gnome-keyring secret) \
+		$(use_with jpeg) \
+		$(use_with ssl gnutls) \
+		$(use_with telepathy) \
+		$(use_with zeroconf avahi) \
+		$(use_with zlib)
+}
diff --git a/net-misc/vino/vino-9999.ebuild b/net-misc/vino/vino-9999.ebuild
index 5760bdeb..0778222b 100644
--- a/net-misc/vino/vino-9999.ebuild
+++ b/net-misc/vino/vino-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -20,7 +20,7 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
-IUSE="crypt libsecret ipv6 jpeg ssl +telepathy zeroconf +zlib"
+IUSE="crypt gnome-keyring ipv6 jpeg ssl +telepathy zeroconf +zlib"
 # bug #394611; tight encoding requires zlib encoding
 REQUIRED_USE="jpeg? ( zlib )"
 
@@ -45,8 +45,8 @@ RDEPEND="
 	>=x11-libs/libnotify-0.7.0:=
 
 	crypt? ( >=dev-libs/libgcrypt-1.1.90:0= )
+	gnome-keyring? ( app-crypt/libsecret )
 	jpeg? ( virtual/jpeg:0= )
-	libsecret? ( app-crypt/libsecret )
 	ssl? ( >=net-libs/gnutls-2.2.0:= )
 	telepathy? ( >=net-libs/telepathy-glib-0.18 )
 	zeroconf? ( >=net-dns/avahi-0.6:=[dbus] )
@@ -62,11 +62,10 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	gnome2_src_configure \
-		--with-gcrypt \
 		$(use_enable ipv6) \
 		$(use_with crypt gcrypt) \
+		$(use_with gnome-keyring secret) \
 		$(use_with jpeg) \
-		$(use_with libsecret secret) \
 		$(use_with ssl gnutls) \
 		$(use_with telepathy) \
 		$(use_with zeroconf avahi) \