gcc-4 compilation fixes, bug #120609

Package-Manager: portage-2.1_pre7-r3

10 files changed, 143 insertions, 22 deletions

diff --git a/games-util/showeq/ChangeLog b/games-util/showeq/ChangeLog
index 7f471154ca0e..e090872d11b1 100644
--- a/games-util/showeq/ChangeLog
+++ b/games-util/showeq/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-util/showeq
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/showeq/ChangeLog,v 1.16 2006/03/17 21:22:45 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/showeq/ChangeLog,v 1.17 2006/04/02 09:04:29 tupone Exp $
+
+  02 Apr 2006; <Tupone@gentoo.org> +files/showeq-5.0.0.18-gcc4.patch,
+  +files/showeq-5.2.4.0-gcc4.patch, +files/showeq-5.3.0.0-gcc4.patch,
+  showeq-5.0.0.18.ebuild, showeq-5.2.4.0.ebuild, showeq-5.3.0.0.ebuild:
+  gcc-4 compiles, bug #120609 by joshuabaergen
 
 *showeq-5.3.0.0 (17 Mar 2006)
 
diff --git a/games-util/showeq/Manifest b/games-util/showeq/Manifest
index 6c378d475fc7..d863b9b7b3db 100644
--- a/games-util/showeq/Manifest
+++ b/games-util/showeq/Manifest
@@ -1,24 +1,43 @@
-MD5 6242187318a26c0a6bf908e7f2a602f2 ChangeLog 2299
-RMD160 694077bae8c8197980869ca72692c4e5e7d610bc ChangeLog 2299
-SHA256 44486c738c08877873e3f5ae3dd18e9df8b3e4c31ddabf1030e0dcc2ac2de9f1 ChangeLog 2299
-MD5 e50ed8d4a1b9184df765b72f6fcab6f1 files/digest-showeq-5.0.0.18 68
-RMD160 cc85a6b982d563c7a2e69736dc3ddd749bb83cea files/digest-showeq-5.0.0.18 68
-SHA256 b987bee4bf55ed04388a3911765b52a11cd158da8647f51c58f2f6660afc16cf files/digest-showeq-5.0.0.18 68
-MD5 9ac4988f43ff998c0009d351a0d64274 files/digest-showeq-5.2.4.0 67
-RMD160 1a6eaa96ac492620d2788944a79f705ac26b9a0a files/digest-showeq-5.2.4.0 67
-SHA256 2240833721c76bad54d2c4fa55e2f5294a155be1e52536039381f7feef0e97e8 files/digest-showeq-5.2.4.0 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0026cb13c6588c5d4d1a0f75ff2efc79 ChangeLog 2559
+RMD160 92ef7edae448884181a97d890b4985adbf7b9e1c ChangeLog 2559
+SHA256 87688041a54f32023c850f364559d082fb904b008f5fe69935bd83a1be4cdc0f ChangeLog 2559
+MD5 562d4fc115dc405eb44a7e6191fe2abd files/digest-showeq-5.0.0.18 250
+RMD160 b97cd1d7385255790d9e73b0996257060b7053b2 files/digest-showeq-5.0.0.18 250
+SHA256 b214b9134e690c444952b1b8a90a3d05d740d8710678781bf603d8457e1ba4a0 files/digest-showeq-5.0.0.18 250
+MD5 ff84d29fc676432b9305650499a361b7 files/digest-showeq-5.2.4.0 247
+RMD160 2e5cec056e2367fe2d9c896f1de70dcf095f12ed files/digest-showeq-5.2.4.0 247
+SHA256 cdd473ed97f42494e0c2dc524d0049458931d0023b1b03bcb114ac7b3c370388 files/digest-showeq-5.2.4.0 247
 MD5 2d5382d97c6d5f59bb14cdf2d2510267 files/digest-showeq-5.3.0.0 247
 RMD160 0820dc8b17c9996bb69624e8b7e71ae581d181d7 files/digest-showeq-5.3.0.0 247
 SHA256 ed575bc33a9dad35efffdef731dbd3a9d076188c7a2a2889d740b44e14cb9ed4 files/digest-showeq-5.3.0.0 247
