[gentoo-commits] proj/gnome:master commit in: net-misc/vino/, net-misc/vino/files/

[Alexandre Rostovtsev]

commit:     b8cd75a512f71e50f47dc339d728e54d873c730a
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 30 22:41:28 2012 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Sun Sep 30 23:08:02 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b8cd75a5

net-misc/vino: 3.5.92 → 3.6.0

Update license. Clear up the USE=secret vs. USE=gnome-keyring mixup
pointed out by elxa. (Note that "gnome-keyring" as the USE flag name
still make sense because libsecret is used for accessing implementations
of the Secret Service API - and the only implementation that currently
exists is gnome-keyring.)

---
 net-misc/vino/files/vino-3.6.0-secret-deps.patch   |   35 ++++++++++++++++++++
 .../vino/{vino-3.5.92.ebuild => vino-3.6.0.ebuild} |   13 ++++---
 net-misc/vino/vino-9999.ebuild                     |    7 ++--
 3 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/net-misc/vino/files/vino-3.6.0-secret-deps.patch b/net-misc/vino/files/vino-3.6.0-secret-deps.patch
new file mode 100644
index 0000000..9eac4c5
--- /dev/null
+++ b/net-misc/vino/files/vino-3.6.0-secret-deps.patch
@@ -0,0 +1,35 @@
+From 018e757ca2ce432142008f519ff8cb96f12c2659 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@g.o>
+Date: Sun, 30 Sep 2012 18:50:33 -0400
+Subject: [PATCH] configure: consistently use LIBSECRET_DEPS, not SECRET_DEPS
+
+https://bugzilla.gnome.org/show_bug.cgi?id=685171
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e41c5c8..0306274 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -117,7 +117,7 @@ AS_IF([test "x$have_network_manager" = "xyes"],
+     [AC_MSG_ERROR([NetworkManager support requested but not found])])])
+ 
+ # Check for secret
+-SECRET_DEPS="libsecret-1"
++LIBSECRET_DEPS="libsecret-1"
+ 
+ AC_ARG_WITH([secret],
+   [AS_HELP_STRING([--without-secret],
+@@ -131,7 +131,7 @@ AS_IF([test "x$with_secret" != "xno"],
+ 
+ AS_IF([test "x$have_secret" != "xno"],
+   [AC_DEFINE([VINO_HAVE_SECRET], [], [Build with secret support])],
+-  [SECRET_DEPS=""
++  [LIBSECRET_DEPS=""
+     AS_IF([test "x$with_secret" = "xyes"],
+     [AC_MSG_ERROR([secret support requested but not found])])])
+ 
+-- 
+1.7.12
+

diff --git a/net-misc/vino/vino-3.5.92.ebuild b/net-misc/vino/vino-3.6.0.ebuild
similarity index 87%
rename from net-misc/vino/vino-3.5.92.ebuild
rename to net-misc/vino/vino-3.6.0.ebuild
index a08c637..e2c7439 100644
--- a/net-misc/vino/vino-3.5.92.ebuild
+++ b/net-misc/vino/vino-3.6.0.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit autotools eutils gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -14,14 +14,14 @@ fi
 DESCRIPTION="An integrated VNC server for GNOME"
 HOMEPAGE="http://www.gnome.org/"
 
-LICENSE="GPL-2"
+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 ipv6 jpeg libnotify networkmanager +secret ssl +telepathy +zlib"
+IUSE="avahi crypt gnome-keyring ipv6 jpeg libnotify networkmanager ssl +telepathy +zlib"
 
 # cairo used in vino-fb
 # libSM and libICE used in eggsmclient-xsmp
@@ -69,10 +69,9 @@ pkg_setup() {
 		$(use_with crypt gcrypt)
 		$(use_enable ipv6)
 		$(use_with jpeg)
-		$(use_with gnome-keyring)
+		$(use_with gnome-keyring secret)
 		$(use_with libnotify)
 		$(use_with networkmanager network-manager)
-		$(use_with secret)
 		$(use_with ssl gnutls)
 		$(use_with telepathy)
 		$(use_with zlib)"
@@ -80,9 +79,13 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=685171
+	epatch "${FILESDIR}/${P}-secret-deps.patch"
+
 	# <glib-2.31 compatibility
 	if [[ ${PV} != 9999 ]]; then
 		rm -v server/vino-marshal.{c,h} || die
 	fi
+	eautoreconf
 	gnome2_src_prepare
 }

diff --git a/net-misc/vino/vino-9999.ebuild b/net-misc/vino/vino-9999.ebuild
index a08c637..9aba716 100644
--- a/net-misc/vino/vino-9999.ebuild
+++ b/net-misc/vino/vino-9999.ebuild
@@ -14,14 +14,14 @@ fi
 DESCRIPTION="An integrated VNC server for GNOME"
 HOMEPAGE="http://www.gnome.org/"
 
-LICENSE="GPL-2"
+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 ipv6 jpeg libnotify networkmanager +secret ssl +telepathy +zlib"
+IUSE="avahi crypt gnome-keyring ipv6 jpeg libnotify networkmanager ssl +telepathy +zlib"
 
 # cairo used in vino-fb
 # libSM and libICE used in eggsmclient-xsmp
@@ -69,10 +69,9 @@ pkg_setup() {
 		$(use_with crypt gcrypt)
 		$(use_enable ipv6)
 		$(use_with jpeg)
-		$(use_with gnome-keyring)
+		$(use_with gnome-keyring secret)
 		$(use_with libnotify)
 		$(use_with networkmanager network-manager)
-		$(use_with secret)
 		$(use_with ssl gnutls)
 		$(use_with telepathy)
 		$(use_with zlib)"