added patch to fix compilation problems if an id3lib is installed. fixes #87597

Package-Manager: portage-2.0.51.19

4 files changed, 48 insertions, 9 deletions

diff --git a/media-sound/splay/ChangeLog b/media-sound/splay/ChangeLog
index 17bc955ce9f5..3ca627cf79d1 100644
--- a/media-sound/splay/ChangeLog
+++ b/media-sound/splay/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/splay
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/splay/ChangeLog,v 1.9 2004/09/14 07:43:59 eradicator Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/splay/ChangeLog,v 1.10 2005/04/04 17:00:34 luckyduck Exp $
+
+  04 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/splay-0.9.5.2-external-id3lib.diff, splay-0.9.5.2.ebuild:
+  added patch to fix compilation problems if an id3lib is installed. 
+  fixes #87597
 
   14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> splay-0.9.5.2.ebuild:
   Stable amd64.
diff --git a/media-sound/splay/Manifest b/media-sound/splay/Manifest
index 7adca1733c8d..a9d4e01f2df5 100644
--- a/media-sound/splay/Manifest
+++ b/media-sound/splay/Manifest
@@ -1,4 +1,15 @@
-MD5 ca5be3e35f5c71027ef9387deeb70c7c ChangeLog 791
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 731ca4f9e8acd30221cdb17c21b03857 splay-0.9.5.2.ebuild 954
+MD5 ab8cb2480455a710b2c57f84123ec92e ChangeLog 996
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 8f73e2555b53183889ea8d4669c676fc splay-0.9.5.2.ebuild 966
 MD5 2dfdb702aadb0c285c3bbeb861a81810 files/digest-splay-0.9.5.2 65
+MD5 79fd2bcd5390d2bf54d6e7fabd2fc367 files/splay-0.9.5.2-external-id3lib.diff 618
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCUXLF06ebR+OMO78RArx7AJ9HcBhj5WNv+l69u3zZog91Op4VOgCfbxnt
+yMFxdlOPioqe6Y9r9VWJgZM=
+=i7Ck
+-----END PGP SIGNATURE-----
diff --git a/media-sound/splay/files/splay-0.9.5.2-external-id3lib.diff b/media-sound/splay/files/splay-0.9.5.2-external-id3lib.diff
new file mode 100644
index 000000000000..603901868e6f
--- /dev/null
+++ b/media-sound/splay/files/splay-0.9.5.2-external-id3lib.diff
@@ -0,0 +1,17 @@
+--- splay.cc~	2005-04-03 19:56:37.000000000 -0300
++++ splay.cc	2005-04-03 19:58:24.000000000 -0300
+@@ -184,9 +184,11 @@
+ 	delete mytag;
+ 	
+       }
+-      catch(ID3_Error &err){
+-	cout << err.GetErrorFile() << " (" << err.GetErrorLine() << "): "
+-	     << err.GetErrorType() << ": " << err.GetErrorDesc() << endl;
++//      catch(ID3_Error &err){
++      catch(...){
++	cout << "Error found (GetError functions disabled)" << endl;
++//	cout << err.GetErrorFile() << " (" << err.GetErrorLine() << "): "
++//	     << err.GetErrorType() << ": " << err.GetErrorDesc() << endl;
+       }
+ #endif /* HAVE_LIBID3 */        
+     }
diff --git a/media-sound/splay/splay-0.9.5.2.ebuild b/media-sound/splay/splay-0.9.5.2.ebuild
index 47261eb4d632..307acfa49153 100644
--- a/media-sound/splay/splay-0.9.5.2.ebuild
+++ b/media-sound/splay/splay-0.9.5.2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.12 2004/09/14 07:43:59 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/splay/splay-0.9.5.2.ebuild,v 1.13 2005/04/04 17:00:34 luckyduck Exp $
+
+inherit eutils
 
 IUSE=""
 
 DESCRIPTION="an audio player, primarily for the console"
 HOMEPAGE="http://splay.sourceforge.net/"
-# Note non-standard sourceforge distribution location, so we can't use
-# mirror://sourceforge/...
 SRC_URI="http://splay.sourceforge.net/tgz/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -16,6 +16,12 @@ KEYWORDS="x86 amd64"
 
 DEPEND="virtual/libc"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}/apps
+	epatch ${FILESDIR}/${P}-external-id3lib.diff
+}
+
 src_compile() {
 	# Force compilation to omit X support according to BUG #5856
 	# even when qt is present on the system.
@@ -27,5 +33,5 @@ src_compile() {
 src_install() {
 	# Specify man-page to prevent xsplay.1 from being installed
 	einstall man_MANS=splay.1 || die "einstall failed"
-	dodoc AUTHORS COPYING COPYING.LIB ChangeLog README README.LIB NEWS
+	dodoc AUTHORS ChangeLog README README.LIB NEWS
 }