Fix build issue when USE=vala is enabled. bug #451670

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

5 files changed, 51 insertions, 8 deletions

diff --git a/net-misc/spice-gtk/ChangeLog b/net-misc/spice-gtk/ChangeLog
index 340456388a4c..fea882d9048a 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/ChangeLog,v 1.52 2013/01/22 17:34:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/ChangeLog,v 1.53 2013/01/25 22:27:28 cardoe Exp $
+
+  25 Jan 2013; Doug Goldstein <cardoe@gentoo.org>
+  +files/0001-build-sys-fix-out-of-tree-build-with-vala.patch,
+  spice-gtk-0.15.3.ebuild, spice-gtk-0.16.ebuild:
+  Fix build issue when USE=vala is enabled. bug #451670
 
   22 Jan 2013; Agostino Sarubbo <ago@gentoo.org> spice-gtk-0.14-r2.ebuild:
   Stable for x86, wrt bug #451580
diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index 1509d415e157..279680433e67 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -1,5 +1,6 @@
 AUX 0.12-parallel-install.patch 723 SHA256 8205e16a007ebb481d5cf9ee66b4c698be408038798fa7176287c5c529af572d SHA512 c6928e2e4e52e65760d7c2d69a44750d4756fea232288835d91eed9ded0d2770d062232283604163a5002565e0c4fc87b776693be5627e629ae588ab0710141c WHIRLPOOL 15af38b3f8986b08e576691fa46744cb42b3ecc51384e86f7f9c1ba2b8a40727684cb8e2529cd748c006bdb8be0bfe93604fb0fe3f90e0cdcc726bdb29f2ff61
 AUX 0.14-Deal-with-libusbredirparser.pc-rename-to-libusbredir.patch 2405 SHA256 09c6ca9e8a49f8c0040f83be35223319efed658a02b3838b55ceded7ce74e156 SHA512 28d6b25796f428bd00ab76502ce714eafaf4395e8855b89a767adedf69ff6b981f90e44d4f14465e11d5b62ca6203a51673206d880aa3caa0a8c10261c6dc59d WHIRLPOOL 04c73ec53b733973f4433e86b3d711e5c32cc3849588973b86e43080e96fabc4a7308aed3fc649eb7a84d2ed1f70f74ce5d6506704bc7b2ef99b03432f4b414a
+AUX 0001-build-sys-fix-out-of-tree-build-with-vala.patch 1273 SHA256 697bb0d30a9808d2d63a60ff3452e6a95a0534572a962aafd622f9e1ad81928f SHA512 82c375f565cd02976b20f648605c1d200d371a158fb7798553ad1d0785fbb24ecc8c2d144d4a010229f03d9f86b1c2f8b38d63ac136f9432e75fb5d7c94c66f8 WHIRLPOOL 3b53c8a164d2d834faddef96a8a147f881a750bacadb7fdb0a0167a24feff0aeefe69651a4a014dbd7ad1e856a0d64a0e614da4df294c52a793db6d16b83d6db
 AUX spice.protocol 159 SHA256 9a13ea202d5b26cbb45874c56df95d30c15a9372e55140426742f249f5b16525 SHA512 39be4ab9878e1c2eb77955e80c23b58d33b6695f1177fda675ba35330ac57c7973d354e58c2b3ffa2129badb9202799e9e07db450fbb9b2d0b123a5361e2ebda WHIRLPOOL 1df7713b6e574f23fec5164e89b16909b8a88ab4cde6204dc7f013b52e1a88018fa2a685560996dcb37df5057ce62a482599f5ef7fa217762abc6fb78c627051
 AUX spice.schemas 1305 SHA256 aa21d09f57e539a9206d88051f2b4d1a15e9eb3e8ea2d104bdcdcb677801ea14 SHA512 bf894c8970c92353df0849e532ac46f7e04a3344090ca70c325ea198aa1a10e94a71649f7648a867d18b07fddc2e87be67d82d332965fc5777466e4798bfa33e WHIRLPOOL 593b2c2bad2ec1c975838ac5665a143c96f04e14a9537863eedd58ee1b34653aaa538b1e1e0a81f756c32ecc5ea4b8e08a5f988ff0fc05759633f6610eb27702
 DIST spice-gtk-0.14.tar.bz2 1204821 SHA256 a16fa27364541493b886cc943f72c8f96ec251083af0a29d405a2c4f490274f5 SHA512 64510e098927d856ac8f05c6d9f07626ee280979fd792bb92f188ff11a15ff54b11acd0471a7e30c8f6fbc594a036c6642bd3369c0d231412ea9aece6d07bba1 WHIRLPOOL 16ce4c6cfb863c76026998239b5bbbd912cdeb5044afb8533020eaf255585863f41080bcc598b51efea3dc99b5e678508f1ece3f18a6dbae0d71e4bb81b513b9
