fix $CC usage #36987

4 files changed, 9 insertions, 68 deletions

diff --git a/app-arch/bzip2/ChangeLog b/app-arch/bzip2/ChangeLog
index e00363d23947..2ee340983111 100644
--- a/app-arch/bzip2/ChangeLog
+++ b/app-arch/bzip2/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for app-arch/bzip2
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.2 2003/12/28 18:40:32 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.3 2004/01/03 04:48:04 vapier Exp $
 
 *bzip2-1.0.2-r3 (28 Dec 2003)
 
+  02 Jan 2003; Mike Frysinger <vapier@gentoo.org> :
+  Change ${CC} ${CXX} to $(gcc-getCC) $(gcc-getCXX) from gcc.eclass #36987.
+
   28 Dec 2003; Martin Schlemmer <azarah@gentoo.org> bzip2-1.0.2-r3.ebuild:
   Make sure bzcat and bunzip2 is installed as symlinks.
 
diff --git a/app-arch/bzip2/bzip2-1.0.2-r2.ebuild b/app-arch/bzip2/bzip2-1.0.2-r2.ebuild
deleted file mode 100644
index 41c024b83b69..000000000000
--- a/app-arch/bzip2/bzip2-1.0.2-r2.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/app-arch/bzip2/bzip2-1.0.2-r2.ebuild,v 1.3 2003/12/17 03:48:28 brad_mssw Exp $
-
-DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
-HOMEPAGE="http://sources.redhat.com/bzip2/"
-SRC_URI="ftp://sources.redhat.com/pub/bzip2/v102/${P}.tar.gz"
-
-LICENSE="BZIP2"
-SLOT="0"
-KEYWORDS="x86 amd64 ppc sparc alpha mips hppa arm ia64 ppc64"
-IUSE="build static"
-
-DEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	cp Makefile Makefile.orig
-	# for optimizations, we keep -fomit-frame-pointer and -fno-strength-reduce
-	# for speed.  -fstrength-reduce seems to slow down the code slightly on x86.
-	# (drobbins)
-	use static && CFLAGS="${CFLAGS} -static"
-	sed -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \
-		-e "s:-O2:${CFLAGS}:g" \
-		Makefile.orig > Makefile || die
-	cp Makefile-libbz2_so Makefile-libbz2_so.orig
-	sed -e "s:-O2:${CFLAGS}:g" \
-		Makefile-libbz2_so.orig > Makefile-libbz2_so || die
-}
-
-src_compile() {
-	if [ -z "`use build`" ]
-	then
-		emake CC="${CC}" CXX="${CXX}" -f Makefile-libbz2_so all || die "Make failed"
-	fi
-	emake CC="${CC}" CXX="${CXX}" all || die "Make failed"
-}
-
-src_install() {
-	if [ -z "`use build`" ]
-	then
-		make PREFIX=${D}/usr install || die
-		mv ${D}/usr/bin ${D}
-
-		dolib.so ${S}/libbz2.so.${PV}
-		dosym /usr/lib/libbz2.so.${PV} /usr/lib/libbz2.so.1.0
-		dosym /usr/lib/libbz2.so.${PV} /usr/lib/libbz2.so
-
-		dodoc README LICENSE CHANGES Y2K_INFO
-		docinto txt
-		dodoc *.txt
-		docinto ps
-		dodoc *.ps
-		dohtml manual_*.html
-	else
-		into /
-		dobin bzip2
-		dosym bzip2 /bin/bzcat
-		dosym bzip2 /bin/bunzip2
-	fi
-}
diff --git a/app-arch/bzip2/bzip2-1.0.2-r3.ebuild b/app-arch/bzip2/bzip2-1.0.2-r3.ebuild
index 4cc786b66d67..d2a6fa129810 100644
--- a/app-arch/bzip2/bzip2-1.0.2-r3.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.2-r3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.2-r3.ebuild,v 1.1 2003/12/28 18:40:32 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.2-r3.ebuild,v 1.2 2004/01/03 04:48:04 vapier Exp $
+
+inherit gcc
 
 DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
 HOMEPAGE="http://sources.redhat.com/bzip2/"
@@ -33,9 +35,9 @@ src_unpack() {
 src_compile() {
 	if [ -z "`use build`" ]
 	then
-		emake CC="${CC}" CXX="${CXX}" -f Makefile-libbz2_so all || die "Make failed"
+		emake CC="$(gcc-getCC)" CXX="$(gcc-getCXX)" -f Makefile-libbz2_so all || die "Make failed"
 	fi
-	emake CC="${CC}" CXX="${CXX}" all || die "Make failed"
+	emake CC="$(gcc-getCC)" CXX="$(gcc-getCXX)" all || die "Make failed"
 }
 
 src_install() {
diff --git a/app-arch/bzip2/files/digest-bzip2-1.0.2-r2 b/app-arch/bzip2/files/digest-bzip2-1.0.2-r2
deleted file mode 100644
index 5b1f375c39ee..000000000000
--- a/app-arch/bzip2/files/digest-bzip2-1.0.2-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ee76864958d568677f03db8afad92beb bzip2-1.0.2.tar.gz 665198