[gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-boxes/

[Gilles Dartiguelongue]

commit:     ae7b4f3625a5efa7dfce759d8c2717f1c889e448
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 16 16:00:51 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec  1 15:48:53 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ae7b4f36

gnome-extra/gnome-boxes: 3.6.3-r1 → 3.10.2

---
 ...s-3.6.3-r1.ebuild => gnome-boxes-3.10.2.ebuild} | 44 ++++++----
 gnome-extra/gnome-boxes/gnome-boxes-3.6.3.ebuild   | 94 ----------------------
 gnome-extra/gnome-boxes/gnome-boxes-9999.ebuild    | 35 ++++----
 gnome-extra/gnome-boxes/metadata.xml               |  6 +-
 4 files changed, 53 insertions(+), 126 deletions(-)

diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.6.3-r1.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.10.2.ebuild
similarity index 69%
rename from gnome-extra/gnome-boxes/gnome-boxes-3.6.3-r1.ebuild
rename to gnome-extra/gnome-boxes/gnome-boxes-3.10.2.ebuild
index 3a51ebd..124bb8e 100644
--- a/gnome-extra/gnome-boxes/gnome-boxes-3.6.3-r1.ebuild
+++ b/gnome-extra/gnome-boxes/gnome-boxes-3.10.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 GCONF_DEBUG="no"
 VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.18"
+VALA_MIN_API_VERSION="0.22"
 
 inherit linux-info gnome2 vala
 if [[ ${PV} = 9999 ]]; then
@@ -17,7 +17,7 @@ HOMEPAGE="https://live.gnome.org/Design/Apps/Boxes"
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="bindist"
+IUSE="bindist smartcard usbredir"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
@@ -25,18 +25,19 @@ else
 fi
 
 # NOTE: sys-fs/* stuff is called via exec()
+# FIXME: ovirt is not available in tree
 RDEPEND="
-	>=dev-libs/libxml2-2.7.8:2
-	>=virtual/udev-165[gudev]
-	>=dev-libs/glib-2.29.90:2
+	>=dev-libs/glib-2.32:2
 	>=dev-libs/gobject-introspection-0.9.6
-	>=sys-libs/libosinfo-0.2.1
-	app-emulation/qemu[spice]
+	>=dev-libs/libxml2-2.7.8:2
+	>=sys-libs/libosinfo-0.2.7
+	>=app-emulation/qemu-1.3.1[spice,smartcard?,usbredir?]
 	>=app-emulation/libvirt-0.9.3[libvirtd,qemu]
-	>=app-emulation/libvirt-glib-0.1.2
-	>=x11-libs/gtk+-3.5.5:3
+	>=app-emulation/libvirt-glib-0.1.7
+	>=x11-libs/gtk+-3.9:3
 	>=net-libs/gtk-vnc-0.4.4[gtk3]
-	>=net-misc/spice-gtk-0.12.101[gtk3]
+	>=net-misc/spice-gtk-0.16[gtk3,smartcard?,usbredir?]
+
 	>=app-misc/tracker-0.16:0=[iso]
 
 	>=media-libs/clutter-gtk-1.3.2:1.0
@@ -47,9 +48,12 @@ RDEPEND="
 	sys-fs/fuse
 	sys-fs/fuseiso
 	sys-fs/mtools
+	>=virtual/udev-165[gudev]
 	!bindist? ( gnome-extra/gnome-boxes-nonfree )
 "
 DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-util/desktop-file-utils
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
@@ -61,7 +65,8 @@ if [[ ${PV} = 9999 ]]; then
 		sys-libs/libosinfo[introspection,vala]
 		app-emulation/libvirt-glib[introspection,vala]
 		net-libs/gtk-vnc[introspection,vala]
