Fixing building with gcc-3 again. Bug #137714

(Portage version: 2.1.1)
 (Signed Manifest commit)

2 files changed, 16 insertions, 112 deletions

diff --git a/games-puzzle/quadra/Manifest b/games-puzzle/quadra/Manifest
index 7c23d52286db..c5a5224eb65a 100644
--- a/games-puzzle/quadra/Manifest
+++ b/games-puzzle/quadra/Manifest
@@ -9,23 +9,19 @@ AUX quadra-1.1.8-amd64.patch 1075 RMD160 3f88f9078fe2daed39b20c0bd51109759a2b17c
 MD5 ffdb7b1e6830df6f4d6064c9fca1f6bb files/quadra-1.1.8-amd64.patch 1075
 RMD160 3f88f9078fe2daed39b20c0bd51109759a2b17c5 files/quadra-1.1.8-amd64.patch 1075
 SHA256 9c8fe51ab59a6234d3f9dd0c4ab0722327e142e99fd3f9a0007009579205893e files/quadra-1.1.8-amd64.patch 1075
-AUX quadra-1.1.8-gcc3.patch 2830 RMD160 1b39182540f7117c6d55ec409708227c49d7cb87 SHA1 335423bc2cd6d9fc6bfb6316c591e0f8e7baa4da SHA256 eb0e08ab1c31a54837b39ab40fa75eaf586a89d3a41525a0d828f9768df0a9a3
-MD5 9e774090da8184c5773262c18467cd32 files/quadra-1.1.8-gcc3.patch 2830
-RMD160 1b39182540f7117c6d55ec409708227c49d7cb87 files/quadra-1.1.8-gcc3.patch 2830
-SHA256 eb0e08ab1c31a54837b39ab40fa75eaf586a89d3a41525a0d828f9768df0a9a3 files/quadra-1.1.8-gcc3.patch 2830
-AUX quadra-1.1.8-gcc41.patch 3014 RMD160 cb01d18d84445caff3877888f74e8396cc3819b1 SHA1 5a4a880110491fe23837485f086e465a6a2112b9 SHA256 8831a6ad7baf745acacc6b9d4b08771c4d43c97391d88f674380c6896b0a4266
-MD5 e873928d45db3656c581f2a8be99da1a files/quadra-1.1.8-gcc41.patch 3014
-RMD160 cb01d18d84445caff3877888f74e8396cc3819b1 files/quadra-1.1.8-gcc41.patch 3014
-SHA256 8831a6ad7baf745acacc6b9d4b08771c4d43c97391d88f674380c6896b0a4266 files/quadra-1.1.8-gcc41.patch 3014
+AUX quadra-1.1.8-gcc3.patch 3221 RMD160 058b31005f511039a1cf7ffa4de2d4b79ba686c8 SHA1 a043a1cd04ae98e8880d060b69879568004549a4 SHA256 093d65e718a1cb346b1011bc5627784a16e0128424b8d7e2af697991e37f04ed
+MD5 b3cf28e17cc49e66089ebec5f2e10291 files/quadra-1.1.8-gcc3.patch 3221
+RMD160 058b31005f511039a1cf7ffa4de2d4b79ba686c8 files/quadra-1.1.8-gcc3.patch 3221
+SHA256 093d65e718a1cb346b1011bc5627784a16e0128424b8d7e2af697991e37f04ed files/quadra-1.1.8-gcc3.patch 3221
 DIST quadra-1.1.8.tar.gz 3379618 RMD160 e57f25a714d5f447f3dcb34c34af9fa22718560d SHA1 3c97ffbbf180b4d952f8aedd183b0fd4a4809957 SHA256 6ebf81d4ffe1cedbebfdcc2cb44fdac875da8ccbd3d113ca5cb62169bf63d201
