Update dependencies, add patch to respect LDFLAGS, avoid sed hacking to respect CFLAGS, respect CC.

(Portage version: 2.1_pre6-r2)

3 files changed, 37 insertions, 12 deletions

diff --git a/media-sound/mp3info/ChangeLog b/media-sound/mp3info/ChangeLog
index 4e0c838a4c8f..c4a6e7a3f635 100644
--- a/media-sound/mp3info/ChangeLog
+++ b/media-sound/mp3info/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/mp3info
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3info/ChangeLog,v 1.15 2005/09/10 15:53:21 flameeyes Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3info/ChangeLog,v 1.16 2006/03/15 01:46:10 flameeyes Exp $
+
+  15 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/mp3info-0.8.4-ldflags.patch, mp3info-0.8.4-r2.ebuild:
+  Update dependencies, add patch to respect LDFLAGS, avoid sed hacking to
+  respect CFLAGS, respect CC.
 
   10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
   mp3info-0.8.4-r1.ebuild, mp3info-0.8.4-r2.ebuild:
diff --git a/media-sound/mp3info/files/mp3info-0.8.4-ldflags.patch b/media-sound/mp3info/files/mp3info-0.8.4-ldflags.patch
new file mode 100644
index 000000000000..e20e4565e783
--- /dev/null
+++ b/media-sound/mp3info/files/mp3info-0.8.4-ldflags.patch
@@ -0,0 +1,17 @@
+Index: mp3info-0.8.4/Makefile
+===================================================================
+--- mp3info-0.8.4.orig/Makefile
++++ mp3info-0.8.4/Makefile
+@@ -52,10 +52,10 @@ all: mp3info gmp3info doc
+ doc: mp3info.txt
+ 
+ mp3info: $(OBJS)
+-	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ 
+ gmp3info: $(XSRC) $(XOBJ) 
+-	$(CC) $(XSRC) $(CFLAGS) -o $@ $(XOBJ) `gtk-config --cflags --libs`
++	$(CC) $(XSRC) $(CFLAGS) $(LDFLAGS) -o $@ $(XOBJ) `gtk-config --cflags --libs`
+ 
+ mp3info.txt: mp3info.1
+ 	groff -t -e -mandoc -Tascii mp3info.1 | col -bx > mp3info.txt
diff --git a/media-sound/mp3info/mp3info-0.8.4-r2.ebuild b/media-sound/mp3info/mp3info-0.8.4-r2.ebuild
index 5f94aa3bd77d..1de3426d13d2 100644
--- a/media-sound/mp3info/mp3info-0.8.4-r2.ebuild
+++ b/media-sound/mp3info/mp3info-0.8.4-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3info/mp3info-0.8.4-r2.ebuild,v 1.3 2005/09/10 15:53:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3info/mp3info-0.8.4-r2.ebuild,v 1.4 2006/03/15 01:46:10 flameeyes Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 IUSE="gtk"
 
@@ -10,7 +10,10 @@ DESCRIPTION="An MP3 technical info viewer and ID3 1.x tag editor"
 SRC_URI="http://ibiblio.org/pub/linux/apps/sound/mp3-utils/${PN}/${P}.tgz"
 HOMEPAGE="http://ibiblio.org/mp3info/"
 
-DEPEND="gtk? ( =x11-libs/gtk+-1.2* )"
+RDEPEND="gtk? ( =x11-libs/gtk+-1.2* )
+	sys-libs/ncurses"
+DEPEND="${RDEPEND}
+	sys-apps/groff"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -20,16 +23,16 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	sed -i -e "s:-O2:${CFLAGS}:" Makefile
-	epatch ${FILESDIR}/gcc.patch
-	epatch ${FILESDIR}/cast.patch
-	epatch ${FILESDIR}/sanity-checks.patch
+	epatch "${FILESDIR}/gcc.patch"
+	epatch "${FILESDIR}/cast.patch"
+	epatch "${FILESDIR}/sanity-checks.patch"
+	epatch "${FILESDIR}/${P}-ldflags.patch"
 }
 
 src_compile() {
-	emake mp3info || die
+	emake mp3info CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die
 	if use gtk; then
-		emake gmp3info || die "gtk mp3info failed"
+		emake gmp3info CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "gtk mp3info failed"
 	fi
 }