-		net-misc/spice-gtk[introspection,vala]"
+		net-misc/spice-gtk[introspection,vala]
+		net-libs/rest:0.7[introspection]"
 fi
 
 pkg_pretend() {
@@ -74,18 +79,23 @@ pkg_pretend() {
 }
 
 src_prepare() {
-	# Add support for tracker-0.16
-	sed -e "s/\(tracker-sparql\)-.*/\1-0.16/" \
-		-i configure.ac configure || die
+	# Do not change CFLAGS, wondering about VALA ones but appears to be
+	# needed as noted in configure comments below
+	sed 's/CFLAGS="$CFLAGS -O0 -ggdb3"//' -i configure{.ac,} || die
 
-	gnome2_src_prepare
 	vala_src_prepare
+	gnome2_src_prepare
 }
 
 src_configure() {
 	DOCS="AUTHORS README NEWS THANKS TODO"
+	# debug needed for splitdebug proper behavior (cardoe)
 	gnome2_src_configure \
-		--disable-strict-cc
+		--enable-debug \
+		--disable-strict-cc \
+		$(use_enable usbredir) \
+		$(use_enable smartcard) \
+		--enable-ovirt=no
 }
 
 pkg_postinst() {

diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.6.3.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.6.3.ebuild
deleted file mode 100644
index 43279aa..0000000
--- a/gnome-extra/gnome-boxes/gnome-boxes-3.6.3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="no"
-
-inherit linux-info gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Simple GNOME 3 application to access remote or virtual systems"
-HOMEPAGE="https://live.gnome.org/Design/Apps/Boxes"
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="bindist"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64" # qemu-kvm[spice] is 64bit-only
-fi
-
-# NOTE: sys-fs/* stuff is called via exec()
-RDEPEND="
-	>=dev-libs/libxml2-2.7.8:2
-	>=virtual/udev-165[gudev]
-	>=dev-libs/glib-2.29.90:2
-	>=dev-libs/gobject-introspection-0.9.6
-	>=sys-libs/libosinfo-0.2.1
-	app-emulation/qemu[spice]
-	>=app-emulation/libvirt-0.9.3[libvirtd,qemu]
-	>=app-emulation/libvirt-glib-0.1.2
-	>=x11-libs/gtk+-3.5.5:3
-	>=net-libs/gtk-vnc-0.4.4[gtk3]
-	>=net-misc/spice-gtk-0.12.101[gtk3]
-	>=app-misc/tracker-0.14[iso]
-	<app-misc/tracker-0.16
-
-	>=media-libs/clutter-gtk-1.3.2:1.0
-	>=media-libs/clutter-1.11.14:1.0
-	>=sys-apps/util-linux-2.20
-	>=net-libs/libsoup-2.38:2.4
-
-	sys-fs/fuse
-	sys-fs/fuseiso
-	sys-fs/mtools
-	!bindist? ( gnome-extra/gnome-boxes-nonfree )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		>=dev-lang/vala-0.17.2:0.18[vapigen]
-		sys-libs/libosinfo[introspection,vala]
-		app-emulation/libvirt-glib[introspection,vala]
-		net-libs/gtk-vnc[introspection,vala]
-		net-misc/spice-gtk[introspection,vala]"
-fi
-
-pkg_pretend() {
-	linux_config_exists
-
-	if ! { linux_chkconfig_present KVM_AMD || \
-		linux_chkconfig_present KVM_INTEL; }; then
-		ewarn "You need KVM support in your kernel to use GNOME Boxes!"
-	fi
-}
-
-src_configure() {
-	DOCS="AUTHORS README NEWS THANKS TODO"
-	G2CONF="${G2CONF}
-		--disable-schemas-compile
-		--disable-strict-cc
-		VALAC=$(type -P valac-0.18)
-		VAPIGEN=$(type -P vapigen-0.18)
-	"
-	gnome2_src_configure
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	elog "Before running gnome-boxes, you will need to load the KVM modules"
-	elog "If you have an Intel Processor, run:"
-	elog "	modprobe kvm-intel"
-	einfo
-	elog "If you have an AMD Processor, run:"
-	elog "	modprobe kvm-amd"
-}

diff --git a/gnome-extra/gnome-boxes/gnome-boxes-9999.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-9999.ebuild
index 8c4f9bf..eb2b91d 100644
--- a/gnome-extra/gnome-boxes/gnome-boxes-9999.ebuild
+++ b/gnome-extra/gnome-boxes/gnome-boxes-9999.ebuild
@@ -1,11 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 GCONF_DEBUG="no"
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.22"
 
-inherit linux-info gnome2
+inherit linux-info gnome2 vala
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -23,16 +25,16 @@ else
 fi
 
 # NOTE: sys-fs/* stuff is called via exec()
+# FIXME: ovirt is not available in tree
 RDEPEND="
-	>=dev-libs/libxml2-2.7.8:2
-	>=virtual/udev-165[gudev]
-	>=dev-libs/glib-2.29.90:2
+	>=dev-libs/glib-2.32:2
 	>=dev-libs/gobject-introspection-0.9.6
-	>=sys-libs/libosinfo-0.2.1
+	>=dev-libs/libxml2-2.7.8:2
+	>=sys-libs/libosinfo-0.2.7
 	>=app-emulation/qemu-1.3.1[spice,smartcard?,usbredir?]
 	>=app-emulation/libvirt-0.9.3[libvirtd,qemu]
-	>=app-emulation/libvirt-glib-0.1.2
-	>=x11-libs/gtk+-3.5.5:3
+	>=app-emulation/libvirt-glib-0.1.7
+	>=x11-libs/gtk+-3.9:3
 	>=net-libs/gtk-vnc-0.4.4[gtk3]
 	>=net-misc/spice-gtk-0.16[gtk3,smartcard?,usbredir?]
 
@@ -46,9 +48,12 @@ RDEPEND="
 	sys-fs/fuse
 	sys-fs/fuseiso
 	sys-fs/mtools
+	>=virtual/udev-165[gudev]
 	!bindist? ( gnome-extra/gnome-boxes-nonfree )
 "
 DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-util/desktop-file-utils
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
@@ -56,11 +61,12 @@ DEPEND="${RDEPEND}
 
 if [[ ${PV} = 9999 ]]; then
 	DEPEND="${DEPEND}
-		>=dev-lang/vala-0.17.2:0.18[vapigen]
+		$(vala_depend)
 		sys-libs/libosinfo[introspection,vala]
 		app-emulation/libvirt-glib[introspection,vala]
 		net-libs/gtk-vnc[introspection,vala]
-		net-misc/spice-gtk[introspection,vala]"
+		net-misc/spice-gtk[introspection,vala]
+		net-libs/rest:0.7[introspection]"
 fi
 
 pkg_pretend() {
@@ -75,8 +81,10 @@ pkg_pretend() {
 src_prepare() {
 	# Do not change CFLAGS, wondering about VALA ones but appears to be
 	# needed as noted in configure comments below
-	sed 's/CFLAGS="$CFLAGS -O0 -ggdb3"' -i configure.ac || die
-	gnome2_src_configure
+	sed 's/CFLAGS="$CFLAGS -O0 -ggdb3"//' -i configure.ac || die
+
+	vala_src_prepare
+	gnome2_src_prepare
 }
 
 src_configure() {
@@ -87,8 +95,7 @@ src_configure() {
 		--disable-strict-cc \
 		$(use_enable usbredir) \
 		$(use_enable smartcard) \
-		VALAC=$(type -P valac-0.18) \
-		VAPIGEN=$(type -P vapigen-0.18)
+		--enable-ovirt=no
 }
 
 pkg_postinst() {

diff --git a/gnome-extra/gnome-boxes/metadata.xml b/gnome-extra/gnome-boxes/metadata.xml
index 6e0e2ec..fa5ebd0 100644
--- a/gnome-extra/gnome-boxes/metadata.xml
+++ b/gnome-extra/gnome-boxes/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+	<herd>gnome</herd>
+	<use>
+		<flag name="usbredir">Use <pkg>sys-apps/usbredir</pkg> to redirect USB
+			devices to another machine over TCP</flag>
+	</use>
 </pkgmetadata>