Version bump (bug #492778), now depend on qemu[smartcard] for smartcard support (this obsoletes libcacard, see bug #491594), add WebDAV filesharing support via USE=webdav (and net-libs/phodav).

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x1A5D023975B0583D!)

6 files changed, 288 insertions, 1 deletions

diff --git a/net-misc/spice-gtk/ChangeLog b/net-misc/spice-gtk/ChangeLog
index 7da7ad2bbf91..e81447dc6aa8 100644
--- a/net-misc/spice-gtk/ChangeLog
+++ b/net-misc/spice-gtk/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-misc/spice-gtk
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/ChangeLog,v 1.82 2014/03/11 20:08:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/ChangeLog,v 1.83 2014/06/13 12:24:31 dev-zero Exp $
+
+*spice-gtk-0.25 (13 Jun 2014)
+
+  13 Jun 2014; Tiziano Müller <dev-zero@gentoo.org>
+  +files/spice-gtk-0.25-Do-not-depend-on-libsoup-directly.patch,
+  +files/spice-gtk-0.25-Introduce-enable-disable-webdav-option.patch,
+  +files/spice-gtk-0.25-missing_gio_libs.patch, +spice-gtk-0.25.ebuild,
+  metadata.xml:
+  Version bump (bug #492778), now depend on qemu[smartcard] for smartcard
+  support (this obsoletes libcacard, see bug #491594), add WebDAV filesharing
+  support via USE=webdav (and net-libs/phodav).
 
   11 Mar 2014; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due #239126
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.25-Do-not-depend-on-libsoup-directly.patch b/net-misc/spice-gtk/files/spice-gtk-0.25-Do-not-depend-on-libsoup-directly.patch
new file mode 100644
index 000000000000..fe24734ed0d5
--- /dev/null
+++ b/net-misc/spice-gtk/files/spice-gtk-0.25-Do-not-depend-on-libsoup-directly.patch
@@ -0,0 +1,29 @@
+From 1dcf7acb4288a27f125458bfa86cf614437657d5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tiziano.mueller@stepping-stone.ch>
+Date: Tue, 20 May 2014 18:49:28 +0200
+Subject: [PATCH 2/2] Do not depend on libsoup directly
+
+The libsoup-dependency is not directly used but comes in as a dependency
+of phodav and phodav has libsoup correctly recorded in its pkg-config
+file.
+---
+ configure.ac | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 70ab75c..f47ee20 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -267,9 +267,6 @@ PKG_CHECK_MODULES(GTHREAD, gthread-2.0 > 2.0.0)
+ AC_SUBST(GTHREAD_CFLAGS)
+ AC_SUBST(GTHREAD_LIBS)
+ 
+-PKG_CHECK_MODULES(SOUP, libsoup-2.4)
+-AC_SUBST(SOUP_CFLAGS)
+-AC_SUBST(SOUP_LIBS)
+ AC_ARG_ENABLE([webdav],
+   AS_HELP_STRING([--enable-webdav=@<:@auto/yes/no@:>@],
+                  [Enable webdav support @<:@default=auto@:>@]),
+-- 
+1.9.2
+
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.25-Introduce-enable-disable-webdav-option.patch b/net-misc/spice-gtk/files/spice-gtk-0.25-Introduce-enable-disable-webdav-option.patch
new file mode 100644
index 000000000000..817a9b0a6d0a
--- /dev/null
+++ b/net-misc/spice-gtk/files/spice-gtk-0.25-Introduce-enable-disable-webdav-option.patch
@@ -0,0 +1,54 @@
+From f25626a68a2fb83b02ee7a13dd4887d1305bc068 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tiziano.mueller@stepping-stone.ch>
+Date: Tue, 20 May 2014 18:48:05 +0200
+Subject: [PATCH 1/2] Introduce --enable/disable-webdav option
+
+This makes the phodav dependency configureable.
+And name it after the corresponding channel.
+---
+ configure.ac | 21 +++++++++++++++++----
+ 1 file changed, 17 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d89bd6f..70ab75c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -270,10 +270,23 @@ AC_SUBST(GTHREAD_LIBS)
+ PKG_CHECK_MODULES(SOUP, libsoup-2.4)
+ AC_SUBST(SOUP_CFLAGS)
+ AC_SUBST(SOUP_LIBS)
++AC_ARG_ENABLE([webdav],
++  AS_HELP_STRING([--enable-webdav=@<:@auto/yes/no@:>@],
++                 [Enable webdav support @<:@default=auto@:>@]),
++  [],
++  [enable_webdav="auto"])
++
++if test "x$enable_webdav" = "xno"; then
++  have_phodav="no"
++else
++  PKG_CHECK_MODULES(PHODAV, [libphodav-1.0], [have_phodav=yes], [have_phodav=no])
++  AC_SUBST(PHODAV_CFLAGS)
++  AC_SUBST(PHODAV_LIBS)
+ 
+-PKG_CHECK_MODULES(PHODAV, [libphodav-1.0], [have_phodav=yes], [have_phodav=no])
+-AC_SUBST(PHODAV_CFLAGS)
+-AC_SUBST(PHODAV_LIBS)
++  if test "x$have_phodav" = "xno" && test "x$enable_webdav" = "xyes"; then
++    AC_MSG_ERROR([webdav support explicitly requested, but some required packages are not available])
++  fi
++fi
+ AS_IF([test "x$have_phodav" = "xyes"],
+        AC_DEFINE(USE_PHODAV, [1], [Define if supporting phodav]))
+ 
+@@ -754,7 +767,7 @@ AC_MSG_NOTICE([
+         Smartcard support:        ${have_smartcard}
+         USB redirection support:  ${have_usbredir} ${with_usbredir_hotplug}
+         DBus:                     ${have_dbus}
+-        PhoDAV:                   ${have_phodav}
++        WebDAV support:           ${have_phodav}
+ 
+         Now type 'make' to build $PACKAGE
+ 
+-- 
+1.9.2
+
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.25-missing_gio_libs.patch b/net-misc/spice-gtk/files/spice-gtk-0.25-missing_gio_libs.patch
new file mode 100644
index 000000000000..8429afd50609
--- /dev/null
+++ b/net-misc/spice-gtk/files/spice-gtk-0.25-missing_gio_libs.patch
@@ -0,0 +1,12 @@
+diff --git a/gtk/Makefile.am b/gtk/Makefile.am
+index 8da1a11..6332db9 100644
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
+@@ -189,6 +189,7 @@ libspice_client_glib_2_0_la_LIBADD =					\
+ 	$(top_builddir)/spice-common/common/libspice-common-client.la	\
+ 	$(GLIB2_LIBS)							\
+ 	$(SOUP_LIBS)							\
++	$(GIO_LIBS)								\
+ 	$(GOBJECT2_LIBS)						\
+ 	$(CELT051_LIBS)							\
+ 	$(OPUS_LIBS)							\
diff --git a/net-misc/spice-gtk/metadata.xml b/net-misc/spice-gtk/metadata.xml
index f876b1b0ad74..eed50c4677ce 100644
--- a/net-misc/spice-gtk/metadata.xml
+++ b/net-misc/spice-gtk/metadata.xml
@@ -17,5 +17,7 @@
 			vapigen and regenerate .vala files using valac</flag>
     <flag name="dbus">Support for desktop integration such as
 			automounting and other APIs exposed by your DE via D-Bus</flag>
+    <flag name="webdav">Support for folder-sharing between guest and client
+		using <pkg>net-libs/phodav</pkg></flag>
   </use>
 </pkgmetadata>
diff --git a/net-misc/spice-gtk/spice-gtk-0.25.ebuild b/net-misc/spice-gtk/spice-gtk-0.25.ebuild
new file mode 100644
index 000000000000..e6f95d8cd4fa
--- /dev/null
+++ b/net-misc/spice-gtk/spice-gtk-0.25.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/spice-gtk-0.25.ebuild,v 1.1 2014/06/13 12:24:31 dev-zero Exp $
+
+EAPI=5
+GCONF_DEBUG="no"
+WANT_AUTOMAKE="1.12"
+VALA_MIN_API_VERSION="0.14"
+VALA_USE_DEPEND="vapigen"
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit autotools eutils python-single-r1 vala
+
+DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI."
+HOMEPAGE="http://spice-space.org http://gitorious.org/spice-gtk"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+SRC_URI="http://spice-space.org/download/gtk/${P}.tar.bz2"
+KEYWORDS="~amd64"
+IUSE="dbus doc gstreamer gtk3 +introspection policykit pulseaudio
+python sasl smartcard static-libs usbredir vala webdav"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	?? ( pulseaudio gstreamer )"
+
+# TODO:
+# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
+# * use external pnp.ids as soon as that means not pulling in gnome-desktop
+RDEPEND="${PYTHON_DEPS}
+	pulseaudio? ( media-sound/pulseaudio[glib] )
+	gstreamer? (
+		media-libs/gstreamer:0.10
+		media-libs/gst-plugins-base:0.10 )
+	>=x11-libs/pixman-0.17.7
+	>=media-libs/celt-0.5.1.1:0.5.1
+	dev-libs/openssl
+	gtk3? ( x11-libs/gtk+:3[introspection?] )
+	x11-libs/gtk+:2[introspection?]
+	>=dev-libs/glib-2.26:2
+	>=x11-libs/cairo-1.2
+	virtual/jpeg
+	sys-libs/zlib
+	dbus? ( dev-libs/dbus-glib )
+	introspection? ( dev-libs/gobject-introspection )
+	python? ( dev-python/pygtk:2 )
+	sasl? ( dev-libs/cyrus-sasl )
+	smartcard? ( app-emulation/qemu[smartcard] )
+	usbredir? (
+		sys-apps/hwids
+		>=sys-apps/usbredir-0.4.2
+		virtual/libusb:1
+		virtual/udev[gudev]
+		policykit? (
+			sys-apps/acl
+			>=sys-auth/polkit-0.110-r1
+			!~sys-auth/polkit-0.111 )
+		)
+	webdav? ( net-libs/phodav )"
+DEPEND="${RDEPEND}
+	dev-lang/python
+	dev-python/pyparsing
+	dev-perl/Text-CSV
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )"
+
+# Hard-deps while building from git:
+# dev-lang/vala:0.14
+# dev-lang/perl
+
+GTK2_BUILDDIR="${WORKDIR}/${P}_gtk2"
+GTK3_BUILDDIR="${WORKDIR}/${P}_gtk3"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${P}-Introduce-enable-disable-webdav-option.patch" \
+		"${FILESDIR}/${P}-Do-not-depend-on-libsoup-directly.patch" \
+		"${FILESDIR}/${P}-missing_gio_libs.patch"
+	epatch_user
+
+	AT_NO_RECURSIVE="yes" eautoreconf
+
+	use vala && vala_src_prepare
+	mkdir ${GTK2_BUILDDIR} ${GTK3_BUILDDIR} || die
+}
+
+src_configure() {
+	local myconf
+	local audio="no"
+
+	use gstreamer && audio="gstreamer"
+	use pulseaudio && audio="pulse"
+
+	if use vala ; then
+		# force vala regen for MinGW, etc
+		rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c
+	fi
+
+	myconf="
+		$(use_enable static-libs static) \
+		$(use_enable introspection) \
+		--with-audio=${audio} \
+		$(use_with python) \
+		$(use_with sasl) \
+		$(use_enable smartcard) \
+		$(use_enable usbredir) \
+		$(use_with usbredir usb-ids-path /usr/share/misc/usb.ids) \
+		$(use_with usbredir usb-acl-helper-dir /usr/libexec) \
+		$(use_enable policykit polkit) \
+		$(use_enable vala) \
+		$(use_enable webdav) \
+		$(use_enable dbus) \
+		$(use_enable doc gtk-doc) \
+		--disable-werror \
+		--enable-pie"
+
+	cd ${GTK2_BUILDDIR}
+	echo "Running configure in ${GTK2_BUILDDIR}"
+	ECONF_SOURCE="${S}" econf --disable-maintainer-mode \
+		--with-gtk=2.0 \
+		${myconf}
+
+	if use gtk3; then
+		cd ${GTK3_BUILDDIR}
+		echo "Running configure in ${GTK3_BUILDDIR}"
+		ECONF_SOURCE="${S}" econf --disable-maintainer-mode \
+			--with-gtk=3.0 \
+			${myconf}
+	fi
+}
+
+src_compile() {
+	cd ${GTK2_BUILDDIR}
+	einfo "Running make in ${GTK2_BUILDDIR}"
+	default
+
+	if use gtk3; then
+		cd ${GTK3_BUILDDIR}
+		einfo "Running make in ${GTK3_BUILDDIR}"
+		default
+	fi
+}
+
+src_test() {
+	cd ${GTK2_BUILDDIR}
+	einfo "Running make check in ${GTK2_BUILDDIR}"
+	default
+
+	if use gtk3; then
+		cd ${GTK3_BUILDDIR}
+		einfo "Running make check in ${GTK3_BUILDDIR}"
+		default
+	fi
+}
+
+src_install() {
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+
+	cd ${GTK2_BUILDDIR}
+	einfo "Running make check in ${GTK2_BUILDDIR}"
+	default
+
+	if use gtk3; then
+		cd ${GTK3_BUILDDIR}
+		einfo "Running make install in ${GTK3_BUILDDIR}"
+		default
+	fi
+
+	# Remove .la files if they're not needed
+	use static-libs || prune_libtool_files
+
+	use python && rm -rf "${ED}"/usr/lib*/python*/site-packages/*.la
+
+	make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
+}