small fixes

2 files changed, 38 insertions, 7 deletions

diff --git a/media-libs/musicbrainz/ChangeLog b/media-libs/musicbrainz/ChangeLog
index 69d30dfb0ad4..a00b81b95a19 100644
--- a/media-libs/musicbrainz/ChangeLog
+++ b/media-libs/musicbrainz/ChangeLog
@@ -1,10 +1,16 @@
 # ChangeLog for media-libs/musicbrainz
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/musicbrainz/ChangeLog,v 1.9 2003/03/23 09:22:39 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/musicbrainz/ChangeLog,v 1.10 2003/03/30 17:32:22 azarah Exp $
+
+  30 Mar 2003; Martin Schlemmer <azarah@gentoo.org> musicbrainz-2.0.1.ebuild :
+  - Regen autoconf/make stuff to fix problems with newer versions of automake.
+  - Do not try to install non-existing doc 'NEWS'.
+  - Remove CC stuff, as it is not distcc friendly, but rather get it to build
+    with our CFLAGS by unsetting the hard-coded ones in configure.in.
 
 *musicbrainz-2.0.1 (23 Mar 2003)
 
-  23 Mar 2003; jje <jje@gentoo.org> musicbrainz-2.0.1.ebuild:
+  23 Mar 2003; jje <jje@gentoo.org> musicbrainz-2.0.1.ebuild :
   New ebuild for Music Brainz 2.0.1.
   
   Submitted by: John Steele Scott <toojays@toojays.net>
diff --git a/media-libs/musicbrainz/musicbrainz-2.0.1.ebuild b/media-libs/musicbrainz/musicbrainz-2.0.1.ebuild
index df72de9a504b..777d8280f360 100644
--- a/media-libs/musicbrainz/musicbrainz-2.0.1.ebuild
+++ b/media-libs/musicbrainz/musicbrainz-2.0.1.ebuild
@@ -1,9 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/musicbrainz/musicbrainz-2.0.1.ebuild,v 1.1 2003/03/23 09:22:39 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/musicbrainz/musicbrainz-2.0.1.ebuild,v 1.2 2003/03/30 17:32:22 azarah Exp $
 
+IUSE=""
+
+inherit libtool
+
+S="${WORKDIR}/lib${P}"
 DESCRIPTION="Client library to access free metadata about mp3/vorbis/CD media"
-S=${WORKDIR}/lib${P}
 SRC_URI="ftp://ftp.musicbrainz.org/pub/musicbrainz/lib${P}.tar.gz"
 HOMEPAGE="http://www.musicbrainz.org/"
 
@@ -13,14 +17,35 @@ KEYWORDS="~x86 ~sparc  ~ppc ~alpha"
 
 DEPEND="virtual/glibc"
 
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# Get it to build with our CFLAGS (need Reconf part below)
+	cp configure.in configure.in.orig
+	sed -e 's:^CFLAGS:#CFLAGS:g' \
+		-e 's:^CPPFLAGS:#CPPFLAGS:g' \
+		configure.in.orig > configure.in
+	
+	# Fix problems with later versions of automake.  Please do not
+	# remove .. if there are any issues, let me know.
+	# <azarah@gentoo.org> (30 Mar 2003)
+	einfo "Reconfiguring..."
+	aclocal
+	autoconf
+	automake
+	
+	elibtoolize
+}
+
 src_compile() {
-	CC="gcc ${CFLAGS}" \
 	econf || die
 	emake || die "compile problem"
 }
 
 src_install() {
-        dodir /usr/lib/pkgconfig
+	dodir /usr/lib/pkgconfig
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO docs/mb_howto.txt
+
+	dodoc AUTHORS COPYING ChangeLog INSTALL README TODO docs/mb_howto.txt
 }