clean up

(Portage version: 2.2_rc67/cvs/Linux x86_64)

5 files changed, 25 insertions, 45 deletions

diff --git a/media-sound/lame/files/lame-3.96-ccc.patch b/media-sound/lame/files/lame-3.96-ccc.patch
index 684782aa0a72..4d3491ae4256 100644
--- a/media-sound/lame/files/lame-3.96-ccc.patch
+++ b/media-sound/lame/files/lame-3.96-ccc.patch
@@ -1,5 +1,10 @@
---- lame-3.96/configure.in.ccc	2004-04-11 10:45:19.000000000 -0400
-+++ lame-3.96/configure.in	2004-07-26 18:32:21.000000000 -0400
+If ccc (alpha compiler) is installed on the system, the default
+configure is broken, fix it to respect CC.  This is only
+directly broken for ARCH=alpha but would affect anybody with a
+ccc binary in their PATH.  Bug #41908  (26 Jul 2004 agriffis)
+
+--- configure.in
++++ configure.in
 @@ -915,11 +915,9 @@
  alpha*-*-linux*)
  
diff --git a/media-sound/lame/files/lame-3.98-gtk-path.patch b/media-sound/lame/files/lame-3.98-gtk-path.patch
index dc9bf4ef5e06..a5843597485a 100644
--- a/media-sound/lame/files/lame-3.98-gtk-path.patch
+++ b/media-sound/lame/files/lame-3.98-gtk-path.patch
@@ -1,6 +1,4 @@
-Index: gtk.m4
-===================================================================
---- gtk.m4.orig
+--- gtk.m4
 +++ gtk.m4
 @@ -0,0 +1,194 @@
 +# Configure paths for GTK+
diff --git a/media-sound/lame/files/lame-3.98-shared-frontend.patch b/media-sound/lame/files/lame-3.98-shared-frontend.patch
index abe96a339c67..a4de9062f78e 100644
--- a/media-sound/lame/files/lame-3.98-shared-frontend.patch
+++ b/media-sound/lame/files/lame-3.98-shared-frontend.patch
@@ -1,6 +1,7 @@
-diff -ur lame-398.old/frontend/Makefile.am lame-398.new/frontend/Makefile.am
---- lame-398.old/frontend/Makefile.am	2006-09-30 11:17:05.000000000 +0200
-+++ lame-398.new/frontend/Makefile.am	2008-07-06 12:36:25.000000000 +0200
+The frontened tries to link staticly, but we prefer shared libs
+
+--- frontend/Makefile.am
++++ frontend/Makefile.am
 @@ -52,7 +52,7 @@
  endif
  
@@ -10,15 +11,3 @@ diff -ur lame-398.old/frontend/Makefile.am lame-398.new/frontend/Makefile.am
  
  INCLUDES = -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include -I$(top_builddir)
  
-diff -ur lame-398.old/frontend/Makefile.in lame-398.new/frontend/Makefile.in
---- lame-398.old/frontend/Makefile.in	2008-06-25 14:17:51.000000000 +0200
-+++ lame-398.new/frontend/Makefile.in	2008-07-06 12:36:39.000000000 +0200
-@@ -152,7 +152,7 @@
- 	$(top_builddir)/libmp3lame/libmp3lame.la \
- 	@FRONTEND_LDADD@
- 
--LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ -static
-+LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
diff --git a/media-sound/lame/files/lame-3.98.2-get_audio.patch b/media-sound/lame/files/lame-3.98.2-get_audio.patch
index 7b53b317aa62..9194b1903cc8 100644
--- a/media-sound/lame/files/lame-3.98.2-get_audio.patch
+++ b/media-sound/lame/files/lame-3.98.2-get_audio.patch
@@ -1,5 +1,7 @@
---- lame-398-2.orig/frontend/get_audio.c     2009-06-17 00:45:34.000000000 +0900
-+++ lame-398-2/frontend/get_audio.c 2009-06-17 00:48:58.000000000 +0900
+Read and write from std* when sndfile is used
+
+--- frontend/get_audio.c
++++ frontend/get_audio.c
 @@ -605,12 +605,17 @@
          }
  #endif
diff --git a/media-sound/lame/lame-3.98.4.ebuild b/media-sound/lame/lame-3.98.4.ebuild
index eb3b8ecbc94b..58790013eccb 100644
--- a/media-sound/lame/lame-3.98.4.ebuild
+++ b/media-sound/lame/lame-3.98.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.98.4.ebuild,v 1.2 2010/08/23 19:54:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.98.4.ebuild,v 1.3 2010/08/23 20:06:34 ssuominen Exp $
 
 EAPI=2
-inherit autotools eutils flag-o-matic toolchain-funcs versionator
+inherit autotools eutils
 
 DESCRIPTION="LAME Ain't an MP3 Encoder"
 HOMEPAGE="http://lame.sourceforge.net"
@@ -21,35 +21,21 @@ DEPEND="${RDEPEND}
 	mmx? ( dev-lang/nasm )"
 
 src_prepare() {
-	# The frontened tries to link staticly, but we prefer shared libs
-	epatch "${FILESDIR}"/${PN}-3.98-shared-frontend.patch
+	epatch \
+		"${FILESDIR}"/${PN}-3.98-shared-frontend.patch \
+		"${FILESDIR}"/${PN}-3.96-ccc.patch \
+		"${FILESDIR}"/${PN}-3.98-gtk-path.patch \
+		"${FILESDIR}"/${PN}-3.98.2-get_audio.patch
 
-	# If ccc (alpha compiler) is installed on the system, the default
-	# configure is broken, fix it to respect CC.  This is only
-	# directly broken for ARCH=alpha but would affect anybody with a
-	# ccc binary in their PATH.  Bug #41908  (26 Jul 2004 agriffis)
-	epatch "${FILESDIR}"/${PN}-3.96-ccc.patch
-
-	# Patch gtk stuff, otherwise eautoreconf dies
-	epatch "${FILESDIR}"/${PN}-3.98-gtk-path.patch
-
-	# Read and write from std* when sndfile is used
-	epatch "${FILESDIR}"/${PN}-3.98.2-get_audio.patch
-
-	# It fails parallel make otherwise when enabling nasm...
-	mkdir libmp3lame/i386/.libs || die
+	mkdir libmp3lame/i386/.libs || die #workaround parallel build with nasm
 
 	AT_M4DIR="${S}" eautoreconf
-	epunt_cxx # embedded bug #74498
+	epunt_cxx #74498
 }
 
 src_configure() {
 	local myconf
 	use sndfile && myconf="--with-fileio=sndfile"
-	# The user sets compiler optimizations... But if you'd like
-	# lame to choose it's own... uncomment one of these (experiMENTAL)
-	# myconf="${myconf} --enable-expopt=full \
-	# myconf="${myconf} --enable-expopt=norm \
 
 	econf \
 		--disable-dependency-tracking \