Changed gcc.eclass to toolchain-funcs.eclass and fixed bug #70010.

5 files changed, 21 insertions, 51 deletions

diff --git a/dev-tex/latex2rtf/ChangeLog b/dev-tex/latex2rtf/ChangeLog
index 6b57f8d0bd0f..6a0809e19c76 100644
--- a/dev-tex/latex2rtf/ChangeLog
+++ b/dev-tex/latex2rtf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tex/latex2rtf
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex2rtf/ChangeLog,v 1.10 2004/09/28 05:32:26 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex2rtf/ChangeLog,v 1.11 2004/11/06 08:11:08 usata Exp $
+
+  06 Nov 2004; Mamoru KOMACHI <usata@gentoo.org>
+  -latex2rtf-1.9.15-r1.ebuild, latex2rtf-1.9.15-r2.ebuild:
+  Changed gcc.eclass to toolchain-funcs.eclass and fixed bug #70010.
 
 *latex2rtf-1.9.15-r2 (28 Sep 2004)
 
diff --git a/dev-tex/latex2rtf/Manifest b/dev-tex/latex2rtf/Manifest
index fb2bdef51abc..f3c7e60da399 100644
--- a/dev-tex/latex2rtf/Manifest
+++ b/dev-tex/latex2rtf/Manifest
@@ -1,9 +1,17 @@
-MD5 320ff8bc22c39e17a9123085001a6cab ChangeLog 1643
-MD5 90996d40e257dcaa4098855a5e603050 latex2rtf-1.9.15-r2.ebuild 1045
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 72509bb5de730d14324dd068bb311b91 ChangeLog 1821
+MD5 7a489ca36b62cb481deaeb76a7800344 latex2rtf-1.9.15-r2.ebuild 1068
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-MD5 a45bee43bcfb6dbf18205d50980d37ee latex2rtf-1.9.15-r1.ebuild 1005
-MD5 0cd549e56f3f8b6d885f04ee983d8661 files/digest-latex2rtf-1.9.15-r1 68
 MD5 5c38ae853a717a1ba595c9b1c29b570b files/latex2rtf-Makefile-gentoo.diff 2211
 MD5 8bfc1664436da66fbf401f933c853ff6 files/latex2rtf-1.9.15-direntry.patch 1179
 MD5 ef5b6998b580eb0f55b60c794ab72215 files/latex2rtf-1.9.15-definitions.c.diff 1349
 MD5 0cd549e56f3f8b6d885f04ee983d8661 files/digest-latex2rtf-1.9.15-r2 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBjIWjVWNWqTUmv+0RAsIpAJ9OYXo6Z1rjClH97rDynqA7bsG31gCeOv/Y
+7GO7b5NgHbDBafrPDDtD/K8=
+=VAii
+-----END PGP SIGNATURE-----
diff --git a/dev-tex/latex2rtf/files/digest-latex2rtf-1.9.15-r1 b/dev-tex/latex2rtf/files/digest-latex2rtf-1.9.15-r1
deleted file mode 100644
index 64ea060bdc7b..000000000000
--- a/dev-tex/latex2rtf/files/digest-latex2rtf-1.9.15-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5aa723f290aa745ee3a37c3814901956 latex2rtf-1.9.15.tar.gz 605467
diff --git a/dev-tex/latex2rtf/latex2rtf-1.9.15-r1.ebuild b/dev-tex/latex2rtf/latex2rtf-1.9.15-r1.ebuild
deleted file mode 100644
index 8420966691fa..000000000000
--- a/dev-tex/latex2rtf/latex2rtf-1.9.15-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.7 2004/08/27 23:06:43 kugelfang Exp $
-
-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 ~amd64"
-SLOT="0"
-IUSE="doc"
-
-DEPEND="virtual/libc
-	virtual/tetex
-	media-gfx/imagemagick"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-Makefile-gentoo.diff
-	epatch ${FILESDIR}/${P}-direntry.patch
-}
-
-src_compile() {
-	emake CC=$(gcc-getCC) || die
-}
-
-src_install() {
-	PREFIX=${D}/usr make -e install || die
-	dodoc README doc/latex2rtf.txt
-	# if doc is not used, only the text version is intalled.
-	if use doc; then
-		dohtml doc/latex2rtf.html
-		dodoc doc/latex2rtf.pdf doc/latex2rtf.txt
-		sed -i "s/\r/\n/g" doc/latex2rtf.info
-		doinfo doc/latex2rtf.info
-	fi
-}
diff --git a/dev-tex/latex2rtf/latex2rtf-1.9.15-r2.ebuild b/dev-tex/latex2rtf/latex2rtf-1.9.15-r2.ebuild
index fac145fc0683..09e3f36dde9a 100644
--- a/dev-tex/latex2rtf/latex2rtf-1.9.15-r2.ebuild
+++ b/dev-tex/latex2rtf/latex2rtf-1.9.15-r2.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/dev-tex/latex2rtf/latex2rtf-1.9.15-r2.ebuild,v 1.1 2004/09/28 05:32:26 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex2rtf/latex2rtf-1.9.15-r2.ebuild,v 1.2 2004/11/06 08:11:08 usata Exp $
 
-inherit eutils gcc
+inherit eutils toolchain-funcs
 
 DESCRIPTION="LaTeX to RTF converter"
 HOMEPAGE="http://latex2rtf.sourceforge.net/"
@@ -26,11 +26,11 @@ src_unpack() {
 }
 
 src_compile() {
-	emake CC=$(gcc-getCC) || die
+	emake CC=$(tc-getCC) || die
 }
 
 src_install() {
-	PREFIX=${D}/usr make -e install || die
+	make PREFIX=${D}/usr CC=$(tc-getCC) install || die
 	dodoc README doc/latex2rtf.txt
 	# if doc is not used, only the text version is intalled.
 	if use doc; then