Pull in app-emulation/spice-protocol (#508820 by Alexander Tsoy), drop old

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 9 insertions, 127 deletions

diff --git a/net-misc/vinagre/ChangeLog b/net-misc/vinagre/ChangeLog
index b9913f59bdde..651e72e525c6 100644
--- a/net-misc/vinagre/ChangeLog
+++ b/net-misc/vinagre/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/vinagre
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/ChangeLog,v 1.107 2014/07/23 15:24:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/ChangeLog,v 1.108 2014/09/07 13:33:37 pacho Exp $
+
+  07 Sep 2014; Pacho Ramos <pacho@gentoo.org> -vinagre-3.10.2.ebuild,
+  -vinagre-3.12.1.ebuild, vinagre-3.12.2.ebuild:
+  Pull in app-emulation/spice-protocol (#508820 by Alexander Tsoy), drop old
 
   23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> vinagre-3.12.2.ebuild:
   Stable for x86, wrt bug #512012
diff --git a/net-misc/vinagre/vinagre-3.10.2.ebuild b/net-misc/vinagre/vinagre-3.10.2.ebuild
deleted file mode 100644
index f9aa8e308aba..000000000000
--- a/net-misc/vinagre/vinagre-3.10.2.ebuild
+++ /dev/null
@@ -1,62 +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/vinagre/vinagre-3.10.2.ebuild,v 1.5 2014/03/15 10:27:45 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION=0.18
-
-inherit gnome2 vala
-
-DESCRIPTION="VNC client for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Vinagre"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="avahi rdp +ssh spice +telepathy"
-
-# cairo used in vinagre-tab
-# gdk-pixbuf used all over the place
-# FIXME: uses xfreerdp ???
-RDEPEND="
-	>=dev-libs/glib-2.28.0:2
-	>=x11-libs/gtk+-3.9.6:3
-	app-crypt/libsecret
-	>=dev-libs/libxml2-2.6.31:2
-	>=net-libs/gtk-vnc-0.4.3[gtk3]
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	x11-themes/gnome-icon-theme
-
-	avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] )
-	rdp? ( net-misc/freerdp )
-	ssh? ( >=x11-libs/vte-0.20:2.90 )
-	spice? ( >=net-misc/spice-gtk-0.5[gtk3] )
-	telepathy? (
-		dev-libs/dbus-glib
-		>=net-libs/telepathy-glib-0.11.6 )
-"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	>=dev-util/intltool-0.50
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	$(vala_depend)
-"
-
-src_prepare() {
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog ChangeLog.pre-git NEWS README"
-	gnome2_src_configure \
-		$(use_with avahi) \
-		$(use_enable rdp) \
-		$(use_enable ssh) \
-		$(use_enable spice) \
-		$(use_with telepathy) \
-		ITSTOOL=$(type -P true)
-}
diff --git a/net-misc/vinagre/vinagre-3.12.1.ebuild b/net-misc/vinagre/vinagre-3.12.1.ebuild
deleted file mode 100644
index 364e26e1a143..000000000000
--- a/net-misc/vinagre/vinagre-3.12.1.ebuild
+++ /dev/null
@@ -1,62 +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/vinagre/vinagre-3.12.1.ebuild,v 1.2 2014/07/18 13:15:02 klausman Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION=0.18
-
-inherit gnome2 vala
-
-DESCRIPTION="VNC client for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Vinagre"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="avahi rdp +ssh spice +telepathy"
-
-# cairo used in vinagre-tab
-# gdk-pixbuf used all over the place
-# FIXME: uses xfreerdp ???
-RDEPEND="
-	>=dev-libs/glib-2.28.0:2
-	>=x11-libs/gtk+-3.9.6:3
-	app-crypt/libsecret
-	>=dev-libs/libxml2-2.6.31:2
-	>=net-libs/gtk-vnc-0.4.3[gtk3]
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	x11-themes/gnome-icon-theme
-
-	avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] )
-	rdp? ( net-misc/freerdp )
-	ssh? ( >=x11-libs/vte-0.20:2.90 )
-	spice? ( >=net-misc/spice-gtk-0.5[gtk3] )
-	telepathy? (
-		dev-libs/dbus-glib
-		>=net-libs/telepathy-glib-0.11.6 )
-"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	>=dev-util/intltool-0.50
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	$(vala_depend)
-"
-
-src_prepare() {
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog ChangeLog.pre-git NEWS README"
-	gnome2_src_configure \
-		$(use_with avahi) \
-		$(use_enable rdp) \
-		$(use_enable ssh) \
-		$(use_enable spice) \
-		$(use_with telepathy) \
-		ITSTOOL=$(type -P true)
-}
diff --git a/net-misc/vinagre/vinagre-3.12.2.ebuild b/net-misc/vinagre/vinagre-3.12.2.ebuild
index 3212393d233a..ac859e3826e7 100644
--- a/net-misc/vinagre/vinagre-3.12.2.ebuild
+++ b/net-misc/vinagre/vinagre-3.12.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-3.12.2.ebuild,v 1.4 2014/07/23 15:24:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-3.12.2.ebuild,v 1.5 2014/09/07 13:33:37 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -32,7 +32,9 @@ RDEPEND="
 	avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] )
 	rdp? ( net-misc/freerdp )
 	ssh? ( >=x11-libs/vte-0.20:2.90 )
-	spice? ( >=net-misc/spice-gtk-0.5[gtk3] )
+	spice? (
+		app-emulation/spice-protocol
+		>=net-misc/spice-gtk-0.5[gtk3] )
 	telepathy? (
 		dev-libs/dbus-glib
 		>=net-libs/telepathy-glib-0.11.6 )