Defaults to use Xft2. Marked previous revision stable on x86 and alpha

6 files changed, 147 insertions, 6 deletions

diff --git a/app-text/xdvik/ChangeLog b/app-text/xdvik/ChangeLog
index 0e0c2dd9387e..b329d7bf18aa 100644
--- a/app-text/xdvik/ChangeLog
+++ b/app-text/xdvik/ChangeLog
@@ -1,9 +1,18 @@
 # ChangeLog for app-text/xdvik
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.2 2003/07/26 16:36:52 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.3 2003/08/18 13:55:01 usata Exp $
+
+*xdvik-22.40y-r1 (18 Aug 2003)
+
+  18 Aug 2003; Mamoru KOMACHI <usata@gentoo.org> xdvik-22.40y-r1.ebuild,
+  files/xdvik-22.40y-j1.17-vfontcap-gentoo.diff:
+  Defaults to use Xft2 rather than VFlib2
 
 *xdvik-22.40y (27 Jul 2003)
 
+  18 Aug 2003; Mamoru KOMACHI <usata@gentoo.org> xdvik-22.40y.ebuild:
+  Marked stable on x86 and alpha
+
   27 Jul 2003; Mamoru KOMACHI <usata@gentoo.org> xdvik-22.40y.ebuild:
   Initial import, closing bug #23130
   Great thanks to Timmy Douglas <timmy+gentoo@cc.gatech.edu> for
diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest
index 4ce6eb4bed34..a9dfcdb50016 100644
--- a/app-text/xdvik/Manifest
+++ b/app-text/xdvik/Manifest
@@ -1,6 +1,6 @@
-MD5 43bcb8f43f7e1d24cedb7077fc4e92ba xdvik-22.40y.ebuild 1337
-MD5 ec35af9bfec12ab1cab90c999cdccb51 ChangeLog 444
-MD5 4ca2bf76caf7e5b1d1e049d4a6e0a90e xdvik-22.40y-r1.ebuild 1535
+MD5 fbcba483120f942d5bce61b19b951670 xdvik-22.40y.ebuild 1335
+MD5 70d61861f02e5ac3259ac603b305fbd2 ChangeLog 745
+MD5 795eb53945b5d05e42951af750caf7f0 xdvik-22.40y-r1.ebuild 1538
 MD5 7605fd292b3cac2b9e0e4372ff8e1277 files/digest-xdvik-22.40y 137
 MD5 8fce9c0c7ca3de1b6fed369d696f85fb files/xdvik-22.40y-j1.17-vfontcap-gentoo.diff 2626
 MD5 7605fd292b3cac2b9e0e4372ff8e1277 files/digest-xdvik-22.40y-r1 137
diff --git a/app-text/xdvik/files/digest-xdvik-22.40y-r1 b/app-text/xdvik/files/digest-xdvik-22.40y-r1
new file mode 100644
index 000000000000..9669e8fa7e52
--- /dev/null
+++ b/app-text/xdvik/files/digest-xdvik-22.40y-r1
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 000000000000..801aed89eb8d
--- /dev/null
+++ b/app-text/xdvik/files/xdvik-22.40y-j1.17-vfontcap-gentoo.diff
@@ -0,0 +1,63 @@
+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
new file mode 100644
index 000000000000..c7b57526558d
--- /dev/null
+++ b/app-text/xdvik/xdvik-22.40y-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.1 2003/08/18 13:55:01 usata 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"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND=">=media-libs/t1lib-1.3
+	virtual/tetex
+	virtual/x11
+	cjk? ( media-fonts/kochi-substitute )
+	libwww? ( >=net-libs/libwww-5.3.2-r1 )"
+
+src_unpack () {
+
+	unpack ${P}.tar.gz
+	if [ -n "`use cjk`" ] ; then
+		epatch ${DISTDIR}/${XDVIK_JP}.patch.gz
+		epatch ${FILESDIR}/${XDVIK_JP}-vfontcap-gentoo.diff
+	fi
+}
+
+src_compile () {
+
+	local myconf
+
+	use libwww && myconf="--with-system-wwwlib"
+	use cjk && myconf="${myconf} --with-vflib=vf2ft" \
+		&& export CPPFLAGS="${CPPFLAGS} -I/usr/include/freetype2"
+
+	econf --enable-xdvietcdir=/usr/share/texmf/xdvi \
+		--disable-multiplatform \
+		--with-system-t1lib \
+		${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 [ -n "`use cjk`" ]; then
+		dodoc CHANGES.xdvik-jp 
+		docinto READMEs
+		dodoc READMEs/*
+	fi
+}
diff --git a/app-text/xdvik/xdvik-22.40y.ebuild b/app-text/xdvik/xdvik-22.40y.ebuild
index 2748a8d92206..32ead6807354 100644
--- a/app-text/xdvik/xdvik-22.40y.ebuild
+++ b/app-text/xdvik/xdvik-22.40y.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.40y.ebuild,v 1.1 2003/07/26 16:31:11 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.40y.ebuild,v 1.2 2003/08/18 13:55:01 usata Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz
 	cjk? ( mirror://gentoo/${XDVIK_PATCH} )"
 HOMEPAGE="http://sourceforge.net/projects/xdvi/"
 
-KEYWORDS="~x86 ~alpha ~ppc ~sparc"
+KEYWORDS="x86 alpha ~ppc ~sparc"
 SLOT="0"
 LICENSE="GPL-2"