Version bump for Gnome 3.16. Clean up old revisions.

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

3 files changed, 18 insertions, 84 deletions

diff --git a/net-misc/vino/ChangeLog b/net-misc/vino/ChangeLog
index cf58ae2f21a4..e1d47e7065c4 100644
--- a/net-misc/vino/ChangeLog
+++ b/net-misc/vino/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/vino
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.220 2015/03/15 13:32:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.221 2015/06/09 10:30:04 eva Exp $
+
+*vino-3.16.0 (09 Jun 2015)
+
+  09 Jun 2015; Gilles Dartiguelongue <eva@gentoo.org> -vino-3.12.0-r1.ebuild,
+  -vino-3.14.1.ebuild, +vino-3.16.0.ebuild:
+  Version bump for Gnome 3.16. Clean up old revisions.
 
   15 Mar 2015; Pacho Ramos <pacho@gentoo.org> vino-3.14.2.ebuild:
   x86 stable, bug 534012
diff --git a/net-misc/vino/vino-3.12.0-r1.ebuild b/net-misc/vino/vino-3.12.0-r1.ebuild
deleted file mode 100644
index c1136a4656dd..000000000000
--- a/net-misc/vino/vino-3.12.0-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-3.12.0-r1.ebuild,v 1.3 2014/12/19 13:43:16 pacho Exp $
-
-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="avahi crypt gnome-keyring ipv6 jpeg networkmanager ssl +telepathy +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
-	>=x11-libs/gtk+-3.0.0:3
-	>=dev-libs/libgcrypt-1.1.90:0=
-
-	dev-libs/dbus-glib
-	x11-libs/cairo:=
-	x11-libs/pango[X]
-	x11-libs/libICE
-	x11-libs/libX11
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libSM
-	x11-libs/libXtst
-
-	>=x11-libs/libnotify-0.7.0:=
-
-	avahi? ( >=net-dns/avahi-0.6:=[dbus] )
-	crypt? ( >=dev-libs/libgcrypt-1.1.90:0= )
-	gnome-keyring? ( app-crypt/libsecret )
-	jpeg? ( virtual/jpeg:0= )
-	networkmanager? ( >=net-misc/networkmanager-0.7 )
-	ssl? ( >=net-libs/gnutls-2.2.0:= )
-	telepathy? ( >=net-libs/telepathy-glib-0.18 )
-	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 \
-		--disable-http-server \
-		--with-gcrypt \
-		$(use_with avahi) \
-		$(use_with crypt gcrypt) \
-		$(use_enable ipv6) \
-		$(use_with jpeg) \
-		$(use_with gnome-keyring secret) \
-		$(use_with networkmanager network-manager) \
-		$(use_with ssl gnutls) \
-		$(use_with telepathy) \
-		$(use_with zlib)
-}
diff --git a/net-misc/vino/vino-3.14.1.ebuild b/net-misc/vino/vino-3.16.0.ebuild
index 3ff120d1b2dc..f4216552e978 100644
--- a/net-misc/vino/vino-3.14.1.ebuild
+++ b/net-misc/vino/vino-3.16.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-3.14.1.ebuild,v 1.1 2014/12/23 23:08:32 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-3.16.0.ebuild,v 1.1 2015/06/09 10:30:04 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vino"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="avahi crypt gnome-keyring ipv6 jpeg networkmanager ssl +telepathy +zlib"
+IUSE="crypt libsecret ipv6 jpeg ssl +telepathy zeroconf +zlib"
 # bug #394611; tight encoding requires zlib encoding
 REQUIRED_USE="jpeg? ( zlib )"
 
@@ -21,29 +21,28 @@ REQUIRED_USE="jpeg? ( zlib )"
 # libSM and libICE used in eggsmclient-xsmp
 RDEPEND="
 	>=dev-libs/glib-2.26:2
-	>=x11-libs/gtk+-3.0.0:3
 	>=dev-libs/libgcrypt-1.1.90:0=
+	>=x11-libs/gtk+-3:3
 
 	dev-libs/dbus-glib
 	x11-libs/cairo:=
-	x11-libs/pango[X]
 	x11-libs/libICE
+	x11-libs/libSM
 	x11-libs/libX11
 	x11-libs/libXdamage
 	x11-libs/libXext
 	x11-libs/libXfixes
-	x11-libs/libSM
 	x11-libs/libXtst
+	x11-libs/pango[X]
 
 	>=x11-libs/libnotify-0.7.0:=
 
-	avahi? ( >=net-dns/avahi-0.6:=[dbus] )
 	crypt? ( >=dev-libs/libgcrypt-1.1.90:0= )
-	gnome-keyring? ( app-crypt/libsecret )
 	jpeg? ( virtual/jpeg:0= )
-	networkmanager? ( >=net-misc/networkmanager-0.7 )
+	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] )
 	zlib? ( sys-libs/zlib:= )
 "
 DEPEND="${RDEPEND}
@@ -57,13 +56,12 @@ DEPEND="${RDEPEND}
 src_configure() {
 	gnome2_src_configure \
 		--with-gcrypt \
-		$(use_with avahi) \
-		$(use_with crypt gcrypt) \
 		$(use_enable ipv6) \
+		$(use_with crypt gcrypt) \
 		$(use_with jpeg) \
-		$(use_with gnome-keyring secret) \
-		$(use_with networkmanager network-manager) \
+		$(use_with libsecret secret) \
 		$(use_with ssl gnutls) \
 		$(use_with telepathy) \
+		$(use_with zeroconf avahi) \
 		$(use_with zlib)
 }