xml2 -> xml use flag

Package-Manager: portage-2.1.1_pre2-r2

2 files changed, 42 insertions, 21 deletions

diff --git a/app-text/wv/Manifest b/app-text/wv/Manifest
index b58c8442ab5f..9c35deadc40e 100644
--- a/app-text/wv/Manifest
+++ b/app-text/wv/Manifest
@@ -1,33 +1,54 @@
-MD5 6119c4fc5e0c053d669bb0d4360fe5ba ChangeLog 3244
-RMD160 87c635777d729614a0fa63028f4cd8de5d8cab6e ChangeLog 3244
-SHA256 f61667b11e94aaef3b9869a4e11d4378812bb4efcd295e8b4d46e6f0227c724d ChangeLog 3244
-MD5 97079efa2a5256ad07ada6260b7ec298 files/digest-wv-1.0.0-r1 60
-RMD160 9fd232c2d46efb815fb72e6117f9f2a1db98fc97 files/digest-wv-1.0.0-r1 60
-SHA256 c04c1437a3162ae7672de19643664e3ab40e7869badde541e3ab30150ab8e30b files/digest-wv-1.0.0-r1 60
-MD5 46b9432b004237ad01179545e665cb16 files/digest-wv-1.2.0 60
-RMD160 dbfadb207618e435b4f76a72e8bc8d3bd444d9e2 files/digest-wv-1.2.0 60
-SHA256 f1582ced69147ae4ced75692696bdf04e3aad89e3e33e67651b1dc717e0850b5 files/digest-wv-1.2.0 60
-MD5 f359296e1c5d5f6ab0d9c9d5a2369468 files/digest-wv-1.2.1 226
-RMD160 7d4b3adbe029f4c8ec0199706e2443d3ff222205 files/digest-wv-1.2.1 226
-SHA256 e907c0be9f68654cc5165a511b838d24db10d8ce67d6c8599973c2ec015e44c6 files/digest-wv-1.2.1 226
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX wv-1.0.0-fix_overflow.patch 1693 RMD160 f5e100431c1609668e38eef07e40d1397bedd024 SHA1 f021fa487db83018431666aa0737f1dd991389bf SHA256 5ea11a2222793f1ed42defaa3c8261dfa6fa455ab1cbdd58a92303f0528e4681
 MD5 29b026d4ff443552a80797b397d37ec6 files/wv-1.0.0-fix_overflow.patch 1693
 RMD160 f5e100431c1609668e38eef07e40d1397bedd024 files/wv-1.0.0-fix_overflow.patch 1693
 SHA256 5ea11a2222793f1ed42defaa3c8261dfa6fa455ab1cbdd58a92303f0528e4681 files/wv-1.0.0-fix_overflow.patch 1693
+AUX wv-1.0.3-gcc4.patch 1131 RMD160 4bb2a379e56eefed64f55ae7be244a8c5807dbce SHA1 a16386a9b4289ddc70d6a9702513ea344eb970f7 SHA256 1d8bc67d909107f403ddb1c42f40afdccc8866fb472fdd15d55b14d0af78b833
 MD5 a1897cf5f55250ffef22b746b2b277f7 files/wv-1.0.3-gcc4.patch 1131
 RMD160 4bb2a379e56eefed64f55ae7be244a8c5807dbce files/wv-1.0.3-gcc4.patch 1131
 SHA256 1d8bc67d909107f403ddb1c42f40afdccc8866fb472fdd15d55b14d0af78b833 files/wv-1.0.3-gcc4.patch 1131
+AUX wv-1.0.3-libole2-readonly.patch 1053 RMD160 98d18c46dfb7eeb55fdfba7ffc64c27ab5620435 SHA1 132264370184598c77ed8d30442df487ef48483b SHA256 96a3dbbdc435b68edbb8c80471b22e4c99236b1f9318bcc4702a35eefed49bd9
 MD5 f7e6bc9c507c536f3b48679fe2dfafba files/wv-1.0.3-libole2-readonly.patch 1053
 RMD160 98d18c46dfb7eeb55fdfba7ffc64c27ab5620435 files/wv-1.0.3-libole2-readonly.patch 1053
 SHA256 96a3dbbdc435b68edbb8c80471b22e4c99236b1f9318bcc4702a35eefed49bd9 files/wv-1.0.3-libole2-readonly.patch 1053
