Added vala USE-flag to regenerate the pre-generated code if requested. Fixed bug...

Package-Manager: portage-2.1.10.27/cvs/Linux x86_64

diff --git a/net-misc/spice-gtk/ChangeLog b/net-misc/spice-gtk/ChangeLog
index c6d4706d872ed5cb176b4839eba0c2952152129b..5e81cff1f913e48f9c0f7acf8878116a5431adb8 100644 (file)
--- a/net-misc/spice-gtk/ChangeLog
+++ b/net-misc/spice-gtk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/spice-gtk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/ChangeLog,v 1.5 2011/07/25 12:32:11 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/ChangeLog,v 1.6 2011/10/19 08:37:10 dev-zero Exp $
+
+  19 Oct 2011; Tiziano Müller <dev-zero@gentoo.org> spice-gtk-0.7.ebuild,
+  metadata.xml:
+  Added vala USE-flag to regenerate the pre-generated code if requested. Fixed
+  bug #377051 by adding -j1 to 'emake install' (final solution will be upstream
+  once spice-gtk is integrated in spice). Fixed bug #377041 by updating the
+  spice-protocol dependency.
 
 *spice-gtk-0.7 (25 Jul 2011)
 

diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index 8a113e57b5b420f75fc770fec01de9fb65172509..ee1721d6ea2b191bbec04f77ce5a04babd144a1b 100644 (file)
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX spice.protocol 159 RMD160 21355d8f9f223cfbd6c37431427e882a1c462693 SHA1 fa0b2a8ae28bd93bc70423a99d803f5af5fe5ed3 SHA256 9a13ea202d5b26cbb45874c56df95d30c15a9372e55140426742f249f5b16525
 AUX spice.schemas 1305 RMD160 308a15a26d54874237c8d1698176c1dddbd3c243 SHA1 a6c8fd323ef971924f996857b9d26cabf8a4696d SHA256 aa21d09f57e539a9206d88051f2b4d1a15e9eb3e8ea2d104bdcdcb677801ea14
@@ -8,15 +8,13 @@ DIST spice-gtk-0.6.tar.bz2 752451 RMD160 09c3d4c55ec15154ddf5a610809fb036ef7838f
 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.ebuild 2495 RMD160 34ac163bdb0b83d5ea8f7dc4b1d3e12cf8de8df3 SHA1 62ccf2787f647ff6dcab07fcb261ded1c53b24b7 SHA256 72765c289d8e700bda335bf017cdc4448166563d64e8e165905a0695d2ab2adb
-MISC ChangeLog 1054 RMD160 3d70ed6ac4e12b63a127688f7ee7419c8870c523 SHA1 b382f3b72e8848e505c6df5cb34d9305ed15566e SHA256 1ddaec14c7283720bf273db046f4b5136e4e3fdb8259bd4381d7bd4e59da078e
-MISC metadata.xml 456 RMD160 0301d3806649e0441f8d15e8c2ae79b378bbdefb SHA1 c43745fc3cac2741d0e79c9d0460a0b5aa4a84f0 SHA256 cc96c74b8c4538df9d31dbb0d8232bb2997d9eb4db2ea1a7bf460961f0d1001a
+EBUILD spice-gtk-0.7.ebuild 2700 RMD160 563214555aba6049d7c62bee51e7c53b8f753aa0 SHA1 c777a3665ffe417282270cfa12bdb9d241ba5d32 SHA256 c4bd2d2d1998e249f0546b980e0c956e979af99a2271d4b0d34867a683c543fe
+MISC ChangeLog 1410 RMD160 d16fce0803094f8b800abdd04178abf7488a058d SHA1 4291b2924cc74a028700a71bfb034029b462c9ba SHA256 3e33c5c22554195d96becb504bbd409c6e103ac9a83015da65ac3674b980ff32
+MISC metadata.xml 554 RMD160 18b243fe67fff640049d3951a72e83e796edadda SHA1 282065748405cf9d85cdf7b1646fa44a0fed4a70 SHA256 e9053ff95b2cb682f2c243f72884bf3f1e34d8cec960b3a51b6c2dd1c365469c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59rQsACgkQfXuS5UK5QB0VPwP7BdnQlza3sVLw+WY+jvest9zv
-cqnoq5PWXA+VteGOZRAWLUdOgq2bV2AILTc33t/X+4Gtn8dSXhrnRtg5CI83FcOW
-SraPvmH/be2Ia6MYWKuSVnAjMJI3/V+15Ao6a3vlreUhknxqyzzmIIRiKwmBi9W9
-Zq1D7UIczUV4ZOm7CA0=
-=pBBO
+iEYEARECAAYFAk6ei6EACgkQGwVqY66cHjBJPACfZRvEGSk4f2QJvrmj5IswUx3a
+vm0An3nJMb3PI/dmZ9JSHSVC38hSLDds
+=Sa5r
 -----END PGP SIGNATURE-----

