New version

7 files changed, 23 insertions, 65 deletions

diff --git a/app-text/wv/ChangeLog b/app-text/wv/ChangeLog
index 1a613b736c9e..71842e8f8862 100644
--- a/app-text/wv/ChangeLog
+++ b/app-text/wv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/wv
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wv/ChangeLog,v 1.12 2003/08/30 12:43:27 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wv/ChangeLog,v 1.13 2003/09/13 16:02:04 foser Exp $
+
+*wv-1.0.0 (13 Sep 2003)
+
+  13 Sep 2003; foser <foser@gentoo.org> wv-1.0.0.ebuild :
+  New version, added xml2 USE flag and minor cleanups
 
   30 Aug 2003; Jason Wever <weeve@gentoo.org> wv-0.7.6.ebuild:
   Added ~sparc to keywords.
diff --git a/app-text/wv/Manifest b/app-text/wv/Manifest
index cbcf9f972a7b..81f43a9f076d 100644
--- a/app-text/wv/Manifest
+++ b/app-text/wv/Manifest
@@ -1,10 +1,6 @@
-MD5 ced5f1ad46f045a81c37df374e89f0b2 wv-0.7.5.ebuild 767
-MD5 443925e01148fbedfc3de5489e86ca47 wv-1.0.0.ebuild 818
+MD5 664b65f386d49586472cf770ac972712 wv-1.0.0.ebuild 858
 MD5 443925e01148fbedfc3de5489e86ca47 wv-0.7.6.ebuild 818
-MD5 591906f2d40473c51f3ae4c31a39a6c2 wv-0.7.1.ebuild 1083
-MD5 74c9c247377a416771ddf96c95c7b6f2 ChangeLog 1352
+MD5 fa4a8ddd2796e11dff7057297685c682 ChangeLog 1490
 MD5 fe85d1375bb12fb4245f9be59895f923 files/wv-0.7.1-rvt.patch 4470
-MD5 0dcc3dd9a1d3fef13efc2355ac83154f files/digest-wv-0.7.1 61
-MD5 7bf937fa41866f7f17a2fc2f6a9d079d files/digest-wv-0.7.5 61
 MD5 bf3a7ec78d6703ae941fa705bd74db99 files/digest-wv-0.7.6 60
 MD5 97079efa2a5256ad07ada6260b7ec298 files/digest-wv-1.0.0 60
diff --git a/app-text/wv/files/digest-wv-0.7.1 b/app-text/wv/files/digest-wv-0.7.1
deleted file mode 100644
index 9ce34dc9b76a..000000000000
--- a/app-text/wv/files/digest-wv-0.7.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f4bf6e9efd6c6eccaad02d3f315beb75 wv-0.7.1.tar.gz 1259264
diff --git a/app-text/wv/files/digest-wv-0.7.5 b/app-text/wv/files/digest-wv-0.7.5
deleted file mode 100644
index 1e25f21b3aee..000000000000
--- a/app-text/wv/files/digest-wv-0.7.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5c52991ce95b2ee02fbaebff0dc36869 wv-0.7.5.tar.gz 1166494
diff --git a/app-text/wv/files/digest-wv-1.0.0 b/app-text/wv/files/digest-wv-1.0.0
new file mode 100644
index 000000000000..31d1553f8c03
--- /dev/null
+++ b/app-text/wv/files/digest-wv-1.0.0
@@ -0,0 +1 @@
+MD5 5e9675a8676cb1c1f6b8ab05af883178 wv-1.0.0.tar.gz 726428
diff --git a/app-text/wv/wv-0.7.1.ebuild b/app-text/wv/wv-0.7.1.ebuild
deleted file mode 100644
index 22da935594f8..000000000000
--- a/app-text/wv/wv-0.7.1.ebuild
+++ /dev/null
@@ -1,51 +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/wv/wv-0.7.1.ebuild,v 1.11 2003/09/05 22:37:22 msterret Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="tool for convertion of MSWord doc and rtf files to something readable"
-SRC_URI="mirror://sourceforge/wvware/wv-0.7.1.tar.gz"
-HOMEPAGE="http://www.wvware.com"
-KEYWORDS="x86 sparc "
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="virtual/glibc
-	>=sys-devel/gcc-2.95.2
-	>=media-libs/libwmf-0.2.2
-	>=media-libs/freetype-2.0.1
-	sys-libs/zlib
-	media-libs/libpng"
-
-RDEPEND="media-gfx/imagemagick"
-
-rc_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	patch -p1 < ${FILESDIR}/wv-0.7.1-rvt.patch
-}
-
-
-src_compile() {
-
-	unset CXXFLAGS
-	unset CFLAGS
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--with-docdir=/usr/share/doc/${PF} || die "./configure failed"
-
-	emake || die
-}
-
-src_install () {
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-}
diff --git a/app-text/wv/wv-0.7.5.ebuild b/app-text/wv/wv-1.0.0.ebuild
index 8ef204eeb0b2..99b82e44da71 100644
--- a/app-text/wv/wv-0.7.5.ebuild
+++ b/app-text/wv/wv-1.0.0.ebuild
@@ -1,26 +1,34 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wv/wv-0.7.5.ebuild,v 1.3 2003/09/05 22:37:22 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wv/wv-1.0.0.ebuild,v 1.1 2003/09/13 16:02:04 foser Exp $
 
-DESCRIPTION="tool for convertion of MSWord doc and rtf files to something readable"
+DESCRIPTION="Tool for conversion of MSWord doc and rtf files to something readable"
 SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
 HOMEPAGE="http://www.wvware.com"
 
-KEYWORDS="x86"
+IUSE="xml2"
+KEYWORDS="~x86 ~ppc ~sparc"
 SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="sys-libs/zlib
 	media-libs/libpng
-	>=media-libs/libwmf-0.2.2"
+	>=media-libs/libwmf-0.2.2	
+	xml2? ( dev-libs/libxml2 )"
 
 src_compile() {
-	econf --with-docdir=/usr/share/doc/${PF} || die
+
+	econf \
+		`use_with xml2 libxml2` \
+		--with-docdir=/usr/share/doc/${PF} \
+		|| die
 
 	make || die
+
 }
 
 src_install () {
+
 	einstall
 
 	insinto /usr/include
@@ -28,4 +36,5 @@ src_install () {
 
 	rm -f ${D}/usr/share/man/man1/wvConvert.1
 	dosym  /usr/share/man/man1/wvWare.1 /usr/share/man/man1/wvConvert.1
+
 }