Add patch to fix compilation with gcc-4.1; bug #132336

Package-Manager: portage-2.1_pre10-r5

5 files changed, 63 insertions, 5 deletions

diff --git a/sci-astronomy/setiathome/ChangeLog b/sci-astronomy/setiathome/ChangeLog
index 0900623c96f2..63f54d7324e9 100644
--- a/sci-astronomy/setiathome/ChangeLog
+++ b/sci-astronomy/setiathome/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-astronomy/setiathome
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/setiathome/ChangeLog,v 1.15 2006/04/23 03:16:11 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/setiathome/ChangeLog,v 1.16 2006/05/18 17:58:11 halcy0n Exp $
+
+  18 May 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/setiathome-4.18-gcc41.patch, setiathome-4.18-r1.ebuild:
+  Add patch to fix compilation with gcc-4.1; bug #132336
 
   23 Apr 2006; Thomas Cort <tcort@gentoo.org> setiathome-4.18-r1.ebuild:
   Added ~alpha keyword wrt Bug #103250.
diff --git a/sci-astronomy/setiathome/Manifest b/sci-astronomy/setiathome/Manifest
index 7d3c9cde6186..bab7b34cdfbd 100644
--- a/sci-astronomy/setiathome/Manifest
+++ b/sci-astronomy/setiathome/Manifest
@@ -1,5 +1,35 @@
-MD5 05544306433b82e01e2e89052e0107af ChangeLog 7199
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX app_info.xml 300 RMD160 bd9a3f9450c280070a50c7392b60ceea9d423558 SHA1 105548126e37808d981cf3db131e107722494f8c SHA256 6b9f92f5c777851cd8ec954cdd293c3c43bf6d9af43d1f520be0a00d42c514cf size 300
 MD5 5d17f0de19d8a17b19630e964e6af47e files/app_info.xml 300
-MD5 d603a47e7a13f3e48f03c355dce9de23 files/digest-setiathome-4.18-r1 165
+RMD160 bd9a3f9450c280070a50c7392b60ceea9d423558 files/app_info.xml 300
+SHA256 6b9f92f5c777851cd8ec954cdd293c3c43bf6d9af43d1f520be0a00d42c514cf files/app_info.xml 300
+AUX setiathome-4.18-gcc41.patch 399 RMD160 5010c9986507c4bc87bcda10e4f8b89b1c122778 SHA1 cafa4fd3b25c02b813cfe7afa2e4d737bd7339ae SHA256 383d9987086f28ed3d76c079975c42606528f953cde8556264cef262f4703fd5 size 399
+MD5 cc8c81058d0d2e11423b871c740b9652 files/setiathome-4.18-gcc41.patch 399
+RMD160 5010c9986507c4bc87bcda10e4f8b89b1c122778 files/setiathome-4.18-gcc41.patch 399
+SHA256 383d9987086f28ed3d76c079975c42606528f953cde8556264cef262f4703fd5 files/setiathome-4.18-gcc41.patch 399
+DIST boinc_public-cvs-2005-08-13.tar.gz 6054534 RMD160 2585effd13c1b6e093141dbc34bebd770c6041be SHA256 3a8b7f3d462a0fa5f1d0ad14c77f790a3cf12b1237a09636cd82b9bfefc2afb7 size 6054534
+DIST seti_boinc-client-cvs-2005-08-20.tar.gz 1861233 RMD160 e3fa7c2acdeba61c404fd024e290057d97337be7 SHA256 964b5195f9b69c99518d46e4057b10b3c42b5c54f26fd549dec7c70f16db815d size 1861233
+EBUILD setiathome-4.18-r1.ebuild 1649 RMD160 a6cafc3bfeb21d6574dd763ff8bdcaae1d83ca7d SHA1 1a52dc0ac42ba01a475c7cc0a92cef306ef874f4 SHA256 fb3632a756be943928390b99f65224064e0b9c05797d27be7677221b60f343dd size 1649
+MD5 1c76c62d2adef30f921fd6b973b5e3f8 setiathome-4.18-r1.ebuild 1649
+RMD160 a6cafc3bfeb21d6574dd763ff8bdcaae1d83ca7d setiathome-4.18-r1.ebuild 1649
+SHA256 fb3632a756be943928390b99f65224064e0b9c05797d27be7677221b60f343dd setiathome-4.18-r1.ebuild 1649
+MISC ChangeLog 7372 RMD160 a19eeb436367f8fddc56595978ba6ee40d5bae0b SHA1 d4ce5f0e0b03c57bcf0a1ad89911b137826ad301 SHA256 efece0ee0d8de1201e7eea6bb0ad5e36c9bd85356e7838f8ccce33ad4b531614 size 7372
+MD5 89e01e1f84489efef51595601ff28454 ChangeLog 7372
+RMD160 a19eeb436367f8fddc56595978ba6ee40d5bae0b ChangeLog 7372
+SHA256 efece0ee0d8de1201e7eea6bb0ad5e36c9bd85356e7838f8ccce33ad4b531614 ChangeLog 7372
+MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 size 156
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 4553cc382be7171a99f262bf2d22bf32 setiathome-4.18-r1.ebuild 1549
+RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
+SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 metadata.xml 156
+MD5 88374094906b6bcae55624791b3b9069 files/digest-setiathome-4.18-r1 587
+RMD160 7f416af7b6792eed46c0165166f2e837913bfa99 files/digest-setiathome-4.18-r1 587
+SHA256 84d564dc785399fd89eb56e904b225c9ac58871df4941c759f2cf2f5f41838b4 files/digest-setiathome-4.18-r1 587
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEbLW7CRZPokWLroQRApxRAJ4zbdTB3Ac6TdJKlO7DnAIDyXz0dgCfRcgV
+njANzYb9TS6D3SdxCOfTf9k=
+=Y8Jy
+-----END PGP SIGNATURE-----
diff --git a/sci-astronomy/setiathome/files/digest-setiathome-4.18-r1 b/sci-astronomy/setiathome/files/digest-setiathome-4.18-r1
index 354c8dd8e440..5b31dfb8e7bb 100644
--- a/sci-astronomy/setiathome/files/digest-setiathome-4.18-r1
+++ b/sci-astronomy/setiathome/files/digest-setiathome-4.18-r1
@@ -1,2 +1,6 @@
 MD5 af114631d61e117de9bafa197864a8ff boinc_public-cvs-2005-08-13.tar.gz 6054534