diff --git a/net-misc/spice-gtk/metadata.xml b/net-misc/spice-gtk/metadata.xml
index 73ec72a383f5cb59cbffe74e54a9b3554e6ff87a..666c5bddaafae8f5b757546e5200291e46a63388 100644 (file)
--- a/net-misc/spice-gtk/metadata.xml
+++ b/net-misc/spice-gtk/metadata.xml
@@ -8,5 +8,6 @@
        <use>
                <flag name="gtk3">Link against <pkg>x11-libs/gtk+:3</pkg> instead of <pkg>x11-libs/gtk+:2</pkg></flag>
                <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
+               <flag name="vala">Regenerate pre-generated vala code using <pkg>dev-lang/vala:0.12</pkg></flag>
        </use>
 </pkgmetadata>

diff --git a/net-misc/spice-gtk/spice-gtk-0.7.ebuild b/net-misc/spice-gtk/spice-gtk-0.7.ebuild
index 7f7aab6f35da709af70a0e1110825b29991b9101..3c13958bb931a3301447a616cd90464f17cf5bcc 100644 (file)
--- a/net-misc/spice-gtk/spice-gtk-0.7.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.ebuild,v 1.1 2011/07/25 12:32:11 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/spice-gtk-0.7.ebuild,v 1.2 2011/10/19 08:37:10 dev-zero Exp $
 
 EAPI=3
 
@@ -15,11 +15,11 @@ SRC_URI="http://spice-space.org/download/gtk/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+cairo doc gnome gstreamer gtk3 introspection kde +pulseaudio python sasl static-libs"
+IUSE="+cairo doc gnome gstreamer gtk3 introspection kde +pulseaudio python sasl static-libs vala"
 
 RDEPEND="pulseaudio? ( !gstreamer? ( media-sound/pulseaudio ) )
        gstreamer? ( media-libs/gstreamer )
-       >=app-emulation/spice-protocol-0.8.0-r1
+       >=app-emulation/spice-protocol-0.8.1
        >=x11-libs/pixman-0.17.7
        >=media-libs/celt-0.5.1.1:0.5.1
        dev-libs/openssl
@@ -34,6 +34,7 @@ RDEPEND="pulseaudio? ( !gstreamer? ( media-sound/pulseaudio ) )
        sasl? ( dev-libs/cyrus-sasl )
        gnome? ( gnome-base/gconf )"
 DEPEND="${RDEPEND}
+       vala? ( dev-lang/vala:0.12 )
        dev-lang/python
        dev-lang/perl
        dev-perl/Text-CSV
@@ -53,6 +54,10 @@ src_configure() {
        use pulseaudio && audio="pulse"
        use gstreamer && audio="gstreamer"
        use gtk3 && gtk="3.0"
+       if use vala ; then
+               rm gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c # force vala regen
+               export VALAC=$(which valac-0.12)
+       fi
 
        econf \
                $(use_enable static-libs static) \
@@ -61,12 +66,13 @@ src_configure() {
                $(use_with !cairo x11) \
                $(use_with python) \
                $(use_with sasl) \
+               $(use_enable vala) \
                --with-gtk="${gtk}" \
                --disable-smartcard
 }
 
 src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
+       emake -j1 DESTDIR="${D}" install || die "emake install failed"
 
        use static-libs || rm -rf "${D}"/usr/lib*/*.la
        use python && rm -rf "${D}"/usr/lib*/python*/site-packages/*.la