Version bump.

6 files changed, 94 insertions, 10 deletions

diff --git a/media-sound/lame/ChangeLog b/media-sound/lame/ChangeLog
index ea5dd8429115..ce80b8b99ec3 100644
--- a/media-sound/lame/ChangeLog
+++ b/media-sound/lame/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/lame
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/ChangeLog,v 1.31 2004/04/04 21:50:42 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/ChangeLog,v 1.32 2004/04/11 19:06:35 eradicator Exp $
+
+*lame-3.96 (11 Apr 2004)
+
+  11 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> lame-3.95.1.ebuild,
+  lame-3.96.ebuild:
+  Version bump.
 
   04 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> lame-3.95.1.ebuild:
   Back to ~arch because of bug #46672.
diff --git a/media-sound/lame/Manifest b/media-sound/lame/Manifest
index bc3de1d969b5..4ac8a5c879e2 100644
--- a/media-sound/lame/Manifest
+++ b/media-sound/lame/Manifest
@@ -1,9 +1,11 @@
+MD5 aec587a8bce81df25019be7cd5f75b82 lame-3.96.ebuild 1873
 MD5 82d25c468d04e3f072c12315c78a3724 lame-3.93.1-r1.ebuild 1644
-MD5 1545ea9c85cbf16a6a9e16a07ce00a06 lame-3.95.1.ebuild 1881
+MD5 5c725d9e049ea9ab92d0a65558543207 lame-3.95.1.ebuild 1934
 MD5 92ac6029106a13c61ca4edde3617e841 lame-3.92.ebuild 1581
 MD5 35c3988b5d268a4c6fbde89b29f37591 ChangeLog 5223
 MD5 05ab4d4775083f0930841e415df18ad6 metadata.xml 160
 MD5 2b1af4843f5ca4107de793b7a584db34 files/digest-lame-3.92 61
+MD5 3b8e04486d3959e978f2466bdc621a59 files/digest-lame-3.96 62
 MD5 1dfbfacec1d8f89bf39620c15becb6bc files/lame-3.91-gcc3.diff 383
 MD5 aefad4480f6888fcee536e08205804b1 files/digest-lame-3.93.1-r1 64
 MD5 d765815e2edcad0f6d81c0813c2dc8f3 files/digest-lame-3.95.1 64
diff --git a/media-sound/lame/files/digest-lame-3.96 b/media-sound/lame/files/digest-lame-3.96
new file mode 100644
index 000000000000..8a4cf5d39cb6
--- /dev/null
+++ b/media-sound/lame/files/digest-lame-3.96
@@ -0,0 +1 @@
+MD5 8fbcfff0cd4e9fef2fdeabbf8fa98600 lame-3.96.tar.gz 1254175
diff --git a/media-sound/lame/lame-3.93.1-r1.ebuild b/media-sound/lame/lame-3.93.1-r1.ebuild
index fd488e1e8a56..489df30a8aa2 100644
--- a/media-sound/lame/lame-3.93.1-r1.ebuild
+++ b/media-sound/lame/lame-3.93.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.93.1-r1.ebuild,v 1.12 2004/02/24 06:45:06 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.93.1-r1.ebuild,v 1.13 2004/04/11 19:06:35 eradicator Exp $
 
 inherit flag-o-matic gcc
 
@@ -18,12 +18,15 @@ RDEPEND=">=sys-libs/ncurses-5.2
 DEPEND="${RDEPEND}
 	x86? ( dev-lang/nasm )"
 
