fix build with gcc 4.3, by Yaroslav Gorbunov, bug #251255

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27.8 x86_64

4 files changed, 55 insertions, 7 deletions

diff --git a/media-sound/splay/ChangeLog b/media-sound/splay/ChangeLog
index 6dab448b6589..a7792eeb0a24 100644
--- a/media-sound/splay/ChangeLog
+++ b/media-sound/splay/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/splay
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/splay/ChangeLog,v 1.16 2008/08/06 22:36:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/splay/ChangeLog,v 1.17 2008/12/19 09:40:22 aballier Exp $
+
+  19 Dec 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/splay-0.9.5.2-gcc43-2.patch, splay-0.9.5.2.ebuild:
+  fix build with gcc 4.3, by Yaroslav Gorbunov, bug #251255
 
   06 Aug 2008; Alexis Ballier <aballier@gentoo.org>
   +files/splay-0.9.5.2-gcc43.patch, splay-0.9.5.2.ebuild:
diff --git a/media-sound/splay/Manifest b/media-sound/splay/Manifest
index 1a40be5a8fe0..f66933100ee0 100644
--- a/media-sound/splay/Manifest
+++ b/media-sound/splay/Manifest
@@ -2,15 +2,16 @@
 Hash: SHA1
 
 AUX splay-0.9.5.2-external-id3lib.diff 618 RMD160 34fcd4c882585f6015b538193d486c46653e763d SHA1 060fae06b2495cbbc268462a36aff136534d3763 SHA256 45323b85ed9a78b84a8fc116ade959942f9065384a14a45209cfb872507e4316
+AUX splay-0.9.5.2-gcc43-2.patch 1838 RMD160 ec990069abf1cd75573b47d3eac9648c93f06c18 SHA1 8e769fcf5f71a1fa4fd68774c45198c92e027b80 SHA256 d05decb40351a2276f997160e1e0dc4d86ade71c929767d8d073303e8059efdd
 AUX splay-0.9.5.2-gcc43.patch 3843 RMD160 d48fb2f30b77bd3810fcf8dab7241e5c0ece69d4 SHA1 5fe3ed75d6c6977650e6b0ed1d3af5147c9be34a SHA256 3880ae076814422c12e19275c87bc540d8a594bd68b0ae8e6faa897edeab1f25
 DIST splay-0.9.5.2.tar.gz 105510 RMD160 a79d0b429b3e73793c51ad071804e6d6362a6ad4 SHA1 a0638c96b8c9a38da026c957979fe3ec3c560f14 SHA256 38266b7620e8dde9ca39ace245ded4d9fadc3ea9e35772190fcfe90efe8d39bd
-EBUILD splay-0.9.5.2.ebuild 978 RMD160 1196a20d87cb7cc00e9228d3e0a3bf51ed50e6ea SHA1 84ed0226c09dc100c05e8e17b81c7b0f1f3396b1 SHA256 4da1f66648448cfc3b375e230753138161089cbcfea3be341bda29cc036dfe64
-MISC ChangeLog 1721 RMD160 4c9f1a20d8af66973171f2ccbc64be32941e4deb SHA1 311d7ced9eabd7cb10f9a4b2b2f59d9a4927182f SHA256 44c8c76e8f306ff6a9e74b534aed7e7fb8df888568476279e7edf8a82fd86473
+EBUILD splay-0.9.5.2.ebuild 1019 RMD160 df96a975c740a668ebe1f8fffa3a2d78fb3e6cb5 SHA1 c835fc64173d0e66b343e296206d3213c50c903f SHA256 7d4e795b2d35d5126beabd8427fb2a95d8968283bbf9ab5dcfd47c7831a138a3
+MISC ChangeLog 1894 RMD160 07b738196de25f09295eadbce6b7d2bcb36c4f31 SHA1 b74e9cf68eac50974d55e63aadb2229141747d3c SHA256 527eddd7a5d660b0f58ed73f2fe11345503497153420371de6fd1167e892d25b
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiaJ1UACgkQvFcC4BYPU0q6CgCeNM0sbFis14FqHKbhJv/FQxlI
-cgkAoKgvnf3NnxfbGqpjbJJoWCun/YsA
-=JoG9
+iEYEARECAAYFAklLbAsACgkQvFcC4BYPU0q5fwCgpLpBgj/0EjInucF7k+WIjbg/
+eWoAniECuv0U0pEHkZnQ8TxxY2uaN8YN
+=UumO
 -----END PGP SIGNATURE-----
