Version bump. See bug #38006. Removed gtk sed stuff. Updated debug target. Removed expopt typo and added some comments. Other repoman fixes as well.

6 files changed, 82 insertions, 6 deletions

diff --git a/media-sound/lame/ChangeLog b/media-sound/lame/ChangeLog
index ffe92d90a78a..2618e4d8f9ae 100644
--- a/media-sound/lame/ChangeLog
+++ b/media-sound/lame/ChangeLog
@@ -1,6 +1,14 @@
 # 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.23 2004/01/12 22:50:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/ChangeLog,v 1.24 2004/01/21 05:35:01 raker Exp $
+
+*lame-3.95.1 (20 Jan 2004)
+
+  20 Jan 2004; Nick Hadaway <raker@gentoo.org> lame-3.95.1.ebuild:
+  Version bump.  Upstream bug fixes, and feature adds.  Updated the
+  debug target.  Fixed tyop :) extopt to expopt but commented out
+  as optimizations are set by the user.  Also added some ebuild
+  fixes as suggested by Gregorio Guidi on bug #38006.
 
   12 Jan 2004; <agriffis@gentoo.org> lame-3.93.1-r1.ebuild:
   stable on ia64
diff --git a/media-sound/lame/Manifest b/media-sound/lame/Manifest
index d0215f887693..5f9571ee1cdb 100644
--- a/media-sound/lame/Manifest
+++ b/media-sound/lame/Manifest
@@ -1,6 +1,8 @@
-MD5 a5c9e9cbf5ed0f21bc16dc2e36d11d2c ChangeLog 3924
-MD5 2be3815e800f9d0a00229563e29af103 lame-3.92.ebuild 1542
 MD5 7bcb3f80ad12d4045f440ccc22e11cee lame-3.93.1-r1.ebuild 1592
+MD5 64ba01df0a9ce2d00c5caadd8230b6f8 lame-3.95.1.ebuild 1701
+MD5 2be3815e800f9d0a00229563e29af103 lame-3.92.ebuild 1542
+MD5 c603b439e992d981d5ca7a5448264ac4 ChangeLog 4272
 MD5 2b1af4843f5ca4107de793b7a584db34 files/digest-lame-3.92 61
-MD5 aefad4480f6888fcee536e08205804b1 files/digest-lame-3.93.1-r1 64
 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.95.1 b/media-sound/lame/files/digest-lame-3.95.1
new file mode 100644
index 000000000000..680d89eb8249
--- /dev/null
+++ b/media-sound/lame/files/digest-lame-3.95.1
@@ -0,0 +1 @@
+MD5 2cfac426cf8b7a2931db5d285ac44cf9 lame-3.95.1.tar.gz 1244071
diff --git a/media-sound/lame/lame-3.92.ebuild b/media-sound/lame/lame-3.92.ebuild
index 6a9b3d894299..3bb9eb913154 100644
--- a/media-sound/lame/lame-3.92.ebuild
+++ b/media-sound/lame/lame-3.92.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.92.ebuild,v 1.16 2003/09/07 00:06:05 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.92.ebuild,v 1.17 2004/01/21 05:35:01 raker Exp $
 
 inherit libtool
 
diff --git a/media-sound/lame/lame-3.95.1.ebuild b/media-sound/lame/lame-3.95.1.ebuild
new file mode 100644
index 000000000000..b4f5bb71310c
--- /dev/null
+++ b/media-sound/lame/lame-3.95.1.ebuild
@@ -0,0 +1,60 @@
+# 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.1 2004/01/21 05:35:01 raker Exp $
+
+inherit flag-o-matic gcc
+
+DESCRIPTION="LAME Ain't an Mp3 Encoder"
+HOMEPAGE="http://lame.sourceforge.net"
+SRC_URI="mirror://sourceforge/lame/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
+IUSE="gtk debug"
+
+RDEPEND=">=sys-libs/ncurses-5.2
+	gtk? ( =x11-libs/gtk+-1.2* )"
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )"
+
+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
+
+	emake || die
+}
+
+src_install() {
+	einstall \
+		pkghtmldir=${D}/usr/share/doc/${PF}/html || die
+
+	dodoc API ChangeLog HACKING PRESETS.draft README* \
+		STYLEGUIDE TODO USAGE
+	dohtml Dll/LameDLLInterface.htm
+}
diff --git a/media-sound/lame/metadata.xml b/media-sound/lame/metadata.xml
new file mode 100644
index 000000000000..3bf6bcfeb512
--- /dev/null
+++ b/media-sound/lame/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+</pkgmetadata>