-# this release completely removed oggvorbis support as it was too outdated.
-src_compile() {
+src_unpack() {
+	unpack ${A}
+
 	# fix gtk detection
-	cp configure configure.orig
-	sed -e "s:gtk12-config:gtk-config:" < configure.orig > configure
+	sed -i -e "s:gtk12-config:gtk-config:" configure
+}
 
+# this release completely removed oggvorbis support as it was too outdated.
+src_compile() {
 	# take out -fomit-frame-pointer from CFLAGS if k6-2
 	is-flag "-march=k6-3" && filter-flags "-fomit-frame-pointer"
 	is-flag "-march=k6-2" && filter-flags "-fomit-frame-pointer"
@@ -32,9 +35,10 @@ src_compile() {
 	[ "`gcc-fullversion`" == "3.3.2" ] && replace-flags -march=2.0 -march=1.0
 
 	local myconf=""
-	if [ "`use gtk`" ] ; then
+	if use gtk; then
 		myconf="${myconf} --enable-mp3x"
 	fi
+
 	[ `use debug` ] \
 		&& myconf="${myconf} --enable-debug=yes" \
 		|| myconf="${myconf} --enable-debug=no"
diff --git a/media-sound/lame/lame-3.95.1.ebuild b/media-sound/lame/lame-3.95.1.ebuild
index 8f31f96514ba..35be865fb036 100644
--- a/media-sound/lame/lame-3.95.1.ebuild
+++ b/media-sound/lame/lame-3.95.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.95.1.ebuild,v 1.10 2004/04/04 21:50:42 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.95.1.ebuild,v 1.11 2004/04/11 19:06:35 eradicator Exp $
 
-inherit flag-o-matic gcc
+inherit flag-o-matic gcc eutils
 
 DESCRIPTION="LAME Ain't an Mp3 Encoder"
 HOMEPAGE="http://lame.sourceforge.net"
@@ -11,6 +11,8 @@ RESTRICT="nomirror"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
+
+# This should remain in ~arch because of bug #46672
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips"
 IUSE="gtk debug"
 
diff --git a/media-sound/lame/lame-3.96.ebuild b/media-sound/lame/lame-3.96.ebuild
new file mode 100644
index 000000000000..5f5ede863207
--- /dev/null
+++ b/media-sound/lame/lame-3.96.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.96.ebuild,v 1.1 2004/04/11 19:06:35 eradicator Exp $
+
+inherit flag-o-matic gcc eutils
+
+DESCRIPTION="LAME Ain't an Mp3 Encoder"
+HOMEPAGE="http://lame.sourceforge.net"
+SRC_URI="mirror://sourceforge/lame/${P}.tar.gz"
+RESTRICT="nomirror"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips"
+IUSE="gtk debug"
+
+RDEPEND=">=sys-libs/ncurses-5.2
+	gtk? ( =x11-libs/gtk+-1.2* )"
+
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/intcast.spider
+}
+
+src_compile() {
+	# take out -fomit-frame-pointer from CFLAGS if k6-2
+	is-flag "-march=k6-3" && filter-flags "-fomit-frame-pointer"
+	is-flag "-march=k6-2" && filter-flags "-fomit-frame-pointer"
+	is-flag "-march=k6" && filter-flags "-fomit-frame-pointer"
+
+	[ "`gcc-fullversion`" == "3.3.2" ] && replace-flags -march=2.0 -march=1.0
+
+	local myconf=""
+	if use gtk; then
+		myconf="${myconf} --enable-mp3x"
+	fi
+
+	# as of 3.95.1 changed from "yes" to "norm" ("alot" is also accepted)
+	[ `use debug` ] \
+		&& myconf="${myconf} --enable-debug=norm" \
+		|| myconf="${myconf} --enable-debug=no"
+
+	# 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 \
+		--enable-shared \
+		--enable-nasm \
+		--enable-mp3rtp \
+		${myconf} || die
+
+	# Parallel make isn't happy
+	emake -j1 || die
+}
+
+src_install() {
+	make DESTDIR=${D} pkghtmldir=/usr/share/doc/${PF}/html install || die
+
+	dodoc API ChangeLog HACKING PRESETS.draft README* STYLEGUIDE TODO USAGE
+	dohtml misc/lameGUI.html Dll/LameDLLInterface.htm
+
+	dobin ${S}/misc/mlame
+}