@@ -7,7 +8,7 @@ DIST spice-gtk-0.15.3-76cb.tar.bz2 1205269 SHA256 ea1c94cc621acc6a33b3f92712a809
 DIST spice-gtk-0.16.tar.bz2 1208505 SHA256 8de079f7ca44505762b9d0c91de8203dfcc6febb12d4ea3ec614de08852e25f9 SHA512 9d12d4c3b53da8b4248000cd935cdd19d0c8cb9227146d768620105858f20f5a326a533ef451c064b98a4caae350b009b4c680b8e77cd05fa92245bcf3801c6f WHIRLPOOL 5929b0806767c775c4a4f2b63ec4c1fedd164ee392c6aa4f5287ca7ecd69c0a5420cfc27a1178759c02af637ec6325dfa76dbc4e6fe50ccf41e652fe6192368a
 EBUILD spice-gtk-0.14-r2.ebuild 4236 SHA256 8af3e04d664e34f5b149e4c4663fc071c672cd98af5f114fb0a549e9c394a492 SHA512 5db208b1c279408bb78cb2b1c6969101a79cc6deae5fd0ec739c8ec143de20141184aadd5582f875a03407f6a5dbab1a61986990ef86d97bc531fbbe6efc8bd6 WHIRLPOOL 465f910492dbabc306e5dd1cefbc300224fe06a9b78e6374195838a8191297090967299a6e4c21da2bc98de628fbe5ecd5bcf04e6aad64e14d603e150d1f2057
 EBUILD spice-gtk-0.14.ebuild 3386 SHA256 d0aee0d2332ab77737702554f162b036dc9e955f28d722694d73762609c39367 SHA512 53724bcc86000745160e34374f26da6282104e58bd896ae9bb8727341a31b8ec06813a9bc250b34ec3353ed5359714c55f90cc9fc1e4c0af994469c96ba9b82a WHIRLPOOL cca8bcec49b5d5f400d8a6f02495b83546809a4b41fa607a381d65e916c9c809af133198e95158f32a71c86a0d7277f39b84434d3cf9593314ca0d57583c1824
