7 files changed, 29 insertions, 24 deletions
diff --git a/mail-mta/qmail/ChangeLog b/mail-mta/qmail/ChangeLog
index 0c2ce6328ed2..fb5b04ef100d 100644
--- a/mail-mta/qmail/ChangeLog
+++ b/mail-mta/qmail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-mta/qmail
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.9 2004/08/31 20:04:11 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.10 2004/10/26 22:23:11 slarti Exp $
+
+  26 Oct 2004; Tom Martin <slarti@gentoo.org> qmail-1.03-r10.ebuild,
+  qmail-1.03-r11.ebuild, qmail-1.03-r12.ebuild, qmail-1.03-r13.ebuild,
+  qmail-1.03-r14.ebuild, qmail-1.03-r15.ebuild:
+  Change inherit gcc -> toolchain and gcc-getCC to tc-getCC. Resolves bug 69004.
 
   31 Aug 2004; Michael Hanselmann <hansmi@gentoo.org>
   +files/1.03-r15/qmail-macos-dns-fix.patch, qmail-1.03-r15.ebuild:
diff --git a/mail-mta/qmail/qmail-1.03-r10.ebuild b/mail-mta/qmail/qmail-1.03-r10.ebuild
index 01b6e63f16ab..c190814e9f33 100644
--- a/mail-mta/qmail/qmail-1.03-r10.ebuild
+++ b/mail-mta/qmail/qmail-1.03-r10.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/mail-mta/qmail/qmail-1.03-r10.ebuild,v 1.4 2004/07/01 19:53:52 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r10.ebuild,v 1.5 2004/10/26 22:23:11 slarti Exp $
 
-inherit gcc eutils
+inherit toolchain-funcs eutils
 
 IUSE="ssl"
 DESCRIPTION="A modern replacement for sendmail which uses maildirs and includes SSL/TLS, AUTH SMTP, and queue optimization"
diff --git a/mail-mta/qmail/qmail-1.03-r11.ebuild b/mail-mta/qmail/qmail-1.03-r11.ebuild
index dbb0ff3645f2..c40e0c8696ef 100644
--- a/mail-mta/qmail/qmail-1.03-r11.ebuild
+++ b/mail-mta/qmail/qmail-1.03-r11.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/mail-mta/qmail/qmail-1.03-r11.ebuild,v 1.5 2004/07/14 16:53:59 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r11.ebuild,v 1.6 2004/10/26 22:23:11 slarti Exp $
 
-inherit gcc eutils
+inherit toolchain-funcs eutils
 
 IUSE="ssl"
 DESCRIPTION="A modern replacement for sendmail which uses maildirs and includes SSL/TLS, AUTH SMTP, and queue optimization"
@@ -106,12 +106,12 @@ src_unpack() {
 	cd ${S}
 
 	if use ssl; then
-		echo "$(gcc-getCC) ${CFLAGS} -DTLS" > conf-cc
+		echo "$(tc-getCC) ${CFLAGS} -DTLS" > conf-cc
 	else
-		echo "$(gcc-getCC) ${CFLAGS}" > conf-cc
+		echo "$(tc-getCC) ${CFLAGS}" > conf-cc
 	fi
 
-	echo "$(gcc-getCC) ${LDFLAGS}" > conf-ld
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
 	echo "500" > conf-spawn
 
 }
diff --git a/mail-mta/qmail/qmail-1.03-r12.ebuild b/mail-mta/qmail/qmail-1.03-r12.ebuild
index a5cba2e17931..57d0b795254e 100644
--- a/mail-mta/qmail/qmail-1.03-r12.ebuild
+++ b/mail-mta/qmail/qmail-1.03-r12.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/mail-mta/qmail/qmail-1.03-r12.ebuild,v 1.4 2004/07/14 16:53:59 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r12.ebuild,v 1.5 2004/10/26 22:23:11 slarti Exp $
 
-inherit gcc eutils fixheadtails
+inherit toolchain-funcs eutils fixheadtails
 
 IUSE="ssl"
 DESCRIPTION="A modern replacement for sendmail which uses maildirs and includes SSL/TLS, AUTH SMTP, and queue optimization"
