commit: 35d3a323a3069825481bda6faf76230c3e5f7d2f
Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 2 15:56:05 2016 +0000
Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Sat Apr 2 15:56:05 2016 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=35d3a323
net-misc/vino: Bump version to 3.20.0
Package-Manager: portage-2.2.28
Manifest-Sign-Key: 0xE9E568677E8B4D42
net-misc/vino/metadata.xml | 1 -
net-misc/vino/{vino-9999.ebuild => vino-3.20.0.ebuild} | 18 +++++-------------
net-misc/vino/vino-9999.ebuild | 9 ++++-----
3 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/net-misc/vino/metadata.xml b/net-misc/vino/metadata.xml
index a35da3e..1208299 100644
--- a/net-misc/vino/metadata.xml
+++ b/net-misc/vino/metadata.xml
@@ -6,7 +6,6 @@
<name>Gentoo GNOME Desktop</name>
</maintainer>
<use>
- <flag name="libsecret">Enable <pkg>app-crypt/libsecret</pkg> support to
store login credentials.</flag>
<flag name="telepathy">Enable desktop sharing through a telepathy
client</flag>
</use>
</pkgmetadata>
diff --git a/net-misc/vino/vino-9999.ebuild b/net-misc/vino/vino-3.20.0.ebuild
similarity index 78%
copy from net-misc/vino/vino-9999.ebuild
copy to net-misc/vino/vino-3.20.0.ebuild
index 5760bde..5dbeac9 100644
--- a/net-misc/vino/vino-9999.ebuild
+++ b/net-misc/vino/vino-3.20.0.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$
@@ -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="crypt libsecret ipv6 jpeg ssl +telepathy zeroconf +zlib"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="crypt gnome-keyring ipv6 jpeg ssl +telepathy zeroconf +zlib"
# bug #394611; tight encoding requires zlib encoding
REQUIRED_USE="jpeg? ( zlib )"
@@ -45,8 +38,8 @@ RDEPEND="
>=x11-libs/libnotify-0.7.0:=
crypt? ( >=dev-libs/libgcrypt-1.1.90:0= )
+ gnome-keyring? ( app-crypt/libsecret )
jpeg? ( virtual/jpeg:0= )
- 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] )
@@ -62,11 +55,10 @@ DEPEND="${RDEPEND}
src_configure() {
gnome2_src_configure \
- --with-gcrypt \
$(use_enable ipv6) \
$(use_with crypt gcrypt) \
+ $(use_with gnome-keyring secret) \
$(use_with jpeg) \
- $(use_with libsecret secret) \
$(use_with ssl gnutls) \
$(use_with telepathy) \
$(use_with zeroconf avahi) \
diff --git a/net-misc/vino/vino-9999.ebuild b/net-misc/vino/vino-9999.ebuild
index 5760bde..0778222 100644
--- a/net-misc/vino/vino-9999.ebuild
+++ b/net-misc/vino/vino-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$
@@ -20,7 +20,7 @@ if [[ ${PV} = 9999 ]]; then
else
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
fi
-IUSE="crypt libsecret ipv6 jpeg ssl +telepathy zeroconf +zlib"
+IUSE="crypt gnome-keyring ipv6 jpeg ssl +telepathy zeroconf +zlib"
# bug #394611; tight encoding requires zlib encoding
REQUIRED_USE="jpeg? ( zlib )"
@@ -45,8 +45,8 @@ RDEPEND="
>=x11-libs/libnotify-0.7.0:=
crypt? ( >=dev-libs/libgcrypt-1.1.90:0= )
+ gnome-keyring? ( app-crypt/libsecret )
jpeg? ( virtual/jpeg:0= )
- 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] )
@@ -62,11 +62,10 @@ DEPEND="${RDEPEND}
src_configure() {
gnome2_src_configure \
- --with-gcrypt \
$(use_enable ipv6) \
$(use_with crypt gcrypt) \
+ $(use_with gnome-keyring secret) \
$(use_with jpeg) \
- $(use_with libsecret secret) \
$(use_with ssl gnutls) \
$(use_with telepathy) \
$(use_with zeroconf avahi) \
