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 4571959CAF for ; Sat, 2 Apr 2016 16:34:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D62F521C004; Sat, 2 Apr 2016 16:34:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DE928E080A for ; Sat, 2 Apr 2016 16:34:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3C897340AC0 for ; Sat, 2 Apr 2016 16:34:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9DD6177 for ; Sat, 2 Apr 2016 16:34:41 +0000 (UTC) From: "Ole Reifschneider" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ole Reifschneider" Message-ID: <1459612274.5eafb0a7ea63552ffc0e7bb8c6c5232499e17b01.tranquility@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.20.0.ebuild net-misc/vinagre/vinagre-9999.ebuild X-VCS-Directories: net-misc/vinagre/ X-VCS-Committer: tranquility X-VCS-Committer-Name: Ole Reifschneider X-VCS-Revision: 5eafb0a7ea63552ffc0e7bb8c6c5232499e17b01 X-VCS-Branch: master Date: Sat, 2 Apr 2016 16:34:41 +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: ddc846a5-67ea-41ee-beb9-b0969bb495af X-Archives-Hash: 32dd46d827c0327722ebbab226b4997e commit: 5eafb0a7ea63552ffc0e7bb8c6c5232499e17b01 Author: Ole Reifschneider gentoo org> AuthorDate: Sat Apr 2 15:51:14 2016 +0000 Commit: Ole Reifschneider gentoo org> CommitDate: Sat Apr 2 15:51:14 2016 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=5eafb0a7 net-misc/vinagre: Bump version to 3.20.0 Package-Manager: portage-2.2.28 Manifest-Sign-Key: 0xE9E568677E8B4D42 .../{vinagre-9999.ebuild => vinagre-3.20.0.ebuild} | 26 +++++----------------- net-misc/vinagre/vinagre-9999.ebuild | 4 ++-- 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/net-misc/vinagre/vinagre-9999.ebuild b/net-misc/vinagre/vinagre-3.20.0.ebuild similarity index 74% copy from net-misc/vinagre/vinagre-9999.ebuild copy to net-misc/vinagre/vinagre-3.20.0.ebuild index 1c3d087..0cba5e3 100644 --- a/net-misc/vinagre/vinagre-9999.ebuild +++ b/net-misc/vinagre/vinagre-3.20.0.ebuild @@ -1,32 +1,24 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI="5" GCONF_DEBUG="no" -VALA_MIN_API_VERSION="0.18" inherit gnome2 linux-info 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="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" -fi +KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" IUSE="rdp +ssh spice +telepathy zeroconf" # cairo used in vinagre-tab # gdk-pixbuf used all over the place RDEPEND=" - >=dev-libs/glib-2.28.0:2 + >=dev-libs/glib-2.32.0:2 >=x11-libs/gtk+-3.9.6:3 app-crypt/libsecret >=dev-libs/libxml2-2.6.31:2 @@ -49,17 +41,12 @@ DEPEND="${RDEPEND} >=dev-lang/perl-5 dev-libs/appstream-glib >=dev-util/intltool-0.50 + dev-util/itstool >=sys-devel/gettext-0.17 virtual/pkgconfig $(vala_depend) " -if [[ ${PV} = 9999 ]]; then - DEPEND+=" - app-text/yelp-tools - gnome-base/gnome-common" -fi - pkg_pretend() { # Needed for VNC ssh tunnel, bug #518574 CONFIG_CHECK="~IPV6" @@ -72,14 +59,11 @@ 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_enable rdp) \ $(use_enable ssh) \ $(use_enable spice) \ $(use_with telepathy) \ - $(use_with zeroconf avahi) \ - ${myconf} + $(use_with zeroconf avahi) } diff --git a/net-misc/vinagre/vinagre-9999.ebuild b/net-misc/vinagre/vinagre-9999.ebuild index 1c3d087..5e9377a 100644 --- a/net-misc/vinagre/vinagre-9999.ebuild +++ b/net-misc/vinagre/vinagre-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -26,7 +26,7 @@ IUSE="rdp +ssh spice +telepathy zeroconf" # cairo used in vinagre-tab # gdk-pixbuf used all over the place RDEPEND=" - >=dev-libs/glib-2.28.0:2 + >=dev-libs/glib-2.32.0:2 >=x11-libs/gtk+-3.9.6:3 app-crypt/libsecret >=dev-libs/libxml2-2.6.31:2