-MD5 525c7299058f839eff524bc25c39267e metadata.xml 345
-RMD160 f9916ca9ebb4af81b9863c42ae578387a8cd7302 metadata.xml 345
-SHA256 03578e3f79bd61f731e83a3f66fa4aaed4a23f3cd98cd4a4aefb84a4e40cc9c9 metadata.xml 345
-MD5 6335e6111535a1ebd438e329cee9694e wv-1.0.0-r1.ebuild 1052
-RMD160 66474fcb7dceeb083e0f45033660db47690a4d78 wv-1.0.0-r1.ebuild 1052
-SHA256 cafc27169de4b5f3b81791d553be9b8b9546f298258aa80c4f6169263d26bfff wv-1.0.0-r1.ebuild 1052
+DIST wv-1.0.0.tar.gz 726428
+DIST wv-1.2.0.tar.gz 627912
+DIST wv-1.2.1.tar.gz 628027 RMD160 92e1ee9ea7b35ad383cd904afd32516f051ef0c7 SHA256 a32ba44b9c1120f753359834037d6573b3e14aa2baf8f94f400c532ad196c732
+EBUILD wv-1.0.0-r1.ebuild 1049 RMD160 a2ad58ec52e9eaf5ccb3821c3b1747b86a422e41 SHA1 bdd6c24bd0dc61271516a2dbf8aa138f8a9501db SHA256 94f7975c288c1cc9066be15f224fd8d3cdf21d76969864d2edf22b0140700472
+MD5 bf919a016b7ab7d8b173758d9c1e5dc0 wv-1.0.0-r1.ebuild 1049
+RMD160 a2ad58ec52e9eaf5ccb3821c3b1747b86a422e41 wv-1.0.0-r1.ebuild 1049
+SHA256 94f7975c288c1cc9066be15f224fd8d3cdf21d76969864d2edf22b0140700472 wv-1.0.0-r1.ebuild 1049
+EBUILD wv-1.2.0.ebuild 1037 RMD160 a619279479b09ecb716f48afd8c19211de846820 SHA1 386556cdd48b5676f333b1ba3f83d537ac3b091c SHA256 d1f23062ffe8ae5a1f726e162b5b72e6d76ea1eafc7310c472a57157e0540bc3
 MD5 d6f866ea0fe1fe6b4dad96618dc07724 wv-1.2.0.ebuild 1037
 RMD160 a619279479b09ecb716f48afd8c19211de846820 wv-1.2.0.ebuild 1037
 SHA256 d1f23062ffe8ae5a1f726e162b5b72e6d76ea1eafc7310c472a57157e0540bc3 wv-1.2.0.ebuild 1037
+EBUILD wv-1.2.1.ebuild 1257 RMD160 d3847d795be2e923bd56ecc0403b392640c65ab7 SHA1 6b4a1e05455f149bf60f5918cceceb2bca84b352 SHA256 f3582b1f6cb908c458be6c661151ad04de544930e1c97b54c1725e72d5f1b0a2
 MD5 28fb769cf43f50c6896bc5fb8992c948 wv-1.2.1.ebuild 1257
 RMD160 d3847d795be2e923bd56ecc0403b392640c65ab7 wv-1.2.1.ebuild 1257
 SHA256 f3582b1f6cb908c458be6c661151ad04de544930e1c97b54c1725e72d5f1b0a2 wv-1.2.1.ebuild 1257
