Add patch to sanitise the build system a bit more. Also embeds --as-needed fixes from TGL (bug #131700).

(Portage version: 2.1_pre10-r5)

4 files changed, 41 insertions, 15 deletions

diff --git a/media-sound/id3v2/ChangeLog b/media-sound/id3v2/ChangeLog
index 017f31c438ed..0553fc36b425 100644
--- a/media-sound/id3v2/ChangeLog
+++ b/media-sound/id3v2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/id3v2
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/id3v2/ChangeLog,v 1.21 2005/09/14 07:30:03 agriffis Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/id3v2/ChangeLog,v 1.22 2006/05/14 12:16:14 flameeyes Exp $
+
+  14 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/id3v2-0.1.11-makefile.patch, id3v2-0.1.11.ebuild:
+  Add patch to sanitise the build system a bit more. Also embeds --as-needed
+  fixes from TGL (bug #131700).
 
   14 Sep 2005; Aron Griffis <agriffis@gentoo.org> id3v2-0.1.11.ebuild:
   Mark 0.1.11 stable on alpha
diff --git a/media-sound/id3v2/files/digest-id3v2-0.1.11 b/media-sound/id3v2/files/digest-id3v2-0.1.11
index e1bc6fbb8cc4..ccc7c26bc6b8 100644
--- a/media-sound/id3v2/files/digest-id3v2-0.1.11
+++ b/media-sound/id3v2/files/digest-id3v2-0.1.11
@@ -1 +1,3 @@
 MD5 68afc3827cf01501dfb22949f901f1d8 id3v2-0.1.11.tar.gz 52427
+RMD160 433900ec5ccc072e5daeaf3fc25902d87bc95a01 id3v2-0.1.11.tar.gz 52427
+SHA256 a459652ba839db12d40ad29e4081aff04b569eb4a84edb845138cffa7d722603 id3v2-0.1.11.tar.gz 52427
diff --git a/media-sound/id3v2/files/id3v2-0.1.11-makefile.patch b/media-sound/id3v2/files/id3v2-0.1.11-makefile.patch
new file mode 100644
index 000000000000..06a26a102b6c
--- /dev/null
+++ b/media-sound/id3v2/files/id3v2-0.1.11-makefile.patch
@@ -0,0 +1,23 @@
+Index: id3v2-0.1.11/Makefile
+===================================================================
+--- id3v2-0.1.11.orig/Makefile
++++ id3v2-0.1.11/Makefile
+@@ -3,14 +3,14 @@ all: id3v2
+ VERSION=0.1.11
+ 
+ PREFIX=	/usr/local
+-CXXFLAGS+=	-I${PREFIX}/include/ -DVERSION="\"${VERSION}\"" #-DSORT_RUNTIME
+-LDFLAGS+=	-L${PREFIX}/lib/ 
++CXXFLAGS+=	-I${PREFIX}/include/ -DVERSION="\"${VERSION}\"" $(OPT_CXXFLAGS) #-DSORT_RUNTIME
++LDFLAGS+=	-L${PREFIX}/lib/ $(OPT_LDFLAGS)
+ 
+ id3v2:	convert.o list.o id3v2.o genre.o
+-	c++ ${LDFLAGS} -pedantic -Wall -lz -lid3 -g -o $@ $^
++	$(CXX) $(LDFLAGS) -pedantic -Wall -o $@ $^ -lz -lid3
+ 
+ create_map: create_map.o
+-	c++ -Wall -g -o $@ $^
++	$(CXX) $(LDFLAGS) -o $@ $^
+ 
+ install: all
+ 	install -c -s id3v2 ${PREFIX}/bin/id3v2
diff --git a/media-sound/id3v2/id3v2-0.1.11.ebuild b/media-sound/id3v2/id3v2-0.1.11.ebuild
index 90cfdc2817a1..bf03b411756d 100644
--- a/media-sound/id3v2/id3v2-0.1.11.ebuild
+++ b/media-sound/id3v2/id3v2-0.1.11.ebuild
@@ -1,10 +1,10 @@
-# 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/id3v2/id3v2-0.1.11.ebuild,v 1.6 2005/09/14 07:30:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/id3v2/id3v2-0.1.11.ebuild,v 1.7 2006/05/14 12:16:14 flameeyes Exp $
 
-IUSE=""
+inherit eutils toolchain-funcs
 
-inherit eutils
+IUSE=""
 
 DESCRIPTION="A command line editor for id3v2 tags."
 HOMEPAGE="http://id3v2.sourceforge.net/"
@@ -16,20 +16,16 @@ KEYWORDS="alpha amd64 ~hppa ppc ~ppc64 sparc x86"
 DEPEND="media-libs/id3lib"
 
 src_unpack() {
-	unpack ${A} && cd ${S} || die "unpack failed"
-
-	# The tarball came with a compiled binary. ;^)
-	make clean
-
-	# Use our own CXXFLAGS
-	sed -i -e "/g++/ s|-g|${CXXFLAGS}|" Makefile || die "sed failed"
+	unpack ${A}
+	cd "${S}"
 
 	# Fix segfault on alpha (and probably other architectures)
-	epatch ${FILESDIR}/${P}-alpha.patch
+	epatch "${FILESDIR}/${P}-alpha.patch"
+	epatch "${FILESDIR}/${P}-makefile.patch"
 }
 
 src_compile() {
-	emake || die
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LDFLAGS="${LDFLAGS}" OPT_CXXFLAGS="${CXXFLAGS}" || die
 }
 
 src_install() {