CAN-2005-0706, bumped 0.99.10 to 0.99.10-r1. Marked 0.99.10-r1 x86 and ppc, please stabilise this version

Package-Manager: portage-2.0.51.19

8 files changed, 69 insertions, 13 deletions

diff --git a/media-libs/libcdaudio/ChangeLog b/media-libs/libcdaudio/ChangeLog
index c5d63639215d..7342dea44e64 100644
--- a/media-libs/libcdaudio/ChangeLog
+++ b/media-libs/libcdaudio/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libcdaudio
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcdaudio/ChangeLog,v 1.16 2004/08/12 00:44:28 mr_bones_ Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcdaudio/ChangeLog,v 1.17 2005/04/05 02:28:10 obz Exp $
+
+*libcdaudio-0.99.10-r1 (05 Apr 2005)
+
+  05 Apr 2005; Mike Gardiner <obz@gentoo.org>
+  +files/libcdaudio-0.99-CAN-2005-0706.patch, +libcdaudio-0.99.10-r1.ebuild:
+  CAN-2005-0706, bumped 0.99.10 to 0.99.10-r1. Marked 0.99.10-r1 x86 and ppc,
+  please stabilise this version
 
   11 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org>
   libcdaudio-0.99.9.ebuild:
diff --git a/media-libs/libcdaudio/Manifest b/media-libs/libcdaudio/Manifest
index 445213b5fadb..a279e7cc4457 100644
--- a/media-libs/libcdaudio/Manifest
+++ b/media-libs/libcdaudio/Manifest
@@ -1,9 +1,12 @@
-MD5 f1272ea2e9e9b4ffbc49a562d6c6a509 ChangeLog 2124
-MD5 d27c5055087eb9293f2b2d4f80863917 libcdaudio-0.99.6-r2.ebuild 860
-MD5 dc0741bc94099caeee3c1be707c97ff5 libcdaudio-0.99.9.ebuild 885
+MD5 7771684be664975b134913a2120f13be ChangeLog 2390
+MD5 f26cf7c2e630af89784290d798bc30c4 libcdaudio-0.99.10.ebuild 790
+MD5 be2c922464861f631fbc4d64b489dd20 libcdaudio-0.99.6-r2.ebuild 856
+MD5 084d8b30fc8ee6e65b7d16730557dc8e libcdaudio-0.99.9.ebuild 879
 MD5 9384ae7ba3e9f56b8027ea92f607042d metadata.xml 215
-MD5 35ee6739a43d0302a61a372b29085297 libcdaudio-0.99.10.ebuild 795
+MD5 6af42d166adbab07638e48a58d1e4861 libcdaudio-0.99.10-r1.ebuild 899
+MD5 89cb62ae5449343d57562921c5f00fd3 files/digest-libcdaudio-0.99.10 70
 MD5 b253d4d268f247d004893896ed915bd8 files/digest-libcdaudio-0.99.6-r2 69
 MD5 93b8c0e34cede421fc69e8380cbcc816 files/digest-libcdaudio-0.99.9 69
 MD5 a56948792d444b771d1a491245a5c2e3 files/libcdaudio-0.99.6-sanity-checks.patch 987
