Fix build with gcc-4.5 Bug #322203

(Portage version: 2.1.8.3/cvs/Linux i686)

4 files changed, 128 insertions, 6 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/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>