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 5DF34138CD1 for ; Fri, 8 May 2015 23:36:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DE07AE07D9; Fri, 8 May 2015 23:36:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4F073E07D9 for ; Fri, 8 May 2015 23:36:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 36689340F25 for ; Fri, 8 May 2015 23:36:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0DA849E2 for ; Fri, 8 May 2015 23:36: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: <1431127284.980f529ac720516ac61e6697b0350e08eb73361d.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: net-misc/vino/ X-VCS-Repository: proj/gnome X-VCS-Files: net-misc/vino/vino-3.16.0.ebuild net-misc/vino/vino-9999.ebuild X-VCS-Directories: net-misc/vino/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 980f529ac720516ac61e6697b0350e08eb73361d X-VCS-Branch: master Date: Fri, 8 May 2015 23:36: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: ae0d3338-4804-479e-91b2-18597d29e2cf X-Archives-Hash: 5930f91dbaa6aa9e7104fe4e4d12485d commit: 980f529ac720516ac61e6697b0350e08eb73361d Author: Gilles Dartiguelongue gentoo org> AuthorDate: Fri May 8 23:01:47 2015 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Fri May 8 23:21:24 2015 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=980f529a net-misc/vino: 3.14.2 → 3.16.0 .../vino/{vino-9999.ebuild => vino-3.16.0.ebuild} | 31 ++++++++-------------- net-misc/vino/vino-9999.ebuild | 22 +++++++-------- 2 files changed, 21 insertions(+), 32 deletions(-) diff --git a/net-misc/vino/vino-9999.ebuild b/net-misc/vino/vino-3.16.0.ebuild similarity index 69% copy from net-misc/vino/vino-9999.ebuild copy to net-misc/vino/vino-3.16.0.ebuild index 04460d9..576f810 100644 --- a/net-misc/vino/vino-9999.ebuild +++ b/net-misc/vino/vino-3.16.0.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: $ @@ -6,21 +6,14 @@ EAPI="5" GCONF_DEBUG="yes" inherit gnome2 -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi DESCRIPTION="An integrated VNC server for GNOME" HOMEPAGE="https://wiki.gnome.org/Projects/Vino" LICENSE="GPL-2+" SLOT="0" -if [[ ${PV} = 9999 ]]; then - KEYWORDS="" -else - KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -fi -IUSE="avahi crypt gnome-keyring ipv6 jpeg networkmanager ssl +telepathy +zlib" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="crypt libsecret ipv6 jpeg ssl +telepathy zeroconf +zlib" # bug #394611; tight encoding requires zlib encoding REQUIRED_USE="jpeg? ( zlib )" @@ -28,29 +21,28 @@ REQUIRED_USE="jpeg? ( zlib )" # libSM and libICE used in eggsmclient-xsmp RDEPEND=" >=dev-libs/glib-2.26:2 - >=x11-libs/gtk+-3.0.0:3 >=dev-libs/libgcrypt-1.1.90:0= + >=x11-libs/gtk+-3:3 dev-libs/dbus-glib x11-libs/cairo:= - x11-libs/pango[X] x11-libs/libICE + x11-libs/libSM x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes - x11-libs/libSM x11-libs/libXtst + x11-libs/pango[X] >=x11-libs/libnotify-0.7.0:= - avahi? ( >=net-dns/avahi-0.6:=[dbus] ) crypt? ( >=dev-libs/libgcrypt-1.1.90:0= ) - gnome-keyring? ( app-crypt/libsecret ) jpeg? ( virtual/jpeg:0= ) - networkmanager? ( >=net-misc/networkmanager-0.7 ) + libsecret? ( app-crypt/libsecret ) ssl? ( >=net-libs/gnutls-2.2.0:= ) telepathy? ( >=net-libs/telepathy-glib-0.18 ) + zeroconf? ( >=net-dns/avahi-0.6:=[dbus] ) zlib? ( sys-libs/zlib:= ) " DEPEND="${RDEPEND} @@ -64,13 +56,12 @@ DEPEND="${RDEPEND} src_configure() { gnome2_src_configure \ --with-gcrypt \ - $(use_with avahi) \ - $(use_with crypt gcrypt) \ $(use_enable ipv6) \ + $(use_with crypt gcrypt) \ $(use_with jpeg) \ - $(use_with gnome-keyring secret) \ - $(use_with networkmanager network-manager) \ + $(use_with libsecret secret) \ $(use_with ssl gnutls) \ $(use_with telepathy) \ + $(use_with zeroconf avahi) \ $(use_with zlib) } diff --git a/net-misc/vino/vino-9999.ebuild b/net-misc/vino/vino-9999.ebuild index 04460d9..8019532 100644 --- a/net-misc/vino/vino-9999.ebuild +++ b/net-misc/vino/vino-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: $ @@ -20,7 +20,7 @@ if [[ ${PV} = 9999 ]]; then else KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" fi -IUSE="avahi crypt gnome-keyring ipv6 jpeg networkmanager ssl +telepathy +zlib" +IUSE="crypt libsecret ipv6 jpeg ssl +telepathy zeroconf +zlib" # bug #394611; tight encoding requires zlib encoding REQUIRED_USE="jpeg? ( zlib )" @@ -28,29 +28,28 @@ REQUIRED_USE="jpeg? ( zlib )" # libSM and libICE used in eggsmclient-xsmp RDEPEND=" >=dev-libs/glib-2.26:2 - >=x11-libs/gtk+-3.0.0:3 >=dev-libs/libgcrypt-1.1.90:0= + >=x11-libs/gtk+-3:3 dev-libs/dbus-glib x11-libs/cairo:= - x11-libs/pango[X] x11-libs/libICE + x11-libs/libSM x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes - x11-libs/libSM x11-libs/libXtst + x11-libs/pango[X] >=x11-libs/libnotify-0.7.0:= - avahi? ( >=net-dns/avahi-0.6:=[dbus] ) crypt? ( >=dev-libs/libgcrypt-1.1.90:0= ) - gnome-keyring? ( app-crypt/libsecret ) jpeg? ( virtual/jpeg:0= ) - networkmanager? ( >=net-misc/networkmanager-0.7 ) + libsecret? ( app-crypt/libsecret ) ssl? ( >=net-libs/gnutls-2.2.0:= ) telepathy? ( >=net-libs/telepathy-glib-0.18 ) + zeroconf? ( >=net-dns/avahi-0.6:=[dbus] ) zlib? ( sys-libs/zlib:= ) " DEPEND="${RDEPEND} @@ -64,13 +63,12 @@ DEPEND="${RDEPEND} src_configure() { gnome2_src_configure \ --with-gcrypt \ - $(use_with avahi) \ - $(use_with crypt gcrypt) \ $(use_enable ipv6) \ + $(use_with crypt gcrypt) \ $(use_with jpeg) \ - $(use_with gnome-keyring secret) \ - $(use_with networkmanager network-manager) \ + $(use_with libsecret secret) \ $(use_with ssl gnutls) \ $(use_with telepathy) \ + $(use_with zeroconf avahi) \ $(use_with zlib) }