dont use $CC

4 files changed, 29 insertions, 23 deletions

diff --git a/app-text/7plus/7plus-2.25.ebuild b/app-text/7plus/7plus-2.25.ebuild
index a0b3ee1ff537..7a5d64bf1ed5 100644
--- a/app-text/7plus/7plus-2.25.ebuild
+++ b/app-text/7plus/7plus-2.25.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/7plus/7plus-2.25.ebuild,v 1.2 2004/03/12 09:18:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/7plus/7plus-2.25.ebuild,v 1.3 2004/04/28 05:44:56 vapier Exp $
+
+inherit gcc
 
 S="${WORKDIR}/7plsrc.${PV//./}"
 DESCRIPTION="An encoder for packet radio"
@@ -8,8 +10,8 @@ HOMEPAGE="http://home.t-online.de/home/dg1bbq/7plus.htm"
 SRC_URI="http://home.t-online.de/home/dg1bbq/7pl${PV//./}sr.tgz"
 
 LICENSE="7plus"
-KEYWORDS="~x86"
 SLOT="0"
+KEYWORDS="~x86"
 IUSE=""
 
 DEPEND="sys-apps/sed"
@@ -18,9 +20,9 @@ RDEPEND=""
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	sed -e "s:CC = gcc:CC = ${CC}:" \
-		-e "s:-O2:${CFLAGS}:" linux.mak > Makefile || \
-			die "sed Makefile failed"
+	sed -e "s:CC = gcc:CC = $(gcc-getCC):" \
+		-e "s:-O2:${CFLAGS}:" linux.mak > Makefile \
+		|| die "sed Makefile failed"
 }
 
 src_compile() {
@@ -28,6 +30,6 @@ src_compile() {
 }
 
 src_install() {
-	dobin 7plus                                || die "dobin failed"
-	dodoc 7pl_hist.nts 7plh_old.nts format.def || die "dodoc failed"
+	dobin 7plus || die "dobin failed"
+	dodoc 7pl_hist.nts 7plh_old.nts format.def
 }
diff --git a/app-text/vlna/vlna-1.2.ebuild b/app-text/vlna/vlna-1.2.ebuild
index 3aec69c971c0..9b9e3d665784 100644
--- a/app-text/vlna/vlna-1.2.ebuild
+++ b/app-text/vlna/vlna-1.2.ebuild
@@ -1,27 +1,27 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/vlna/vlna-1.2.ebuild,v 1.1 2004/02/26 19:38:39 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/vlna/vlna-1.2.ebuild,v 1.2 2004/04/28 05:45:24 vapier Exp $
+
+inherit gcc
 
 DESCRIPTION="Add nonbreakable spaces after some prepositions in Czech texts"
 HOMEPAGE="http://math.feld.cvut.cz/olsak/cstex/"
 SRC_URI="ftp://math.feld.cvut.cz/pub/olsak/vlna/${P}.tar.gz"
 
-KEYWORDS="~x86"
-SLOT="0"
 LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~x86"
 IUSE=""
 
 DEPEND="virtual/glibc"
 
-S="${WORKDIR}/${PN}"
+S=${WORKDIR}/${PN}
 
 src_compile() {
-
-	emake CC="${CC}" CFLAGS="${CFLAGS}" || die "make failed"
+	emake CC="$(gcc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
 }
 
 src_install() {
-
 	make DESTDIR=${D} \
 		BINDIR=${D}/usr/bin \
 		MANDIR=${D}/usr/share/man/man1 \
diff --git a/dev-embedded/picasm/picasm-1.12b.ebuild b/dev-embedded/picasm/picasm-1.12b.ebuild
index 95bec2827226..17f83bdafd14 100644
--- a/dev-embedded/picasm/picasm-1.12b.ebuild
+++ b/dev-embedded/picasm/picasm-1.12b.ebuild
@@ -1,27 +1,31 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/picasm/picasm-1.12b.ebuild,v 1.2 2004/03/05 09:03:51 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/picasm/picasm-1.12b.ebuild,v 1.3 2004/04/28 05:45:50 vapier Exp $
+
+inherit gcc
 
 MY_PV="${PV//.}"
 MY_P="${PN}${MY_PV}"
 DESCRIPTION="An assembler and disassembler for 12 and 14-bit PIC chips"
 HOMEPAGE="http://www.iki.fi/trossi/pic/"
 SRC_URI="http://www.iki.fi/trossi/pic/${MY_P}.tar.gz"
+
 LICENSE="X11"
 SLOT="0"
-IUSE=""
 KEYWORDS="x86"
+IUSE=""
+
 DEPEND="sys-devel/gcc"
 RDEPEND=""
 
-S="${WORKDIR}/${PN}"
+S=${WORKDIR}/${PN}
 
 src_compile() {
-	emake CFLAGS="${CFLAGS}" CC="${CC}" || die
+	emake CFLAGS="${CFLAGS}" CC="$(gcc-getCC)" || die
 }
 
 src_install() {
-	dobin picasm
+	dobin picasm || die
 	dodoc picasm.txt devices.txt HISTORY TODO
 	dohtml picasm.html
 	docinto examples
diff --git a/dev-games/hawknl/hawknl-1.68.ebuild b/dev-games/hawknl/hawknl-1.68.ebuild
index f90da2ca7084..aed11a522a7b 100644
--- a/dev-games/hawknl/hawknl-1.68.ebuild
+++ b/dev-games/hawknl/hawknl-1.68.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc., 2004 Richard Garand <richard@garandnet.net>
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/hawknl/hawknl-1.68.ebuild,v 1.4 2004/02/21 23:52:52 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/hawknl/hawknl-1.68.ebuild,v 1.5 2004/04/28 05:46:15 vapier Exp $
 
 DESCRIPTION="A cross-platform network library designed for games"
 HOMEPAGE="http://www.hawksoft.com/hawknl/"
@@ -23,16 +23,16 @@ src_unpack() {
 
 	sed -i \
 		-e 's:make :$(MAKE) :g' makefile \
-			|| die "sed makefile failed"
+		|| die "sed makefile failed"
 
 	sed -i \
 		-e '/echo /d' src/makefile.linux \
-			|| die "sed src/makefile.linux failed"
+		|| die "sed src/makefile.linux failed"
 }
 
 src_compile () {
 	emake \
-		CC=${CC} \
+		CC="$(gcc-getCC)" \
 		OPTFLAGS="${CFLAGS} -D_GNU_SOURCE -D_REENTRANT" || die "emake failed"
 }