commit: 980f529ac720516ac61e6697b0350e08eb73361d
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri May 8 23:01:47 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> 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)
}
