Changed DEPEND. Marked as stable for x86 and alpha.

5 files changed, 32 insertions, 17 deletions

diff --git a/app-text/xdvik/ChangeLog b/app-text/xdvik/ChangeLog
index b329d7bf18aa..7d1b4e95551f 100644
--- a/app-text/xdvik/ChangeLog
+++ b/app-text/xdvik/ChangeLog
@@ -1,9 +1,13 @@
 # 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.3 2003/08/18 13:55:01 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.4 2003/09/08 17:02:23 usata Exp $
 
 *xdvik-22.40y-r1 (18 Aug 2003)
 
+  09 Sep 2003; Mamoru KOMACHI <usata@gentoo.org> xdvik-22.40y-r1.ebuild,
+  xdvik-22.40y.ebuild:
+  Changed to DEPEND only on ptex (app-text/tetex contains xdvi binary)
+
   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
diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest
index 6239dc72b15f..22221bec6a1f 100644
--- a/app-text/xdvik/Manifest
+++ b/app-text/xdvik/Manifest
@@ -1,6 +1,7 @@
-MD5 70d61861f02e5ac3259ac603b305fbd2 ChangeLog 745
-MD5 a839b2736e662226ffe07dbc1a998793 xdvik-22.40y.ebuild 1337
-MD5 4f482c123fd36bbce7c5c4a6e43d897c xdvik-22.40y-r1.ebuild 1540
+MD5 bb6beea5d8afcbd0cbd432cc540e6086 xdvik-22.40y.ebuild 1351
+MD5 0435e4bb80765ad6080e307be54b710a metadata.xml 316
+MD5 19edd5ebfc4c709d0495cf85a32a49db ChangeLog 913
+MD5 32548f7cc9155e9ba5bc90d5f5f70dae xdvik-22.40y-r1.ebuild 1508
 MD5 7605fd292b3cac2b9e0e4372ff8e1277 files/digest-xdvik-22.40y 137
-MD5 7605fd292b3cac2b9e0e4372ff8e1277 files/digest-xdvik-22.40y-r1 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/metadata.xml b/app-text/xdvik/metadata.xml
new file mode 100644
index 000000000000..aa2ccd6ec6cb
--- /dev/null
+++ b/app-text/xdvik/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>cjk</herd>
+<longdescription>
+XDVIK is a dvi previewer on X with kpathsea support.  It also supports
+multibyte character rendering via Xft2 (or VFlib2).
+</longdescription>
+</pkgmetadata>
diff --git a/app-text/xdvik/xdvik-22.40y-r1.ebuild b/app-text/xdvik/xdvik-22.40y-r1.ebuild
index 18233ae79a0d..f0d2774d95eb 100644
--- a/app-text/xdvik/xdvik-22.40y-r1.ebuild
+++ b/app-text/xdvik/xdvik-22.40y-r1.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-r1.ebuild,v 1.2 2003/09/05 22:37:22 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.40y-r1.ebuild,v 1.3 2003/09/08 17:02:24 usata Exp $
 
 inherit eutils
 
@@ -13,12 +13,13 @@ 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"
+KEYWORDS="x86 alpha ~ppc ~sparc"
 SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND=">=media-libs/t1lib-1.3
-	virtual/tetex
+	app-text/ptex
+	!app-text/tetex
 	virtual/x11
 	cjk? ( media-fonts/kochi-substitute )
 	libwww? ( >=net-libs/libwww-5.3.2-r1 )"
@@ -34,16 +35,14 @@ src_unpack () {
 
 src_compile () {
 
-	local myconf
-
-	use libwww && myconf="--with-system-wwwlib"
-	use cjk && myconf="${myconf} --with-vflib=vf2ft" \
-		&& export CPPFLAGS="${CPPFLAGS} -I/usr/include/freetype2"
+	use cjk && export CPPFLAGS="${CPPFLAGS} -I/usr/include/freetype2"
 
 	econf --enable-xdvietcdir=/usr/share/texmf/xdvi \
 		--disable-multiplatform \
 		--with-system-t1lib \
-		${myconf} || die "econf failed"
+		`use_with libwww system-wwwlib` \
+		`use_with cjk vflib=vf2ft` \
+		|| die "econf failed"
 
 	cd texk/xdvik
 	make || die
@@ -56,7 +55,8 @@ src_install () {
 
 	cd ${S}/texk/xdvik
 	einstall texmf=${D}/usr/share/texmf \
-		XDVIETCDIR=${D}/usr/share/texmf/xdvi || die "install failed"
+		XDVIETCDIR=${D}/usr/share/texmf/xdvi \
+		|| die "install failed"
 
 	dodoc ANNOUNCE BUGS FAQ README.*
 	if [ -n "`use cjk`" ]; then
diff --git a/app-text/xdvik/xdvik-22.40y.ebuild b/app-text/xdvik/xdvik-22.40y.ebuild
index 41e9ba8f5148..59a8e6011620 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.3 2003/09/05 22:37:22 msterret Exp $
+# $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
 
@@ -18,7 +18,8 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND=">=media-libs/t1lib-1.3
-	virtual/tetex
+	app-text/ptex
+	!app-text/tetex
 	virtual/x11
 	cjk? ( =media-libs/vflib-2* )
 	libwww? ( >=net-libs/libwww-5.3.2-r1 )"