If ccc (alpha compiler) is installed on the system, the default configure is broken, fix it to respect CC. This is only directly broken for ARCH=alpha but would affect anybody with a ccc binary in their PATH. #41908

7 files changed, 62 insertions, 17 deletions

diff --git a/media-sound/lame/ChangeLog b/media-sound/lame/ChangeLog
index 31ea78e4262b..c27fccba306e 100644
--- a/media-sound/lame/ChangeLog
+++ b/media-sound/lame/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/lame
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/ChangeLog,v 1.47 2004/07/26 04:55:07 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/ChangeLog,v 1.48 2004/07/28 17:04:09 agriffis Exp $
+
+  28 Jul 2004; Aron Griffis <agriffis@gentoo.org> +files/lame-3.96-ccc.patch,
+  lame-3.92.ebuild, lame-3.93.1-r1.ebuild, lame-3.96.1.ebuild,
+  lame-3.96.ebuild:
+  If ccc (alpha compiler) is installed on the system, the default configure is
+  broken, fix it to respect CC. This is only directly broken for ARCH=alpha but
+  would affect anybody with a ccc binary in their PATH. #41908
 
 *lame-3.96.1 (25 Jul 2004)
 
diff --git a/media-sound/lame/Manifest b/media-sound/lame/Manifest
index b1fb7e045112..83b6790981b8 100644
--- a/media-sound/lame/Manifest
+++ b/media-sound/lame/Manifest
@@ -1,11 +1,12 @@
-MD5 86a951a6f85e7018d91fb4d7d0169d83 ChangeLog 6756
-MD5 77051968e4602d1525964d9dc32b9f3d lame-3.92.ebuild 1554
-MD5 9b52bf10f6fc6b7d60f746f007124d6d lame-3.93.1-r1.ebuild 1610
+MD5 f908b88d67a5f3e359ced4dd865f43d4 lame-3.92.ebuild 1552
+MD5 5a99cc8dfb13e74eaefb4f258906dcfe lame-3.93.1-r1.ebuild 1610
+MD5 14cae91e6012c05ea1bece5d6e4eb1d4 lame-3.96.ebuild 2169
 MD5 05ab4d4775083f0930841e415df18ad6 metadata.xml 160
-MD5 b015b671c03438a94fa4d70289c143b4 lame-3.96.1.ebuild 1782
-MD5 100ddf2c0f621c4a037f5239623fcbe6 lame-3.96.ebuild 1825
+MD5 39f034d2b423e6992678f5ab64a99adb lame-3.96.1.ebuild 2163
+MD5 223508749a3b312bb78136b8ad8fbdcb ChangeLog 7138
 MD5 2b1af4843f5ca4107de793b7a584db34 files/digest-lame-3.92 61
 MD5 aefad4480f6888fcee536e08205804b1 files/digest-lame-3.93.1-r1 64
 MD5 3b8e04486d3959e978f2466bdc621a59 files/digest-lame-3.96 62
 MD5 1dfbfacec1d8f89bf39620c15becb6bc files/lame-3.91-gcc3.diff 383
 MD5 f7a856198d82691c0506cfc77fa95e87 files/digest-lame-3.96.1 64
+MD5 af03fdd6d579097e09e99b9faeaf929b files/lame-3.96-ccc.patch 658
diff --git a/media-sound/lame/files/lame-3.96-ccc.patch b/media-sound/lame/files/lame-3.96-ccc.patch
new file mode 100644
index 000000000000..684782aa0a72
--- /dev/null
+++ b/media-sound/lame/files/lame-3.96-ccc.patch
@@ -0,0 +1,16 @@
+--- lame-3.96/configure.in.ccc	2004-04-11 10:45:19.000000000 -0400
++++ lame-3.96/configure.in	2004-07-26 18:32:21.000000000 -0400
+@@ -915,11 +915,9 @@
+ alpha*-*-linux*)
+ 
+ ################################################################
+-#### Check if 'ccc' is in our path
++#### Check if we're using Compaq's C Compiler: 'ccc'
+ ################################################################
+-if test "`which ccc 2>/dev/null | grep -c ccc`" != "0" ; then
+-	# Compaq's C Compiler
+-	CC=ccc
++if test "`echo $CC | sed 's/.*\///'`" = ccc; then
+ 
+ ################################################################
+ #### set 'OPTIMIZATION = -arch host -tune host' 
diff --git a/media-sound/lame/lame-3.92.ebuild b/media-sound/lame/lame-3.92.ebuild
index 983c52aede57..54a39dc60581 100644
--- a/media-sound/lame/lame-3.92.ebuild
+++ b/media-sound/lame/lame-3.92.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # 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.21 2004/07/01 07:56:20 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.92.ebuild,v 1.22 2004/07/28 17:04:09 agriffis Exp $
 
 inherit libtool
 
