[gentoo-commits] proj/gnome:master commit in: net-misc/vinagre/

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     a5836469e4b447281c830fc341be5ec56b58568d
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri May  8 22:56:48 2015 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri May  8 23:21:24 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=a5836469

net-misc/vinagre: 3.14.3 → 3.16.0

 .../{vinagre-9999.ebuild => vinagre-3.16.0.ebuild} | 23 ++++------------------
 net-misc/vinagre/vinagre-9999.ebuild               |  4 ++--
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/net-misc/vinagre/vinagre-9999.ebuild b/net-misc/vinagre/vinagre-3.16.0.ebuild
similarity index 75%
copy from net-misc/vinagre/vinagre-9999.ebuild
copy to net-misc/vinagre/vinagre-3.16.0.ebuild
index 9767427..8da8a75 100644
--- a/net-misc/vinagre/vinagre-9999.ebuild
+++ b/net-misc/vinagre/vinagre-3.16.0.ebuild
@@ -1,26 +1,19 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 GCONF_DEBUG="no"
-VALA_MIN_API_VERSION=0.18
+VALA_MIN_API_VERSION="0.18"
 
 inherit gnome2 vala
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="VNC client for the GNOME desktop"
 HOMEPAGE="https://wiki.gnome.org/Apps/Vinagre"
 
 LICENSE="GPL-3+"
 SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="avahi rdp +ssh spice +telepathy"
 
 # cairo used in vinagre-tab
@@ -54,20 +47,12 @@ DEPEND="${RDEPEND}
 	$(vala_depend)
 "
 
-if [[ ${PV} = 9999 ]]; then
-	DEPEND+="
-		app-text/yelp-tools
-		gnome-base/gnome-common"
-fi
-
 src_prepare() {
 	vala_src_prepare
 	gnome2_src_prepare
 }
 
 src_configure() {
-	local myconf=""
-	[[ ${PV} = 9999 ]] || myconf="ITSTOOL=$(type -P true)"
 	DOCS="AUTHORS ChangeLog ChangeLog.pre-git NEWS README"
 	gnome2_src_configure \
 		$(use_with avahi) \
@@ -75,5 +60,5 @@ src_configure() {
 		$(use_enable ssh) \
 		$(use_enable spice) \
 		$(use_with telepathy) \
-		${myconf}
+		ITSTOOL=$(type -P true)
 }

diff --git a/net-misc/vinagre/vinagre-9999.ebuild b/net-misc/vinagre/vinagre-9999.ebuild
index 9767427..fde58a6 100644
--- a/net-misc/vinagre/vinagre-9999.ebuild
+++ b/net-misc/vinagre/vinagre-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -19,7 +19,7 @@ SLOT="0"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 fi
 IUSE="avahi rdp +ssh spice +telepathy"