Fix installation and build with gcc-4.1, bug #133851 & #133852

Package-Manager: portage-2.1_rc2-r1

6 files changed, 64 insertions, 15 deletions

diff --git a/games-strategy/boson/ChangeLog b/games-strategy/boson/ChangeLog
index 1b4117f9d227..5aecf71bdbd9 100644
--- a/games-strategy/boson/ChangeLog
+++ b/games-strategy/boson/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-strategy/boson
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/boson/ChangeLog,v 1.15 2006/05/12 15:42:10 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/boson/ChangeLog,v 1.16 2006/05/25 21:50:54 tupone Exp $
+
+  25 May 2006; <Tupone@gentoo.org> +files/boson-0.11-gcc41.patch,
+  +files/boson-0.11-install.patch, boson-0.11.ebuild:
+  Fix installation, bug #133851 by nyhm
+  Fix for gcc-4.1, bug #133852 by nyhm
 
   12 May 2006; Chris Gianelloni <wolf31o2@gentoo.org> -boson-0.10.ebuild,
   boson-0.11.ebuild:
diff --git a/games-strategy/boson/Manifest b/games-strategy/boson/Manifest
index 6798745c2848..1cf6b8d62ed0 100644
--- a/games-strategy/boson/Manifest
+++ b/games-strategy/boson/Manifest
@@ -1,16 +1,34 @@
-DIST boson-all-0.11.tar.bz2 34512377 size 34512377
-EBUILD boson-0.11.ebuild 820 RMD160 ec4f7627d9c92fa09785f20430531a76d576402c SHA1 442017414a925e75582b3b0cce975b9aaca7d639 SHA256 ee6dbd37936c9b2e772992a36c0d4801ea31e993a4c1f604786c03df2d0232f8 size 820
-MD5 b840bc0a229d17eb9f17654d1afda928 boson-0.11.ebuild 820
-RMD160 ec4f7627d9c92fa09785f20430531a76d576402c boson-0.11.ebuild 820
-SHA256 ee6dbd37936c9b2e772992a36c0d4801ea31e993a4c1f604786c03df2d0232f8 boson-0.11.ebuild 820
-MISC ChangeLog 2665 RMD160 f90c1e0a1b383100d4ba7b34d7cc7878d377ce35 SHA1 5180d69ba9d060022d0a1a99187ea9a0a934c9b7 SHA256 88119178288acde4f59b169dda3dbc8e35ebce6482e7d624b7276453cbcff6b5 size 2665
-MD5 f6df5fee662bd608ab9dff5cb28f7dbe ChangeLog 2665
-RMD160 f90c1e0a1b383100d4ba7b34d7cc7878d377ce35 ChangeLog 2665
-SHA256 88119178288acde4f59b169dda3dbc8e35ebce6482e7d624b7276453cbcff6b5 ChangeLog 2665
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX boson-0.11-gcc41.patch 240 RMD160 db18c4c5d38f0b7e3bd8c9ca31f1c1b6df85079d SHA1 454533f1bcb1a3aed1478ee8612928a6b7e5d32f SHA256 f56dfd2d8d552da25abb4f4e015f8ec4bacff213fac836dfd2c93b3a235d30d5
+MD5 aea34d1ddf68da8bb7cbc3d4974062a4 files/boson-0.11-gcc41.patch 240
+RMD160 db18c4c5d38f0b7e3bd8c9ca31f1c1b6df85079d files/boson-0.11-gcc41.patch 240
+SHA256 f56dfd2d8d552da25abb4f4e015f8ec4bacff213fac836dfd2c93b3a235d30d5 files/boson-0.11-gcc41.patch 240
+AUX boson-0.11-install.patch 366 RMD160 92dacdf1231b27543ec604ed13a6e74ce6b98b78 SHA1 0dcac35c4cce552ced9ed7de96bae6d2d0e562a2 SHA256 c35dddbbe1bd7f3214eb4551a5a9eb347fa215b56fb0eafc1e9fcf1322d3d5f8
+MD5 1cf14b28f3ae56002b15c0b43e522e05 files/boson-0.11-install.patch 366
+RMD160 92dacdf1231b27543ec604ed13a6e74ce6b98b78 files/boson-0.11-install.patch 366
+SHA256 c35dddbbe1bd7f3214eb4551a5a9eb347fa215b56fb0eafc1e9fcf1322d3d5f8 files/boson-0.11-install.patch 366
+DIST boson-all-0.11.tar.bz2 34512377 RMD160 4b5e857287778bf62187083d2ba3c545844dda0f SHA1 bf0977ed82febb227cba1a36d7887463fe99194c SHA256 e8c0ac944bb1fd3cb74b1a66f47e73c3ca26ccb91a5f055256aa6d9e9d9d88ae
+EBUILD boson-0.11.ebuild 900 RMD160 e8b5631dbeb72788f4a75e8f192e3c17656cf13e SHA1 a34b2773b34f9a576c2ac95afa92e9681fd88695 SHA256 1606b608da4e32cb2b686e52ab7532452f917ba4709c72e39640b3f56d11e1e1
+MD5 dae0e44434dfc7ff0417a35a6539a7ef boson-0.11.ebuild 900
+RMD160 e8b5631dbeb72788f4a75e8f192e3c17656cf13e boson-0.11.ebuild 900
+SHA256 1606b608da4e32cb2b686e52ab7532452f917ba4709c72e39640b3f56d11e1e1 boson-0.11.ebuild 900
+MISC ChangeLog 2863 RMD160 949c21e75393a9337f6b78c37d0991ebbaba5bb8 SHA1 2a0b5ed34458cbb8fb0317da42008cdb7cf0b57f SHA256 8a9122bbd2a9ab1f2c6f6e588ff70339e2fc07050d66978112dbca441e729a5d
+MD5 8895ce5952ddeea216141491b68e856e ChangeLog 2863
+RMD160 949c21e75393a9337f6b78c37d0991ebbaba5bb8 ChangeLog 2863
+SHA256 8a9122bbd2a9ab1f2c6f6e588ff70339e2fc07050d66978112dbca441e729a5d ChangeLog 2863
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 47de16314e87d8d2e20c957b7bc51c5c files/digest-boson-0.11 69
-RMD160 e3eb8f5860ff6f544ee02e596cb5e3e47719b512 files/digest-boson-0.11 69
-SHA256 e90d3bca2c1cc3c3018e1599eafb95b52a130a1c598d596e436feb35c9cc2809 files/digest-boson-0.11 69
+MD5 f31d9d51d335af48a2f4ce3edda298d3 files/digest-boson-0.11 253
+RMD160 e00312b7087bce3ba6745408f6b176e02d93b207 files/digest-boson-0.11 253
+SHA256 089520f5dd36557172d7fb7def832dafccc0f8841b70f9f0029904492f54a359 files/digest-boson-0.11 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEdibX2CTtIKiFlQIRAuGCAJ9AqMbJEBrME+BwYnp8/0OQJrjOPgCeLQkj
+yW/hDs1pe8FwzlWtQzBFhOM=
+=9wGi
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/boson/boson-0.11.ebuild b/games-strategy/boson/boson-0.11.ebuild
index c0369d48185c..c86f96421ec7 100644
--- a/games-strategy/boson/boson-0.11.ebuild
+++ b/games-strategy/boson/boson-0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation and Thomas Capricelli <orzel@kde.org>
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/boson/boson-0.11.ebuild,v 1.4 2006/05/12 15:42:10 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/boson/boson-0.11.ebuild,v 1.5 2006/05/25 21:50:54 tupone Exp $
 
 inherit kde
 
