Add patch to fix compilation with gcc-4.3. Thanks to sigmatador AT gmail DOT com; bug #245847

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.27.1 x86_64

4 files changed, 48 insertions, 7 deletions

diff --git a/sci-electronics/alliance/ChangeLog b/sci-electronics/alliance/ChangeLog
index 0cf9c480099c..86447fa9a7ad 100644
--- a/sci-electronics/alliance/ChangeLog
+++ b/sci-electronics/alliance/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-electronics/alliance
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/alliance/ChangeLog,v 1.10 2007/12/06 12:44:51 corsair Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/alliance/ChangeLog,v 1.11 2008/11/26 21:59:11 halcy0n Exp $
+
+  26 Nov 2008; Mark Loeser <halcy0n@gentoo.org>
+  +files/alliance-5.0-gcc43.patch, alliance-5.0.20070718.ebuild:
+  Add patch to fix compilation with gcc-4.3. Thanks to sigmatador AT gmail
+  DOT com; bug #245847
 
   06 Dec 2007; Markus Rothe <corsair@gentoo.org>
   alliance-5.0.20070718.ebuild:
diff --git a/sci-electronics/alliance/Manifest b/sci-electronics/alliance/Manifest
index a0a81a7f2333..d7d5da48c62a 100644
--- a/sci-electronics/alliance/Manifest
+++ b/sci-electronics/alliance/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX alliance-5.0-gcc43.patch 735 RMD160 26f058ea66cae8b3b4d991257e59e74c10be3f2a SHA1 0e8595cdc1c9a6cdb4e622e3fcd0dc4ad9c077f5 SHA256 28db74745780429d5783c3ae2990dd94137d6a1098f16d5d33e3db7670f687c7
 DIST alliance-5.0-20060509.tar.gz 8192768 RMD160 9558452c7b0c7758a2d853d2d31cd8fc553f905f SHA1 93076a3b7cbbc79759498cf69fb3acfd4cc1fc05 SHA256 7f81b38707b5e6167d6278f48fc3af60de8b30d3bab2344a2b2d30ef1d5aa687
 DIST alliance-5.0-20070718.tar.gz 8197393 RMD160 dc1911517d58bbbdde86a0def21e1447a24f9dea SHA1 e975e3b58a91de96b98f0ff2360798ae5eece6be SHA256 4e17c8f9f4d344061166856d47e58527c6ae870fda0c73b5ba0200967d23af9f
 DIST alliance-tutorials-5.0-20070718.i386.rpm 2727945 RMD160 2d811f3bd8352b0fa846b5bac6a878ea17e23300 SHA1 b788d598632671f37fe02caa176283d7824ee753 SHA256 c0b9b5a96a5440be9b9a14b40f2ad446f486cad9acdd61e1c8be70b2a5c54465
 EBUILD alliance-5.0.20060509.ebuild 1291 RMD160 664fba94125019a086c21a77622373c2b7a0f86f SHA1 0ff9f49bf7529dfd6188a287e4604e20d7efa747 SHA256 0b5cd9affee9108c027a8f72a080b8978fdc146e31dcc65fa7b8af55fa0c58de
