Version bumped.

6 files changed, 90 insertions, 70 deletions

diff --git a/app-text/xdvik/ChangeLog b/app-text/xdvik/ChangeLog
index 2ac4fcdb32f9..6196366e3d73 100644
--- a/app-text/xdvik/ChangeLog
+++ b/app-text/xdvik/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/xdvik
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.7 2004/03/07 21:54:30 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.8 2004/05/05 11:29:01 usata Exp $
+
+*xdvik-22.40y-r2 (05 May 2004)
+
+  05 May 2004; Mamoru KOMACHI <usata@gentoo.org> xdvik-22.40y-r2.ebuild,
+  xdvik-22.40y.ebuild:
+  Version bumped.
 
   07 Mar 2004; Jon Portnoy <avenj@gentoo.org> xdvik-22.40y-r1.ebuild :
   AMD64 keywords.
diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest
index 1477f6ee674d..82e034413b6c 100644
--- a/app-text/xdvik/Manifest
+++ b/app-text/xdvik/Manifest
@@ -1,7 +1,9 @@
+MD5 59799c8668d2092d9d17f27003ccf853 xdvik-22.82.ebuild 1631
+MD5 5c62cb7af35ca77cc0a34a9711d32bdd xdvik-22.40y-r1.ebuild 1573
 MD5 042a788a55025df322f18ab9f7f2e8a0 ChangeLog 1244
 MD5 e94683fd6e8552de7f9cc96d8c1110ec metadata.xml 432
-MD5 5c62cb7af35ca77cc0a34a9711d32bdd xdvik-22.40y-r1.ebuild 1573
-MD5 bb6beea5d8afcbd0cbd432cc540e6086 xdvik-22.40y.ebuild 1351
-MD5 7605fd292b3cac2b9e0e4372ff8e1277 files/digest-xdvik-22.40y 137
-MD5 7605fd292b3cac2b9e0e4372ff8e1277 files/digest-xdvik-22.40y-r1 137
+MD5 cf2de188325a6ebafb29d715491f1538 xdvik-22.40y-r2.ebuild 1646
 MD5 8fce9c0c7ca3de1b6fed369d696f85fb files/xdvik-22.40y-j1.17-vfontcap-gentoo.diff 2626
+MD5 0f29e6fdaea95c7b98281c4789d5d4c4 files/digest-xdvik-22.82 140
+MD5 7605fd292b3cac2b9e0e4372ff8e1277 files/digest-xdvik-22.40y-r1 137
+MD5 ef28316e4f45cb7762b5ec33efe38f61 files/digest-xdvik-22.40y-r2 139
diff --git a/app-text/xdvik/files/digest-xdvik-22.40y b/app-text/xdvik/files/digest-xdvik-22.40y
deleted file mode 100644
index 9669e8fa7e52..000000000000
--- a/app-text/xdvik/files/digest-xdvik-22.40y
+++ /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/digest-xdvik-22.40y-r2 b/app-text/xdvik/files/digest-xdvik-22.40y-r2
new file mode 100644
index 000000000000..9c66bb81b763
--- /dev/null
+++ b/app-text/xdvik/files/digest-xdvik-22.40y-r2
@@ -0,0 +1,2 @@
+MD5 ab9083c9580e215715dc0369db3c028b xdvik-22.40y1.tar.gz 2256174
+MD5 9ce0615764079502f3b76692127a068a xdvik-22.40y1-j1.21.patch.gz 166908
diff --git a/app-text/xdvik/xdvik-22.40y-r2.ebuild b/app-text/xdvik/xdvik-22.40y-r2.ebuild
new file mode 100644
index 000000000000..ad732130dc1c
--- /dev/null
+++ b/app-text/xdvik/xdvik-22.40y-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2004 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-r2.ebuild,v 1.1 2004/05/05 11:29:01 usata Exp $
+
+inherit eutils
+
+IUSE="cjk libwww"
+
+MY_P="${P}1"
+XDVIK_JP="${MY_P}-j1.21"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="DVI previewer for X Window System"
+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"
+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 ${MY_P}.tar.gz
+	if [ -n "`use cjk`" ] ; then
+		epatch ${DISTDIR}/${XDVIK_JP}.patch.gz
+		sed -i -e "/\/usr\/local/s/^/%/g" \
+			-e "/kochi-.*-subst/s/%//g" \
+			${S}/texk/xdvik/vfontmap.freetype || die
+	fi
+}
+
+src_compile () {
+
+	local myconf
+
+	if [ -n "`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 [ -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
deleted file mode 100644
index 59a8e6011620..000000000000
--- a/app-text/xdvik/xdvik-22.40y.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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.4 2003/09/08 17:02:24 usata Exp $
-
-inherit eutils
-
-IUSE="cjk libwww"
-
-XDVIK_PATCH="${P}-j1.17.patch.gz"
-
-DESCRIPTION="DVI previewer for X Window System"
-SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz
-	cjk? ( mirror://gentoo/${XDVIK_PATCH} )"
-HOMEPAGE="http://sourceforge.net/projects/xdvi/"
-
-KEYWORDS="x86 alpha ~ppc ~sparc"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND=">=media-libs/t1lib-1.3
-	app-text/ptex
-	!app-text/tetex
-	virtual/x11
-	cjk? ( =media-libs/vflib-2* )
-	libwww? ( >=net-libs/libwww-5.3.2-r1 )"
-
-src_unpack () {
-
-	unpack ${P}.tar.gz
-	use cjk && epatch ${DISTDIR}/${XDVIK_PATCH}
-}
-
-src_compile () {
-
-	local myconf
-
-	use libwww && myconf="--with-system-wwwlib"
-
-	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
-}