-MD5 89cb62ae5449343d57562921c5f00fd3 files/digest-libcdaudio-0.99.10 70
+MD5 89cb62ae5449343d57562921c5f00fd3 files/digest-libcdaudio-0.99.10-r1 70
+MD5 fdf5fc6e4b573352260b0065d3fcc934 files/libcdaudio-0.99-CAN-2005-0706.patch 457
diff --git a/media-libs/libcdaudio/files/digest-libcdaudio-0.99.10-r1 b/media-libs/libcdaudio/files/digest-libcdaudio-0.99.10-r1
new file mode 100644
index 000000000000..f425feab1a33
--- /dev/null
+++ b/media-libs/libcdaudio/files/digest-libcdaudio-0.99.10-r1
@@ -0,0 +1 @@
+MD5 a437c0a937f60bbad3605496a851671a libcdaudio-0.99.10.tar.gz 353389
diff --git a/media-libs/libcdaudio/files/libcdaudio-0.99-CAN-2005-0706.patch b/media-libs/libcdaudio/files/libcdaudio-0.99-CAN-2005-0706.patch
new file mode 100644
index 000000000000..7fc60e367b7d
--- /dev/null
+++ b/media-libs/libcdaudio/files/libcdaudio-0.99-CAN-2005-0706.patch
@@ -0,0 +1,12 @@
+--- libcdaudio-0.99.10/src/cddb.c.orig	2005-04-03 15:37:04.180240520 +0200
++++ libcdaudio-0.99.10/src/cddb.c	2005-04-03 15:38:07.389631232 +0200
+@@ -1034,7 +1034,7 @@
+     }
+ 	   
+     query->query_matches = 0;
+-    while(!cddb_read_line(sock, inbuffer, 256)) {
++    while(query->query_matches < MAX_INEXACT_MATCHES && !cddb_read_line(sock, inbuffer, 256)) {
+       slashed = 0;
+       if(strchr(inbuffer, '/') != NULL && parse_disc_artist) {
+ 	index = 0;
+
diff --git a/media-libs/libcdaudio/libcdaudio-0.99.10-r1.ebuild b/media-libs/libcdaudio/libcdaudio-0.99.10-r1.ebuild
new file mode 100644
index 000000000000..3bb291c7c73b
--- /dev/null
+++ b/media-libs/libcdaudio/libcdaudio-0.99.10-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcdaudio/libcdaudio-0.99.10-r1.ebuild,v 1.1 2005/04/05 02:28:10 obz Exp $
+
+inherit flag-o-matic
+
+DESCRIPTION="Library of cd audio related routines."
+HOMEPAGE="http://libcdaudio.sourceforge.net/"
+SRC_URI="mirror://sourceforge/libcdaudio/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc ~sparc ~alpha ~hppa ~mips ~amd64 ~ia64"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	# CAN-2005-0706 (#84936)
+	epatch ${FILESDIR}/${PN}-0.99-CAN-2005-0706.patch
+}
+
+src_compile() {
+	# -fPIC is required for this library on alpha, see bug #17192
+	use alpha && append-flags -fPIC
+
+	econf --enable-threads --with-gnu-ld || die "econf failed"
+	emake || die "compile problem."
+}
+
+src_install() {
+	einstall
+	dodoc AUTHORS COPYING ChangLog INSTALL NEWS README TODO
+}
diff --git a/media-libs/libcdaudio/libcdaudio-0.99.10.ebuild b/media-libs/libcdaudio/libcdaudio-0.99.10.ebuild
index 030e646d62ec..e52fec60055a 100644
--- a/media-libs/libcdaudio/libcdaudio-0.99.10.ebuild
+++ b/media-libs/libcdaudio/libcdaudio-0.99.10.ebuild
@@ -1,6 +1,6 @@
-# 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-libs/libcdaudio/libcdaudio-0.99.10.ebuild,v 1.4 2004/07/14 20:01:00 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcdaudio/libcdaudio-0.99.10.ebuild,v 1.5 2005/04/05 02:28:10 obz Exp $
 
 inherit flag-o-matic
 
diff --git a/media-libs/libcdaudio/libcdaudio-0.99.6-r2.ebuild b/media-libs/libcdaudio/libcdaudio-0.99.6-r2.ebuild
index 4ef69a17d624..b3ca83672480 100644
--- a/media-libs/libcdaudio/libcdaudio-0.99.6-r2.ebuild
+++ b/media-libs/libcdaudio/libcdaudio-0.99.6-r2.ebuild
@@ -1,6 +1,6 @@
-# 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-libs/libcdaudio/libcdaudio-0.99.6-r2.ebuild,v 1.9 2004/07/14 20:01:00 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcdaudio/libcdaudio-0.99.6-r2.ebuild,v 1.10 2005/04/05 02:28:10 obz Exp $
 
 inherit flag-o-matic
 
diff --git a/media-libs/libcdaudio/libcdaudio-0.99.9.ebuild b/media-libs/libcdaudio/libcdaudio-0.99.9.ebuild
index fe0c549d9a1c..1adfb53c6abb 100644
--- a/media-libs/libcdaudio/libcdaudio-0.99.9.ebuild
+++ b/media-libs/libcdaudio/libcdaudio-0.99.9.ebuild
@@ -1,6 +1,6 @@
-# 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-libs/libcdaudio/libcdaudio-0.99.9.ebuild,v 1.11 2004/08/12 00:44:28 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcdaudio/libcdaudio-0.99.9.ebuild,v 1.12 2005/04/05 02:28:10 obz Exp $
 
 inherit flag-o-matic gnuconfig