+MD5 da4a82a816ff11e0595a98dac6e71d73 files/showeq-5.0.0.18-gcc4.patch 1705
+RMD160 09f0df0945e1f743b712d7a757ae0dc0b10fcdaa files/showeq-5.0.0.18-gcc4.patch 1705
+SHA256 9662a8943bfe82be9813d7bab0c1ffa6367f357c8f1d473b2dbe27b1c8a72d2e files/showeq-5.0.0.18-gcc4.patch 1705
+MD5 e6c4477e2d4f268ac84dcb4c3228e772 files/showeq-5.2.4.0-gcc4.patch 409
+RMD160 d0d2fca4b668a46b367085eb91f2964fb06c8dc2 files/showeq-5.2.4.0-gcc4.patch 409
+SHA256 33a69485fa05f4bd95b87a56a7a597fcf67c3330891b8d7d107e0fb4206d9bfa files/showeq-5.2.4.0-gcc4.patch 409
+MD5 e6c4477e2d4f268ac84dcb4c3228e772 files/showeq-5.3.0.0-gcc4.patch 409
+RMD160 d0d2fca4b668a46b367085eb91f2964fb06c8dc2 files/showeq-5.3.0.0-gcc4.patch 409
+SHA256 33a69485fa05f4bd95b87a56a7a597fcf67c3330891b8d7d107e0fb4206d9bfa files/showeq-5.3.0.0-gcc4.patch 409
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 0433d79a5008ffea5657759361560049 showeq-5.0.0.18.ebuild 821
-RMD160 f694830f2c6b15243556bf0aea02fc4a1233195f showeq-5.0.0.18.ebuild 821
-SHA256 256606e3dbfa35da1597983c57d3d12b0c119abff61508c145b12db94db92af8 showeq-5.0.0.18.ebuild 821
-MD5 2e338ec3ea7a7bed69878cb8bddf215f showeq-5.2.4.0.ebuild 828
-RMD160 dfbf4c328d3ced178a957321917f1e40f4d4b93a showeq-5.2.4.0.ebuild 828
-SHA256 e31230292a4ecd180c6fc78645bb82983fea9b7b05b976dfaeb404cc85e5f6f1 showeq-5.2.4.0.ebuild 828
-MD5 5f6778a7307fc8519e91b28bd17caeca showeq-5.3.0.0.ebuild 856
-RMD160 e7669c32b45b3333238d0235953380fe0ea31ee5 showeq-5.3.0.0.ebuild 856
-SHA256 2d2e5c30f43d1494ba2589d2c344682e3fa85fefee47b494f7a5f3f9c94670f1 showeq-5.3.0.0.ebuild 856
+MD5 8393d59f12d23e0c667a47f467c96317 showeq-5.0.0.18.ebuild 860
+RMD160 30a853f3d949f205dfa82e0bc4b0cf1bd05c8f5e showeq-5.0.0.18.ebuild 860
+SHA256 69af3e55ff85b02e09b3b2a3912e1e206418c581deb359739e6ea4fc7f14bada showeq-5.0.0.18.ebuild 860
+MD5 9aacbf71a50685b7cad58fa3e3d68085 showeq-5.2.4.0.ebuild 867
+RMD160 350abca8e2500013bbf5422a7f4eada15555534d showeq-5.2.4.0.ebuild 867
+SHA256 c626ea149d3d1652bb85894bd2cfc5a43c3e8db7922e2cf9a62bceab50852047 showeq-5.2.4.0.ebuild 867
+MD5 3193292604fdc5a1c64b13afe9af90ff showeq-5.3.0.0.ebuild 895
+RMD160 d888514fe0cbeae279b5f8a278669218687a45a0 showeq-5.3.0.0.ebuild 895
+SHA256 b04b1433435f6d411e31ac68e22222847b3f77211d6f1bc08dd44cced713f79b showeq-5.3.0.0.ebuild 895
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFEL5O32CTtIKiFlQIRAoI4AJ91DaJJ6hoCqz9U6tQ97jWZ+V11NQCgnBAd
+At2RMkSTvH5AJ4Q9yr8j1IE=
+=H91o
+-----END PGP SIGNATURE-----
diff --git a/games-util/showeq/files/digest-showeq-5.0.0.18 b/games-util/showeq/files/digest-showeq-5.0.0.18
index cca733212888..2571c1d29891 100644
--- a/games-util/showeq/files/digest-showeq-5.0.0.18
+++ b/games-util/showeq/files/digest-showeq-5.0.0.18
@@ -1 +1,3 @@
 MD5 273e871b5166d73ae0e8ac32e28539db showeq-5.0.0.18.tar.bz2 741051
