Fix for gcc-4.1

Package-Manager: portage-2.1_rc1-r3

4 files changed, 121 insertions, 12 deletions

diff --git a/games-roguelike/scourge/ChangeLog b/games-roguelike/scourge/ChangeLog
index e1db3d562f74..ba0dc8c8f257 100644
--- a/games-roguelike/scourge/ChangeLog
+++ b/games-roguelike/scourge/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-roguelike/scourge
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/scourge/ChangeLog,v 1.16 2006/03/16 08:11:13 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/scourge/ChangeLog,v 1.17 2006/05/21 21:07:05 tupone Exp $
+
+  21 May 2006; <Tupone@gentoo.org> +files/scourge-0.12-gcc41.patch,
+  scourge-0.12.ebuild:
+  Fix for gcc-4.1
 
   16 Mar 2006; Michael Sterrett <mr_bones_@gentoo.org> scourge-0.12.ebuild:
   create desktop entry - patch from Cristiano Chiucchiolo via bug #126340
diff --git a/games-roguelike/scourge/Manifest b/games-roguelike/scourge/Manifest
index fc8bc31e182b..4f036cbc6bb0 100644
--- a/games-roguelike/scourge/Manifest
+++ b/games-roguelike/scourge/Manifest
@@ -1,12 +1,30 @@
-MD5 04b3444197acfbd51287f96d6ee399a7 ChangeLog 2210
-RMD160 82b426e8a06ddbe2f68ef623da3c681f26195586 ChangeLog 2210
-SHA256 f389c523a215b4a4ba43270206bd2c6b8e1096364edf1f6983d271b24c337a97 ChangeLog 2210
-MD5 4ad0b623de23fb8fccaec48c348422f6 files/digest-scourge-0.12 244
-RMD160 e9567558bf12cc6e19ef77696fdadf794ce16266 files/digest-scourge-0.12 244
-SHA256 78ac182ac684a54918eb52ad758c310cb2f9d1c68eaa495553bac1582b260c55 files/digest-scourge-0.12 244
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX scourge-0.12-gcc41.patch 2796 RMD160 80060ec4a08f7f57f290e6d34d8224421ab90a39 SHA1 1e73ffb796025405d48bc631da35b9966ef8c1c1 SHA256 02706d57a09b605ac5a2be5b4928d5aca53aea1c4d26b02a84a07539e2aebdd1 size 2796
+MD5 633c2007aebbce56a525325c6bc32f95 files/scourge-0.12-gcc41.patch 2796
+RMD160 80060ec4a08f7f57f290e6d34d8224421ab90a39 files/scourge-0.12-gcc41.patch 2796
+SHA256 02706d57a09b605ac5a2be5b4928d5aca53aea1c4d26b02a84a07539e2aebdd1 files/scourge-0.12-gcc41.patch 2796
+DIST scourge-0.12.tar.gz 37318491 RMD160 8885af473c68394f3844f23c6e189099845233f8 SHA256 34def3462d92db2f373bd200b0e022ccbbd4b5b00d5b95aa69fefc001382b5bd size 37318491
+EBUILD scourge-0.12.ebuild 1168 RMD160 485162411f761ca6fe3aaffd8277dab13fcddfca SHA1 b5d16d2a53b7e89e704659776bdbdf9087570c36 SHA256 7ce3888d6bc4f72353b6ad1ef9a2a246098d40653027a13940991c9ad87b584f size 1168
+MD5 93ad4aea1204be14b25cd31a690fc86e scourge-0.12.ebuild 1168
+RMD160 485162411f761ca6fe3aaffd8277dab13fcddfca scourge-0.12.ebuild 1168
+SHA256 7ce3888d6bc4f72353b6ad1ef9a2a246098d40653027a13940991c9ad87b584f scourge-0.12.ebuild 1168
+MISC ChangeLog 2317 RMD160 98032c6d9852a2a7195ad74c195c433460e332de SHA1 35052ed58ba44fa737d7e4ad8f8db953134968b6 SHA256 b0d3cf980c8ebaad3f7e385f2543e44cecc87af3da1bd8c194f5460983d9c58d size 2317
+MD5 5197f2507d3c1998e77665889533718d ChangeLog 2317
+RMD160 98032c6d9852a2a7195ad74c195c433460e332de ChangeLog 2317
+SHA256 b0d3cf980c8ebaad3f7e385f2543e44cecc87af3da1bd8c194f5460983d9c58d ChangeLog 2317
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 6b80f67f95431554598a9a1c8eb7bb15 scourge-0.12.ebuild 1128
-RMD160 5062c2fc96ba1c6cbb8bde6b7b5208a164042a4a scourge-0.12.ebuild 1128
-SHA256 991a1f20120aafc2d902654746eb150df932f5077aca2fcf41a69130b35f09d6 scourge-0.12.ebuild 1128
+MD5 4ad0b623de23fb8fccaec48c348422f6 files/digest-scourge-0.12 244
+RMD160 e9567558bf12cc6e19ef77696fdadf794ce16266 files/digest-scourge-0.12 244
+SHA256 78ac182ac684a54918eb52ad758c310cb2f9d1c68eaa495553bac1582b260c55 files/digest-scourge-0.12 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEcNaI2CTtIKiFlQIRAg76AJ0drVzwMHIISztBu2u4dkxdPVEn1QCcDwKS
+wc6C+zNrpWIZsuV4OFaeYV0=
+=h5P3
+-----END PGP SIGNATURE-----
diff --git a/games-roguelike/scourge/files/scourge-0.12-gcc41.patch b/games-roguelike/scourge/files/scourge-0.12-gcc41.patch
new file mode 100644
index 000000000000..37253c52dd35
--- /dev/null
+++ b/games-roguelike/scourge/files/scourge-0.12-gcc41.patch
@@ -0,0 +1,85 @@
+--- src/minimap.h.old	2006-05-21 22:19:13.000000000 +0200
++++ src/minimap.h	2006-05-21 22:19:25.000000000 +0200
+@@ -78,8 +78,8 @@
+   void toMiniMapCoord(int &x, int &y);       
+   
+  public:
+-  MiniMap::MiniMap();
+-  MiniMap::~MiniMap();
++  MiniMap();
++  ~MiniMap();
+   MiniMap(Scourge *scourge);
+ 
+   void reset();
+--- src/preferences.h.old	2006-05-21 22:18:24.000000000 +0200
++++ src/preferences.h	2006-05-21 22:18:48.000000000 +0200
+@@ -112,10 +112,10 @@
+     TEST
+   };
+  
+-  Preferences::Preferences() {
++  Preferences() {
+     stencilBufInitialized = false;
+   }
+-  virtual Preferences::~Preferences() {}
++  virtual ~Preferences() {}
+   
+   // engine variables
+   virtual bool getFullscreen() = 0;
+--- src/userconfiguration.h.old	2006-05-21 22:19:41.000000000 +0200
++++ src/userconfiguration.h	2006-05-21 22:19:51.000000000 +0200
+@@ -100,8 +100,8 @@
+    
+  public:
+  
+-  UserConfiguration::UserConfiguration();
+-  UserConfiguration::~UserConfiguration();
++  UserConfiguration();
++  ~UserConfiguration();
+   
+   const char * getEngineActionDescription(int i);  
+   const char * getEngineActionKeyName(int i);      
+--- src/render/map.h.old	2006-05-21 22:35:29.000000000 +0200
++++ src/render/map.h	2006-05-21 22:36:07.000000000 +0200
+@@ -348,10 +348,10 @@
+   Shape *removePosition(Sint16 x, Sint16 y, Sint16 z);
+   Shape *removeLocation(Sint16 x, Sint16 y, Sint16 z);
+   
+-  void Map::setItem(Sint16 x, Sint16 y, Sint16 z, RenderedItem *item);
++  void setItem(Sint16 x, Sint16 y, Sint16 z, RenderedItem *item);
+   RenderedItem *removeItem(Sint16 x, Sint16 y, Sint16 z);
+   
+-  void Map::setCreature(Sint16 x, Sint16 y, Sint16 z, RenderedCreature *creature);
++  void setCreature(Sint16 x, Sint16 y, Sint16 z, RenderedCreature *creature);
+   RenderedCreature *removeCreature(Sint16 x, Sint16 y, Sint16 z);
+   
+   /**
+@@ -406,7 +406,7 @@
+   // like shapefits, but returns the blocking location or, NULL if there's nothing there
+   Location *getBlockingLocation(Shape *shape, int x, int y, int z);
+ 
+-  Location *Map::getDropLocation(Shape *shape, int x, int y, int z);
++  Location *getDropLocation(Shape *shape, int x, int y, int z);
+ 
+   inline void updateLightMap() { lightMapChanged = resortShapes = true; }
+ 
+@@ -435,7 +435,7 @@
+            DrawLater *later=NULL);
+ 
+   bool isDoor(int x, int y);
+-  bool Map::isDoor(Shape *shape);
++  bool isDoor(Shape *shape);
+ 
+   // ====================================================================
+   // Locked doors/chests code
+--- src/sound.h.old	2006-05-21 22:53:20.000000000 +0200
++++ src/sound.h	2006-05-21 22:53:38.000000000 +0200
+@@ -71,7 +71,7 @@
+   void playSound(const char *file);
+ 
+   void setMusicVolume(int volume);
+-  void Sound::setEffectsVolume(int volume);
++  void setEffectsVolume(int volume);
+ 
+ protected:
+ #ifdef HAVE_SDL_MIXER
diff --git a/games-roguelike/scourge/scourge-0.12.ebuild b/games-roguelike/scourge/scourge-0.12.ebuild
index 724599bfd617..6387cb0a82f2 100644
--- a/games-roguelike/scourge/scourge-0.12.ebuild
+++ b/games-roguelike/scourge/scourge-0.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/scourge/scourge-0.12.ebuild,v 1.3 2006/03/16 08:11:13 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/scourge/scourge-0.12.ebuild,v 1.4 2006/05/21 21:07:05 tupone Exp $
 
 inherit eutils games
 
@@ -30,7 +30,9 @@ DEPEND="|| (
 
 src_unpack() {
 	unpack ${A}
-	find "${S}/data" -type f -exec chmod a-x \{\} \;
+	cd "${S}"
+	find data -type f -exec chmod a-x \{\} \;
+	epatch "${FILESDIR}/${P}"-gcc41.patch
 }
 
 src_compile() {