add patch for building with gcc43 - submitted by fox via bug #271222

Package-Manager: portage-2.1.6.11/cvs/Linux i686

4 files changed, 24 insertions, 14 deletions

diff --git a/games-arcade/ultrastar-ng/ChangeLog b/games-arcade/ultrastar-ng/ChangeLog
index ba3dee47898d..07a8aaadb3e4 100644
--- a/games-arcade/ultrastar-ng/ChangeLog
+++ b/games-arcade/ultrastar-ng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/ultrastar-ng
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/ultrastar-ng/ChangeLog,v 1.7 2009/04/29 20:09:17 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/ultrastar-ng/ChangeLog,v 1.8 2009/05/30 16:25:54 mr_bones_ Exp $
+
+  30 May 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/ultrastar-ng-0.2.1-gcc43.patch, ultrastar-ng-0.2.1-r1.ebuild:
+  add patch for building with gcc43 - submitted by fox via bug #271222
 
   09 Feb 2009; Michael Sterrett <mr_bones_@gentoo.org>
   ultrastar-ng-0.2.1-r1.ebuild:
diff --git a/games-arcade/ultrastar-ng/Manifest b/games-arcade/ultrastar-ng/Manifest
index 552a31aa9245..6ef707296900 100644
--- a/games-arcade/ultrastar-ng/Manifest
+++ b/games-arcade/ultrastar-ng/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ultrastar-ng-0.2.1-bash4.patch 2467 RMD160 38c7af7d2743b3393a485f16c03b8c436e312418 SHA1 69cae2971fd62ff7a1e51dc4237d997f6db31b3e SHA256 b2281ad0ed1626fd5a194798ab77a8c6b45b441302baa3fa98d0279c64da96e5
+AUX ultrastar-ng-0.2.1-gcc43.patch 881 RMD160 9c895f64804ced920408dd03b96607f28f805773 SHA1 bfb194cbf1412891c67c86b4cd39873539d8fe52 SHA256 d19a9f6e14bf292ac8d9ec8220ae7e9d5a82d37abd67db0cde8c0141e831e8a1
 DIST UltraStar-ng-0.2.1.tar.gz 1687366 RMD160 6ab305e67eabda09951a0e459798c7a66e11d801 SHA1 d0a2bfd8622825ea9f0f7694cdaf1d5f78c50dae SHA256 a93daad488c07217512fbf6a2f5ded39cf71664736dd3a33a725241838554d6d
 DIST ultrastar-songs-2.tar.bz2 15571726 RMD160 9b4eea4862728ad1fbfc1e5d462f4afd4d6e89fc SHA1 25d2392775bfa27f48cd201eebb6e3eb2c96c3b2 SHA256 645b460367df95697756a1ed02e01593e9aa3e77a4ce6ef1b9f334c37b1c6a03
-EBUILD ultrastar-ng-0.2.1-r1.ebuild 2275 RMD160 e9aa33526f5e18564924a19d72b06a5a8b37f58e SHA1 88ada0b65f0f0b72144c9448af8f307eca7e7c29 SHA256 3221bae0cd827d2ee3dc342332b8ae681eff4716364411850c097435e1c907a0
-MISC ChangeLog 1428 RMD160 d1b26314a62a51f0d20b9c3b4fc3e64a0297a154 SHA1 83d0d0fe018b126bf4c392421b350f61092336d4 SHA256 da8570dbb74177a80348514123791f369df031e23cacc40af9f66476f8a91f18
+EBUILD ultrastar-ng-0.2.1-r1.ebuild 2328 RMD160 ecfef8a8977bf67b8dfdfbbf54575c1439124681 SHA1 720e31a08b2c4e7ee90299fd77957a7321fd502b SHA256 cbb8814abb354a538913f07cc805e17ff165cfe783ef7d3fc3ae1de7845e7e5d
+MISC ChangeLog 1626 RMD160 d55605ed3dbb872f67d117c238a2962202e6dced SHA1 81bcf482e99e79a2d4d7048319ebc50d197625ff SHA256 f96d0e14efa1c6e70f19525cdf0def5ded2ff16dde8784cb07ee0de02164fdcb
 MISC metadata.xml 381 RMD160 2aa3b651d0c921334a985cabb9a8c147ac439044 SHA1 cf288d5c9e6e1716a3902f1edfac8c17b8d74c79 SHA256 830b30f0b8d2f1c0a5f0f9aaf4d96961928c8fca77505cfaf2fc685be75e8056
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkn6T+sACgkQ/ejvha5XGaMrJACfc7M2xlE7zR1lFE4lMb91iyRI
-YdAAoItWCZlB8zS1IQEbyQnqcvGSgY2p
-=DOcg
------END PGP SIGNATURE-----
diff --git a/games-arcade/ultrastar-ng/files/ultrastar-ng-0.2.1-gcc43.patch b/games-arcade/ultrastar-ng/files/ultrastar-ng-0.2.1-gcc43.patch
new file mode 100644
index 000000000000..a946de382a29
--- /dev/null
+++ b/games-arcade/ultrastar-ng/files/ultrastar-ng-0.2.1-gcc43.patch
@@ -0,0 +1,14 @@
+--- audio/audio_dev_tone.cpp	2007-11-04 12:44:26.000000000 +0100
++++ audio/audio_dev_tone.cpp.patched	2009-05-23 13:50:51.690432280 +0200
+@@ -54,9 +54,10 @@
+ 			double freq = 440.0, amplitude = 0.1, phase = 0.0;
+ 			using namespace boost::spirit;
+ 			using namespace boost::lambda;
++			placeholder1_type arg1;
+ 			if (!parse(tonestr.c_str(),
+ 			  !(limit_d(1.0, s.rate() / 2.0)[real_p][assign_a(freq)]) >> *(!ch_p('.') >> (
+-			  str_p("amplitude(") >> (max_limit_d(0.0)[real_p][var(amplitude) = bind(static_cast<double(*)(double, double)>(std::pow), 10.0, _1 / 20.0)] | real_p[assign_a(amplitude)]) |
++			  str_p("amplitude(") >> (max_limit_d(0.0)[real_p][var(amplitude) = bind(static_cast<double(*)(double, double)>(std::pow), 10.0, arg1 / 20.0)] | real_p[assign_a(amplitude)]) |
+ 			  str_p("phase(") >> limit_d(0.0, 1.0)[real_p][assign_a(phase)]
+ 			  ) >> ')')
+ 			  ).full)
diff --git a/games-arcade/ultrastar-ng/ultrastar-ng-0.2.1-r1.ebuild b/games-arcade/ultrastar-ng/ultrastar-ng-0.2.1-r1.ebuild
index 5584aaecd09a..4e444160540d 100644
--- a/games-arcade/ultrastar-ng/ultrastar-ng-0.2.1-r1.ebuild
+++ b/games-arcade/ultrastar-ng/ultrastar-ng-0.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/ultrastar-ng/ultrastar-ng-0.2.1-r1.ebuild,v 1.7 2009/04/29 20:09:17 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/ultrastar-ng/ultrastar-ng-0.2.1-r1.ebuild,v 1.8 2009/05/30 16:25:54 mr_bones_ Exp $
 
 EAPI=2
 inherit autotools eutils games
@@ -47,6 +47,7 @@ S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-bash4.patch # bug #267316
+	epatch "${FILESDIR}"/${P}-gcc43.patch # bug #271222
 	touch docs/ultrastarng.6  # no, don't try to rebuild the man page
 	eautoreconf
 }