use toolchain-funcs.eclass instead of gcc.eclass

(Portage version: 2.0.51.19)

5 files changed, 10 insertions, 55 deletions

diff --git a/app-i18n/nkf/files/digest-nkf-2.0.5 b/app-i18n/nkf/files/digest-nkf-2.0.5
deleted file mode 100644
index 47552ab72d5e..000000000000
--- a/app-i18n/nkf/files/digest-nkf-2.0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e34d936b20aaf581da5759fbaf0438f3 nkf205.tar.gz 149809
diff --git a/app-i18n/nkf/nkf-2.0.2-r1.ebuild b/app-i18n/nkf/nkf-2.0.2-r1.ebuild
index ef1828a7fd24..43cfa908459e 100644
--- a/app-i18n/nkf/nkf-2.0.2-r1.ebuild
+++ b/app-i18n/nkf/nkf-2.0.2-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/nkf-2.0.2-r1.ebuild,v 1.11 2005/03/21 07:00:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/nkf-2.0.2-r1.ebuild,v 1.12 2005/05/15 18:48:11 usata Exp $
 
-inherit gcc perl-module
+inherit toolchain-funcs perl-module
 
 MY_P="${PN}${PV//./}"
 DESCRIPTION="Network Kanji code conversion Filter with UTF-8/16 support"
@@ -19,7 +19,7 @@ DEPEND="virtual/libc"
 S=${WORKDIR}/${MY_P}
 
 src_compile() {
-	emake CC="$(gcc-getCC)" CFLAGS="${CFLAGS}" nkf || die
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" nkf || die
 	if use perl; then
 		cd ${S}/NKF.mod
 		perl-module_src_compile
diff --git a/app-i18n/nkf/nkf-2.0.4.ebuild b/app-i18n/nkf/nkf-2.0.4.ebuild
index b84390eafadf..1eb692e45e61 100644
--- a/app-i18n/nkf/nkf-2.0.4.ebuild
+++ b/app-i18n/nkf/nkf-2.0.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/nkf-2.0.4.ebuild,v 1.12 2005/03/21 07:00:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/nkf-2.0.4.ebuild,v 1.13 2005/05/15 18:48:11 usata Exp $
 
-inherit gcc perl-module
+inherit toolchain-funcs perl-module
 
 MY_P="${PN}${PV//./}"
 DESCRIPTION="Network Kanji code conversion Filter with UTF-8/16 support"
@@ -19,7 +19,7 @@ DEPEND="virtual/libc"
 S=${WORKDIR}/${MY_P}
 
 src_compile() {
-	emake CC="$(gcc-getCC)" CFLAGS="${CFLAGS}" nkf || die
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" nkf || die
 	if use perl; then
 		cd ${S}/NKF.mod
 		perl-module_src_compile
diff --git a/app-i18n/nkf/nkf-2.0.5-r1.ebuild b/app-i18n/nkf/nkf-2.0.5-r1.ebuild
index b6c4ccbf5484..a16e754e6d91 100644
--- a/app-i18n/nkf/nkf-2.0.5-r1.ebuild
+++ b/app-i18n/nkf/nkf-2.0.5-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/nkf-2.0.5-r1.ebuild,v 1.2 2005/05/12 19:00:56 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/nkf-2.0.5-r1.ebuild,v 1.3 2005/05/15 18:48:11 usata Exp $
 
-inherit gcc eutils perl-module distutils
+inherit toolchain-funcs eutils perl-module distutils
 
 MY_P="${PN}${PV//./}"
 DESCRIPTION="Network Kanji code conversion Filter with UTF-8/16 support"
@@ -19,7 +19,7 @@ DEPEND="virtual/libc"
 S=${WORKDIR}/${MY_P}
 
 src_compile() {
-	emake CC="$(gcc-getCC)" CFLAGS="${CFLAGS}" nkf || die
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" nkf || die
 	if use perl; then
 		cd ${S}/NKF.mod
 		perl-module_src_compile
@@ -30,7 +30,7 @@ src_compile() {
 		epatch ${FILESDIR}/nkf-python.patch
 		cd ${S}/NKF.python
 		distutils_src_compile
-		distutils_src_test
+		src_test
 	fi
 }
 
diff --git a/app-i18n/nkf/nkf-2.0.5.ebuild b/app-i18n/nkf/nkf-2.0.5.ebuild
deleted file mode 100644
index adbdae0901ee..000000000000
--- a/app-i18n/nkf/nkf-2.0.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/nkf-2.0.5.ebuild,v 1.1 2005/04/11 22:43:30 matsuu Exp $
-
-inherit gcc perl-module
-
-MY_P="${PN}${PV//./}"
-DESCRIPTION="Network Kanji code conversion Filter with UTF-8/16 support"
-HOMEPAGE="http://sourceforge.jp/projects/nkf/"
-SRC_URI="http://www01.tcp-ip.or.jp/~furukawa/nkf_utf8/${MY_P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ppc64 ~ia64"
-IUSE="perl cjk"
-
-DEPEND="virtual/libc"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	emake CC="$(gcc-getCC)" CFLAGS="${CFLAGS}" nkf || die
-	if use perl; then
-		cd ${S}/NKF.mod
-		perl-module_src_compile
-		perl-module_src_test
-	fi
-}
-
-src_install() {
-	dobin nkf || die
-	doman nkf.1
-	if use cjk; then
-		dodir /usr/share/man/ja/man1
-		insinto /usr/share/man/ja/man1
-		./nkf -e nkf.1j > nkf.1
-		doins nkf.1
-	fi
-	dodoc INSTALL* nkf.doc
-	if use perl; then
-		cd ${S}/NKF.mod
-		perl-module_src_install
-	fi
-}