use tc-getCC

2 files changed, 20 insertions, 20 deletions

diff --git a/sys-boot/elilo/elilo-3.4.ebuild b/sys-boot/elilo/elilo-3.4.ebuild
index e313e25fc606..8014a65d45c6 100644
--- a/sys-boot/elilo/elilo-3.4.ebuild
+++ b/sys-boot/elilo/elilo-3.4.ebuild
@@ -1,15 +1,16 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/elilo/elilo-3.4.ebuild,v 1.6 2004/06/24 22:34:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/elilo/elilo-3.4.ebuild,v 1.7 2004/10/28 16:04:50 vapier Exp $
 
 inherit eutils
 
 DESCRIPTION="Linux boot loader for EFI-based systems such as IA-64"
 HOMEPAGE="http://developer.intel.com/technology/efi"
 SRC_URI="ftp://ftp.hpl.hp.com/pub/linux-ia64/${P}.tar.gz"
-KEYWORDS="ia64"
-SLOT="0"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="ia64"
 IUSE=""
 
 # gnu-efi contains only static libs, so there's no run-time dep on it
@@ -18,9 +19,10 @@ RDEPEND="sys-boot/efibootmgr
 	sys-fs/dosfstools"
 
 src_unpack() {
-	unpack ${A} && cd ${S} || die "failed to unpack"
-	epatch ${FILESDIR}/elilo-3.4-makefile.patch || die "epatch failed"
-	epatch ${FILESDIR}/elilo-3.3a-devscheme.patch || die "epatch failed"
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/elilo-3.4-makefile.patch
+	epatch ${FILESDIR}/elilo-3.3a-devscheme.patch
 }
 
 src_compile() {
@@ -34,7 +36,7 @@ src_compile() {
 	# "prefix" on the next line specifies where to find gcc, as, ld,
 	# etc.  It's not the usual meaning of "prefix".  By blanking it we
 	# allow PATH to be searched.
-	emake -j1 prefix= CC="${CC}" ARCH=${iarch} || die "emake failed"
+	emake -j1 prefix= CC="$(tc-getCC)" ARCH=${iarch} || die "emake failed"
 
 	# unversion the man-pages and Debian's elilo script
 	cp ${FILESDIR}/elilo.8-${PV} elilo.8
@@ -43,9 +45,7 @@ src_compile() {
 }
 
 src_install() {
-	dodir /usr/lib/elilo || die
-	dodir /usr/sbin || die
-	dodir /etc || die
+	dodir /usr/lib/elilo /usr/sbin /etc
 
 	# install the efi executable in a known location
 	install -m755 elilo.efi ${D}/usr/lib/elilo || die
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0a.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0a.ebuild
index f870eed17423..025e91810bdd 100644
--- a/sys-boot/gnu-efi/gnu-efi-3.0a.ebuild
+++ b/sys-boot/gnu-efi/gnu-efi-3.0a.ebuild
@@ -1,24 +1,24 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/gnu-efi/gnu-efi-3.0a.ebuild,v 1.6 2004/07/01 21:46:11 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/gnu-efi/gnu-efi-3.0a.ebuild,v 1.7 2004/10/28 16:03:31 vapier Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Library for build EFI Applications"
-SRC_URI="ftp://ftp.hpl.hp.com/pub/linux-ia64/gnu-efi-3.0a.tar.gz"
 HOMEPAGE="http://developer.intel.com/technology/efi"
+SRC_URI="ftp://ftp.hpl.hp.com/pub/linux-ia64/gnu-efi-3.0a.tar.gz"
 
-KEYWORDS="ia64 ~x86"
-SLOT="3"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="ia64 x86"
 IUSE=""
 
-DEPEND="virtual/libc"	# don't think there's anything else
-RDEPEND="virtual/libc"
+DEPEND="virtual/libc"
 
 src_unpack() {
-	unpack ${A} && cd ${S} || die "failed to unpack"
-	epatch ${FILESDIR}/gnu-efi-3.0a-lds.patch || die "epatch failed"
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/gnu-efi-3.0a-lds.patch
 }
 
 src_compile() {
@@ -28,7 +28,7 @@ src_compile() {
 		x86)  iarch=ia32 ;;
 		*)    die "unknown architecture: $ARCH" ;;
 	esac
-	emake CC="${CC}" ARCH=${iarch} -j1 || die "emake failed"
+	emake CC="$(tc-getCC)" ARCH=${iarch} -j1 || die "emake failed"
 }
 
 src_install() {