+MISC ChangeLog 3244 RMD160 87c635777d729614a0fa63028f4cd8de5d8cab6e SHA1 8bad5209e5cd61b3cea4b040cd2270d60a8a92a7 SHA256 f61667b11e94aaef3b9869a4e11d4378812bb4efcd295e8b4d46e6f0227c724d
+MD5 6119c4fc5e0c053d669bb0d4360fe5ba ChangeLog 3244
+RMD160 87c635777d729614a0fa63028f4cd8de5d8cab6e ChangeLog 3244
+SHA256 f61667b11e94aaef3b9869a4e11d4378812bb4efcd295e8b4d46e6f0227c724d ChangeLog 3244
+MISC metadata.xml 345 RMD160 f9916ca9ebb4af81b9863c42ae578387a8cd7302 SHA1 4945e12d606044e3a2b7aa723570c4e429706ef7 SHA256 03578e3f79bd61f731e83a3f66fa4aaed4a23f3cd98cd4a4aefb84a4e40cc9c9
+MD5 525c7299058f839eff524bc25c39267e metadata.xml 345
+RMD160 f9916ca9ebb4af81b9863c42ae578387a8cd7302 metadata.xml 345
+SHA256 03578e3f79bd61f731e83a3f66fa4aaed4a23f3cd98cd4a4aefb84a4e40cc9c9 metadata.xml 345
+MD5 97079efa2a5256ad07ada6260b7ec298 files/digest-wv-1.0.0-r1 60
+RMD160 9fd232c2d46efb815fb72e6117f9f2a1db98fc97 files/digest-wv-1.0.0-r1 60
+SHA256 c04c1437a3162ae7672de19643664e3ab40e7869badde541e3ab30150ab8e30b files/digest-wv-1.0.0-r1 60
+MD5 46b9432b004237ad01179545e665cb16 files/digest-wv-1.2.0 60
+RMD160 dbfadb207618e435b4f76a72e8bc8d3bd444d9e2 files/digest-wv-1.2.0 60
+SHA256 f1582ced69147ae4ced75692696bdf04e3aad89e3e33e67651b1dc717e0850b5 files/digest-wv-1.2.0 60
+MD5 f359296e1c5d5f6ab0d9c9d5a2369468 files/digest-wv-1.2.1 226
+RMD160 7d4b3adbe029f4c8ec0199706e2443d3ff222205 files/digest-wv-1.2.1 226
+SHA256 e907c0be9f68654cc5165a511b838d24db10d8ce67d6c8599973c2ec015e44c6 files/digest-wv-1.2.1 226
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFEq2tu9AbAhSK0CiwRAi8OAJ0QTOSDR0DCm9WmIxgHH5lbqFrR7ACeK+u9
+c6Cxu1b2hn484LbrCrDdy2I=
+=AOGm
+-----END PGP SIGNATURE-----
diff --git a/app-text/wv/wv-1.0.0-r1.ebuild b/app-text/wv/wv-1.0.0-r1.ebuild
index 30f7ea0d27f2..ba5b67723cb4 100644
--- a/app-text/wv/wv-1.0.0-r1.ebuild
+++ b/app-text/wv/wv-1.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wv/wv-1.0.0-r1.ebuild,v 1.4 2005/01/01 16:42:22 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wv/wv-1.0.0-r1.ebuild,v 1.5 2006/07/05 07:34:00 mr_bones_ Exp $
 
 inherit eutils
 
@@ -8,7 +8,7 @@ DESCRIPTION="Tool for conversion of MSWord doc and rtf files to something readab
 SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
 HOMEPAGE="http://wvware.sourceforge.net"
 
-IUSE="xml2 wmf"
+IUSE="xml wmf"
 KEYWORDS="x86 ppc sparc hppa alpha ia64 amd64 ppc64"
 SLOT="0"
 LICENSE="GPL-2"
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 DEPEND="sys-libs/zlib
 	media-libs/libpng
 	wmf? ( >=media-libs/libwmf-0.2.2 )
-	xml2? ( dev-libs/libxml2 )"
+	xml? ( dev-libs/libxml2 )"
 
 src_unpack() {