| 1 |
commit: 35d3a323a3069825481bda6faf76230c3e5f7d2f |
| 2 |
Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 2 15:56:05 2016 +0000 |
| 4 |
Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 2 15:56:05 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=35d3a323 |
| 7 |
|
| 8 |
net-misc/vino: Bump version to 3.20.0 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
Manifest-Sign-Key: 0xE9E568677E8B4D42 |
| 12 |
|
| 13 |
net-misc/vino/metadata.xml | 1 - |
| 14 |
net-misc/vino/{vino-9999.ebuild => vino-3.20.0.ebuild} | 18 +++++------------- |
| 15 |
net-misc/vino/vino-9999.ebuild | 9 ++++----- |
| 16 |
3 files changed, 9 insertions(+), 19 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-misc/vino/metadata.xml b/net-misc/vino/metadata.xml |
| 19 |
index a35da3e..1208299 100644 |
| 20 |
--- a/net-misc/vino/metadata.xml |
| 21 |
+++ b/net-misc/vino/metadata.xml |
| 22 |
@@ -6,7 +6,6 @@ |
| 23 |
<name>Gentoo GNOME Desktop</name> |
| 24 |
</maintainer> |
| 25 |
<use> |
| 26 |
- <flag name="libsecret">Enable <pkg>app-crypt/libsecret</pkg> support to store login credentials.</flag> |
| 27 |
<flag name="telepathy">Enable desktop sharing through a telepathy client</flag> |
| 28 |
</use> |
| 29 |
</pkgmetadata> |
| 30 |
|
| 31 |
diff --git a/net-misc/vino/vino-9999.ebuild b/net-misc/vino/vino-3.20.0.ebuild |
| 32 |
similarity index 78% |
| 33 |
copy from net-misc/vino/vino-9999.ebuild |
| 34 |
copy to net-misc/vino/vino-3.20.0.ebuild |
| 35 |
index 5760bde..5dbeac9 100644 |
| 36 |
--- a/net-misc/vino/vino-9999.ebuild |
| 37 |
+++ b/net-misc/vino/vino-3.20.0.ebuild |
| 38 |
@@ -1,4 +1,4 @@ |
| 39 |
-# Copyright 1999-2015 Gentoo Foundation |
| 40 |
+# Copyright 1999-2016 Gentoo Foundation |
| 41 |
# Distributed under the terms of the GNU General Public License v2 |
| 42 |
# $Id$ |
| 43 |
|
| 44 |
@@ -6,21 +6,14 @@ EAPI="5" |
| 45 |
GCONF_DEBUG="yes" |
| 46 |
|
| 47 |
inherit gnome2 |
| 48 |
-if [[ ${PV} = 9999 ]]; then |
| 49 |
- inherit gnome2-live |
| 50 |
-fi |
| 51 |
|
| 52 |
DESCRIPTION="An integrated VNC server for GNOME" |
| 53 |
HOMEPAGE="https://wiki.gnome.org/Projects/Vino" |
| 54 |
|
| 55 |
LICENSE="GPL-2+" |
| 56 |
SLOT="0" |
| 57 |
-if [[ ${PV} = 9999 ]]; then |
| 58 |
- KEYWORDS="" |
| 59 |
-else |
| 60 |
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
| 61 |
-fi |
| 62 |
-IUSE="crypt libsecret ipv6 jpeg ssl +telepathy zeroconf +zlib" |
| 63 |
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
| 64 |
+IUSE="crypt gnome-keyring ipv6 jpeg ssl +telepathy zeroconf +zlib" |
| 65 |
# bug #394611; tight encoding requires zlib encoding |
| 66 |
REQUIRED_USE="jpeg? ( zlib )" |
| 67 |
|
| 68 |
@@ -45,8 +38,8 @@ RDEPEND=" |
| 69 |
>=x11-libs/libnotify-0.7.0:= |
| 70 |
|
| 71 |
crypt? ( >=dev-libs/libgcrypt-1.1.90:0= ) |
| 72 |
+ gnome-keyring? ( app-crypt/libsecret ) |
| 73 |
jpeg? ( virtual/jpeg:0= ) |
| 74 |
- libsecret? ( app-crypt/libsecret ) |
| 75 |
ssl? ( >=net-libs/gnutls-2.2.0:= ) |
| 76 |
telepathy? ( >=net-libs/telepathy-glib-0.18 ) |
| 77 |
zeroconf? ( >=net-dns/avahi-0.6:=[dbus] ) |
| 78 |
@@ -62,11 +55,10 @@ DEPEND="${RDEPEND} |
| 79 |
|
| 80 |
src_configure() { |
| 81 |
gnome2_src_configure \ |
| 82 |
- --with-gcrypt \ |
| 83 |
$(use_enable ipv6) \ |
| 84 |
$(use_with crypt gcrypt) \ |
| 85 |
+ $(use_with gnome-keyring secret) \ |
| 86 |
$(use_with jpeg) \ |
| 87 |
- $(use_with libsecret secret) \ |
| 88 |
$(use_with ssl gnutls) \ |
| 89 |
$(use_with telepathy) \ |
| 90 |
$(use_with zeroconf avahi) \ |
| 91 |
|
| 92 |
diff --git a/net-misc/vino/vino-9999.ebuild b/net-misc/vino/vino-9999.ebuild |
| 93 |
index 5760bde..0778222 100644 |
| 94 |
--- a/net-misc/vino/vino-9999.ebuild |
| 95 |
+++ b/net-misc/vino/vino-9999.ebuild |
| 96 |
@@ -1,4 +1,4 @@ |
| 97 |
-# Copyright 1999-2015 Gentoo Foundation |
| 98 |
+# Copyright 1999-2016 Gentoo Foundation |
| 99 |
# Distributed under the terms of the GNU General Public License v2 |
| 100 |
# $Id$ |
| 101 |
|
| 102 |
@@ -20,7 +20,7 @@ if [[ ${PV} = 9999 ]]; then |
| 103 |
else |
| 104 |
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
| 105 |
fi |
| 106 |
-IUSE="crypt libsecret ipv6 jpeg ssl +telepathy zeroconf +zlib" |
| 107 |
+IUSE="crypt gnome-keyring ipv6 jpeg ssl +telepathy zeroconf +zlib" |
| 108 |
# bug #394611; tight encoding requires zlib encoding |
| 109 |
REQUIRED_USE="jpeg? ( zlib )" |
| 110 |
|
| 111 |
@@ -45,8 +45,8 @@ RDEPEND=" |
| 112 |
>=x11-libs/libnotify-0.7.0:= |
| 113 |
|
| 114 |
crypt? ( >=dev-libs/libgcrypt-1.1.90:0= ) |
| 115 |
+ gnome-keyring? ( app-crypt/libsecret ) |
| 116 |
jpeg? ( virtual/jpeg:0= ) |
| 117 |
- libsecret? ( app-crypt/libsecret ) |
| 118 |
ssl? ( >=net-libs/gnutls-2.2.0:= ) |
| 119 |
telepathy? ( >=net-libs/telepathy-glib-0.18 ) |
| 120 |
zeroconf? ( >=net-dns/avahi-0.6:=[dbus] ) |
| 121 |
@@ -62,11 +62,10 @@ DEPEND="${RDEPEND} |
| 122 |
|
| 123 |
src_configure() { |
| 124 |
gnome2_src_configure \ |
| 125 |
- --with-gcrypt \ |
| 126 |
$(use_enable ipv6) \ |
| 127 |
$(use_with crypt gcrypt) \ |
| 128 |
+ $(use_with gnome-keyring secret) \ |
| 129 |
$(use_with jpeg) \ |
| 130 |
- $(use_with libsecret secret) \ |
| 131 |
$(use_with ssl gnutls) \ |
| 132 |
$(use_with telepathy) \ |
| 133 |
$(use_with zeroconf avahi) \ |
Archives