Patch to fix compilation with gcc-4.1 by Karol Szumski <mareviq AT interia DOT pl>; bug #121349

Package-Manager: portage-2.1_pre5-r4

4 files changed, 62 insertions, 5 deletions

diff --git a/media-libs/plib/ChangeLog b/media-libs/plib/ChangeLog
index 397631c5e269..6576d4e2fc1b 100644
--- a/media-libs/plib/ChangeLog
+++ b/media-libs/plib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/plib
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/plib/ChangeLog,v 1.26 2006/01/25 05:26:24 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/plib/ChangeLog,v 1.27 2006/03/10 21:46:58 halcy0n Exp $
+
+  10 Mar 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/plib-1.8.4-gcc41.patch, plib-1.8.4.ebuild:
+  Patch to fix compilation with gcc-4.1 by Karol Szumski <mareviq AT interia
+  DOT pl>; bug #121349
 
   25 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org> plib-1.6.0.ebuild,
   plib-1.8.3.ebuild, plib-1.8.4.ebuild:
diff --git a/media-libs/plib/Manifest b/media-libs/plib/Manifest
index 1b26f945fdf2..0c95753b71cb 100644
--- a/media-libs/plib/Manifest
+++ b/media-libs/plib/Manifest
@@ -1,8 +1,37 @@
-MD5 f7bb97110a370fdedf4eb5438b26869b ChangeLog 3405
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ed38744eeaefe0be01fef87b6ea8b722 ChangeLog 3600
+RMD160 c552a097dd3dd65da6601610956e4d5e425f4b4c ChangeLog 3600
+SHA256 86cbbccba739c87e78cdc4aece5b5b3b87ef224fa3da862a917f74a3494e23c7 ChangeLog 3600
 MD5 f5061365a80c4d8aececf56604d9b5c8 files/digest-plib-1.6.0 62
+RMD160 f9ed6df5738e4a0741761b687977e605f887f58c files/digest-plib-1.6.0 62
+SHA256 2b0fe08f347f7d1bcc533fcd1682e13a416f59188a998c2720fed6aa175646ce files/digest-plib-1.6.0 62
 MD5 bc913bb51ba51adf7d83ee2a5b784fac files/digest-plib-1.8.3 62
+RMD160 2f1c81bb799071da5bca8bf6d7085f791fd407aa files/digest-plib-1.8.3 62
+SHA256 f21c2d3a346ea05940a8942c38418f9c49d49ff71ad949269e1b3c97068fabd4 files/digest-plib-1.8.3 62
 MD5 b786078ffac425978e62d0f7ebdb6feb files/digest-plib-1.8.4 62
+RMD160 031cb65d978ebda06865790318aecd9f5e7f1157 files/digest-plib-1.8.4 62
+SHA256 20ae246f4c458d97fda91a2b44a01b47a1c31b5e3e86a04b660fc5adec6472c8 files/digest-plib-1.8.4 62
+MD5 df018721fb95cb80084a51f865f58b43 files/plib-1.8.4-gcc41.patch 705
+RMD160 616bee0f6e8c3e47d158805ce1770beae0b4938c files/plib-1.8.4-gcc41.patch 705
+SHA256 036340c3271599af4386799ac4caf3d4be730fb483136c59f2cdb80b5d9bc953 files/plib-1.8.4-gcc41.patch 705
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
 MD5 db364c5aee519d415253d0c5b6acecb9 plib-1.6.0.ebuild 667
+RMD160 12deb4a89f2f2c18c26ee42bb7efdf1847e5c2de plib-1.6.0.ebuild 667
+SHA256 a2ca4d900f8dc087e48ae5c394a9b1c0550393cfe4838e3f0ae92d0556fc3e5c plib-1.6.0.ebuild 667
 MD5 ea22495868a2ff1a662361db0244592a plib-1.8.3.ebuild 740
-MD5 67ba18cd6eab2dbbdc830f5b7539d6fa plib-1.8.4.ebuild 919
+RMD160 42628729b82b86f206531a161a2960352a9b6d93 plib-1.8.3.ebuild 740
+SHA256 acec181279b939955a928d2675594c0fcd1e409c3cd17ae55b54bc978f806f1c plib-1.8.3.ebuild 740
+MD5 c59b0f93f5c630ccb826aac6ceee23f6 plib-1.8.4.ebuild 962
+RMD160 823b4ab995e4a6145c7ec1f0932138f0ef315fd4 plib-1.8.4.ebuild 962
+SHA256 c6128562615f9f45126d51f3ef98939cc2ac3de1e7854bb0e074b7204968b60f plib-1.8.4.ebuild 962
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFEEfPcCRZPokWLroQRApS4AJwKmtWFtRvcRrvZajQAobaYq5vQDgCgkAB8
+34FyRwC9nZ55JTUVGZxBRtQ=
+=h5fx
+-----END PGP SIGNATURE-----
diff --git a/media-libs/plib/files/plib-1.8.4-gcc41.patch b/media-libs/plib/files/plib-1.8.4-gcc41.patch
new file mode 100644
index 000000000000..8de385211dc4
--- /dev/null
+++ b/media-libs/plib/files/plib-1.8.4-gcc41.patch
@@ -0,0 +1,20 @@
+--- ./plib-1.8.4/src/ssgAux/ssgaSky.h.old	2003-09-26 16:54:20.000000000 +0200
++++ ./plib-1.8.4/src/ssgAux/ssgaSky.h	2006-02-02 21:22:01.000000000 +0100
+@@ -104,7 +104,7 @@
+   ssgaCelestialBodyList ( int init = 3 )
+ 	  : ssgSimpleList ( sizeof(ssgaCelestialBody*), init ) { }
+ 
+-  ssgaCelestialBodyList::~ssgaCelestialBodyList () { removeAll(); }
++  ~ssgaCelestialBodyList () { removeAll(); }
+ 
+   int getNum (void) { return total ; }
+ 
+@@ -192,7 +192,7 @@
+   ssgaCloudLayerList ( int init = 3 )
+ 	  : ssgSimpleList ( sizeof(ssgaCloudLayer*), init ) { }
+ 
+-  ssgaCloudLayerList::~ssgaCloudLayerList () { removeAll(); }
++  ~ssgaCloudLayerList () { removeAll(); }
+ 
+   int getNum (void) { return total ; }
+ 
diff --git a/media-libs/plib/plib-1.8.4.ebuild b/media-libs/plib/plib-1.8.4.ebuild
index c55909c682fc..292b92e01afb 100644
--- a/media-libs/plib/plib-1.8.4.ebuild
+++ b/media-libs/plib/plib-1.8.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/plib/plib-1.8.4.ebuild,v 1.9 2006/01/25 05:26:24 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/plib/plib-1.8.4.ebuild,v 1.10 2006/03/10 21:46:58 halcy0n Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic eutils
 
 DESCRIPTION="multimedia library used by many games"
 HOMEPAGE="http://plib.sourceforge.net/"
@@ -24,6 +24,9 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
+
+	epatch "${FILESDIR}"/${P}-gcc41.patch
+
 	# Since plib only provides static libraries, force
 	# building as PIC or plib is useless to amd64/etc...
 	append-flags -fPIC