Fix build with gcc-4.5 Bug #322203

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

5 files changed, 132 insertions, 9 deletions

diff --git a/games-board/freedoko/ChangeLog b/games-board/freedoko/ChangeLog
index 62f4494e47b5..b21c090d7ad3 100644
--- a/games-board/freedoko/ChangeLog
+++ b/games-board/freedoko/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/freedoko
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/freedoko/ChangeLog,v 1.8 2010/04/20 19:10:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/freedoko/ChangeLog,v 1.9 2010/06/01 10:03:28 tupone Exp $
+
+  01 Jun 2010; Tupone Alfredo <tupone@gentoo.org> freedoko-0.7.8.ebuild,
+  +files/freedoko-0.7.8-gcc45.patch, metadata.xml:
+  Fix build with gcc-4.5 Bug #322203 by flameeyes@gentoo.org
 
 *freedoko-0.7.8 (20 Apr 2010)
 
diff --git a/games-board/freedoko/Manifest b/games-board/freedoko/Manifest
index 790b79ee3d67..53c45d91d3eb 100644
--- a/games-board/freedoko/Manifest
+++ b/games-board/freedoko/Manifest
@@ -1,4 +1,5 @@
 AUX Fix_Cardset_Make.patch 498 RMD160 2000df1c9401800fd11abdfdaa6f459a3125c576 SHA1 c372123f4f101564cf749f340469566292d91481 SHA256 933b819fdd660a8a7ac5bec560f5b6047732351847c61970c8c9e40652cec39a
+AUX freedoko-0.7.8-gcc45.patch 4228 RMD160 903680b6a18089b6e5161cc3aa0a483f3a2fba43 SHA1 73238cbc9861f332d3084da568c80f9f32f362b9 SHA256 37eecb1e408e409803475428e8905e2f62551e92dc9774144084da561f0253f6
 AUX freedoko-0.7.8-gentoo.patch 2794 RMD160 0c9e1f25786fadd9456518f77ebfabce1e8a5c0e SHA1 56023951b9ef7337ef41bf55da6fb2b693804241 SHA256 0a078230ff95a4ab747eb1c015af5ac8c1130b49126e526f3dd931cf818597b9
 AUX nodoc.patch 368 RMD160 220eb20e38556d2b029092a91f698a0150bc9974 SHA1 471f5def092b812f49d2d7019c4e86eea7e70d6e SHA256 c31e2c78a9a6f81c2e0db5c8a5943ffd68146df6fcd2705410bff21b6236a3f6
 AUX nonet.patch 421 RMD160 c283ea36b61cda2e98fe9f89d21118e207fbf256 SHA1 f0fc2a78a438625382bc8d5f728a7792b0ab7e2e SHA256 72fe58f2afd6bff66776bfe6f7045b39e8264e684cf15a001a28bc992d041289
@@ -11,6 +12,6 @@ DIST kdecarddecks.zip 3370611 RMD160 c99a94e52e697c49068a31a0fc10acca7f528c86 SH
 DIST openclipart.zip 1251509 RMD160 6f1738994a20c42078d1c475978bfb56118143a6 SHA1 ca188615c68a54d190e4494d82deadd28f78c140 SHA256 68b1c83e7c8325d5d2dfd4cc846571640d21af820fb675e253f8834436e15d3a
 DIST pysol.zip 26314316 RMD160 0ceb36c33e3de983e7a60df13367857fe14ddba7 SHA1 2ebe408cdfa9e40277727033fe7306438976c120 SHA256 94d0e2d6aa13e5b007efaf08af0f506f48708e3243186db77f23e2e4660c0aa6
 DIST xskat.zip 666085 RMD160 c4e10c6ca9753a544fa1197d45a6759363742f7e SHA1 af209c9b1b8b33bae657e049d146d58541296fad SHA256 77cd3d7b3305ef1c201963e512557637929b394f4c1b19d838395dda3c9f8a1d
