old

(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)

5 files changed, 6 insertions, 161 deletions

diff --git a/media-sound/lame/ChangeLog b/media-sound/lame/ChangeLog
index 47dfd32893a5..67adc8116c99 100644
--- a/media-sound/lame/ChangeLog
+++ b/media-sound/lame/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/lame
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/ChangeLog,v 1.147 2012/03/02 21:13:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/ChangeLog,v 1.148 2012/03/02 21:14:52 ssuominen Exp $
+
+  02 Mar 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -files/lame-3.98.2-get_audio.patch, -lame-3.98.4.ebuild,
+  -files/lame-3.98-shared-frontend.patch, -lame-3.99.4.ebuild:
+  old
 
   02 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> lame-3.99.3.ebuild:
   ppc/ppc64 stable wrt #398353
diff --git a/media-sound/lame/files/lame-3.98-shared-frontend.patch b/media-sound/lame/files/lame-3.98-shared-frontend.patch
deleted file mode 100644
index a4de9062f78e..000000000000
--- a/media-sound/lame/files/lame-3.98-shared-frontend.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-The frontened tries to link staticly, but we prefer shared libs
-
---- frontend/Makefile.am
-+++ frontend/Makefile.am
-@@ -52,7 +52,7 @@
- endif
- 
- CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@ @SNDFILE_CFLAGS@
--LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ -static
-+LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@
- 
- INCLUDES = -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include -I$(top_builddir)
- 
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
deleted file mode 100644
index 9194b1903cc8..000000000000
--- a/media-sound/lame/files/lame-3.98.2-get_audio.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Read and write from std* when sndfile is used
-
---- frontend/get_audio.c
-+++ frontend/get_audio.c
-@@ -605,12 +605,17 @@
-         }
- #endif
- #ifdef HAVE_MPGLIB
--        if ((musicin = fopen(lpszFileName, "rb")) == NULL) {
-+       if (!strcmp(lpszFileName, "-")) {
-+         lame_set_stream_binary_mode(musicin = stdin); /* Read from standard input. */
-+       }
-+       else {
-+         if ((musicin = fopen(lpszFileName, "rb")) == NULL) {
-             if (silent < 10) {
--                error_printf("Could not find \"%s\".\n", lpszFileName);
-+             error_printf("Could not find \"%s\".\n", lpszFileName);
-             }
-             exit(1);
--        }
-+         }
-+       }
-         if (-1 == lame_decode_initfile(musicin, &mp3input_data, enc_delay, enc_padding)) {
-             if (silent < 10) {
-                 error_printf("Error reading headers in mp3 input file %s.\n", lpszFileName);
diff --git a/media-sound/lame/lame-3.98.4.ebuild b/media-sound/lame/lame-3.98.4.ebuild
deleted file mode 100644
index 8ed20b5810c4..000000000000
--- a/media-sound/lame/lame-3.98.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2011 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.15 2011/11/28 17:59:49 ssuominen Exp $
-
-EAPI=3
-inherit autotools eutils
-
-DESCRIPTION="LAME Ain't an MP3 Encoder"
-HOMEPAGE="http://lame.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz -> ${P}-r1.tar.gz" #346155
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug mmx mp3rtp sndfile static-libs"
-
-RDEPEND=">=sys-libs/ncurses-5.2
-	sndfile? ( >=media-libs/libsndfile-1.0.2 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	mmx? ( dev-lang/nasm )"
-
-RESTRICT="mirror" #346155
-
-src_prepare() {
-	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
-
-	mkdir libmp3lame/i386/.libs || die #workaround parallel build with nasm
-
-	sed -i -e '/define sp/s/+/ + /g' libmp3lame/i386/nasm.h || die
-
-	AT_M4DIR="${S}" eautoreconf
-	epunt_cxx #74498
-}
-
-src_configure() {
-	local myconf
-	use sndfile && myconf="--with-fileio=sndfile"
-
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static) \
-		$(use_enable debug debug norm) \
-		$(use_enable mmx nasm) \
-		--disable-mp3x \
-		$(use_enable mp3rtp) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" pkghtmldir="${EPREFIX}/usr/share/doc/${PF}/html" install || die
-	dobin misc/mlame || die
-
-	dodoc API ChangeLog HACKING README* STYLEGUIDE TODO USAGE || die
-	dohtml misc/lameGUI.html Dll/LameDLLInterface.htm || die
-
-	find "${ED}" -name '*.la' -exec rm -f '{}' +
-}
diff --git a/media-sound/lame/lame-3.99.4.ebuild b/media-sound/lame/lame-3.99.4.ebuild
deleted file mode 100644
index 1f1668a3d694..000000000000
--- a/media-sound/lame/lame-3.99.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.99.4.ebuild,v 1.1 2012/02/04 16:52:02 ssuominen Exp $
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="LAME Ain't an MP3 Encoder"
-HOMEPAGE="http://lame.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug mmx mp3rtp sndfile static-libs"
-
-RDEPEND=">=sys-libs/ncurses-5.7-r7
-	sndfile? ( >=media-libs/libsndfile-1.0.2 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	mmx? ( dev-lang/nasm )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-3.96-ccc.patch \
-		"${FILESDIR}"/${PN}-3.98-gtk-path.patch
-
-	mkdir libmp3lame/i386/.libs || die #workaround parallel build with nasm
-
-	sed -i -e '/define sp/s/+/ + /g' libmp3lame/i386/nasm.h || die
-
-	use mmx || sed -i -e '/AC_PATH_PROG/s:nasm:dIsAbLe&:' configure.in #361879
-
-	AT_M4DIR=${S} eautoreconf
-	epunt_cxx #74498
-}
-
-src_configure() {
-	local myconf
-	use mmx && myconf+="--enable-nasm" #361879
-	use sndfile && myconf+=" --with-fileio=sndfile"
-
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable debug debug norm) \
-		--disable-mp3x \
-		$(use_enable mp3rtp) \
-		--enable-dynamic-frontends \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" pkghtmldir="${EPREFIX}/usr/share/doc/${PF}/html" install
-	dobin misc/mlame
-
-	dodoc API ChangeLog HACKING README STYLEGUIDE TODO USAGE
-	dohtml misc/lameGUI.html Dll/LameDLLInterface.htm
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}