@@ -156,12 +156,12 @@ src_unpack() {
 	#EPATCH_SINGLE_MSG="qmail-pop3d reports erroneous figures on STAT after a DELE" \
 	#epatch ${DISTDIR}/qmail-pop3d-stat.patch 
 
-	echo -n "$(gcc-getCC) ${CFLAGS}" >${S}/conf-cc
+	echo -n "$(tc-getCC) ${CFLAGS}" >${S}/conf-cc
 	if use ssl; then
 		einfo "Enabling SSL/TLS functionality"
 		echo -n ' -DTLS' >>${S}/conf-cc
 	fi
-	echo -n "$(gcc-getCC) ${LDFLAGS}" > ${S}/conf-ld
+	echo -n "$(tc-getCC) ${LDFLAGS}" > ${S}/conf-ld
 	echo -n "500" > ${S}/conf-spawn
 
 	# fix coreutils messup
diff --git a/mail-mta/qmail/qmail-1.03-r13.ebuild b/mail-mta/qmail/qmail-1.03-r13.ebuild
index 4c22ccca42ba..a857cab5a921 100644
--- a/mail-mta/qmail/qmail-1.03-r13.ebuild
+++ b/mail-mta/qmail/qmail-1.03-r13.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/mail-mta/qmail/qmail-1.03-r13.ebuild,v 1.5 2004/07/20 14:24:11 tomk Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r13.ebuild,v 1.6 2004/10/26 22:23:11 slarti Exp $
 
-inherit gcc eutils fixheadtails
+inherit toolchain-funcs eutils fixheadtails
 
 IUSE="ssl"
 DESCRIPTION="A modern replacement for sendmail which uses maildirs and includes SSL/TLS, AUTH SMTP, and queue optimization"
@@ -156,12 +156,12 @@ src_unpack() {
 	#EPATCH_SINGLE_MSG="qmail-pop3d reports erroneous figures on STAT after a DELE" \
 	#epatch ${DISTDIR}/qmail-pop3d-stat.patch 
 
-	echo -n "$(gcc-getCC) ${CFLAGS}" >${S}/conf-cc
+	echo -n "$(tc-getCC) ${CFLAGS}" >${S}/conf-cc
 	if use ssl; then
 		einfo "Enabling SSL/TLS functionality"
 		echo -n ' -DTLS' >>${S}/conf-cc
 	fi
-	echo -n "$(gcc-getCC) ${LDFLAGS}" > ${S}/conf-ld
+	echo -n "$(tc-getCC) ${LDFLAGS}" > ${S}/conf-ld
 	echo -n "500" > ${S}/conf-spawn
 
 	# fix coreutils messup
diff --git a/mail-mta/qmail/qmail-1.03-r14.ebuild b/mail-mta/qmail/qmail-1.03-r14.ebuild
index fa05f3d6a1e3..f3d3f7c3d80b 100644
--- a/mail-mta/qmail/qmail-1.03-r14.ebuild
+++ b/mail-mta/qmail/qmail-1.03-r14.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/mail-mta/qmail/qmail-1.03-r14.ebuild,v 1.5 2004/07/20 14:24:11 tomk Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r14.ebuild,v 1.6 2004/10/26 22:23:11 slarti Exp $
 
-inherit gcc eutils fixheadtails
+inherit toolchain-funcs eutils fixheadtails
 
 IUSE="ssl noauthcram notlsbeforeauth"
 DESCRIPTION="A modern replacement for sendmail which uses maildirs and includes SSL/TLS, AUTH SMTP, and queue optimization"
@@ -187,7 +187,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${PVR}/qmail-gentoo-branding.patch
 	sed -e "s/__PF__/${PF}/" -i ${S}/qmail-smtpd.c
 
-	echo -n "$(gcc-getCC) ${CFLAGS}" >${S}/conf-cc
+	echo -n "$(tc-getCC) ${CFLAGS}" >${S}/conf-cc
 	if use ssl; then
 		einfo "Enabling SSL/TLS functionality"
 		echo -n ' -DTLS ' >>${S}/conf-cc
@@ -210,7 +210,7 @@ src_unpack() {
 		einfo "Enabling AUTHCRAM support"
 	fi
 
-	echo -n "$(gcc-getCC) ${LDFLAGS}" > ${S}/conf-ld
+	echo -n "$(tc-getCC) ${LDFLAGS}" > ${S}/conf-ld
 	echo -n "500" > ${S}/conf-spawn
 
 	# fix coreutils messup
diff --git a/mail-mta/qmail/qmail-1.03-r15.ebuild b/mail-mta/qmail/qmail-1.03-r15.ebuild
index 2c072e6630d5..6bf7f8ead0f6 100644
--- a/mail-mta/qmail/qmail-1.03-r15.ebuild
+++ b/mail-mta/qmail/qmail-1.03-r15.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/mail-mta/qmail/qmail-1.03-r15.ebuild,v 1.7 2004/08/31 20:04:11 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r15.ebuild,v 1.8 2004/10/26 22:23:11 slarti Exp $
 
-inherit gcc eutils fixheadtails
+inherit toolchain-funcs eutils fixheadtails
 
 IUSE="ssl noauthcram notlsbeforeauth"
 DESCRIPTION="A modern replacement for sendmail which uses maildirs and includes SSL/TLS, AUTH SMTP, and queue optimization"
@@ -200,7 +200,7 @@ src_unpack() {
 		epatch ${FILESDIR}/${PVR}/qmail-macos-dns-fix.patch
 	fi
 
-	echo -n "$(gcc-getCC) ${CFLAGS}" >${S}/conf-cc
+	echo -n "$(tc-getCC) ${CFLAGS}" >${S}/conf-cc
 	if use ssl; then
 		einfo "Enabling SSL/TLS functionality"
 		echo -n ' -DTLS ' >>${S}/conf-cc
@@ -223,7 +223,7 @@ src_unpack() {
 		einfo "Enabling AUTHCRAM support"
 	fi
 
-	echo -n "$(gcc-getCC) ${LDFLAGS}" > ${S}/conf-ld
+	echo -n "$(tc-getCC) ${LDFLAGS}" > ${S}/conf-ld
 	echo -n "500" > ${S}/conf-spawn
 
 	# fix coreutils messup