summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Brinkmann <luckyduck@gentoo.org>2005-05-21 11:17:20 +0000
committerJan Brinkmann <luckyduck@gentoo.org>2005-05-21 11:17:20 +0000
commit5d3c875abcd0c48a52570d26d3acaab26a021321 (patch)
treee335ab9a8dce3f7b387a7ba7e5e52b4d4abfb1d5 /media-sound/lame
parentfix patch (diff)
downloadgentoo-2-5d3c875abcd0c48a52570d26d3acaab26a021321.tar.gz
gentoo-2-5d3c875abcd0c48a52570d26d3acaab26a021321.tar.bz2
gentoo-2-5d3c875abcd0c48a52570d26d3acaab26a021321.zip
dont force the use of nasm by default on x86, fixes bug #93279
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'media-sound/lame')
-rw-r--r--media-sound/lame/ChangeLog5
-rw-r--r--media-sound/lame/Manifest10
-rw-r--r--media-sound/lame/lame-3.96.1.ebuild4
-rw-r--r--media-sound/lame/lame-3.96.ebuild4
4 files changed, 11 insertions, 12 deletions
diff --git a/media-sound/lame/ChangeLog b/media-sound/lame/ChangeLog
index 42f1284912c9..27bf41961e03 100644
--- a/media-sound/lame/ChangeLog
+++ b/media-sound/lame/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-sound/lame
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/ChangeLog,v 1.62 2005/05/15 14:28:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/ChangeLog,v 1.63 2005/05/21 11:17:20 luckyduck Exp $
+
+ 21 May 2005; Jan Brinkmann <luckyduck@gentoo.org> lame-3.96.1.ebuild:
+ dont force the use of nasm by default on x86, fixes bug #93279
15 May 2005; Diego Pettenò <flameeyes@gentoo.org> lame-3.96.ebuild,
lame-3.96.1.ebuild:
diff --git a/media-sound/lame/Manifest b/media-sound/lame/Manifest
index ad5ff34b64eb..c17ec30123c9 100644
--- a/media-sound/lame/Manifest
+++ b/media-sound/lame/Manifest
@@ -1,8 +1,8 @@
-MD5 c6173fe82ac027a4fb36defc4143a514 ChangeLog 8648
-MD5 5e508e82fa66c88cf4ad7fb1cfd2c9df lame-3.96.1.ebuild 2338
-MD5 153a99cea0e3e55e4b275ad24385274c lame-3.96.ebuild 2225
+MD5 6f159e59d48534b94ec7de76d8fbc558 lame-3.96.ebuild 2183
+MD5 66abf77eed9d8865b9a0d377471b411b lame-3.96.1.ebuild 2287
+MD5 aa3ad37da27aad6e7ea7964e17c4ee1d ChangeLog 8786
MD5 05ab4d4775083f0930841e415df18ad6 metadata.xml 160
-MD5 3b8e04486d3959e978f2466bdc621a59 files/digest-lame-3.96 62
-MD5 f7a856198d82691c0506cfc77fa95e87 files/digest-lame-3.96.1 64
MD5 af03fdd6d579097e09e99b9faeaf929b files/lame-3.96-ccc.patch 658
+MD5 3b8e04486d3959e978f2466bdc621a59 files/digest-lame-3.96 62
MD5 77956e1d8bad436bc943b5005842aa80 files/lame-3.96.1-shared-frontend.patch 945
+MD5 f7a856198d82691c0506cfc77fa95e87 files/digest-lame-3.96.1 64
diff --git a/media-sound/lame/lame-3.96.1.ebuild b/media-sound/lame/lame-3.96.1.ebuild
index 1ed14923190e..f2a79c26e052 100644
--- a/media-sound/lame/lame-3.96.1.ebuild
+++ b/media-sound/lame/lame-3.96.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.96.1.ebuild,v 1.14 2005/05/15 14:28:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.96.1.ebuild,v 1.15 2005/05/21 11:17:20 luckyduck Exp $
inherit flag-o-matic toolchain-funcs eutils
@@ -16,7 +16,6 @@ IUSE="gtk debug"
RDEPEND=">=sys-libs/ncurses-5.2
gtk? ( =x11-libs/gtk+-1.2* )"
DEPEND="${RDEPEND}
- x86? ( dev-lang/nasm )
sys-devel/autoconf"
src_unpack() {
@@ -60,7 +59,6 @@ src_compile() {
econf \
--enable-shared \
- $(use_enable x86 nasm) \
--enable-mp3rtp \
${myconf} || die
diff --git a/media-sound/lame/lame-3.96.ebuild b/media-sound/lame/lame-3.96.ebuild
index 13ac7744a812..2a2a27cff506 100644
--- a/media-sound/lame/lame-3.96.ebuild
+++ b/media-sound/lame/lame-3.96.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# 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.18 2005/05/15 14:28:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.96.ebuild,v 1.19 2005/05/21 11:17:20 luckyduck Exp $
inherit flag-o-matic toolchain-funcs eutils
@@ -18,7 +18,6 @@ RDEPEND=">=sys-libs/ncurses-5.2
gtk? ( =x11-libs/gtk+-1.2* )"
DEPEND="${RDEPEND}
- x86? ( dev-lang/nasm )
sys-devel/autoconf"
src_unpack() {
@@ -59,7 +58,6 @@ src_compile() {
econf \
--enable-shared \
- --enable-nasm \
--enable-mp3rtp \
${myconf} || die