From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 4859B138247 for ; Thu, 14 Nov 2013 22:52:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B5DFCE0B1A; Thu, 14 Nov 2013 22:52:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 97D6EE0B43 for ; Thu, 14 Nov 2013 22:52:12 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C899833F24A for ; Thu, 14 Nov 2013 22:52:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E2E7CE54D6 for ; Thu, 14 Nov 2013 22:52:08 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1384475951.4ed8f991c474594a1f76718fdf4130441b85d8d0.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: net-misc/vinagre/ X-VCS-Repository: proj/gnome X-VCS-Files: net-misc/vinagre/vinagre-3.10.0.ebuild net-misc/vinagre/vinagre-9999.ebuild X-VCS-Directories: net-misc/vinagre/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 4ed8f991c474594a1f76718fdf4130441b85d8d0 X-VCS-Branch: master Date: Thu, 14 Nov 2013 22:52:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e381e9cc-ad64-4838-96b1-bca05fa4d8cf X-Archives-Hash: d50e981749c1e0977ce6bfbfe964684a commit: 4ed8f991c474594a1f76718fdf4130441b85d8d0 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sun Oct 13 21:33:44 2013 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Fri Nov 15 00:39:11 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4ed8f991 net-misc/vinagre: 3.8.3 → 3.10.0 --- .../{vinagre-9999.ebuild => vinagre-3.10.0.ebuild} | 36 +++++++++------------- net-misc/vinagre/vinagre-9999.ebuild | 22 +++++++------ 2 files changed, 26 insertions(+), 32 deletions(-) diff --git a/net-misc/vinagre/vinagre-9999.ebuild b/net-misc/vinagre/vinagre-3.10.0.ebuild similarity index 68% copy from net-misc/vinagre/vinagre-9999.ebuild copy to net-misc/vinagre/vinagre-3.10.0.ebuild index a4fbaa3..d6ec931 100644 --- a/net-misc/vinagre/vinagre-9999.ebuild +++ b/net-misc/vinagre/vinagre-3.10.0.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() { + gnome2_src_prepare + vala_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() { 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 -rf "${ED}"/usr/share/doc/vinagre || die } diff --git a/net-misc/vinagre/vinagre-9999.ebuild b/net-misc/vinagre/vinagre-9999.ebuild index a4fbaa3..3f5845b 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,31 @@ 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_configure() { + local myconf="" + [[ ${PV} = 9999 ]] || myconf="ITSTOOL=$(type -P true)" 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) \ + ${myconf} } 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 + rm -rf "${ED}"/usr/share/doc/vinagre || die }