$CC -> $(tc-getCC)

5 files changed, 32 insertions, 34 deletions

diff --git a/sys-apps/sysvinit/sysvinit-2.84.ebuild b/sys-apps/sysvinit/sysvinit-2.84.ebuild
index d8663f12c44e..2a6cce56e597 100644
--- a/sys-apps/sysvinit/sysvinit-2.84.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.84.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.84.ebuild,v 1.6 2004/08/19 22:05:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.84.ebuild,v 1.7 2004/11/05 01:30:50 vapier Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="/sbin/init - parent of all processes"
 HOMEPAGE="http://freshmeat.net/projects/sysvinit/"
@@ -40,7 +40,7 @@ src_unpack() {
 
 src_compile() {
 	cd ${S}/src
-	emake CC="${CC:-gcc}" LD="${CC:-gcc}" \
+	emake CC="$(tc-getCC)" LD="$(tc-getCC)" \
 		LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS} -D_GNU_SOURCE" || die
 }
 
diff --git a/sys-apps/sysvinit/sysvinit-2.85-r1.ebuild b/sys-apps/sysvinit/sysvinit-2.85-r1.ebuild
index edc12c247c75..ce400469da86 100644
--- a/sys-apps/sysvinit/sysvinit-2.85-r1.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.85-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.85-r1.ebuild,v 1.6 2004/08/24 03:37:25 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.85-r1.ebuild,v 1.7 2004/11/05 01:30:50 vapier Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="/sbin/init - parent of all processes"
 HOMEPAGE="http://freshmeat.net/projects/sysvinit/"
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.cistron.nl/pub/people/miquels/software/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="selinux bootstrap build"
 
 RDEPEND="selinux? ( >=sys-libs/libselinux-1.14 )"
@@ -35,7 +35,7 @@ src_compile() {
 	# the shared obj by default anyway!  The other option is to
 	# refrain from building sulogin, but that isn't a good option.
 	# (09 Jul 2004 agriffis)
-	emake -C ${S}/src CC="${CC:-gcc}" LD="${CC:-gcc}" \
+	emake -C ${S}/src CC="$(tc-getCC)" LD="$(tc-getCC)" \
 		LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS} -D_GNU_SOURCE" \
 		LCRYPT="-lcrypt" || die
 }
@@ -43,9 +43,9 @@ src_compile() {
 src_install() {
 	cd ${S}/src
 	into /
-	dosbin init halt killall5 runlevel shutdown sulogin
+	dosbin init halt killall5 runlevel shutdown sulogin || die "dosbin"
 	dosym init /sbin/telinit
-	dobin last mesg utmpdump wall
+	dobin last mesg utmpdump wall || die "dobin"
 	dosym killall5 /sbin/pidof
 	dosym halt /sbin/reboot
 	dosym halt /sbin/poweroff
@@ -56,7 +56,7 @@ src_install() {
 	# sysvinit docs
 	cd ${S}
 	doman man/*.[1-9]
-	dodoc COPYRIGHT README doc/*
+	dodoc README doc/*
 
 	# install our inittab
 	insinto /etc
diff --git a/sys-apps/sysvinit/sysvinit-2.85.ebuild b/sys-apps/sysvinit/sysvinit-2.85.ebuild
index 446110da3102..d4eec81ae9a9 100644
--- a/sys-apps/sysvinit/sysvinit-2.85.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.85.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.85.ebuild,v 1.5 2004/08/19 22:05:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.85.ebuild,v 1.6 2004/11/05 01:30:50 vapier Exp $
 
 inherit eutils
 
@@ -35,7 +35,7 @@ src_unpack() {
 
 src_compile() {
 	cd ${S}/src
-	emake CC="${CC:-gcc}" LD="${CC:-gcc}" \
+	emake CC="$(tc-getCC)" LD="$(tc-getCC)" \
 		LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS} -D_GNU_SOURCE" || die
 }
 
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r8.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r8.ebuild
index 17ef5db5d3f9..9503dcab0ff5 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r8.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r8.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r8.ebuild,v 1.17 2004/10/23 05:45:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r8.ebuild,v 1.18 2004/11/05 01:33:20 vapier Exp $
 
-inherit eutils gcc
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Collection of tools for managing UNIX services"
 HOMEPAGE="http://cr.yp.to/ucspi-tcp.html"
@@ -14,12 +14,13 @@ SRC_URI="http://cr.yp.to/${PN}/${P}.tar.gz
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 ~ppc-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ~ppc-macos sparc s390 x86"
 IUSE="ssl ipv6 selinux"
 
 DEPEND="virtual/libc
 	ssl? ( >=dev-libs/openssl-0.9.6g )"
-RDEPEND="selinux? ( sec-policy/selinux-ucspi-tcp )"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-ucspi-tcp )"
 PROVIDE="virtual/inetd"
 
 src_unpack() {
@@ -41,8 +42,8 @@ src_unpack() {
 	epatch ${DISTDIR}/ucspi-rss.diff
 	epatch ${FILESDIR}/${PV}-head-1.patch
 
-	echo "$(gcc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(gcc-getCC) ${LDFLAGS}" > conf-ld
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
 	echo "/usr/" > conf-home
 
 	# allow larger responses
diff --git a/sys-apps/ucspi-unix/ucspi-unix-0.36-r1.ebuild b/sys-apps/ucspi-unix/ucspi-unix-0.36-r1.ebuild
index 403ff5d638da..a5db26f3d099 100644
--- a/sys-apps/ucspi-unix/ucspi-unix-0.36-r1.ebuild
+++ b/sys-apps/ucspi-unix/ucspi-unix-0.36-r1.ebuild
@@ -1,37 +1,34 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-unix/ucspi-unix-0.36-r1.ebuild,v 1.6 2004/10/17 11:22:50 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-unix/ucspi-unix-0.36-r1.ebuild,v 1.7 2004/11/05 01:34:06 vapier Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
-DESCRIPTION="A ucspi implementation for unix sockets."
+DESCRIPTION="A ucspi implementation for unix sockets"
+HOMEPAGE="http://untroubled.org/ucspi-unix/"
 SRC_URI="http://untroubled.org/ucspi-unix/${P}.tar.gz"
 
-DEPEND=">=dev-libs/bglibs-1.009-r1"
-HOMEPAGE="http://untroubled.org/ucspi-unix/"
-KEYWORDS="x86 amd64 sparc ~ppc"
-IUSE=""
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
+IUSE=""
+
+DEPEND=">=dev-libs/bglibs-1.009-r1"
 
 src_unpack() {
 	unpack ${A}
-
-	# Fix for head syntax in Makefile
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-gentoo-head.patch
 }
 
 src_compile() {
-	echo "${CC} ${CFLAGS} -I/usr/lib/bglibs/include" > conf-cc
-	echo "${CC} -s -L/usr/lib/bglibs/lib" > conf-ld
+	echo "$(tc-getCC) ${CFLAGS} -I${ROOT}/usr/lib/bglibs/include" > conf-cc
+	echo "$(tc-getCC) -s -L${ROOT}/usr/lib/bglibs/lib" > conf-ld
 	make || die  #don't use emake b/c of jobserver
 }
 
-src_install () {
-	exeinto /usr/bin
-	doexe unixserver unixclient unixcat
+src_install() {
+	dobin unixserver unixclient unixcat || die
 	doman unixserver.1 unixclient.1
-
 	dodoc ANNOUNCEMENT ChangeLog NEWS PROTOCOL README TODO
 }