summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-sound/lame/ChangeLog8
-rw-r--r--media-sound/lame/files/digest-lame-3.93.01
-rw-r--r--media-sound/lame/files/digest-lame-3.93.11
-rw-r--r--media-sound/lame/lame-3.93.0.ebuild63
-rw-r--r--media-sound/lame/lame-3.93.1-r1.ebuild38
-rw-r--r--media-sound/lame/lame-3.93.1.ebuild66
6 files changed, 28 insertions, 149 deletions
diff --git a/media-sound/lame/ChangeLog b/media-sound/lame/ChangeLog
index 3fc4dade500c..392b8eb91e93 100644
--- a/media-sound/lame/ChangeLog
+++ b/media-sound/lame/ChangeLog
@@ -1,9 +1,15 @@
# ChangeLog for media-sound/lame
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/ChangeLog,v 1.18 2003/02/12 07:30:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/ChangeLog,v 1.19 2003/03/10 11:53:20 seemant Exp $
*lame-3.93.1-r1 (28 Jan 2003)
+ 10 Mar 2003; Seemant Kulleen <seemant@gentoo.org> lame-3.93.0.ebuild,
+ lame-3.93.0.ebuild, lame-3.93.1-r1.ebuild, lame-3.93.1.ebuild,
+ lame-3.93.1.ebuild:
+ filter out -fomit-frame-pointer for k6 based cpu's. Thanks to: sinterklaas
+ <jerroose@xs4all.nl> in bug #15559
+
28 Jan 2003; Nick Hadaway <raker@gentoo.org> lame-3.93.1-r1.ebuild,
files/digest-lame-3.93.1-r1 :
Got rid of the autotools and libtool workarounds and just sed'd the
diff --git a/media-sound/lame/files/digest-lame-3.93.0 b/media-sound/lame/files/digest-lame-3.93.0
deleted file mode 100644
index 1184ed7afd05..000000000000
--- a/media-sound/lame/files/digest-lame-3.93.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2c054c7eec1f966499d0945642bd8cba lame-3.93.0.tar.gz 1036360
diff --git a/media-sound/lame/files/digest-lame-3.93.1 b/media-sound/lame/files/digest-lame-3.93.1
deleted file mode 100644
index bc8392a0b0e7..000000000000
--- a/media-sound/lame/files/digest-lame-3.93.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1b79c08045eafc55e24ebd38d9e84329 lame-3.93.1.tar.gz 1037603
diff --git a/media-sound/lame/lame-3.93.0.ebuild b/media-sound/lame/lame-3.93.0.ebuild
deleted file mode 100644
index c3c64370e751..000000000000
--- a/media-sound/lame/lame-3.93.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2003 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.0.ebuild,v 1.3 2003/02/13 13:14:45 vapier Exp $
-
-IUSE="gtk"
-
-inherit libtool
-MY_PV=`echo ${PV}|cut -d . -f -2`
-S=${WORKDIR}/lame-${MY_PV}
-DESCRIPTION="LAME Ain't an Mp3 Encoder"
-SRC_URI="mirror://sourceforge/lame/${P}.tar.gz"
-HOMEPAGE="http://www.mp3dev.org/mp3/"
-
-DEPEND="virtual/glibc
- x86? ( dev-lang/nasm )
- >=sys-libs/ncurses-5.2
- gtk? ( =x11-libs/gtk+-1.2* )"
-# this release completely removed oggvorbis support as it was too outdated.
-
-RDEPEND="virtual/glibc
- >=sys-libs/ncurses-5.2
- gtk? ( =x11-libs/gtk+-1.2* )"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc "
-
-
-src_compile() {
- elibtoolize
-
- local myconf=""
- if [ "`use gtk`" ] ; then
- myconf="${myconf} --enable-mp3x"
- fi
- if [ "${DEBUG}" ] ; then
- myconf="${myconf} --enable-debug=yes"
- else
- myconf="${myconf} --enable-debug=no"
- fi
-
- ./configure --prefix=/usr \
- --mandir=/usr/share/man \
- --enable-shared \
- --enable-nasm \
- --enable-mp3rtp \
- --enable-extopt=full \
- ${myconf} || die
-
- emake || die
-}
-
-src_install () {
-
- make prefix=${D}/usr \
- mandir=${D}/usr/share/man \
- pkghtmldir=${D}/usr/share/doc/${PF}/html \
- install || die
-
- dodoc API COPYING HACKING PRESETS.draft LICENSE README* TODO USAGE
- dohtml -r ./
-}
-
diff --git a/media-sound/lame/lame-3.93.1-r1.ebuild b/media-sound/lame/lame-3.93.1-r1.ebuild
index 25a8e10dd7a4..7dc5c5d0dfbe 100644
--- a/media-sound/lame/lame-3.93.1-r1.ebuild
+++ b/media-sound/lame/lame-3.93.1-r1.ebuild
@@ -1,28 +1,35 @@
# Copyright 1999-2003 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.2 2003/02/13 13:14:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.93.1-r1.ebuild,v 1.3 2003/03/10 11:53:20 seemant Exp $
+
+inherit flag-o-matic
IUSE="gtk"
DESCRIPTION="LAME Ain't an Mp3 Encoder"
-SRC_URI="mirror://sourceforge/lame/${P}.tar.gz"
HOMEPAGE="http://www.mp3dev.org/mp3/"
-DEPEND="virtual/glibc
- x86? ( dev-lang/nasm )
- >=sys-libs/ncurses-5.2
- gtk? ( =x11-libs/gtk+-1.2* )"
-# this release completely removed oggvorbis support as it was too outdated.
-RDEPEND="virtual/glibc
- >=sys-libs/ncurses-5.2
- gtk? ( =x11-libs/gtk+-1.2* )"
-LICENSE="LGPL-2.1"
+SRC_URI="mirror://sourceforge/lame/${P}.tar.gz"
+
SLOT="0"
+LICENSE="LGPL-2.1"
KEYWORDS="x86 ~ppc sparc alpha"
+RDEPEND=">=sys-libs/ncurses-5.2
+ gtk? ( =x11-libs/gtk+-1.2* )"
+
+DEPEND="${RDEPEND}
+ x86? ( dev-lang/nasm )"
+
+# this release completely removed oggvorbis support as it was too outdated.
src_compile() {
# fix gtk detection
cp configure configure.orig
sed -e "s:gtk12-config:gtk-config:" < configure.orig > configure
+ # take out -fomit-frame-pointer from CFLAGS if k6-2
+ is-flag "-march=k6-3" && strip-flags "-fomit-frame-pointer"
+ is-flag "-march=k6-2" && strip-flags "-fomit-frame-pointer"
+ is-flag "-march=k6" && strip-flags "-fomit-frame-pointer"
+
local myconf=""
if [ "`use gtk`" ] ; then
myconf="${myconf} --enable-mp3x"
@@ -33,8 +40,7 @@ src_compile() {
myconf="${myconf} --enable-debug=no"
fi
- ./configure --prefix=/usr \
- --mandir=/usr/share/man \
+ econf \
--enable-shared \
--enable-nasm \
--enable-mp3rtp \
@@ -46,10 +52,8 @@ src_compile() {
src_install () {
- make prefix=${D}/usr \
- mandir=${D}/usr/share/man \
- pkghtmldir=${D}/usr/share/doc/${PF}/html \
- install || die
+ einstall \
+ pkghtmldir=${D}/usr/share/doc/${PF}/html || die
dodoc API COPYING HACKING PRESETS.draft LICENSE README* TODO USAGE
dohtml -r ./
diff --git a/media-sound/lame/lame-3.93.1.ebuild b/media-sound/lame/lame-3.93.1.ebuild
deleted file mode 100644
index 58c11eff06f9..000000000000
--- a/media-sound/lame/lame-3.93.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2003 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.ebuild,v 1.6 2003/02/13 13:14:57 vapier Exp $
-
-IUSE="gtk"
-
-inherit libtool eutils
-
-DESCRIPTION="LAME Ain't an Mp3 Encoder"
-SRC_URI="mirror://sourceforge/lame/${P}.tar.gz"
-HOMEPAGE="http://www.mp3dev.org/mp3/"
-
-DEPEND="virtual/glibc
- x86? ( dev-lang/nasm )
- >=sys-libs/ncurses-5.2
- gtk? ( =x11-libs/gtk+-1.2* )"
-# this release completely removed oggvorbis support as it was too outdated.
-
-RDEPEND="virtual/glibc
- >=sys-libs/ncurses-5.2
- gtk? ( =x11-libs/gtk+-1.2* )"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 ~ppc sparc alpha"
-
-src_compile() {
- elibtoolize
-
- # Fix configure borking on detecting gtk-config
- export WANT_AUTOMAKE_1_5=1
- export WANT_AUTOCONF_2_5=1
- autoreconf
-
- local myconf=""
- if [ "`use gtk`" ] ; then
- myconf="${myconf} --enable-mp3x"
- fi
- if [ "${DEBUG}" ] ; then
- myconf="${myconf} --enable-debug=yes"
- else
- myconf="${myconf} --enable-debug=no"
- fi
-
- ./configure --prefix=/usr \
- --mandir=/usr/share/man \
- --enable-shared \
- --enable-nasm \
- --enable-mp3rtp \
- --enable-extopt=full \
- ${myconf} || die
-
- emake || die
-}
-
-src_install () {
-
- make prefix=${D}/usr \
- mandir=${D}/usr/share/man \
- pkghtmldir=${D}/usr/share/doc/${PF}/html \
- install || die
-
- dodoc API COPYING HACKING PRESETS.draft LICENSE README* TODO USAGE
- dohtml -r ./
-}
-