diff --git a/media-sound/splay/files/splay-0.9.5.2-gcc43-2.patch b/media-sound/splay/files/splay-0.9.5.2-gcc43-2.patch
new file mode 100644
index 000000000000..d07090743b5a
--- /dev/null
+++ b/media-sound/splay/files/splay-0.9.5.2-gcc43-2.patch
@@ -0,0 +1,42 @@
+diff -Nurpa splay-0.9.5.2.orig/apps/splay.cc splay-0.9.5.2/apps/splay.cc
+--- splay-0.9.5.2.orig/apps/splay.cc	2008-12-17 03:37:47.000000000 +0300
++++ splay-0.9.5.2/apps/splay.cc	2008-12-17 03:39:34.000000000 +0300
+@@ -150,16 +150,16 @@ ostream& operator<<(ostream& s, const ID
+   // Print just what we want...
+   s.setf(ios::left);  // The filled fields get the text to the left
+   s << 
+-    "Title : " << nn(ID3_GetTitle(tag)) << endl;
++    "Title : " << nn(ID3_GetTitle(tag)) << std::endl;
+   s << 
+-    "Artist: " << setw(30) << nn(ID3_GetArtist(tag)) << 
++    "Artist: " << std::setw(30) << nn(ID3_GetArtist(tag)) << 
+     "Album: " << nn(ID3_GetAlbum(tag)) << 
+-    endl ; 
++    std::endl ; 
+   
+   s << 
+-    "Genre : " << setw(18) << nn(ID3_gen_list[ID3_GetGenreNum(tag)]) << 
+-    "Track: " << setw(5) << ID3_GetTrackNum(tag) << 
+-    "Year: " <<  setw(6) << nn(ID3_GetYear(tag)); 
++    "Genre : " << std::setw(18) << nn(ID3_gen_list[ID3_GetGenreNum(tag)]) << 
++    "Track: " << std::setw(5) << ID3_GetTrackNum(tag) << 
++    "Year: " <<  std::setw(6) << nn(ID3_GetYear(tag)); 
+ //   if ( ID3_GetComment(tag) ){
+ //     s << endl << "Comment:" << nn(ID3_GetComment(tag)) <<
+ //       nn(ID3_GetLyricist(tag)) << nn(ID3_GetLyrics(tag));
+@@ -180,13 +180,13 @@ static void play(char *filename)
+       try {
+ 	const ID3_Tag*  mytag = new ID3_Tag(filename);
+ 	if ( mytag->HasV1Tag() || mytag->HasV2Tag()  )
+-	  cout << mytag << endl;
++	  std::cout << mytag << std::endl;
+ 	delete mytag;
+ 	
+       }
+ //      catch(ID3_Error &err){
+       catch(...){
+-	cout << "Error found (GetError functions disabled)" << endl;
++	std::cout << "Error found (GetError functions disabled)" << std::endl;
+ //	cout << err.GetErrorFile() << " (" << err.GetErrorLine() << "): "
+ //	     << err.GetErrorType() << ": " << err.GetErrorDesc() << endl;
+       }
diff --git a/media-sound/splay/splay-0.9.5.2.ebuild b/media-sound/splay/splay-0.9.5.2.ebuild
index 15ca152999b1..be6822fd8428 100644
--- a/media-sound/splay/splay-0.9.5.2.ebuild
+++ b/media-sound/splay/splay-0.9.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/splay/splay-0.9.5.2.ebuild,v 1.18 2008/08/06 22:36:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/splay/splay-0.9.5.2.ebuild,v 1.19 2008/12/19 09:40:22 aballier Exp $
 
 inherit eutils
 
@@ -19,6 +19,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-gcc43.patch"
 	cd "${S}/apps"
 	epatch "${FILESDIR}/${P}-external-id3lib.diff"
+	epatch "${FILESDIR}/${P}-gcc43-2.patch"
 }
 
 src_compile() {