No more toolchain-funcs.

packages/app-cdr/bin2iso/bin2iso-1.9b.exheres-0

@@ -1,8 +1,6 @@
 # Copyright 2008 Daniel Mierswa <impulze@impulze.org>
 # Distributed under the terms of the GNU General Public License v2
 
-require toolchain-funcs
-
 SUMMARY="BIN -> ISO/WAV Converter"
 DESCRIPTION="
     Convert .bin files into .iso files with a .cue file or try to create .cue
@@ -26,7 +24,7 @@ src_unpack() {
 }
 
 src_compile() {
-    $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o "${SRC}.out" "${FETCHEDDIR}/${SRC}" \
+    "${CC}" ${CFLAGS} ${LDFLAGS} -o "${SRC}.out" "${FETCHEDDIR}/${SRC}" \
         || die "compilation failed"
 }
 

packages/app-emulation/qemu/qemu.exlib

@@ -1,8 +1,6 @@
 # Copyright 2008, 2009 Daniel Mierswa <impulze@impulze.org>
 # Distributed under the terms of the GNU General Public License v2
 
-require toolchain-funcs
-
 export_exlib_phases src_prepare src_configure
 
 SUMMARY="A generic and open source machine emulator and virtualizer."
@@ -68,8 +66,8 @@ qemu_src_configure ()
 
     ./configure \
         --prefix=/usr \
-        --host-cc="$(tc-getBUILD_CC)" \
+        --host-cc="${BUILD_CC}" \
-        --cc="$(tc-getCC)" \
+        --cc="${CC}" \
         --extra-cflags="$CFLAGS" \
         --extra-ldflags="$LDFLAGS" \
         --disable-strip \

packages/app-text/tofrodos/tofrodos-1.7.8.exheres-0

@@ -1,7 +1,7 @@
 # Copyright 2009 Daniel Mierswa <impulze@impulze.org>
 # Distributed under the terms of the GNU General Public License v2
 
-require multilib toolchain-funcs
+require multilib
 
 SUMMARY="Conversion between Unix and MSDOS text files."
 DESCRIPTION="A text file conversion utility that converts ASCII files between
@@ -24,8 +24,8 @@ src_prepare() {
     default
 
     sed \
-        -e "/CC =/s:gcc:$(tc-getCC):" \
+        -e "/CC =/s:gcc:${CC}:" \
-        -e "/LD =/s:gcc:$(tc-getCC):" \
+        -e "/LD =/s:gcc:${CC}:" \
         -e "/CFLAGS =/s:\$(CDEBUG):$CFLAGS:" \
         -e "/LDFLAGS =/s:\$(LDEBUG):$LDFLAGS:" \
         -i Makefile || die "sed Makefile failed"

packages/games-strategy/jaggedalliance2-stracciatella/jaggedalliance2-stracciatella.exlib

@@ -1,8 +1,6 @@
 # Copyright 2009 Daniel Mierswa <impulze@impulze.org>
 # Distributed under the terms of the GNU General Public License v2
 
-require toolchain-funcs
-
 SUMMARY="A tactical role-playing game. Third game of the Jagged Alliance series."
 DESCRIPTION="A very high rated tactical role-playing game with a big community and
 lots of modifications."
@@ -52,7 +50,7 @@ src_prepare() {
     option linguas:pl && ja2_config LNG=POLISH
     option linguas:ru && ja2_config LNG=RUSSIAN
     option linguas:ru_gold && ja2_config LNG=RUSSIAN_GOLD
-    ja2_config CC=$(tc-getCC) CXX=$(tc-getCXX)
+    ja2_config CC="${CC}" CXX="${CXX}"
     ja2_config PREFIX="${IMAGE}/usr" MANPREFIX="${IMAGE}/usr/share"
 }
 

packages/sys-fs/ddrescue/ddrescue-1.11.exheres-0

@@ -1,5 +1,5 @@
 
-require gnu [ suffix=gz ] toolchain-funcs
+require gnu [ suffix=gz ]
 
 SUMMARY="Data recovery tool trying to rescue as much as possible."
 
@@ -11,8 +11,8 @@ MYOPTIONS=""
 DEPENDENCIES=""
 
 DEFAULT_SRC_CONFIGURE_PARAMS=(
-    CC=$(tc-getCC)
+    CC="${CC}"
-    CXX=$(tc-getCXX)
+    CXX="${CXX}"
     CPPFLAGS=${CPPFLAGS}
     CFLAGS=${CFLAGS}
     CXXFLAGS=${CXXFLAGS}

packages/sys-libs/uClibc/uClibc.exlib

@@ -1,8 +1,6 @@
 # Copyright 2008 Daniel Mierswa <impulze@impulze.org>
 # Distributed under the terms of the GNU General Public License v2
 
-require toolchain-funcs
-
 SUMMARY="A C library for developing embedded Linux systems."
 DESCRIPTION="A small C library that runs on standard Linux and MMU-less (also
     known as µClinux) systems with support for alpha, amd64, ARM, Blackfin,
@@ -25,10 +23,10 @@ src_compile() {
     make defconfig
 
     make \
-        CC=$(tc-getCC) \
+        CC="${CC}" \
-        AR=$(tc-getAR) \
+        AR="${AR}" \
-        LD=$(tc-getLD) \
+        LD="${LD}" \
-        NM=$(tc-getNM) \
+        NM="${NM}" \
-        HOSTCC=$(tc-getBUILD_CC)
+        HOSTCC="${BUILD_CC}"
 }