-EBUILD quadra-1.1.8.ebuild 1752 RMD160 3ced862811f8e8f6314c1b8fc4e2a0121a75557f SHA1 d6445a6210bc0b6f536651121484fcc19207d698 SHA256 b74cc700c55da53f9b071cd7dd68f074e5a670d361cc3a22757548a1db5b2c16
-MD5 edad3a6f0e6cdc8fd36ac5903d824450 quadra-1.1.8.ebuild 1752
-RMD160 3ced862811f8e8f6314c1b8fc4e2a0121a75557f quadra-1.1.8.ebuild 1752
-SHA256 b74cc700c55da53f9b071cd7dd68f074e5a670d361cc3a22757548a1db5b2c16 quadra-1.1.8.ebuild 1752
-MISC ChangeLog 1912 RMD160 5e72230ee092fbde54626e2639a2c520d14fced6 SHA1 cebd73d22070e5b58f8d0df88c840c5fb69137cc SHA256 c52e6f4ecab39ab982215276c2964db71f659e72344dc6cdba08b1f6f63be07b
-MD5 8c86a90f956561226b878ebc8bef002a ChangeLog 1912
-RMD160 5e72230ee092fbde54626e2639a2c520d14fced6 ChangeLog 1912
-SHA256 c52e6f4ecab39ab982215276c2964db71f659e72344dc6cdba08b1f6f63be07b ChangeLog 1912
+EBUILD quadra-1.1.8.ebuild 1718 RMD160 104ba0cab404a8c9f30e78ea4879a0016bea9f0f SHA1 0acf27614a36f9e5dba6c31b1599bcaad47a906f SHA256 7c2f9fd6bc1239a9c4d00c2756850b6605f17168c0827cd7b9cf99e1d97b6c2f
+MD5 1b59b34691c9a8f6eb82ca46865b9f6e quadra-1.1.8.ebuild 1718
+RMD160 104ba0cab404a8c9f30e78ea4879a0016bea9f0f quadra-1.1.8.ebuild 1718
+SHA256 7c2f9fd6bc1239a9c4d00c2756850b6605f17168c0827cd7b9cf99e1d97b6c2f quadra-1.1.8.ebuild 1718
+MISC ChangeLog 2140 RMD160 dac11799a7536e9783ebe2da1660564efc25b230 SHA1 0d8310351d2339b27e1b8fa71329e404d320dc32 SHA256 122ce9c469f9523bbbb296c86263dbcb6eef06c26c077b62f5dc84a2046989d7
+MD5 0891e6a0e96a2cd2f8fe190fcad43237 ChangeLog 2140
+RMD160 dac11799a7536e9783ebe2da1660564efc25b230 ChangeLog 2140
+SHA256 122ce9c469f9523bbbb296c86263dbcb6eef06c26c077b62f5dc84a2046989d7 ChangeLog 2140
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -34,9 +30,9 @@ MD5 14e60e570efd3ac017642659293fdff8 files/digest-quadra-1.1.8 241
 RMD160 00d1804ab7dfb5c1a09e80f6717af6ba25ef6d6b files/digest-quadra-1.1.8 241
 SHA256 bedb0acd7b2cc7358e4d769861c5b82b7f8d9a1b4c919aa9b3bf41df076548d5 files/digest-quadra-1.1.8 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEfeaz2CTtIKiFlQIRAp5XAKCf+xVA0olKLCNQ5um28NhcB1+qjQCgxdyu
-DRHcaDQpunOWTggJR3AW3T4=
-=FTIG
+iD8DBQFFCQLA2CTtIKiFlQIRAvm4AKCXY/sIl/0RdCqcAO0Sf2qfnyT6twCdFx1d
+5pp3uUvZ6WivxJGYOv3tMdM=
+=r9q8
 -----END PGP SIGNATURE-----