@@ -22,6 +22,9 @@ need-kde 3
 
 S=${WORKDIR}/${PN}-all-${PV}
 
+PATCHES="${FILESDIR}/${P}"-gcc41.patch
+PATCHES1="${FILESDIR}/${P}"-install.patch
+
 src_compile() {
 	myconf="$(use_with opengl gl)"
 	MAKEOPTS="${MAKEOPTS} -j1"
diff --git a/games-strategy/boson/files/boson-0.11-gcc41.patch b/games-strategy/boson/files/boson-0.11-gcc41.patch
new file mode 100644
index 000000000000..f692b139578c
--- /dev/null
+++ b/games-strategy/boson/files/boson-0.11-gcc41.patch
@@ -0,0 +1,10 @@
+--- ufo/include/ufo/gl/ugl_builtinfontrenderer.hpp
++++ ufo/include/ufo/gl/ugl_builtinfontrenderer.hpp
+@@ -42,6 +42,7 @@
+ 
+ class UFontPlugin;
+ class UPluginBase;
++class UGL_BuiltinFontMetrics;
+ 
+ // damn ms vc6
+ struct UBuiltinFontStruct {
diff --git a/games-strategy/boson/files/boson-0.11-install.patch b/games-strategy/boson/files/boson-0.11-install.patch
new file mode 100644
index 000000000000..4d076c87f2d7
--- /dev/null
+++ b/games-strategy/boson/files/boson-0.11-install.patch
@@ -0,0 +1,11 @@
+--- themes/cursors/Makefile.in
++++ themes/cursors/Makefile.in
+@@ -452,7 +452,7 @@
+ 			if test -f $(srcdir)/$$i/$$f; then \
+ 				$(INSTALL_DATA) $(srcdir)/$$i/$$f $(DESTDIR)$(cursordir)/$$i/$$f ;\
+ 			fi \
+-		done\
++		done;\
+ 	done
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/games-strategy/boson/files/digest-boson-0.11 b/games-strategy/boson/files/digest-boson-0.11
index 4102e08d3c8f..a6e9b99449b9 100644
--- a/games-strategy/boson/files/digest-boson-0.11
+++ b/games-strategy/boson/files/digest-boson-0.11
@@ -1 +1,3 @@
 MD5 1fc50d67fd5e6b8f52116155f7c2531d boson-all-0.11.tar.bz2 34512377
+RMD160 4b5e857287778bf62187083d2ba3c545844dda0f boson-all-0.11.tar.bz2 34512377
+SHA256 e8c0ac944bb1fd3cb74b1a66f47e73c3ca26ccb91a5f055256aa6d9e9d9d88ae boson-all-0.11.tar.bz2 34512377