+RMD160 2585effd13c1b6e093141dbc34bebd770c6041be boinc_public-cvs-2005-08-13.tar.gz 6054534
+SHA256 3a8b7f3d462a0fa5f1d0ad14c77f790a3cf12b1237a09636cd82b9bfefc2afb7 boinc_public-cvs-2005-08-13.tar.gz 6054534
 MD5 f0c57d5713071b167582228d07d82621 seti_boinc-client-cvs-2005-08-20.tar.gz 1861233
+RMD160 e3fa7c2acdeba61c404fd024e290057d97337be7 seti_boinc-client-cvs-2005-08-20.tar.gz 1861233
+SHA256 964b5195f9b69c99518d46e4057b10b3c42b5c54f26fd549dec7c70f16db815d seti_boinc-client-cvs-2005-08-20.tar.gz 1861233
diff --git a/sci-astronomy/setiathome/files/setiathome-4.18-gcc41.patch b/sci-astronomy/setiathome/files/setiathome-4.18-gcc41.patch
new file mode 100644
index 000000000000..f157442e9fec
--- /dev/null
+++ b/sci-astronomy/setiathome/files/setiathome-4.18-gcc41.patch
@@ -0,0 +1,11 @@
+--- db/sqlblob.h.orig	2006-05-05 14:16:53.000000000 +0200
++++ db/sqlblob.h	2006-05-05 14:17:42.000000000 +0200
+@@ -68,7 +68,7 @@
+    start=end+1;
+    end=buf.find(tag);
+    if (b.mem) delete(b.mem);
+-   b.mem=new std::vector<T>(xml_decode_string(buf.c_str()+start,end-start,enc_string));
++   b.mem=new std::vector<T>(xml_decode_string<T>(buf.c_str()+start,end-start,enc_string));
+    return i;
+ }
+ 
diff --git a/sci-astronomy/setiathome/setiathome-4.18-r1.ebuild b/sci-astronomy/setiathome/setiathome-4.18-r1.ebuild
index 2f432e2b9597..0be36cf0f415 100644
--- a/sci-astronomy/setiathome/setiathome-4.18-r1.ebuild
+++ b/sci-astronomy/setiathome/setiathome-4.18-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/setiathome/setiathome-4.18-r1.ebuild,v 1.4 2006/04/23 03:16:11 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/setiathome/setiathome-4.18-r1.ebuild,v 1.5 2006/05/18 17:58:11 halcy0n Exp $
+
+inherit eutils
 
 MY_PN="seti_boinc-client-cvs"
 MY_PV="2005-08-20"
@@ -22,6 +24,13 @@ DEPEND="~sci-misc/boinc-4.72.20050813
 
 S=${WORKDIR}/seti_boinc
 
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc41.patch
+}
+
 src_compile() {
 	# The setiathome GUI doesn't work - so disable it for now...
 	econf BOINCDIR=${WORKDIR}/boinc_public \