-EBUILD spice-gtk-0.15.3.ebuild 4379 SHA256 7a79c2876e173c5c19e0770adabb1c36c409675f15d4e48d8d23ab1e4a498027 SHA512 b5c34d087b860e239f6f8144a9faa3282f9d2ba640efaf23e451f36eaae29b364c717e9995329a4f24f06ffa74a55a3205ee9a7d86d60a9ecb954a194e89e721 WHIRLPOOL 4744c9d6c1a250aeddd414943706cf26c995799cf879c489e4dd6f62c5a12f6b2d3a36f9f6d4da51d517a66dd09b4df077df481825cd2af3452a71f273e31b7e
-EBUILD spice-gtk-0.16.ebuild 4317 SHA256 be594e874a8f46f6baff638d31a26344c8c406bde03761f0f8c29f1080a23ba5 SHA512 0c7e82ad8e01c45f2eced2f1f58e8878bc07976777d505043a23cd7ab61b1014fc24ae5be8a4fdf974cb6be89e411c4068096ee2c2d51ea201e449961e2e8230 WHIRLPOOL 63c7ac7fd27f12cc21f2fd6dd0a629da8e7fc13df9d3f8c8cf381ccbcba618c2f9a5bbcdfb6c6bf81c4eb668a81753c25ba34957c23003ebb0cefe8cb81c5681
-MISC ChangeLog 8368 SHA256 df757744ad9d05fabc22a3fef05731e74624be21895faa31ce652464e232e160 SHA512 13f40bc97ddd8446e9f99e53e3fbf49e20eefb6e0e9425e0f9be22b780b1bfa2c009e835c03f2088df72abf5fb7b19cff39ebdd21bf3633277b66c9db337c2f6 WHIRLPOOL adeffdb016f56d4f81e201e3248e89dc9c572576d3af0eb989d3c2257b4e83bdeb60e221a9ee5d84ddc13b30d2cd3b5bb8ec0e1df370f68adf305de9196dc330
+EBUILD spice-gtk-0.15.3.ebuild 4450 SHA256 3315a8d30c7b24f6455781d6590255b92208614233ac64a2a77873d04bea83fe SHA512 0142773c02e40541f7085dcca2aed89b3d38af0a58fdf84e3b51f7f09127e273776a74c84965f3736a03ffd2eeef70a3b732490d29514773af6a4e0c87b18d41 WHIRLPOOL e77dff075d562b7187dadeac757ac2e91b5a3810ff8ded9638468652e4347d25eb1b6a6ccace4e4c07f6069f41188697aed53d99ab53592ce2110e2b3016ae3f
+EBUILD spice-gtk-0.16.ebuild 4390 SHA256 b5a5b788c308b74eece7a7665fba81ad121c52e2a68e3f49f5586b8bf3087260 SHA512 57cfb7f82122ef5f1b668479220da83b000827bd819cc8e6d22059ceab5e123d88e1e812f83fc304f48b608acc647e977eecadcf2a60536b831f5f0e6183fb9e WHIRLPOOL 512c5651e91291c1196d5d0307153bb6141698604081e31533ab95672e3c18d6576135b895179e12c5be6101792fa45eefed05b992e0df9853d63d478e29d2d1
+MISC ChangeLog 8591 SHA256 c1eae1ea013cc20e106a685133ea2028c77c8d30d42dd5f15858cc985aa84b47 SHA512 b242b5428c9694d4efdee39b40b1ae0a3c33fabf214a8b733bc1e21fdc189bf33eda95f7e4c87e772fe5eef162f85540f60c182718267d82aebac1ccb82bebee WHIRLPOOL 39e8e7d6f6a8d5719561c533dc7661675a93c9b7825517127c291529c299e8d02d0c8405db5d4c7c1fe52a86fefb1d9961244d9e5018527b5dc40bd88e111592
 MISC metadata.xml 1093 SHA256 e870c8e701b20e9b02117b10d3a5a401b21df1e6259c03e0c13540db6c2fd123 SHA512 20eebe5c2396bc77a6eff62cf742ada3cd4ddbef3fa38a0cee2758964d6e9810bd45734c33e89bd18d784d16faecf3ca61e5311053e4c77d1338144f9cb5032e WHIRLPOOL 19828941ec2e27d8f06fdaeea1f45b78156c5265923492f2b2e5073cec0d072fd93ae5ec4951bd82bad306afd21ed9e9424addb3bde152038eefc8ff7d4f6407
