Version bump for Gnome 3.10

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

3 files changed, 14 insertions, 77 deletions

diff --git a/net-misc/vinagre/ChangeLog b/net-misc/vinagre/ChangeLog
index 20896b7fb1ad..9004e13e92dd 100644
--- a/net-misc/vinagre/ChangeLog
+++ b/net-misc/vinagre/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/vinagre
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/ChangeLog,v 1.95 2013/12/08 19:33:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/ChangeLog,v 1.96 2013/12/24 17:35:43 pacho Exp $
+
+*vinagre-3.10.2 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +vinagre-3.10.2.ebuild,
+  -vinagre-3.6.2.ebuild, -vinagre-3.8.2.ebuild:
+  Version bump for Gnome 3.10
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> vinagre-3.8.3.ebuild:
   x86 stable, bug #478252
diff --git a/net-misc/vinagre/vinagre-3.8.2.ebuild b/net-misc/vinagre/vinagre-3.10.2.ebuild
index 74ff04c2acac..2217da1bfead 100644
--- a/net-misc/vinagre/vinagre-3.8.2.ebuild
+++ b/net-misc/vinagre/vinagre-3.10.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-3.8.2.ebuild,v 1.1 2013/05/14 19:53:07 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-3.10.2.ebuild,v 1.1 2013/12/24 17:35:43 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -9,7 +9,7 @@ VALA_MIN_API_VERSION=0.18
 inherit gnome2 vala
 
 DESCRIPTION="VNC client for the GNOME desktop"
-HOMEPAGE="http://live.gnome.org/Vinagre"
+HOMEPAGE="https://wiki.gnome.org/Vinagre"
 
 LICENSE="GPL-3+"
 SLOT="0"
@@ -18,9 +18,10 @@ 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.0.3:3
+	>=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]
@@ -45,24 +46,17 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-	gnome2_src_prepare
 	vala_src_prepare
+	gnome2_src_prepare
 }
 
 src_configure() {
 	DOCS="AUTHORS ChangeLog ChangeLog.pre-git NEWS README"
 	gnome2_src_configure \
-		ITSTOOL=$(type -P true) \
 		$(use_with avahi) \
 		$(use_enable rdp) \
 		$(use_enable ssh) \
 		$(use_enable spice) \
-		$(use_with telepathy)
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Remove its own installation of DOCS that go to $PN instead of $P and aren't ecompressed
-	rm -rf "${ED}"/usr/share/doc/vinagre || die
+		$(use_with telepathy) \
+		ITSTOOL=$(type -P true)
 }
diff --git a/net-misc/vinagre/vinagre-3.6.2.ebuild b/net-misc/vinagre/vinagre-3.6.2.ebuild
deleted file mode 100644
index 256ed808c0bd..000000000000
--- a/net-misc/vinagre/vinagre-3.6.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-3.6.2.ebuild,v 1.8 2013/02/02 23:07:03 ago Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="VNC client for the GNOME desktop"
-HOMEPAGE="http://live.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
-RDEPEND="
-	>=dev-libs/glib-2.28.0:2
-	>=x11-libs/gtk+-3.0.3: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/rdesktop )
-	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
-"
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog ChangeLog.pre-git NEWS README"
-	G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
-	gnome2_src_configure \
-		VALAC=$(type -P valac-0.18) \
-		$(use_with avahi) \
-		$(use_enable rdp) \
-		$(use_enable ssh) \
-		$(use_enable spice) \
-		$(use_with telepathy)
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Remove its own installation of DOCS that go to $PN instead of $P and aren't ecompressed
-	rm -rf "${ED}"/usr/share/doc/vinagre
-}