From: Nirbheek Chauhan Date: Mon, 9 Jan 2012 15:33:10 +0000 (+0000) Subject: Add usbredir support, remove USE=cairo, + other minor ebuild changes. Update vala... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=84b087ad8bea51c40acc439a797fe87fe7866a0f;p=gentoo.git Add usbredir support, remove USE=cairo, + other minor ebuild changes. Update vala use-description. Add myself to metadata.xml with dev-zero's permission. Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64 --- diff --git a/net-misc/spice-gtk/ChangeLog b/net-misc/spice-gtk/ChangeLog index 76bfc0365a2b..7c6d062e0bac 100644 --- a/net-misc/spice-gtk/ChangeLog +++ b/net-misc/spice-gtk/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/spice-gtk # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/ChangeLog,v 1.7 2012/01/07 20:38:03 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/ChangeLog,v 1.8 2012/01/09 15:33:10 nirbheek Exp $ + + 09 Jan 2012; Nirbheek Chauhan spice-gtk-0.7.159.ebuild, + metadata.xml: + Add usbredir support, remove USE=cairo, + other minor ebuild changes. Update + vala use-description. Add myself to metadata.xml with dev-zero's permission. *spice-gtk-0.7.159 (07 Jan 2012) diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest index 858f861e0d9e..93aa8e258219 100644 --- a/net-misc/spice-gtk/Manifest +++ b/net-misc/spice-gtk/Manifest @@ -9,24 +9,24 @@ DIST spice-gtk-0.7.159.tar.bz2 800551 RMD160 f2601be265cff1379cfdf4caf3e2d4291ca DIST spice-gtk-0.7.tar.bz2 783274 RMD160 bf6db1716968cf2ba911d971a2b73b173878ba54 SHA1 aa5a5968ab24b482d973755a089f39fdc3952366 SHA256 a8e415203d59a336e3c30a16a4af4610df4bfc27fefd0326d8098759037fcb51 EBUILD spice-gtk-0.5.ebuild 2217 RMD160 1fbce76ead0f64713541cb87802666c25da0bc8a SHA1 e9fb3ebfacf3d1a2bb5ba19ae1d0b1f86b9115e3 SHA256 2a1524f6a11275efa1772fe3baa16835c0cfcf6ec587e52aac9ddbca05858ab6 EBUILD spice-gtk-0.6-r1.ebuild 2476 RMD160 ddc161c9d81c76d738f7b7a001c0678b2d860f3d SHA1 c56c2fb903ad60dfc03662fc13134cb89e631a00 SHA256 44c9e197ffe53ebf94860226f0f230c1ad21f7f7de5948e83daa80455c0abc81 -EBUILD spice-gtk-0.7.159.ebuild 3021 RMD160 8954c313e39f6fed721c0e2b944ae996e69b8965 SHA1 5789aa07f9b504ecdf2e5caa538911121dfe8b6a SHA256 0d01a0f8339fc195f94a2d5898929dabaae6deae8d1cec5b79ed9a21185e40c6 +EBUILD spice-gtk-0.7.159.ebuild 3312 RMD160 b5eebd25edace7cae0fa7ba322423621c6a820f6 SHA1 98b9200c9c6829321a86c52ff6cd0c89a07c1d5f SHA256 ac4a6c53e5487e63c75a4ebdb1ad33cb43aad8650a3907345fc7c6b454d72cb7 EBUILD spice-gtk-0.7.ebuild 2700 RMD160 563214555aba6049d7c62bee51e7c53b8f753aa0 SHA1 c777a3665ffe417282270cfa12bdb9d241ba5d32 SHA256 c4bd2d2d1998e249f0546b980e0c956e979af99a2271d4b0d34867a683c543fe -MISC ChangeLog 1567 RMD160 2c9b68dc49bf0a177562e83225509ff983fbd10d SHA1 0d202e572b58167b9dc6a710c247410e555ddb88 SHA256 1fb81ed6c6bd47f5970e7d9f3c3fdd8677241efb2074fa1e98ff920f25ad980f -MISC metadata.xml 554 RMD160 18b243fe67fff640049d3951a72e83e796edadda SHA1 282065748405cf9d85cdf7b1646fa44a0fed4a70 SHA256 e9053ff95b2cb682f2c243f72884bf3f1e34d8cec960b3a51b6c2dd1c365469c +MISC ChangeLog 1822 RMD160 760b41b6dc3c551537c83e4b53350d6df0ff7bcb SHA1 04beea60cd2af5c98cd88136caff4ceee0bb105f SHA256 bb080e9b4c20344ca72820a9f89abe4affd6ceb0a96ddef79da37a312ac59d90 +MISC metadata.xml 910 RMD160 3d840aa7b2a3f80b09efd18d9f1492776d99a996 SHA1 9b706dd492282a009bb2a0f4ad8bc7d559196a74 SHA256 b5785797bf26350dd7977d7f67a106aece090b33cfb7987fc95b2030ca382e40 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBAgAGBQJPCK09AAoJEO/kOhxWD91kiDEP/ieG7bvjTX8jMlG41grUEB1c -qD4P8o5ivRyc4TEiOiI98VA7sXhPNna+Is1niHG5JTo0Q3hbxvj7Yp8wR6RjtOkD -IQ/0rT1NHfdSt3E/Yrk4lHC25jVpHk5ogbPVht/Own5NpbRIl5l5XWANE7QXb6G5 -2PRXGMx33PyYlJBttW3IsRIenUgpMPv7dj3EgvxZI8mpwcMjjNyH6U5WonJFRlZR -mzAZVNC1sFF6h2KdnsZ+lbUCPQ43SVTc/nYo3JRVmPyc9hxPIEtVBD4Sl77mcXz7 -ik7lJFxF9e5IwFxP297OLza/OX3O6frv07DjhW0xwIwyVTcXlcZbRx8411yZYtqD -cba+rez4engvFIxrA7eSPJMWMt2/FWodnQSgFjFqdD/1QcsUMWNOeLlu7f2q2iry -T3U+NsPZ0YDWXhQ7OwGMKxgd10AeirvvY9hsF+I9vu/ZOcXgMcPKYwyylLQ4Yrk2 -qL2pFVjjqhKJnZ2uMjTiQGfwrHttP3CRgDt/kOgvdkAq+nfLduZ6pAN1Yh7hM0bz -20kvy9CM4Cmp3Qb32fymboEz2HTcflVhnRvrfq6KXvFELuJmypv4hm+ePoFkopqs -f5aSd5q44/ZwAxE0ui/E99ak6UJBcdW5rHcam4qlteGI/k+IQkYl188MqUrWeBD4 -ZcLgt8fCtSCknf7+pXgp -=FgNe +iQIcBAEBAgAGBQJPCwi+AAoJEO/kOhxWD91k790P/0FWP9i4t1LM0CPWDk8aKqCZ +9vrPaLgc5TYE4mASqCx5C67paYyc3Tt0jbj6D6I+/rEXtB7mJQHUgUPXsVAkmbFA +tk1IoJ78NY7A9bbOWvS8dz4SBwSJUuOJHf9yS/dIYvWIaccXZE0wvEdFbcwJZzM5 +or8BFQcWwKiPH39WtNDtIxyphyWL1x7327uON+9+V1UmQ9mucDe+gRf6525BngGp +Hqh/meUyA+j68cyoh46kAL5CjCx+h2yLkuURA1tt5AELXppVwVrWnTNSddnzGVU8 +FL7IaLHU/WIYp/F9fPh5VKJBdo40YRV4b+qElLcAO5n6RRtECs58aMaC3b05xht/ +x5epUd0BK07CEKQJqR3zYqH/qxQQKyvdaUfuL1QpERgBVlgbe4EGc7Irw072zydD +ojpU7M48u9G2R7mOfS3GU3kHkclTx7q/UoHPCe17XJKrpYTQfdUWm8Qu30hO76by +XdMlVbC3tybdkUDT4mQ0GVoHbnWWD3QlCOVcF9Lzzh7HWMb59HIPRK5+/Fj3bhJ7 +dMc6cNbGGzgsAwqtP27gOPtZM0wFMMijFAro4lT82Cwnn0u1U61oJD4doicfMTw5 +XobYxxhytTA/MadFcI/Okn5AiJ+pegWtDON0Svx3YVW81p1QGy5EZL9eSPsG5WwR +PB9RTsKdLUyFO0zzTZ0Y +=JodE -----END PGP SIGNATURE----- diff --git a/net-misc/spice-gtk/metadata.xml b/net-misc/spice-gtk/metadata.xml index 666c5bddaafa..f0ce32770521 100644 --- a/net-misc/spice-gtk/metadata.xml +++ b/net-misc/spice-gtk/metadata.xml @@ -5,9 +5,20 @@ dev-zero@gentoo.org Tiziano Müller + + nirbheek@gentoo.org + Nirbheek Chauhan + - Link against x11-libs/gtk+:3 instead of x11-libs/gtk+:2 - Use dev-libs/gobject-introspection for introspection - Regenerate pre-generated vala code using dev-lang/vala:0.12 + Link against x11-libs/gtk+:3 instead of + x11-libs/gtk+:2 + Use dev-libs/gobject-introspection + for introspection + Enable sys-auth/polkit support for the + usbredir acl helper + Use sys-apps/usbredir to redirect USB + devices to another machine over TCP + Generate dev-lang/vala bindings using + vapigen and regenerate .vala files using valac diff --git a/net-misc/spice-gtk/spice-gtk-0.7.159.ebuild b/net-misc/spice-gtk/spice-gtk-0.7.159.ebuild index 0913cb161635..9d44ba7216e2 100644 --- a/net-misc/spice-gtk/spice-gtk-0.7.159.ebuild +++ b/net-misc/spice-gtk/spice-gtk-0.7.159.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.7.159.ebuild,v 1.1 2012/01/07 20:38:03 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/spice-gtk-0.7.159.ebuild,v 1.2 2012/01/09 15:33:10 nirbheek Exp $ EAPI="4" GCONF_DEBUG="no" @@ -16,8 +16,10 @@ LICENSE="LGPL-2.1" SLOT="0" SRC_URI="http://spice-space.org/download/gtk/${P}.tar.bz2" KEYWORDS="~amd64 ~x86" -IUSE="+cairo doc gnome gstreamer gtk3 +introspection kde +pulseaudio python sasl static-libs vala" +IUSE="doc gnome gstreamer gtk3 +introspection kde policykit +pulseaudio +python sasl static-libs usbredir vala" +# TODO: check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h RDEPEND="pulseaudio? ( !gstreamer? ( media-sound/pulseaudio ) ) gstreamer? ( media-libs/gstreamer:0.10 @@ -35,14 +37,26 @@ RDEPEND="pulseaudio? ( !gstreamer? ( media-sound/pulseaudio ) ) introspection? ( dev-libs/gobject-introspection ) python? ( dev-python/pygtk:2 ) sasl? ( dev-libs/cyrus-sasl ) - gnome? ( gnome-base/gconf )" + gnome? ( gnome-base/gconf ) + usbredir? ( + policykit? ( + sys-auth/polkit + sys-apps/acl ) + >=dev-libs/libusb-1.0.9_rc1 + >=sys-apps/usbredir-0.3.1 + sys-fs/udev[gudev] )" DEPEND="${RDEPEND} vala? ( dev-lang/vala:0.14 ) dev-lang/python - dev-lang/perl - dev-perl/Text-CSV dev-python/pyparsing - dev-util/pkgconfig" + dev-util/pkgconfig + >=dev-util/intltool-0.40.0 + >=sys-devel/gettext-0.17" + +# Hard-deps while building from git: +# dev-lang/vala:0.14 +# dev-lang/perl +# dev-perl/Text-CSV pkg_setup() { if use gstreamer && use pulseaudio ; then @@ -59,35 +73,34 @@ src_configure() { # TODO: do a double build like gtk-vnc does to install both gtk2 & gtk3 libs use gtk3 && gtk="3.0" if use vala ; then - rm -vf gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c # force vala regen + # force vala regen for MinGW, etc + rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c fi - # TODO: usbredirection support - # needs libusbredirhost, newer libusb, policykit, libacl - econf \ + econf --disable-maintainer-mode \ VALAC=$(type -P valac-0.14) \ VAPIGEN=$(type -P vapigen-0.14) \ $(use_enable static-libs static) \ $(use_enable introspection) \ --with-audio="${audio}" \ - $(use_with !cairo x11) \ $(use_with python) \ $(use_with sasl) \ + $(use_enable usbredir) \ + $(use_enable policykit polkit) \ $(use_enable vala) \ --with-gtk="${gtk}" \ --disable-smartcard \ - --disable-usbredir \ --disable-werror } src_install() { - emake -j1 DESTDIR="${D}" install || die "emake install failed" + emake -j1 DESTDIR="${D}" install use static-libs || rm -rf "${D}"/usr/lib*/*.la use python && rm -rf "${D}"/usr/lib*/python*/site-packages/*.la use doc || rm -rf "${D}/usr/share/gtk-doc" - dodoc AUTHORS NEWS README TODO + dodoc AUTHORS NEWS README THANKS TODO make_desktop_entry spicy Spicy "" net