diff --git a/net-misc/spice-gtk/files/0001-build-sys-fix-out-of-tree-build-with-vala.patch b/net-misc/spice-gtk/files/0001-build-sys-fix-out-of-tree-build-with-vala.patch
new file mode 100644
index 000000000000..92be8ccc5aa4
--- /dev/null
+++ b/net-misc/spice-gtk/files/0001-build-sys-fix-out-of-tree-build-with-vala.patch
@@ -0,0 +1,35 @@
+From 6d454e4100a01499c13d55057fdd9307437a5f87 Mon Sep 17 00:00:00 2001
+From: Andrew Hughes <gnu.andrew@redhat.com>
+Date: Wed, 16 Jan 2013 22:47:18 +0000
+Subject: build-sys: fix out-of-tree build with vala
+
+---
+diff --git a/gtk/controller/Makefile.am b/gtk/controller/Makefile.am
+index f2abf93..00552e8 100644
+--- a/gtk/controller/Makefile.am
++++ b/gtk/controller/Makefile.am
+@@ -76,14 +76,16 @@ spice_controller_dump_SOURCES = dump.c
+ spice_controller_dump_LDADD = libspice-controller.la
+ 
+ controller.vala.stamp: $(libspice_controller_la_VALASOURCES) custom.vapi
+-	@if test -z "$(VALAC)"; then \
+-		echo "" ; \
+-		echo "  *** Error: missing valac!" ; \
++	@if test -z "$(VALAC)"; then						  \
++		echo "" ;							  \
++		echo "  *** Error: missing valac!" ;				  \
+ 		echo "  *** You must run autogen.sh or configure --enable-vala" ; \
+-		echo "" ; \
+-		exit 1 ; \
++		echo "" ;							  \
++		exit 1 ;							  \
+ 	fi
+-	$(VALA_V)$(VALAC) $(VALAFLAGS) $(AM_VALAFLAGS) $(libspice_controller_la_VALASOURCES) -H spice-controller.h
++	$(VALA_V)$(VALAC) $(VALAFLAGS) $(AM_VALAFLAGS)			\
++	  $(addprefix $(srcdir)/,$(libspice_controller_la_VALASOURCES))	\
++	  -H spice-controller.h
+ 	@touch $@
+ 
+ $(libspice_controller_la_BUILT_SOURCES): controller.vala.stamp
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/net-misc/spice-gtk/spice-gtk-0.15.3.ebuild b/net-misc/spice-gtk/spice-gtk-0.15.3.ebuild
index 000361d763b6..77be47a2db08 100644
--- a/net-misc/spice-gtk/spice-gtk-0.15.3.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.15.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.15.3.ebuild,v 1.1 2013/01/12 23:56:49 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/spice-gtk-0.15.3.ebuild,v 1.2 2013/01/25 22:27:28 cardoe Exp $
 
 EAPI=5
 GCONF_DEBUG="no"
@@ -82,7 +82,8 @@ src_prepare() {
 	mkdir ${GTK3_BUILDDIR} || die
 
 	epatch \
-		"${FILESDIR}/0.12-parallel-install.patch"
+		"${FILESDIR}/0.12-parallel-install.patch" \
+		"${FILESDIR}/0001-build-sys-fix-out-of-tree-build-with-vala.patch"
 	eautoreconf
 }
 
diff --git a/net-misc/spice-gtk/spice-gtk-0.16.ebuild b/net-misc/spice-gtk/spice-gtk-0.16.ebuild
index f496ec020850..0b2377bafb6b 100644
--- a/net-misc/spice-gtk/spice-gtk-0.16.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.16.ebuild,v 1.3 2013/01/13 11:11:02 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/spice-gtk-0.16.ebuild,v 1.4 2013/01/25 22:27:28 cardoe Exp $
 
 EAPI=5
 GCONF_DEBUG="no"
@@ -79,7 +79,8 @@ src_prepare() {
 	mkdir ${GTK3_BUILDDIR} || die
 
 	epatch \
-		"${FILESDIR}/0.12-parallel-install.patch"
+		"${FILESDIR}/0.12-parallel-install.patch" \
+		"${FILESDIR}/0001-build-sys-fix-out-of-tree-build-with-vala.patch"
 	eautoreconf
 }