+RMD160 9da5bec7ff034c7d914ff43bf3c3768b32fe3c1e showeq-5.0.0.18.tar.bz2 741051
+SHA256 39af82a08f1fa0a398fd380a0577733a943045eadf87f8de362e43943541d9d3 showeq-5.0.0.18.tar.bz2 741051
diff --git a/games-util/showeq/files/digest-showeq-5.2.4.0 b/games-util/showeq/files/digest-showeq-5.2.4.0
index 3e831193bc2b..8dc0fb38d032 100644
--- a/games-util/showeq/files/digest-showeq-5.2.4.0
+++ b/games-util/showeq/files/digest-showeq-5.2.4.0
@@ -1 +1,3 @@
 MD5 82b52e0656576e4d8297dbf750db5716 showeq-5.2.4.0.tar.bz2 804125
+RMD160 bc05a9312e6362e3322a46c3f2787381915b3e46 showeq-5.2.4.0.tar.bz2 804125
+SHA256 091dae8cbbd2a25106a587205730e19502458b3094ac3a27ea7dbb871493b692 showeq-5.2.4.0.tar.bz2 804125
diff --git a/games-util/showeq/files/showeq-5.0.0.18-gcc4.patch b/games-util/showeq/files/showeq-5.0.0.18-gcc4.patch
new file mode 100644
index 000000000000..c2caecbab3fc
--- /dev/null
+++ b/games-util/showeq/files/showeq-5.0.0.18-gcc4.patch
@@ -0,0 +1,65 @@
+--- src/point.h.old	2006-01-28 00:06:55.000000000 -0700
++++ src/point.h	2006-01-28 00:08:28.000000000 -0700
+@@ -111,35 +111,35 @@
+ 
+ // default constructor
+ template <class _T> inline
+-Point3D<_T>::Point3D<_T>()
++Point3D<_T>::Point3D()
+ {
+   setPoint(0, 0, 0);
+ }
+ 
+ // copy constructor
+ template <class _T> inline
+-Point3D<_T>::Point3D<_T>(const Point3D<_T>& point)
++Point3D<_T>::Point3D(const Point3D<_T>& point)
+ {
+   setPoint(point.x(), point.y(), point.z());
+ }
+ 
+ // copy constructor
+ template <class _T> inline
+-Point3D<_T>::Point3D<_T>(const QPoint& point)
++Point3D<_T>::Point3D(const QPoint& point)
+ {
+   setPoint(point.x(), point.y(), 0);
+ }
+ 
+ // convenience constructor
+ template <class _T> inline
+-Point3D<_T>::Point3D<_T>(_T x, _T y, _T z)
++Point3D<_T>::Point3D(_T x, _T y, _T z)
+ {
+   setPoint(x, y, z);
+ }
+ 
+ // obligatory virtual destructor
+ template <class _T> inline
+-Point3D<_T>::~Point3D<_T>()
++Point3D<_T>::~Point3D()
+ {
+ }
+ 
+--- src/spawnmonitor.h.old	2006-01-27 23:52:51.000000000 -0700
++++ src/spawnmonitor.h	2006-01-27 23:53:20.000000000 -0700
+@@ -98,7 +98,7 @@
+ {
+ Q_OBJECT
+ public:
+-  SpawnMonitor::SpawnMonitor(const DataLocationMgr* dataLocMgr, 
++  SpawnMonitor(const DataLocationMgr* dataLocMgr, 
+ 			     ZoneMgr* zoneMgr, SpawnShell* spawnShell, 
+ 			     QObject* parent = 0, 
+ 			     const char* name = "spawnmonitor" );
+--- src/pointarray.h.old	2006-01-28 00:11:28.000000000 -0700
++++ src/pointarray.h	2006-01-28 00:11:43.000000000 -0700
+@@ -57,7 +57,7 @@
+ };
+ 
+ template <class _T> inline 
+-Point3DArray<_T>::Point3DArray<_T>(uint32_t nPoints, const _T* points)
++Point3DArray<_T>::Point3DArray(uint32_t nPoints, const _T* points)
+ {
+   setPoints(nPoints, points);
+ }
diff --git a/games-util/showeq/files/showeq-5.2.4.0-gcc4.patch b/games-util/showeq/files/showeq-5.2.4.0-gcc4.patch
new file mode 100644
index 000000000000..7ea5824930f3
--- /dev/null
+++ b/games-util/showeq/files/showeq-5.2.4.0-gcc4.patch
@@ -0,0 +1,11 @@
+--- src/spawnmonitor.h.old	2006-01-27 23:52:51.000000000 -0700
++++ src/spawnmonitor.h	2006-01-27 23:53:20.000000000 -0700
+@@ -98,7 +98,7 @@
+ {
+ Q_OBJECT
+ public:
+-  SpawnMonitor::SpawnMonitor(const DataLocationMgr* dataLocMgr, 
++  SpawnMonitor(const DataLocationMgr* dataLocMgr, 
+ 			     ZoneMgr* zoneMgr, SpawnShell* spawnShell, 
+ 			     QObject* parent = 0, 
+ 			     const char* name = "spawnmonitor" );
diff --git a/games-util/showeq/files/showeq-5.3.0.0-gcc4.patch b/games-util/showeq/files/showeq-5.3.0.0-gcc4.patch
new file mode 100644
index 000000000000..7ea5824930f3
--- /dev/null
+++ b/games-util/showeq/files/showeq-5.3.0.0-gcc4.patch
@@ -0,0 +1,11 @@
+--- src/spawnmonitor.h.old	2006-01-27 23:52:51.000000000 -0700
++++ src/spawnmonitor.h	2006-01-27 23:53:20.000000000 -0700
+@@ -98,7 +98,7 @@
+ {
+ Q_OBJECT
+ public:
+-  SpawnMonitor::SpawnMonitor(const DataLocationMgr* dataLocMgr, 
++  SpawnMonitor(const DataLocationMgr* dataLocMgr, 
+ 			     ZoneMgr* zoneMgr, SpawnShell* spawnShell, 
+ 			     QObject* parent = 0, 
+ 			     const char* name = "spawnmonitor" );
diff --git a/games-util/showeq/showeq-5.0.0.18.ebuild b/games-util/showeq/showeq-5.0.0.18.ebuild
index de4c18c0a160..f56cd7218b46 100644
--- a/games-util/showeq/showeq-5.0.0.18.ebuild
+++ b/games-util/showeq/showeq-5.0.0.18.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-util/showeq/showeq-5.0.0.18.ebuild,v 1.6 2006/03/17 21:22:45 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/showeq/showeq-5.0.0.18.ebuild,v 1.7 2006/04/02 09:04:29 tupone Exp $
 
 inherit kde games
 
@@ -19,6 +19,8 @@ DEPEND="|| ( x11-libs/libXt virtual/x11 )
 	$(qt_min_version 3.1)
 	>=sys-libs/gdbm-1.8.0"
 
+PATCHES="${FILESDIR}/${P}"-gcc4.patch
+
 src_compile() {
 	kde_src_compile nothing
 	egamesconf || die
diff --git a/games-util/showeq/showeq-5.2.4.0.ebuild b/games-util/showeq/showeq-5.2.4.0.ebuild
index 86facd830bfc..2647a68f0e11 100644
--- a/games-util/showeq/showeq-5.2.4.0.ebuild
+++ b/games-util/showeq/showeq-5.2.4.0.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-util/showeq/showeq-5.2.4.0.ebuild,v 1.4 2006/03/17 21:22:45 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/showeq/showeq-5.2.4.0.ebuild,v 1.5 2006/04/02 09:04:29 tupone Exp $
 
 inherit kde games
 
@@ -19,6 +19,8 @@ DEPEND="|| ( x11-libs/libXt virtual/x11 )
 	$(qt_min_version 3.2)
 	>=sys-libs/gdbm-1.8.0"
 
+PATCHES="${FILESDIR}/${P}"-gcc4.patch
+
 src_compile() {
 	kde_src_compile nothing
 	egamesconf || die
diff --git a/games-util/showeq/showeq-5.3.0.0.ebuild b/games-util/showeq/showeq-5.3.0.0.ebuild
index a8100cb8e019..f1a616d92c18 100644
--- a/games-util/showeq/showeq-5.3.0.0.ebuild
+++ b/games-util/showeq/showeq-5.3.0.0.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-util/showeq/showeq-5.3.0.0.ebuild,v 1.1 2006/03/17 21:22:45 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/showeq/showeq-5.3.0.0.ebuild,v 1.2 2006/04/02 09:04:29 tupone Exp $
 
 inherit kde games
 
@@ -20,6 +20,8 @@ RDEPEND="virtual/libpcap
 DEPEND="${RDEPEND}
 	|| ( x11-libs/libXt virtual/x11 )"
 
+PATCHES="${FILESDIR}/${P}"-gcc4.patch
+
 src_compile() {
 	kde_src_compile nothing
 	egamesconf || die