dont use $CC

3 files changed, 24 insertions, 28 deletions

diff --git a/dev-tex/cjk-latex/cjk-latex-4.5.2.ebuild b/dev-tex/cjk-latex/cjk-latex-4.5.2.ebuild
index 0f703d31723d..931abc4613dd 100644
--- a/dev-tex/cjk-latex/cjk-latex-4.5.2.ebuild
+++ b/dev-tex/cjk-latex/cjk-latex-4.5.2.ebuild
@@ -1,10 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/cjk-latex/cjk-latex-4.5.2.ebuild,v 1.6 2004/05/06 16:52:08 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/cjk-latex/cjk-latex-4.5.2.ebuild,v 1.7 2004/05/10 17:42:42 vapier Exp $
 
-IUSE="doc emacs"
-
-inherit latex-package elisp-common
+inherit latex-package elisp-common gcc
 
 MY_P="${P/-latex/}"
 
@@ -16,9 +14,9 @@ SRC_URI="ftp://ftp.ffii.org/pub/cjk/${MY_P}.tar.gz
 	doc? ( ftp://ftp.ffii.org/pub/cjk/${MY_P}-doc.tar.gz )"
 
 LICENSE="GPL-2"
-
 SLOT="0"
-KEYWORDS="~x86 amd64 ~ppc ~sparc"
+KEYWORDS="~x86 ~ppc ~sparc amd64"
+IUSE="doc emacs"
 
 DEPEND="virtual/tetex
 	emacs? ( virtual/emacs )"
@@ -26,7 +24,6 @@ DEPEND="virtual/tetex
 S=${WORKDIR}/${MY_P}
 
 src_unpack() {
-
 	unpack ${MY_P}.tar.gz
 	use doc && unpack ${MY_P}-doc.tar.gz
 
@@ -43,15 +40,14 @@ src_unpack() {
 }
 
 src_compile() {
-
 	cd utils
 	for d in *conv; do
 		cd $d
 		local f=`echo $d | tr '[:upper:]' '[:lower:]'`
-		${CC} ${CFLAGS} -o $f $f.c || die
+		$(gcc-getCC) ${CFLAGS} -o $f $f.c || die
 		if [ $d = CEFconv ] ; then
-			${CC} ${CFLAGS} -o cef5conv cef5conv.c || die
-			${CC} ${CFLAGS} -o cefsconv cefsconv.c || die
+			$(gcc-getCC) ${CFLAGS} -o cef5conv cef5conv.c || die
+			$(gcc-getCC) ${CFLAGS} -o cefsconv cefsconv.c || die
 		fi
 		cd -
 	done
@@ -61,7 +57,7 @@ src_compile() {
 	make || die
 	cd -
 
-	if [ "`use emacs`" ] ; then
+	if use emacs ; then
 		cd lisp
 		elisp-compile *.el
 		cd emacs-20.3
@@ -79,7 +75,6 @@ src_compile() {
 }
 
 src_install() {
-
 	cd utils
 	for d in *conv; do
 		cd $d
@@ -96,7 +91,7 @@ src_install() {
 	cp -a texinput/* ${D}/${TEXMF}/tex/latex/${PN} || die
 	cp -a contrib/wadalab ${D}/${TEXMF}/tex/latex/${PN} || die
 
-	if [ "`use emacs`" ] ; then
+	if use emacs ; then
 		cd utils/lisp
 		elisp-install ${PN} *.el{,c} emacs-20.3/*.el{,c}
 		cd -
@@ -115,7 +110,7 @@ src_install() {
 	dodoc ChangeLog README doc/*
 	docinto chinese; dodoc doc/chinese/*
 	docinto japanese; dodoc doc/japanese/*
-	if [ "`use doc`" ] ; then
+	if use doc ; then
 		docinto cjk; dodoc doc/cjk/*
 		insinto /usr/share/doc/${P}/dvi
 		doins doc/dvi/*
@@ -124,7 +119,7 @@ src_install() {
 	fi
 
 	docinto examples; dodoc examples/*
-	if [ "`use doc`" ] ; then
+	if use doc ; then
 		docinto examples/cjk; dodoc examples/cjk/*
 		insinto /usr/share/doc/${P}/examples/dvi
 		doins examples/dvi/*
diff --git a/dev-tex/csindex/csindex-2.11c.ebuild b/dev-tex/csindex/csindex-2.11c.ebuild
index 5ca87b85de15..1a79e8707953 100644
--- a/dev-tex/csindex/csindex-2.11c.ebuild
+++ b/dev-tex/csindex/csindex-2.11c.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/dev-tex/csindex/csindex-2.11c.ebuild,v 1.2 2004/04/26 13:58:36 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/csindex/csindex-2.11c.ebuild,v 1.3 2004/05/10 17:43:15 vapier Exp $
+
+inherit gcc
 
 MY_P="${PN}-19980713"
 
@@ -8,21 +10,20 @@ DESCRIPTION="Utility for creating Czech/Slovak-sorted LaTeX index-files"
 HOMEPAGE="http://math.feld.cvut.cz/olsak/cstex/"
 SRC_URI="ftp://math.feld.cvut.cz/pub/cstex/base/${MY_P}.tar.gz"
 
-KEYWORDS="x86"
-SLOT="0"
 LICENSE="MakeIndex"
+SLOT="0"
+KEYWORDS="x86"
 IUSE=""
 
 DEPEND="virtual/glibc"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 src_compile() {
-
-	emake CC="${CC}" CFLAGS="${CFLAGS}" || die "make failed"
+	emake CC="$(gcc-getCC)" CFLAGS="${CFLAGS}" || die "make failed"
 }
 
 src_install() {
-	dobin csindex
+	dobin csindex || die
 	dodoc README
 }
diff --git a/dev-tex/latex2rtf/latex2rtf-1.9.15-r1.ebuild b/dev-tex/latex2rtf/latex2rtf-1.9.15-r1.ebuild
index 131def0e59df..56851c2d8c5b 100644
--- a/dev-tex/latex2rtf/latex2rtf-1.9.15-r1.ebuild
+++ b/dev-tex/latex2rtf/latex2rtf-1.9.15-r1.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex2rtf/latex2rtf-1.9.15-r1.ebuild,v 1.3 2004/05/07 12:14:45 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex2rtf/latex2rtf-1.9.15-r1.ebuild,v 1.4 2004/05/10 17:44:38 vapier Exp $
 
-inherit eutils
-
-IUSE="doc"
+inherit eutils gcc
 
 DESCRIPTION="LaTeX to RTF converter"
 HOMEPAGE="http://latex2rtf.sourceforge.net/"
 SRC_URI="mirror://sourceforge/latex2rtf/${P}.tar.gz"
+
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc"
 SLOT="0"
+IUSE="doc"
 
 DEPEND="virtual/glibc
 	virtual/tetex
@@ -25,7 +25,7 @@ src_unpack() {
 }
 
 src_compile() {
-	emake CC=${CC} || die
+	emake CC=$(gcc-getCC) || die
 }
 
 src_install() {