Added all arches from tetex-2.0.2-r3.

5 files changed, 10 insertions, 142 deletions

diff --git a/app-text/xdvik/ChangeLog b/app-text/xdvik/ChangeLog
index ec160c066eed..fd832cdee663 100644
--- a/app-text/xdvik/ChangeLog
+++ b/app-text/xdvik/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/xdvik
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.16 2004/10/16 10:26:48 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.17 2004/10/17 01:59:48 usata Exp $
+
+  17 Oct 2004; Mamoru KOMACHI <usata@gentoo.org>
+  -files/xdvik-22.40y-j1.17-vfontcap-gentoo.diff, -xdvik-22.40y-r1.ebuild,
+  xdvik-22.40y-r2.ebuild:
+  Added all arches from tetex-2.0.2-r3.
 
 *xdvik-22.84.3 (16 Oct 2004)
 
diff --git a/app-text/xdvik/files/digest-xdvik-22.40y-r1 b/app-text/xdvik/files/digest-xdvik-22.40y-r1
deleted file mode 100644
index 9669e8fa7e52..000000000000
--- a/app-text/xdvik/files/digest-xdvik-22.40y-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4623886baf11e26566699bc60f93aabf xdvik-22.40y.tar.gz 2255606
-MD5 bb7ee652fbfd502444f929401802b9b9 xdvik-22.40y-j1.17.patch.gz 189833
diff --git a/app-text/xdvik/files/xdvik-22.40y-j1.17-vfontcap-gentoo.diff b/app-text/xdvik/files/xdvik-22.40y-j1.17-vfontcap-gentoo.diff
deleted file mode 100644
index 801aed89eb8d..000000000000
--- a/app-text/xdvik/files/xdvik-22.40y-j1.17-vfontcap-gentoo.diff
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -urN xdvik-22.40y-j1.17/texk/xdvik/vfontmap.sample xdvik-22.40y/texk/xdvik/vfontmap.sample
---- xdvik-22.40y-j1.17/texk/xdvik/vfontmap.sample	2003-08-18 22:26:35.000000000 +0900
-+++ xdvik-22.40y/texk/xdvik/vfontmap.sample	2003-08-18 22:25:31.000000000 +0900
-@@ -1,31 +1,34 @@
-+#
-+# Sample vfontmap entry
-+#
- 
--min	min     # for ASCII
--nmin	min     # for ASCII
--goth	goth    # for ASCII
--ngoth	goth    # for ASCII
--jis	min	# for JIS
--jisg	goth	# for JIS
--dm	min     # for NTT
--dg	goth    # for NTT
--
--mgoth	maru
--fmin	fmin
--fgoth	goth
-+#min	min     # for ASCII
-+#nmin	min     # for ASCII
-+#goth	goth    # for ASCII
-+#ngoth	goth    # for ASCII
-+#jis	min	# for JIS
-+#jisg	goth	# for JIS
-+#dm	min     # for NTT
-+#dg	goth    # for NTT
-+#
-+#mgoth	maru
-+#fmin	fmin
-+#fgoth	goth
- 
- #  --with-vflib=vf2ft
--# min     /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf
--# nmin    /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf
--# goth    /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf
--# tmin    /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf
--# tgoth   /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf
--# ngoth   /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf
--# jis     /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf
--# jisg    /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf
--# dm      /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W3.otf  # not checked
--# dg      /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W6.otf # not checked
--# mgoth   /usr/local/share/texmf/dvipdfm/CIDFont/HiraMaruPro-W4.otf
--# fmin    /usr/local/share/texmf/dvipdfm/CIDFont/HiraMinPro-W6.otf
--# fgoth   /usr/local/share/texmf/dvipdfm/CIDFont/HiraKakuPro-W8.otf
-+min     /usr/X11R6/lib/X11/fonts/truetype/kochi-mincho-subst.ttf
-+nmin    /usr/X11R6/lib/X11/fonts/truetype/kochi-mincho-subst.ttf
-+goth    /usr/X11R6/lib/X11/fonts/truetype/kochi-gothic-subst.ttf
-+tmin    /usr/X11R6/lib/X11/fonts/truetype/kochi-mincho-subst.ttf
-+tgoth   /usr/X11R6/lib/X11/fonts/truetype/kochi-gothic-subst.ttf
-+ngoth   /usr/X11R6/lib/X11/fonts/truetype/kochi-gothic-subst.ttf
-+jis     /usr/X11R6/lib/X11/fonts/truetype/kochi-mincho-subst.ttf
-+jisg    /usr/X11R6/lib/X11/fonts/truetype/kochi-gothic-subst.ttf
-+dm      /usr/X11R6/lib/X11/fonts/truetype/kochi-mincho-subst.ttf
-+dg      /usr/X11R6/lib/X11/fonts/truetype/kochi-gothic-subst.ttf
-+mgoth   /usr/X11R6/lib/X11/fonts/truetype/kochi-gothic-subst.ttf
-+fmin    /usr/X11R6/lib/X11/fonts/truetype/kochi-mincho-subst.ttf
-+fgoth   /usr/X11R6/lib/X11/fonts/truetype/kochi-gothic-subst.ttf
- 
- # UTF package (needed --with-vflib=vf2ft)
- #
diff --git a/app-text/xdvik/xdvik-22.40y-r1.ebuild b/app-text/xdvik/xdvik-22.40y-r1.ebuild
deleted file mode 100644
index b8112b08e220..000000000000
--- a/app-text/xdvik/xdvik-22.40y-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.40y-r1.ebuild,v 1.9 2004/06/24 22:56:29 agriffis Exp $
-
-inherit eutils
-
-IUSE="cjk libwww"
-
-XDVIK_JP="${P}-j1.17"
-
-DESCRIPTION="DVI previewer for X Window System"
-SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz
-	cjk? ( mirror://gentoo/${XDVIK_JP}.patch.gz )"
-HOMEPAGE="http://sourceforge.net/projects/xdvi/"
-
-KEYWORDS="x86 alpha ppc sparc amd64"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND=">=media-libs/t1lib-1.3
-	app-text/ptex
-	!app-text/tetex
-	virtual/x11
-	cjk? ( media-fonts/kochi-substitute )
-	libwww? ( >=net-libs/libwww-5.3.2-r1 )"
-
-src_unpack () {
-
-	unpack ${P}.tar.gz
-	if use cjk ; then
-		epatch ${DISTDIR}/${XDVIK_JP}.patch.gz
-		epatch ${FILESDIR}/${XDVIK_JP}-vfontcap-gentoo.diff
-	fi
-}
-
-src_compile () {
-
-	local myconf
-
-	if use cjk ; then
-		 export CPPFLAGS="${CPPFLAGS} -I/usr/include/freetype2"
-		 myconf="${myconf} --with-vflib=vf2ft"
-	fi
-
-	econf --enable-xdvietcdir=/usr/share/texmf/xdvi \
-		--disable-multiplatform \
-		--with-system-t1lib \
-		`use_with libwww system-wwwlib` \
-		${myconf} || die "econf failed"
-
-	cd texk/xdvik
-	make || die
-}
-
-src_install () {
-
-	dodir /usr/share/texmf/xdvi
-	dodir /usr/share/man/man1
-
-	cd ${S}/texk/xdvik
-	einstall texmf=${D}/usr/share/texmf \
-		XDVIETCDIR=${D}/usr/share/texmf/xdvi \
-		|| die "install failed"
-
-	dodoc ANNOUNCE BUGS FAQ README.*
-	if use cjk; then
-		dodoc CHANGES.xdvik-jp
-		docinto READMEs
-		dodoc READMEs/*
-	fi
-}
diff --git a/app-text/xdvik/xdvik-22.40y-r2.ebuild b/app-text/xdvik/xdvik-22.40y-r2.ebuild
index 9e4debeb1dff..aedffb49ff4d 100644
--- a/app-text/xdvik/xdvik-22.40y-r2.ebuild
+++ b/app-text/xdvik/xdvik-22.40y-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.40y-r2.ebuild,v 1.8 2004/10/16 10:26:48 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.40y-r2.ebuild,v 1.9 2004/10/17 01:59:48 usata Exp $
 
 inherit eutils
 
@@ -15,15 +15,14 @@ SRC_URI="mirror://sourceforge/xdvi/${MY_P}.tar.gz
 	cjk? ( http://www.nn.iij4u.or.jp/~tutimura/tex/${XDVIK_JP}.patch.gz )"
 HOMEPAGE="http://sourceforge.net/projects/xdvi/"
 
-KEYWORDS="x86 alpha ppc sparc ~amd64 ppc64"
+KEYWORDS="x86 alpha amd64 arm hppa ia64 macos ppc ppc64 ppc-macos sparc"
 SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND=">=media-libs/t1lib-1.3
-	app-text/ptex
-	!app-text/tetex
 	virtual/x11
-	cjk? ( media-fonts/kochi-substitute )
+	virtual/tetex
+	cjk? ( >=media-libs/freetype-2 )
 	libwww? ( >=net-libs/libwww-5.3.2-r1 )"
 
 src_unpack () {