-EBUILD alliance-5.0.20070718.ebuild 1666 RMD160 227ac58f81213424284a811a95c67c83ef573549 SHA1 54de093bac6bbfe386ec2c1273a218a992a1bd6f SHA256 bd0201aea696fd70ee655e8052933b073f19eab7e1ef9e27fadb4fe718de8605
-MISC ChangeLog 1418 RMD160 58aae26cc5356031a16449d8786c868d07cfaa86 SHA1 d162edfaf830e81880d1f58921fa701b1be2d56e SHA256 4b3d93510cdf1e1d8a1028f77a881aefe8d605a3be44b380e58e55daba9ed5de
+EBUILD alliance-5.0.20070718.ebuild 1720 RMD160 8e831f645fc2df8b95555c0d4f61dd659b213b5f SHA1 6be3d0f05bad15d2c91b3ec6b35a8d7e4fe6ca7a SHA256 067c7966c4df121669df8e7f6016381b363700428073901676a14f7e1da031d5
+MISC ChangeLog 1630 RMD160 ea2b870184d5ea3385634b2cdfda51408bcb9240 SHA1 f2e8484c8e5bbc141ba170d77a3a0e60e8740672 SHA256 e601393f02c01d714f200e002a8184d2849fc2fcf6c2ce270090bbf0a736bfa9
 MISC metadata.xml 780 RMD160 fd82c785383e3cb7bf1faf218010a90a0c73c140 SHA1 7cd5688ec380585e148a11370f3ebeff7af228e4 SHA256 f14bc65123e4618907193f37cdc79e84b9890fe95a97dbc637c38f4b6d55ce6f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkktxr8ACgkQCRZPokWLroR3UgCfSyu1Dzvg1ljouu+K/NCSj8hz
+ZjkAn2jNnEFvTTjqtW5IJjiA1oGQFJG0
+=jDVK
+-----END PGP SIGNATURE-----
diff --git a/sci-electronics/alliance/alliance-5.0.20070718.ebuild b/sci-electronics/alliance/alliance-5.0.20070718.ebuild
index 775f97b7f0c3..6b9c3d40277d 100644
--- a/sci-electronics/alliance/alliance-5.0.20070718.ebuild
+++ b/sci-electronics/alliance/alliance-5.0.20070718.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/alliance/alliance-5.0.20070718.ebuild,v 1.2 2007/12/06 12:44:51 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/alliance/alliance-5.0.20070718.ebuild,v 1.3 2008/11/26 21:59:11 halcy0n Exp $
 
-inherit versionator flag-o-matic rpm
+inherit versionator flag-o-matic rpm eutils
 
 MY_PV=$(replace_version_separator 2 '-' )
 UPSTREAM_VERSION=$(get_version_component_range 1-2)
@@ -22,6 +22,7 @@ S="${WORKDIR}/${PN}-${UPSTREAM_VERSION}"
 src_unpack() {
 	rpm_src_unpack
 	cd "${S}"
+	epatch "${FILESDIR}"/alliance-5.0-gcc43.patch
 
 	# Fix compilation issue
 	sed -i -e "s/private: static void  operator delete/public: static void  operator delete/" nero/src/ADefs.h || die "sed failed"
diff --git a/sci-electronics/alliance/files/alliance-5.0-gcc43.patch b/sci-electronics/alliance/files/alliance-5.0-gcc43.patch
new file mode 100644
index 000000000000..fbca8ff53b36
--- /dev/null
+++ b/sci-electronics/alliance/files/alliance-5.0-gcc43.patch
@@ -0,0 +1,24 @@
+diff -ur alliance-5.0-orig/nero/src/MDefs.h alliance-5.0/nero/src/MDefs.h
+--- alliance-5.0-orig/nero/src/MDefs.h	2008-11-26 16:41:06.000000000 -0500
++++ alliance-5.0/nero/src/MDefs.h	2008-11-26 16:44:40.000000000 -0500
+@@ -24,6 +24,8 @@
+ # define  __MDefs__  1
+ 
+ 
++# include  <limits.h>
++# include  <cstring>
+ # include  "UDefs.h"
+ 
+ 
+diff -ur alliance-5.0-orig/ocp/src/placer/PPlacement.h alliance-5.0/ocp/src/placer/PPlacement.h
+--- alliance-5.0-orig/ocp/src/placer/PPlacement.h	2008-11-26 16:41:06.000000000 -0500
++++ alliance-5.0/ocp/src/placer/PPlacement.h	2008-11-26 16:46:06.000000000 -0500
+@@ -43,6 +43,7 @@
+ #include <fstream>
+ #include <vector>
+ #include <map>
++#include <cstring>
+ using namespace std;
+ 
+ #include "mut.h"
+