diff --git a/games-puzzle/quadra/files/quadra-1.1.8-gcc41.patch b/games-puzzle/quadra/files/quadra-1.1.8-gcc41.patch
deleted file mode 100644
index 02ede4884ec8..000000000000
--- a/games-puzzle/quadra/files/quadra-1.1.8-gcc41.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff -ur quadra-1.1.8-orig/skelton/include/array.h quadra-1.1.8/skelton/include/array.h
---- quadra-1.1.8-orig/skelton/include/array.h	2006-05-21 16:35:30.000000000 -0400
-+++ quadra-1.1.8/skelton/include/array.h	2006-05-21 16:53:06.000000000 -0400
-@@ -21,6 +21,7 @@
- #ifndef _HEADER_ARRAY
- #define _HEADER_ARRAY
- #include <vector>
-+#include <algorithm>
- 
- #ifndef max
- #define max(a,b) (((a) > (b)) ? (a) : (b))
-@@ -37,7 +38,9 @@
- 		v.push_back(t);
- 	}
- 	void add_before(const T& t, int i) {
--		v.insert(&v[i], t);
-+		typename std::vector<T>::iterator iter = v.begin();
-+		std::advance(iter, i);
-+		v.insert(iter, t);
- 	}
- 	bool remove_item(const T& t) {
- 		for(int i=0; i<size(); i++)
-@@ -51,7 +54,9 @@
- 		v.pop_back();
- 	}
- 	void remove(int i) {
--		v.erase(&v[i]);
-+		typename std::vector<T>::iterator iter = v.begin();
-+		std::advance(iter, i);
-+		v.erase(iter);
- 	}
- 	int size() const {
- 		return v.size();
-diff -ur quadra-1.1.8-orig/source/net_server.cpp quadra-1.1.8/source/net_server.cpp
---- quadra-1.1.8-orig/source/net_server.cpp	2006-05-21 16:35:30.000000000 -0400
-+++ quadra-1.1.8/source/net_server.cpp	2006-05-21 16:54:27.000000000 -0400
-@@ -400,13 +400,14 @@
- 				}
- 			}
- 		}
-+		unsigned i;
- 		if(playeraccepted.accepted == 0) {
- 			if(game->net_list.size() == MAXPLAYERS)
- 				playeraccepted.accepted = 5; // game is full, can't join
- 			if(game->server_max_players && game->net_list.size() >= game->server_max_players)
- 				playeraccepted.accepted = 5; // game is full, can't join
- 			if(game->server_max_teams && game->net_list.count_teams() >= game->server_max_teams) {
--				for(unsigned i=0; i<MAXPLAYERS; ++i) {
-+				for(i=0; i<MAXPLAYERS; ++i) {
- 					Canvas* c=game->net_list.get(i);
- 					if(c && c->color==p->team)
- 						break;
-diff -ur quadra-1.1.8-orig/source/net_stuff.cpp quadra-1.1.8/source/net_stuff.cpp
---- quadra-1.1.8-orig/source/net_stuff.cpp	2006-05-21 16:35:30.000000000 -0400
-+++ quadra-1.1.8/source/net_stuff.cpp	2006-05-21 16:55:03.000000000 -0400
-@@ -29,6 +29,7 @@
- #include "texte.h"
- #include "video.h"
- #include "nglog.h"
-+#include <stdarg.h>
- 
- RCSID("$Id: quadra-1.1.8-gcc41.patch,v 1.1 2006/05/31 18:55:36 tupone Exp $")
- 
-diff -ur quadra-1.1.8-orig/source/quadra.cpp quadra-1.1.8/source/quadra.cpp
---- quadra-1.1.8-orig/source/quadra.cpp	2006-05-21 16:35:30.000000000 -0400
-+++ quadra-1.1.8/source/quadra.cpp	2006-05-21 16:56:12.000000000 -0400
-@@ -65,6 +65,7 @@
- #include "clock.h"
- #include "net_server.h"
- #include "quadra.h"
-+#include <exception>
- 
- RCSID("$Id: quadra-1.1.8-gcc41.patch,v 1.1 2006/05/31 18:55:36 tupone Exp $")
- 
-@@ -2387,7 +2388,7 @@
- 				try {
- 					overmind.step();
- 				}
--				catch(exception *e) {
-+				catch(std::exception *e) {
- 					msgbox("Exception caught from overmind.step(): %s\n", e->what());
- 				}
- 				#ifdef PAINTDETECTOR2000
-@@ -2406,7 +2407,7 @@
- 			try {
- 				ecran->draw_zone();
- 			}
--			catch(exception *e) {
-+			catch(std::exception *e) {
- 				msgbox("Exception caught from ecran->draw_zone(): %s\n", e->what());
- 			}
-