Fix building with gcc4.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 51 insertions, 12 deletions

diff --git a/app-cdr/cdrdao/ChangeLog b/app-cdr/cdrdao/ChangeLog
index b192507dd6e2..a03e8f9cf2d9 100644
--- a/app-cdr/cdrdao/ChangeLog
+++ b/app-cdr/cdrdao/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/cdrdao
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.66 2005/06/30 00:01:07 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.67 2005/06/30 23:16:35 azarah Exp $
+
+  30 Jun 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/cdrdao-1.2.0-gcc4.patch, cdrdao-1.2.0.ebuild:
+  Fix building with gcc4.
 
 *cdrdao-1.2.0 (29 Jun 2005)
 
diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest
index e78a41c89c14..c761713a9de0 100644
--- a/app-cdr/cdrdao/Manifest
+++ b/app-cdr/cdrdao/Manifest
@@ -1,17 +1,28 @@
-MD5 1f48ccba2996a160bc1a23a3b351122f ChangeLog 9478
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0e2c75605541ad393623a870c92f0253 cdrdao-1.2.0.ebuild 1721
 MD5 eabea7c61116301e189d721177fe8a48 cdrdao-1.1.7-r3.ebuild 3011
-MD5 682de67a4d49d634eadcb022c280a0e1 metadata.xml 488
 MD5 71328287f8bdbbfefbab9cc9334dd1f3 cdrdao-1.1.9.ebuild 1946
 MD5 64512dea0ed843a5ef724b3c56703c20 cdrdao-1.1.9-r2.ebuild 1970
-MD5 777c8c690a29bc31560369bb6e80c870 cdrdao-1.2.0.ebuild 1647
-MD5 6f398aabdbd1ed1aa966f460fdbac3d2 files/1.1.8-gcc34.patch 10476
+MD5 5798a6a340985f6000354fac4a7722a8 ChangeLog 9613
+MD5 682de67a4d49d634eadcb022c280a0e1 metadata.xml 488
 MD5 46fb619628173aa68a337e7d49dd25b6 files/cdrdao-1.1.7-gentoo-version.patch 753
-MD5 a7dc4823c3a7d7582f9b87afdddb51e0 files/cdrdao-1.1.7-r2-mp32dao-gentoo.diff 779
-MD5 1fd823e821f7407e5a49d410b1cf238a files/cdrdao-1.1.9-cast.patch 347
+MD5 2c45c0fc635b97b04317d564cb810c41 files/digest-cdrdao-1.1.9-r2 65
+MD5 bfcab12a6211829eb71aa6ee3d0245be files/gcdmaster.desktop 127
+MD5 fa3eba1fe67c5c7c44e413fdb7f6d3e2 files/digest-cdrdao-1.2.0 65
+MD5 26ca1675cea490f4807b4f365b923d51 files/cdrdao-Project.h-gcc3.4.patch 753
 MD5 e21496bf5b1e2efcd09be0b16241b165 files/digest-cdrdao-1.1.7-r3 69
+MD5 6f398aabdbd1ed1aa966f460fdbac3d2 files/1.1.8-gcc34.patch 10476
+MD5 aea0047a0dd9c6dcc02c997f6bbeee79 files/cdrdao-1.2.0-gcc4.patch 869
+MD5 1fd823e821f7407e5a49d410b1cf238a files/cdrdao-1.1.9-cast.patch 347
 MD5 2c45c0fc635b97b04317d564cb810c41 files/digest-cdrdao-1.1.9 65
-MD5 bfcab12a6211829eb71aa6ee3d0245be files/gcdmaster.desktop 127
+MD5 a7dc4823c3a7d7582f9b87afdddb51e0 files/cdrdao-1.1.7-r2-mp32dao-gentoo.diff 779
 MD5 91898eebd71b9a81fa6e7d61652f6152 files/cdrdao-1.1.9-ppc64.patch 5217
-MD5 26ca1675cea490f4807b4f365b923d51 files/cdrdao-Project.h-gcc3.4.patch 753
-MD5 2c45c0fc635b97b04317d564cb810c41 files/digest-cdrdao-1.1.9-r2 65
-MD5 fa3eba1fe67c5c7c44e413fdb7f6d3e2 files/digest-cdrdao-1.2.0 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCxH221ZcsMnZjRyIRAguYAKCoGMZheC4anGgYy39nMMWAmbwPJACeO4d4
+iwlecugzZsRd+b0mTNt0bAM=
+=dExl
+-----END PGP SIGNATURE-----
diff --git a/app-cdr/cdrdao/cdrdao-1.2.0.ebuild b/app-cdr/cdrdao/cdrdao-1.2.0.ebuild
index 2ae80af15205..35db723c2be8 100644
--- a/app-cdr/cdrdao/cdrdao-1.2.0.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.2.0.ebuild,v 1.2 2005/06/30 10:55:52 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.2.0.ebuild,v 1.3 2005/06/30 23:16:35 azarah Exp $
 
 inherit flag-o-matic eutils
 
@@ -28,6 +28,8 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
+	[[ $(gcc-major-version) -eq 4 ]] && epatch ${FILESDIR}/${P}-gcc4.patch
+
 	# Add gentoo to version
 	sed -i -e "s:^PACKAGE_STRING='cdrdao 1.1.9':PACKAGE_STRING='cdrdao 1.1.9 gentoo':" configure
 
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.0-gcc4.patch b/app-cdr/cdrdao/files/cdrdao-1.2.0-gcc4.patch
new file mode 100644
index 000000000000..ad00a44b436d
--- /dev/null
+++ b/app-cdr/cdrdao/files/cdrdao-1.2.0-gcc4.patch
@@ -0,0 +1,22 @@
+--- cdrdao-1.2.0/trackdb/FormatConverter.h	2005-06-30 13:35:59.000000000 +0200
++++ cdrdao-1.2.0.az/trackdb/FormatConverter.h	2005-06-30 13:34:18.000000000 +0200
+@@ -95,7 +95,7 @@
+ 
+   // Convert all files contained in a given Toc object, and update the
+   // Toc accordingly. This is a big time blocking call.
+-  FormatSupport::Status convert(Toc* toc);
++  FormatSupport::Status convert(class Toc* toc);
+ 
+   // Dynamic allocator.
+   FormatSupport* newConverter(const char* src);
+--- cdrdao-1.2.0/trackdb/CueParser.cc	2005-06-30 13:36:09.000000000 +0200
++++ cdrdao-1.2.0.az/trackdb/CueParser.cc	2005-06-30 13:36:22.000000000 +0200
+@@ -23,7 +23,7 @@
+ 
+ #include "Cue2Toc.h"
+ 
+-extern Toc *parseToc(const char* tocBuffer, const char *filename);
++extern class Toc *parseToc(const char* tocBuffer, const char *filename);
+ 
+ Toc *parseCue(FILE *fp, const char *filename)
+ {