fix #47869 #48776 and use econf

5 files changed, 63 insertions, 56 deletions

diff --git a/media-sound/cdparanoia/ChangeLog b/media-sound/cdparanoia/ChangeLog
index fa9f64ca1394..119057786c71 100644
--- a/media-sound/cdparanoia/ChangeLog
+++ b/media-sound/cdparanoia/ChangeLog
@@ -1,9 +1,14 @@
 # ChangeLog for media-sound/cdparanoia
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/ChangeLog,v 1.10 2004/04/22 19:43:51 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/ChangeLog,v 1.11 2004/04/24 02:26:24 vapier Exp $
 
 *cdparanoia-3.9.8-r1 (22 Apr 2004)
 
+  23 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
+  Add gcc-3.4 patch (#47869 by Tamran Lengyel), fix include path with 
+  the new cdda_interface patch (#48776 by Carmine Moleti), and use econf 
+  instead of ./configure (me).
+
   22 Apr 2004; Martin Schlemmer <azarah@gentoo.org>
   cdparanoia-3.9.8-r1.ebuild,
   files/cdparanoia-3.9.8-include-cdda_interface_h.patch:
diff --git a/media-sound/cdparanoia/cdparanoia-3.9.8-r1.ebuild b/media-sound/cdparanoia/cdparanoia-3.9.8-r1.ebuild
index c5ae6edd1b99..e8f4cdb7121e 100644
--- a/media-sound/cdparanoia/cdparanoia-3.9.8-r1.ebuild
+++ b/media-sound/cdparanoia/cdparanoia-3.9.8-r1.ebuild
@@ -1,46 +1,47 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/cdparanoia-3.9.8-r1.ebuild,v 1.1 2004/04/22 19:43:52 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/cdparanoia-3.9.8-r1.ebuild,v 1.2 2004/04/24 02:26:24 vapier Exp $
 
-IUSE=
-
-inherit eutils
+inherit eutils flag-o-matic gnuconfig
 
 MY_P=${PN}-III-alpha9.8
-S=${WORKDIR}/${MY_P}
 DESCRIPTION="an advanced CDDA reader with error correction"
-SRC_URI="http://www.xiph.org/paranoia/download/${MY_P}.src.tgz"
 HOMEPAGE="http://www.xiph.org/paranoia/"
+SRC_URI="http://www.xiph.org/paranoia/download/${MY_P}.src.tgz"
 
-DEPEND="virtual/glibc"
-
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 ~mips"
+IUSE=""
+
+DEPEND="virtual/glibc"
+
+S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
-	
 	cd ${S}
 	# cdda_paranoia.h should include cdda_interface_h, else most configure
 	# scripts testing for support fails (gnome-vfs, etc).
 	epatch ${FILESDIR}/${P}-include-cdda_interface_h.patch
+	epatch ${FILESDIR}/${PV}-gcc34.patch
+	ln -s configure.guess config.guess
+	ln -s configure.sub config.sub
+	gnuconfig_update
+	rm config.{guess,sub}
 }
 
 src_compile() {
-	./configure --prefix=/usr || die
-	# The configure script doesn't recognize i686-pc-linux-gnu
-	# --host=${CHOST}
-
+	append-flags -I${S}/interface
+	econf || die
 	make OPT="${CFLAGS}" || die
 }
 
 src_install() {
 	dodir /usr/{bin,lib,include} /usr/share/man/man1
-	make prefix=${D}/usr \
+	make \
+		prefix=${D}/usr \
 		MANDIR=${D}/usr/share/man \
 		install || die
-
-	dodoc FAQ.txt GPL README
+	dodoc FAQ.txt README
 }
-
diff --git a/media-sound/cdparanoia/cdparanoia-3.9.8.ebuild b/media-sound/cdparanoia/cdparanoia-3.9.8.ebuild
deleted file mode 100644
index 0196810562ff..000000000000
--- a/media-sound/cdparanoia/cdparanoia-3.9.8.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/cdparanoia-3.9.8.ebuild,v 1.23 2004/04/20 17:18:17 eradicator Exp $
-
-IUSE=""
-
-MY_P=${PN}-III-alpha9.8
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="an advanced CDDA reader with error correction"
-SRC_URI="http://www.xiph.org/paranoia/download/${MY_P}.src.tgz"
-HOMEPAGE="http://www.xiph.org/paranoia/"
-
-DEPEND="virtual/glibc"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 ~mips"
-
-src_compile() {
-
-	./configure --prefix=/usr || die
-	#the configure script doesn't recognize i686-pc-linux-gnu
-	#--host=${CHOST}
-
-	make OPT="${CFLAGS}" || die
-}
-
-src_install() {
-	dodir /usr/{bin,lib,include} /usr/share/man/man1
-	make prefix=${D}/usr \
-		MANDIR=${D}/usr/share/man \
-		install || die
-
-	dodoc FAQ.txt GPL README
-}
-
diff --git a/media-sound/cdparanoia/files/3.9.8-gcc34.patch b/media-sound/cdparanoia/files/3.9.8-gcc34.patch
new file mode 100644
index 000000000000..cc960baad589
--- /dev/null
+++ b/media-sound/cdparanoia/files/3.9.8-gcc34.patch
@@ -0,0 +1,38 @@
+--- cdparanoia-III-alpha9.8/interface/utils.h	2000-04-19 18:41:04.000000000 -0400
++++ cdparanoia-III-alpha9.8/interface/utils_.h	2004-04-14 21:14:14.880147264 -0400
+@@ -111,7 +111,7 @@
+       d->errorbuf=catstring(d->errorbuf,s);
+       break;
+     case CDDA_MESSAGE_FORGETIT:
+-    default:
++    default: ;
+     }
+   }
+ }
+@@ -126,7 +126,7 @@
+       d->messagebuf=catstring(d->messagebuf,s);
+       break;
+     case CDDA_MESSAGE_FORGETIT:
+-    default:
++    default: ;
+     }
+   }
+ }
+@@ -168,7 +168,7 @@
+       }
+       break;
+     case CDDA_MESSAGE_FORGETIT:
+-    default:
++    default: ;
+     }
+   }
+   if(malloced)free(buffer);
+@@ -204,7 +204,7 @@
+ 	}
+       break;
+     case CDDA_MESSAGE_FORGETIT:
+-    default:
++    default: ;
+     }
+   }
+   if(malloced)free(buffer);
diff --git a/media-sound/cdparanoia/files/digest-cdparanoia-3.9.8 b/media-sound/cdparanoia/files/digest-cdparanoia-3.9.8
deleted file mode 100644
index 3e520917e172..000000000000
--- a/media-sound/cdparanoia/files/digest-cdparanoia-3.9.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7218e778b5970a86c958e597f952f193 cdparanoia-III-alpha9.8.src.tgz 116591