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

[Gilles Dartiguelongue]

commit:     911758e19751be1eb1893d399d6ef62296391204
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 21:33:44 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec  1 22:03:51 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=911758e1

net-misc/vinagre: 3.8.3 → 3.10.2

---
 .../{vinagre-9999.ebuild => vinagre-3.10.2.ebuild} | 38 +++++++++-------------
 net-misc/vinagre/vinagre-9999.ebuild               | 29 ++++++++++-------
 2 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/net-misc/vinagre/vinagre-9999.ebuild b/net-misc/vinagre/vinagre-3.10.2.ebuild
similarity index 68%
copy from net-misc/vinagre/vinagre-9999.ebuild
copy to net-misc/vinagre/vinagre-3.10.2.ebuild
index a4fbaa3..912252a 100644
--- a/net-misc/vinagre/vinagre-9999.ebuild
+++ b/net-misc/vinagre/vinagre-3.10.2.ebuild
@@ -4,30 +4,24 @@
 
 EAPI="5"
 GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
+VALA_MIN_API_VERSION=0.18
 
-inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
+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"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
+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.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]
@@ -48,30 +42,28 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.50
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
+	$(vala_depend)
 "
 
-if [[ ${PV} = 9999 ]]; then
-	DEPEND+="
-		dev-lang/vala:0.18
-		app-text/yelp-tools
-		gnome-base/gnome-common"
-fi
+src_prepare() {
+	vala_src_prepare
+	gnome2_src_prepare
+}
 
 src_configure() {
-	DOCS="AUTHORS ChangeLog ChangeLog.pre-git NEWS README"
-	[[ ${PV} = 9999 ]] || 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)
+		$(use_with telepathy) \
+		ITSTOOL=$(type -P true)
 }
 
 src_install() {
+	DOCS="AUTHORS ChangeLog ChangeLog.pre-git NEWS README"
 	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
+	rm -r "${ED}"/usr/share/doc/vinagre || die
 }

diff --git a/net-misc/vinagre/vinagre-9999.ebuild b/net-misc/vinagre/vinagre-9999.ebuild
index a4fbaa3..10f31ec 100644
--- a/net-misc/vinagre/vinagre-9999.ebuild
+++ b/net-misc/vinagre/vinagre-9999.ebuild
@@ -4,30 +4,31 @@
 
 EAPI="5"
 GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
+VALA_MIN_API_VERSION=0.18
 
-inherit gnome2
+inherit gnome2 vala
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
 
 DESCRIPTION="VNC client for the GNOME desktop"
-HOMEPAGE="http://live.gnome.org/Vinagre"
+HOMEPAGE="https://wiki.gnome.org/Vinagre"
 
 LICENSE="GPL-3+"
 SLOT="0"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 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]
@@ -48,30 +49,36 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.50
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
+	$(vala_depend)
 "
 
 if [[ ${PV} = 9999 ]]; then
 	DEPEND+="
-		dev-lang/vala:0.18
 		app-text/yelp-tools
 		gnome-base/gnome-common"
 fi
 
+src_prepare() {
+	vala_src_prepare
+	gnome2_src_prepare
+}
+
 src_configure() {
-	DOCS="AUTHORS ChangeLog ChangeLog.pre-git NEWS README"
-	[[ ${PV} = 9999 ]] || G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
+	local myconf=""
+	[[ ${PV} = 9999 ]] || myconf="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)
+		$(use_with telepathy) \
+		${myconf}
 }
 
 src_install() {
+	DOCS="AUTHORS ChangeLog ChangeLog.pre-git NEWS README"
 	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
+	rm -r "${ED}"/usr/share/doc/vinagre || die
 }