-EBUILD freedoko-0.7.8.ebuild 2744 RMD160 d7207f2accdc58c800760374f9de6761bd8d4a37 SHA1 ffa235e6751402127f32251169d10aa1afa95749 SHA256 43fedc851286b394876b8a689aea0de27fb307eb6731bc5eae830b6fd6eaf6cc
-MISC ChangeLog 1527 RMD160 8bceda9126fe2a2940880b8a620dc70366278b54 SHA1 4475735c94a1ecf629d5eb1e633cb859a0a97234 SHA256 377ff4109db58dd1d557819ac8f8126734a5c686d96eee03f111a16801670713
-MISC metadata.xml 812 RMD160 327da3de98448fbdc2b7500068c92e271c8f800b SHA1 8a302887b177ea28c3d9b3ac98d600edbed72b60 SHA256 1bd6d63d2ea73b8f88010dda41e0fe534f1eec00145fd3188fcbd8d33c8a30e4
+EBUILD freedoko-0.7.8.ebuild 2758 RMD160 af62e4e405fea047354a2255f03c0c3d8a1e7f7b SHA1 363ec531702510608fb06d645770faed15cad946 SHA256 5a71b04736b4282f89d6eaaeae3436d936aaf43b34f7d6c97067b026ace32c25
+MISC ChangeLog 1710 RMD160 d866478f8e7b057397f2544dfe1dd52adcc496dd SHA1 bbbff6ce788b470c07b2c7ebe6b906d39f1dbe89 SHA256 de157c23fdf19db4a966f8d7b0779f85c2cbec3a376c84e83da2f8748b6af822
+MISC metadata.xml 746 RMD160 99588a5ba21684c71ad8b28463fbabba937f5727 SHA1 24667e1d234ab81743da19aa707a5c4cf5520313 SHA256 02b7fdcce405b42ea886f2a267a6a249428a9bf2c47e6a0b00793932ad56141b
diff --git a/games-board/freedoko/files/freedoko-0.7.8-gcc45.patch b/games-board/freedoko/files/freedoko-0.7.8-gcc45.patch
new file mode 100644
index 000000000000..fd7f722c77b3
--- /dev/null
+++ b/games-board/freedoko/files/freedoko-0.7.8-gcc45.patch
@@ -0,0 +1,121 @@
+--- src/game/gameplay_action.cpp.old	2010-06-01 10:50:55.000000000 +0200
++++ src/game/gameplay_action.cpp	2010-06-01 10:51:23.000000000 +0200
+@@ -268,7 +268,7 @@
+  ** 
+  ** @version	0.6.8
+  **/
+-GameplayAction::GameplayAction&
++GameplayAction&
+ GameplayAction::operator=(GameplayAction const& action)
+ {
+   this->type = action.type;
+--- src/game/gameplay_actions/pure.cpp.old	2010-06-01 10:53:02.000000000 +0200
++++ src/game/gameplay_actions/pure.cpp	2010-06-01 10:53:54.000000000 +0200
+@@ -90,7 +90,7 @@
+  ** 
+  ** @version	0.7.3
+  **/
+-GameplayAction::Pure::Pure&
++GameplayAction::Pure&
+ GameplayAction::Pure::operator=(Pure const& action)
+ {
+   this->GameplayAction::operator=(action);
+--- src/game/gameplay_actions/player1.cpp.old	2010-06-01 10:55:59.000000000 +0200
++++ src/game/gameplay_actions/player1.cpp	2010-06-01 10:56:10.000000000 +0200
+@@ -103,7 +103,7 @@
+  ** 
+  ** @version	0.7.3
+  **/
+-GameplayAction::Player1::Player1&
++GameplayAction::Player1&
+ GameplayAction::Player1::operator=(Player1 const& action)
+ {
+   this->GameplayAction::operator=(action);
+--- src/game/gameplay_actions/base_cards.cpp.old	2010-06-01 10:56:47.000000000 +0200
++++ src/game/gameplay_actions/base_cards.cpp	2010-06-01 10:56:59.000000000 +0200
+@@ -142,7 +142,7 @@
+  ** 
+  ** @version	0.7.3
+  **/
+-GameplayAction::BaseCards::BaseCards&
++GameplayAction::BaseCards&
+ GameplayAction::BaseCards::operator=(BaseCards const& poverty_shift)
+ {
+   this->Player1::operator=(poverty_shift);
+--- src/game/gameplay_actions/reservation.cpp.old	2010-06-01 10:57:46.000000000 +0200
++++ src/game/gameplay_actions/reservation.cpp	2010-06-01 10:57:59.000000000 +0200
+@@ -110,7 +110,7 @@
+  ** 
+  ** @version	0.7.3
+  **/
+-GameplayAction::Reservation::Reservation&
++GameplayAction::Reservation&
+ GameplayAction::Reservation::operator=(Reservation const& reservation)
+ {
+   this->Player1::operator=(reservation);
+--- src/game/gameplay_actions/marriage.cpp.old	2010-06-01 10:58:29.000000000 +0200
++++ src/game/gameplay_actions/marriage.cpp	2010-06-01 10:58:43.000000000 +0200
+@@ -121,7 +121,7 @@
+  ** 
+  ** @version	0.7.1
+  **/
+-GameplayAction::Marriage::Marriage&
++GameplayAction::Marriage&
+ GameplayAction::Marriage::operator=(Marriage const& marriage)
+ {
+   this->Player1::operator=(marriage);
+--- src/game/gameplay_actions/genscher.cpp.old	2010-06-01 10:59:12.000000000 +0200
++++ src/game/gameplay_actions/genscher.cpp	2010-06-01 10:59:22.000000000 +0200
+@@ -120,7 +120,7 @@
+  ** 
+  ** @version	0.7.1
+  **/
+-GameplayAction::Genscher::Genscher&
++GameplayAction::Genscher&
+ GameplayAction::Genscher::operator=(Genscher const& genscher)
+ {
+   this->Player1::operator=(genscher);
+--- src/game/gameplay_actions/announcement.cpp.old	2010-06-01 10:59:46.000000000 +0200
++++ src/game/gameplay_actions/announcement.cpp	2010-06-01 10:59:58.000000000 +0200
+@@ -132,7 +132,7 @@
+  ** 
+  ** @version	0.7.1
+  **/
+-GameplayAction::Announcement::Announcement&
++GameplayAction::Announcement&
+ GameplayAction::Announcement::operator=(Announcement const& announcement)
+ {
+   this->Player1::operator=(announcement);
+--- src/game/gameplay_actions/card_played.cpp.old	2010-06-01 11:00:28.000000000 +0200
++++ src/game/gameplay_actions/card_played.cpp	2010-06-01 11:00:40.000000000 +0200
+@@ -178,7 +178,7 @@
+  ** 
+  ** @version	0.7.3
+  **/
+-GameplayAction::CardPlayed::CardPlayed&
++GameplayAction::CardPlayed&
+ GameplayAction::CardPlayed::operator=(CardPlayed const& card_played)
+ {
+   this->Player1::operator=(card_played);
+--- src/game/gameplay_actions/trick_full.cpp.old	2010-06-01 11:01:10.000000000 +0200
++++ src/game/gameplay_actions/trick_full.cpp	2010-06-01 11:01:20.000000000 +0200
+@@ -224,7 +224,7 @@
+  ** 
+  ** @version	0.7.1
+  **/
+-GameplayAction::TrickFull::TrickFull&
++GameplayAction::TrickFull&
+ GameplayAction::TrickFull::operator=(TrickFull const& trick_full)
+ {
+   this->GameplayAction::operator=(trick_full);
+--- src/game/gameplay_actions/check.cpp.old	2010-06-01 11:01:56.000000000 +0200
++++ src/game/gameplay_actions/check.cpp	2010-06-01 11:02:07.000000000 +0200
+@@ -104,7 +104,7 @@
+  ** 
+  ** @version	0.7.6
+  **/
+-GameplayAction::Check::Check&
++GameplayAction::Check&
+ GameplayAction::Check::operator=(Check const& action)
+ {
+   this->Pure::operator=(action);
diff --git a/games-board/freedoko/freedoko-0.7.8.ebuild b/games-board/freedoko/freedoko-0.7.8.ebuild
index cdc11b8b6ed4..ec117deeb9b6 100644
--- a/games-board/freedoko/freedoko-0.7.8.ebuild
+++ b/games-board/freedoko/freedoko-0.7.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/freedoko/freedoko-0.7.8.ebuild,v 1.1 2010/04/20 19:10:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/freedoko/freedoko-0.7.8.ebuild,v 1.2 2010/06/01 10:03:28 tupone Exp $
 
 EAPI=2
 inherit eutils games
@@ -60,9 +60,7 @@ src_unpack() {
 	fi
 }
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch "${FILESDIR}"/${P}-gcc45.patch )
 
 src_compile() {
 	export CPPFLAGS="-DPUBLIC_DATA_DIRECTORY_VALUE='\"${GAMES_DATADIR}/${PN}\"'"
diff --git a/games-board/freedoko/metadata.xml b/games-board/freedoko/metadata.xml
index 2d19168dfb16..a6d11048ff5b 100644
--- a/games-board/freedoko/metadata.xml
+++ b/games-board/freedoko/metadata.xml
@@ -6,7 +6,6 @@
 The Linux version of the popular german cardgame "Doppelkopf"
 </longdescription>
   <use>
-    <flag name="altenburgcards">Use the Altenburg card set</flag>
     <flag name="kdecards">Install the KDE card set</flag>
     <flag name="net">Enable network game support</flag>
     <flag name="pysolcards">Install the PySol card set</flag>