-DESCRIPTION="LAME Ain't an Mp3 Encoder"
+DESCRIPTION="LAME Ain't an MP3 Encoder"
 HOMEPAGE="http://www.mp3dev.org/mp3/"
 SRC_URI="mirror://sourceforge/lame/${P}.tar.gz"
 
diff --git a/media-sound/lame/lame-3.93.1-r1.ebuild b/media-sound/lame/lame-3.93.1-r1.ebuild
index a85cb8b42313..013e5db57048 100644
--- a/media-sound/lame/lame-3.93.1-r1.ebuild
+++ b/media-sound/lame/lame-3.93.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # 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.16 2004/06/25 00:08:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.93.1-r1.ebuild,v 1.17 2004/07/28 17:04:09 agriffis Exp $
 
 inherit flag-o-matic gcc
 
-DESCRIPTION="LAME Ain't an Mp3 Encoder"
+DESCRIPTION="LAME Ain't an MP3 Encoder"
 HOMEPAGE="http://www.mp3dev.org/mp3/"
 SRC_URI="mirror://sourceforge/lame/${P}.tar.gz"
 
diff --git a/media-sound/lame/lame-3.96.1.ebuild b/media-sound/lame/lame-3.96.1.ebuild
index f901433a8288..d1b87c1a149d 100644
--- a/media-sound/lame/lame-3.96.1.ebuild
+++ b/media-sound/lame/lame-3.96.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 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.1 2004/07/26 04:55:07 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.96.1.ebuild,v 1.2 2004/07/28 17:04:09 agriffis Exp $
 
 IUSE="gtk debug"
 
 inherit flag-o-matic gcc eutils
 
-DESCRIPTION="LAME Ain't an Mp3 Encoder"
+DESCRIPTION="LAME Ain't an MP3 Encoder"
 HOMEPAGE="http://lame.sourceforge.net"
 SRC_URI="mirror://sourceforge/lame/${P}.tar.gz"
 
@@ -18,7 +18,20 @@ RDEPEND=">=sys-libs/ncurses-5.2
 	gtk? ( =x11-libs/gtk+-1.2* )"
 
 DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )"
+	x86? ( dev-lang/nasm )
+	sys-devel/autoconf"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S} || die
+
+	# If ccc (alpha compiler) is installed on the system, the default
+	# configure is broken, fix it to respect CC.  This is only
+	# directly broken for ARCH=alpha but would affect anybody with a
+	# ccc binary in their PATH.  Bug #41908  (26 Jul 2004 agriffis)
+	epatch ${FILESDIR}/lame-3.96-ccc.patch
+	autoconf || die
+}
 
 src_compile() {
 	# take out -fomit-frame-pointer from CFLAGS if k6-2
diff --git a/media-sound/lame/lame-3.96.ebuild b/media-sound/lame/lame-3.96.ebuild
index ec7c36438ff8..12d1eee8ab3c 100644
--- a/media-sound/lame/lame-3.96.ebuild
+++ b/media-sound/lame/lame-3.96.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 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.11 2004/07/23 18:07:50 gongloo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.96.ebuild,v 1.12 2004/07/28 17:04:09 agriffis Exp $
 
 inherit flag-o-matic gcc eutils
 
-DESCRIPTION="LAME Ain't an Mp3 Encoder"
+DESCRIPTION="LAME Ain't an MP3 Encoder"
 HOMEPAGE="http://lame.sourceforge.net"
 SRC_URI="mirror://sourceforge/lame/${P}.tar.gz"
 RESTRICT="nomirror"
@@ -18,11 +18,19 @@ RDEPEND=">=sys-libs/ncurses-5.2
 	gtk? ( =x11-libs/gtk+-1.2* )"
 
 DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )"
+	x86? ( dev-lang/nasm )
+	sys-devel/autoconf"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd ${S} || die
+
+	# If ccc (alpha compiler) is installed on the system, the default
+	# configure is broken, fix it to respect CC.  This is only
+	# directly broken for ARCH=alpha but would affect anybody with a
+	# ccc binary in their PATH.  Bug #41908  (26 Jul 2004 agriffis)
+	epatch ${FILESDIR}/lame-3.96-ccc.patch
+	autoconf || die
 }
 
 src_compile() {