Change USE=xml2 to USE=xml #116346.

Package-Manager: portage-2.1_pre7-r3

16 files changed, 113 insertions, 105 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index e99734ec2d23..f092a4357776 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.136 2006/04/01 22:32:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.137 2006/04/02 20:11:19 vapier Exp $
+
+  02 Apr 2006; Mike Frysinger <vapier@gentoo.org> wine-0.9.ebuild,
+  wine-0.9.1.ebuild, wine-0.9.2.ebuild, wine-0.9.3.ebuild,
+  wine-0.9.4.ebuild, wine-0.9.5-r1.ebuild, wine-0.9.6.ebuild,
+  wine-0.9.7.ebuild, wine-0.9.8-r1.ebuild, wine-0.9.9.ebuild,
+  wine-0.9.10.ebuild, wine-0.9.11.ebuild, wine-9999.ebuild,
+  wine-20050930.ebuild:
+  Change USE=xml2 to USE=xml #116346.
 
 *wine-0.9.11 (01 Apr 2006)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 4edf0f0bee33..f6bc0d468f7e 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f4f0ffb8533118a0696c9a530f4b29b3 ChangeLog 25379
-RMD160 f77a595ad96679e2bbfb6a7de6055551466ae5b2 ChangeLog 25379
-SHA256 ab0b228386615d18bcdfd144ef85038a2896ac4c1476d782122b755bca594aac ChangeLog 25379
+MD5 fd1067c44e16d3adf464443fbf37e51a ChangeLog 25752
+RMD160 0fa256447140e6740d0fd95e32ea357dd054a34a ChangeLog 25752
+SHA256 ee5268f9efa97fb5c3cf7e93d08f1eac0e2e982add647fc03e4b2b057e94ded0 ChangeLog 25752
 MD5 fb8724a36ec3bef0ad3a3c36376b786a files/digest-wine-0.9 63
 RMD160 e2e2e9e410345effc5472930c8dff010b8cb1116 files/digest-wine-0.9 63
 SHA256 05a0841e1f0afa0af868b58819bc9a64e00cab9e6817034a5c93dc4c273b161d files/digest-wine-0.9 63
@@ -127,42 +127,42 @@ SHA256 a056fd8fa2aa9254b99e10b74d40a4780e824b5dedaae50de3c83974056bb514 files/wi
 MD5 78959654c62738e9d3ff3302e974d98a metadata.xml 791
 RMD160 2c8f8f40729fde13d93730374ee39811c29c20de metadata.xml 791
 SHA256 6ad20d106c155d738b1ac41ccdb5ee8495c42129fd53308e641414e345d7e018 metadata.xml 791
-MD5 3d7390a26b7a59b744fa0475a43e30fb wine-0.9.1.ebuild 4163
-RMD160 8e0fa509c6a5f8648fa93f782094a9a9e9bc40a0 wine-0.9.1.ebuild 4163
-SHA256 945e9b8cfc5d6361ebca684224c61fd119d2c3d6a454dbd91c6022a55e9f85fd wine-0.9.1.ebuild 4163
-MD5 264cbe05894ab584d167ce78f76a5c7c wine-0.9.10.ebuild 3480
-RMD160 7017a82b48266604de837404fc1bd3a8ac184415 wine-0.9.10.ebuild 3480
-SHA256 a162bfd1a446dbeaa91a9acfca3915bece9f76b67ac74bf2fc392ed5de2b4e2b wine-0.9.10.ebuild 3480
-MD5 a96bb2226b5fac8c53b36305f72e6ad8 wine-0.9.11.ebuild 3513
-RMD160 9a5035ba162200277ecfb8367f506936fba6217a wine-0.9.11.ebuild 3513
-SHA256 0fe2960c604aa1d3eca3a8f343690f1db4029d57ecce7a2c1a6886d2dd5380e5 wine-0.9.11.ebuild 3513
-MD5 04e48d4022668a20ca8067f78efa3fe3 wine-0.9.2.ebuild 4163
-RMD160 0b6f5f526599162144f4b4fb375e0a34cf3a0d4b wine-0.9.2.ebuild 4163
-SHA256 d774b0105e3d38784bb18ebe7f37671174cf7f5ea26fbcb331c46e8fd693d0a0 wine-0.9.2.ebuild 4163
-MD5 2c432c4c908019cd73abbbc36fd5a7ee wine-0.9.3.ebuild 4164
-RMD160 3f62f4bbd77049e7d514eb30a469d5296b3db4be wine-0.9.3.ebuild 4164
-SHA256 d1578535964e62c44b1743830c69948e62bcc84a47d782daf21114abdf633372 wine-0.9.3.ebuild 4164
-MD5 10814ed3cacfd3fb45f1ea84cd74ee22 wine-0.9.4.ebuild 4215
-RMD160 72c3b5115a24feaac5dc2e427d44c50bdc6f77a6 wine-0.9.4.ebuild 4215
-SHA256 b159c74e782bf295548b782c909b018107f4eda81a2ef64027acb2b3cfc85872 wine-0.9.4.ebuild 4215
-MD5 439e061d4bee6b60b66d670dc6f201a2 wine-0.9.5-r1.ebuild 3858
-RMD160 a6c5f6a674c9af9b5c6d0fc33521ceb10a042d02 wine-0.9.5-r1.ebuild 3858
-SHA256 c7a98821c1f7f298d14d381387a989288adf44c1225df5965a278d9d40a76f8a wine-0.9.5-r1.ebuild 3858
-MD5 62f72e643848d306fc4c2b7a867c2463 wine-0.9.6.ebuild 4191
-RMD160 91e112965c37793230ee09fef318ef918692f507 wine-0.9.6.ebuild 4191
-SHA256 07d245c2d27e68f6e6801aa46e337d102a5f86861214285ae2ed39f692327361 wine-0.9.6.ebuild 4191
-MD5 33d0c139698a6e632551806d10b3a9b6 wine-0.9.7.ebuild 3778
-RMD160 8361d28450a873ccbfd29dc6e6e5a9bda4af5d8b wine-0.9.7.ebuild 3778
-SHA256 443fd2a9f85d2be827f32fb01f8889bd4dc4418947f3bbc2fb89c96820d36cb7 wine-0.9.7.ebuild 3778
-MD5 531e7cab235cdeed8e6f26f9e55eea95 wine-0.9.8-r1.ebuild 3532
-RMD160 1ff78e48a87ecbacf00847e74857eb955a650ed0 wine-0.9.8-r1.ebuild 3532
-SHA256 a33df502a7a0f89d726e8d1ba6eb0d28926e8e187598ef69388bd53f1dcfd2e5 wine-0.9.8-r1.ebuild 3532
-MD5 662fb947aa7e3bafc0de859ffd276e74 wine-0.9.9.ebuild 3531
-RMD160 2d85ed6a2d0f6525669a87dcf78f5b9ad4175621 wine-0.9.9.ebuild 3531
-SHA256 e7e5b9e3a764f3c55aa87791e24419ae9c9d62e1b1b88ed9091c6450ee0e64a3 wine-0.9.9.ebuild 3531
-MD5 21ddb0867b74f4c6173ed23343f7e98c wine-0.9.ebuild 4161
-RMD160 79fb50d481466d24bf02ab08b940b1e11483f4d3 wine-0.9.ebuild 4161
-SHA256 884d6647a4636707f415b4bce5921789d230d7bc1af19f6cb523d681c202a87a wine-0.9.ebuild 4161
+MD5 61beb6308c5939d8868885bd01f81227 wine-0.9.1.ebuild 4161
+RMD160 f7138f6592011e0255c2ff00fd9fb2f737c6b68c wine-0.9.1.ebuild 4161
+SHA256 1e938dc1fa681a24126e5aa334dc73e3a02a5410781bbea641d5fbf0ca61401e wine-0.9.1.ebuild 4161
+MD5 b6b334724e7a94510fc24d980b56f38c wine-0.9.10.ebuild 3477
+RMD160 c52235f7edbe1d90d636ac7bd3c8566ec78b4013 wine-0.9.10.ebuild 3477
+SHA256 9cf6f021cfab534d32b51980ccfc65132424ef8bee1285069a5009e42afec9e3 wine-0.9.10.ebuild 3477
+MD5 3474ebaa45d44e0d53d30cf295ef82a5 wine-0.9.11.ebuild 3510
+RMD160 fb0581f1cbaf3e762f8ff0dd08b539d1984548d9 wine-0.9.11.ebuild 3510
+SHA256 31847a90444457c0ae27c87713cca182cb2579a5c13f6519c86b8b8674c1f940 wine-0.9.11.ebuild 3510
+MD5 0e8a939a0799b82181ee17f084caf7eb wine-0.9.2.ebuild 4161
+RMD160 32af02785815020bd693318786246cd46ea8107b wine-0.9.2.ebuild 4161
+SHA256 aa516a61dd7eaa622a5b0e8cd74646371371f13a2118cf6989f88eb7a75e2268 wine-0.9.2.ebuild 4161
+MD5 8c8824ac22850cc9272b7100c7c32caf wine-0.9.3.ebuild 4161
+RMD160 f1385121ec67e34970a36062d711786e09ae86e2 wine-0.9.3.ebuild 4161
+SHA256 d962f5c6fee81d6396a48978f7b5f1a75ab63fb56c118cb5c1cf24f5980da079 wine-0.9.3.ebuild 4161
+MD5 f0fc08e8711b38cce99c7d3a90f738d2 wine-0.9.4.ebuild 4212
+RMD160 0b0e06ee128c820800bd63499f613c6408369abe wine-0.9.4.ebuild 4212
+SHA256 cdae01af457dbee12b1de44119d63ff396440c19185cfeb3947d164e37b1707a wine-0.9.4.ebuild 4212
+MD5 48bd8849dbd50c0bfedea1968696e7e9 wine-0.9.5-r1.ebuild 3855
+RMD160 80cee42624a3c6eb29df905a5475923e6e9e6b22 wine-0.9.5-r1.ebuild 3855
+SHA256 fc8f11acd5eb256c2904972c3c92bf367e9f51d227f33a0afcee308052d0ae80 wine-0.9.5-r1.ebuild 3855
+MD5 890aa8869b89a5ff50e5335848fb31d0 wine-0.9.6.ebuild 4189
+RMD160 eee65125f72fe49dc7a78e10cf939b5e3f9a05ed wine-0.9.6.ebuild 4189
+SHA256 e71006a80d9388965f66bf7702c88cff3a979617fc049ad39f00678b2ca9b9e1 wine-0.9.6.ebuild 4189
+MD5 b9f2ec7b1b52d145d1102fdf08f16cf5 wine-0.9.7.ebuild 3775
+RMD160 59abd3c61f4fd32aa9a342970123a152c4ab050f wine-0.9.7.ebuild 3775
+SHA256 7f0eb7e6a0d8cead76a702b178f48fa8dea4719c1faeb94f58cb0a512571374a wine-0.9.7.ebuild 3775
+MD5 cc819dbcb0ae42adae015146548e0b53 wine-0.9.8-r1.ebuild 3529
+RMD160 938da9342c19454f15df566ee70dd28d96c7dd73 wine-0.9.8-r1.ebuild 3529
+SHA256 f152be11a7c1c76a99b2f0ba94ac4aadd0dfc33a7cbabc9ec43a8eb9ad50cfcc wine-0.9.8-r1.ebuild 3529
+MD5 2ac147c0257aec97fdac998a9069f8e1 wine-0.9.9.ebuild 3528
+RMD160 6172ea262ab75d3fd36a3482f38d197c8de2a579 wine-0.9.9.ebuild 3528
+SHA256 4940f5a23aee7818ee06b882df6269ce788ce673c7bc10ee10b0bec6f2610b42 wine-0.9.9.ebuild 3528
+MD5 55e004106680dbaa45daa8c63fd1d3b8 wine-0.9.ebuild 4159
+RMD160 79abb032219624a3301d344f6f2af8039daeebca wine-0.9.ebuild 4159
+SHA256 8c32b45d3cd2c6c35a4168fa630cb69beca4219b5d5c4d4186a9e79dd3b3c14e wine-0.9.ebuild 4159
 MD5 31538979b50530ea70f66bce6e211fbf wine-20041019-r3.ebuild 3519
 RMD160 81068f46639f69d4027e080ee0a56911a1371a97 wine-20041019-r3.ebuild 3519
 SHA256 7b3ef86813d44df5e38ea3945d477e49e2c736a9be52cfd91cc0f8e0e72251b2 wine-20041019-r3.ebuild 3519
@@ -190,16 +190,16 @@ SHA256 098d1fb66e32e2362b7a456a70f527fbfe662d3069998c8304e8f00e85c8114f wine-200
 MD5 0e30712a21051163ec72566e4110fa95 wine-20050830.ebuild 4250
 RMD160 c01b18fe76144b2bcb46291ba9cb352253a8d72b wine-20050830.ebuild 4250
 SHA256 ca38fdc493d05a347edafe54e033bd53ff2aa0ef99e5278162ff8c86d960d041 wine-20050830.ebuild 4250
-MD5 29457fef5e35e100e30a06a404d60a52 wine-20050930.ebuild 4271
-RMD160 699da780b52e40c39d2ac8b7b65ef9b80b137295 wine-20050930.ebuild 4271
-SHA256 12ecca44a0bcc34d26e949b648fbf7660d0367e5de9b98398676f29b2d1b65d9 wine-20050930.ebuild 4271
-MD5 96f1bf862996bb04f81abc07ea2a4dd4 wine-9999.ebuild 3526
-RMD160 a3fda8b23201fdb5e3c0dd363f4abda3dd6cb6d6 wine-9999.ebuild 3526
-SHA256 86c71d59e1c60956421510ae582ae90483ebaec4e4b16fb92ff77919f95dce9e wine-9999.ebuild 3526
+MD5 8dc85d48c2fdb724b588658c9f78ef1f wine-20050930.ebuild 4268
+RMD160 7792a7677ba56af5f3babd7b0fc7a50c589372ea wine-20050930.ebuild 4268
+SHA256 56d7212afa61eecd9bc691fe85d832278e30fdf5b361640640aa7a57cda7f23b wine-20050930.ebuild 4268
+MD5 16ce84a9773603dbe63a7218befa7b79 wine-9999.ebuild 3523
+RMD160 0181971699654ce130406ef82eed75021f4951c1 wine-9999.ebuild 3523
+SHA256 e08dfbc889806d6eb63eda6d255f29afb2921123703cd04682533e817f60e182 wine-9999.ebuild 3523
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFELv+k2+ySkm8kpY0RAtjpAKCUP5+ehzERy9muSD+W4JMm3jsMkgCbBDGB
-qqtBbyqJy1ExfrtfKJn49t8=
-=tfTM
+iD8DBQFEMDAM2+ySkm8kpY0RAkEPAJ42+at25HfWpvLSyef4Br3o2zDmLQCfTj2H
+atYCZjJH2wFbs9ebId5Aq18=
+=LJqr
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-0.9.1.ebuild b/app-emulation/wine/wine-0.9.1.ebuild
index 515d43ef55fb..0e09b99bf93a 100644
--- a/app-emulation/wine/wine-0.9.1.ebuild
+++ b/app-emulation/wine/wine-0.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.1.ebuild,v 1.9 2006/03/09 23:45:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.1.ebuild,v 1.10 2006/04/02 20:11:19 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/wine-${PV}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
-IUSE="alsa arts cups debug esd gif glut jack jpeg lcms ldap nas ncurses opengl oss scanner truetype xml2 X"
+IUSE="alsa arts cups debug esd gif glut jack jpeg lcms ldap nas ncurses opengl oss scanner truetype xml X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -38,7 +38,7 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	ldap? ( net-nds/openldap )
 	glut? ( virtual/glut )
 	lcms? ( media-libs/lcms )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	truetype? ( media-libs/freetype media-gfx/fontforge )
 	scanner? ( media-gfx/sane-backends )
 	amd64? (
@@ -109,7 +109,7 @@ src_compile() {
 	config_cache cups cups/cups.h
 	config_cache alsa alsa/asoundlib.h sys/asoundlib.h asound:snd_pcm_open
 	config_cache nas audio/audiolib.h audio/soundlib.h
-	config_cache xml2 libxml/parser.h libxslt/pattern.h libxslt/transform.h
+	config_cache xml libxml/parser.h libxslt/pattern.h libxslt/transform.h
 	config_cache ldap ldap.h lber.h
 	config_cache gif gif_lib.h
 	config_cache glut glut:glutMainLoop
diff --git a/app-emulation/wine/wine-0.9.10.ebuild b/app-emulation/wine/wine-0.9.10.ebuild
index e40d062006ef..0c5e92c8f43e 100644
--- a/app-emulation/wine/wine-0.9.10.ebuild
+++ b/app-emulation/wine/wine-0.9.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.10.ebuild,v 1.1 2006/03/16 00:08:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.10.ebuild,v 1.2 2006/04/02 20:11:19 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/wine-${PV}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="alsa arts cups debug esd gif glut jack jpeg lcms ldap nas ncurses opengl oss scanner truetype xml2 X"
+IUSE="alsa arts cups debug esd gif glut jack jpeg lcms ldap nas ncurses opengl oss scanner truetype xml X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -38,7 +38,7 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	ldap? ( net-nds/openldap )
 	glut? ( virtual/glut )
 	lcms? ( media-libs/lcms )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	truetype? ( media-libs/freetype media-gfx/fontforge )
 	scanner? ( media-gfx/sane-backends )
 	amd64? (
@@ -93,7 +93,7 @@ src_compile() {
 	config_cache cups cups/cups.h
 	config_cache alsa alsa/asoundlib.h sys/asoundlib.h asound:snd_pcm_open
 	config_cache nas audio/audiolib.h audio/soundlib.h
-	config_cache xml2 libxml/parser.h libxslt/pattern.h libxslt/transform.h
+	config_cache xml libxml/parser.h libxslt/pattern.h libxslt/transform.h
 	config_cache ldap ldap.h lber.h
 	config_cache gif gif_lib.h
 	config_cache glut glut:glutMainLoop
diff --git a/app-emulation/wine/wine-0.9.11.ebuild b/app-emulation/wine/wine-0.9.11.ebuild
index 1fc12efd8be1..22ca394fe63d 100644
--- a/app-emulation/wine/wine-0.9.11.ebuild
+++ b/app-emulation/wine/wine-0.9.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.11.ebuild,v 1.1 2006/04/01 22:32:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.11.ebuild,v 1.2 2006/04/02 20:11:19 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/wine-${PV}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* -amd64 ~x86"
-IUSE="alsa arts cups debug esd gif glut jack jpeg lcms ldap nas ncurses opengl oss scanner truetype xml2 X"
+IUSE="alsa arts cups debug esd gif glut jack jpeg lcms ldap nas ncurses opengl oss scanner truetype xml X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -38,7 +38,7 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	ldap? ( net-nds/openldap )
 	glut? ( virtual/glut )
 	lcms? ( media-libs/lcms )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	truetype? ( media-libs/freetype media-gfx/fontforge )
 	scanner? ( media-gfx/sane-backends )
 	amd64? (
@@ -93,7 +93,7 @@ src_compile() {
 	config_cache cups cups/cups.h
 	config_cache alsa alsa/asoundlib.h sys/asoundlib.h asound:snd_pcm_open
 	config_cache nas audio/audiolib.h audio/soundlib.h
-	config_cache xml2 libxml/parser.h libxslt/pattern.h libxslt/transform.h
+	config_cache xml libxml/parser.h libxslt/pattern.h libxslt/transform.h
 	config_cache ldap ldap.h lber.h
 	config_cache gif gif_lib.h
 	config_cache glut glut:glutMainLoop
diff --git a/app-emulation/wine/wine-0.9.2.ebuild b/app-emulation/wine/wine-0.9.2.ebuild
index 4f99c5d0a9c4..cd83869b75e0 100644
--- a/app-emulation/wine/wine-0.9.2.ebuild
+++ b/app-emulation/wine/wine-0.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.2.ebuild,v 1.9 2006/03/09 23:45:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.2.ebuild,v 1.10 2006/04/02 20:11:19 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/wine-${PV}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
-IUSE="alsa arts cups debug esd gif glut jack jpeg lcms ldap nas ncurses opengl oss scanner truetype xml2 X"
+IUSE="alsa arts cups debug esd gif glut jack jpeg lcms ldap nas ncurses opengl oss scanner truetype xml X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -38,7 +38,7 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	ldap? ( net-nds/openldap )
 	glut? ( virtual/glut )
 	lcms? ( media-libs/lcms )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	truetype? ( media-libs/freetype media-gfx/fontforge )
 	scanner? ( media-gfx/sane-backends )
 	amd64? (
@@ -109,7 +109,7 @@ src_compile() {
 	config_cache cups cups/cups.h
 	config_cache alsa alsa/asoundlib.h sys/asoundlib.h asound:snd_pcm_open
 	config_cache nas audio/audiolib.h audio/soundlib.h
-	config_cache xml2 libxml/parser.h libxslt/pattern.h libxslt/transform.h
+	config_cache xml libxml/parser.h libxslt/pattern.h libxslt/transform.h
 	config_cache ldap ldap.h lber.h
 	config_cache gif gif_lib.h
 	config_cache glut glut:glutMainLoop
diff --git a/app-emulation/wine/wine-0.9.3.ebuild b/app-emulation/wine/wine-0.9.3.ebuild
index d475c0ea2c9f..906af5b64d98 100644
--- a/app-emulation/wine/wine-0.9.3.ebuild
+++ b/app-emulation/wine/wine-0.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.3.ebuild,v 1.10 2006/03/09 23:45:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.3.ebuild,v 1.11 2006/04/02 20:11:19 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/wine-${PV}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
-IUSE="alsa arts cups debug esd gif glut jack jpeg lcms ldap nas ncurses opengl oss scanner truetype xml2 X"
+IUSE="alsa arts cups debug esd gif glut jack jpeg lcms ldap nas ncurses opengl oss scanner truetype xml X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -38,7 +38,7 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	ldap? ( net-nds/openldap )
 	glut? ( virtual/glut )
 	lcms? ( media-libs/lcms )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	truetype? ( media-libs/freetype media-gfx/fontforge )
 	scanner? ( media-gfx/sane-backends )
 	amd64? (
@@ -109,7 +109,7 @@ src_compile() {
 	config_cache cups cups/cups.h
 	config_cache alsa alsa/asoundlib.h sys/asoundlib.h asound:snd_pcm_open
 	config_cache nas audio/audiolib.h audio/soundlib.h
-	config_cache xml2 libxml/parser.h libxslt/pattern.h libxslt/transform.h
+	config_cache xml libxml/parser.h libxslt/pattern.h libxslt/transform.h
 	config_cache ldap ldap.h lber.h
 	config_cache gif gif_lib.h
 	config_cache glut glut:glutMainLoop
diff --git a/app-emulation/wine/wine-0.9.4.ebuild b/app-emulation/wine/wine-0.9.4.ebuild
index 4b4c108a2e7f..48f56e39f760 100644
--- a/app-emulation/wine/wine-0.9.4.ebuild
+++ b/app-emulation/wine/wine-0.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.4.ebuild,v 1.10 2006/03/09 23:45:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.4.ebuild,v 1.11 2006/04/02 20:11:19 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/wine-${PV}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
-IUSE="alsa arts cups debug esd gif glut jack jpeg lcms ldap nas ncurses opengl oss scanner truetype xml2 X"
+IUSE="alsa arts cups debug esd gif glut jack jpeg lcms ldap nas ncurses opengl oss scanner truetype xml X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -38,7 +38,7 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	ldap? ( net-nds/openldap )
 	glut? ( virtual/glut )
 	lcms? ( media-libs/lcms )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	truetype? ( media-libs/freetype media-gfx/fontforge )
 	scanner? ( media-gfx/sane-backends )
 	amd64? (
@@ -110,7 +110,7 @@ src_compile() {
 	config_cache cups cups/cups.h
 	config_cache alsa alsa/asoundlib.h sys/asoundlib.h asound:snd_pcm_open
 	config_cache nas audio/audiolib.h audio/soundlib.h
-	config_cache xml2 libxml/parser.h libxslt/pattern.h libxslt/transform.h
+	config_cache xml libxml/parser.h libxslt/pattern.h libxslt/transform.h
 	config_cache ldap ldap.h lber.h
 	config_cache gif gif_lib.h
 	config_cache glut glut:glutMainLoop
diff --git a/app-emulation/wine/wine-0.9.5-r1.ebuild b/app-emulation/wine/wine-0.9.5-r1.ebuild
index a2a4e13560a4..eb598cac8cca 100644
--- a/app-emulation/wine/wine-0.9.5-r1.ebuild
+++ b/app-emulation/wine/wine-0.9.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.5-r1.ebuild,v 1.7 2006/03/09 23:45:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.5-r1.ebuild,v 1.8 2006/04/02 20:11:19 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/wine-${PV}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
-IUSE="alsa arts cups debug esd gif glut jack jpeg lcms ldap nas ncurses opengl oss scanner truetype xml2 X"
+IUSE="alsa arts cups debug esd gif glut jack jpeg lcms ldap nas ncurses opengl oss scanner truetype xml X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -38,7 +38,7 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	ldap? ( net-nds/openldap )
 	glut? ( virtual/glut )
 	lcms? ( media-libs/lcms )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	truetype? ( media-libs/freetype media-gfx/fontforge )
 	scanner? ( media-gfx/sane-backends )
 	amd64? (
@@ -95,7 +95,7 @@ src_compile() {
 	config_cache cups cups/cups.h
 	config_cache alsa alsa/asoundlib.h sys/asoundlib.h asound:snd_pcm_open
 	config_cache nas audio/audiolib.h audio/soundlib.h
-	config_cache xml2 libxml/parser.h libxslt/pattern.h libxslt/transform.h
+	config_cache xml libxml/parser.h libxslt/pattern.h libxslt/transform.h
 	config_cache ldap ldap.h lber.h
 	config_cache gif gif_lib.h
 	config_cache glut glut:glutMainLoop
diff --git a/app-emulation/wine/wine-0.9.6.ebuild b/app-emulation/wine/wine-0.9.6.ebuild
index cbf20a0866b0..4fd6911e3c7a 100644
--- a/app-emulation/wine/wine-0.9.6.ebuild
+++ b/app-emulation/wine/wine-0.9.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.6.ebuild,v 1.9 2006/03/09 23:45:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.6.ebuild,v 1.10 2006/04/02 20:11:19 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/wine-${PV}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
-IUSE="alsa arts cups debug esd gif glut jack jpeg lcms ldap nas ncurses opengl oss scanner truetype xml2 X"
+IUSE="alsa arts cups debug esd gif glut jack jpeg lcms ldap nas ncurses opengl oss scanner truetype xml X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -38,7 +38,7 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	ldap? ( net-nds/openldap )
 	glut? ( virtual/glut )
 	lcms? ( media-libs/lcms )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	truetype? ( media-libs/freetype media-gfx/fontforge )
 	scanner? ( media-gfx/sane-backends )
 	amd64? (
@@ -109,7 +109,7 @@ src_compile() {
 	config_cache cups cups/cups.h
 	config_cache alsa alsa/asoundlib.h sys/asoundlib.h asound:snd_pcm_open
 	config_cache nas audio/audiolib.h audio/soundlib.h
-	config_cache xml2 libxml/parser.h libxslt/pattern.h libxslt/transform.h
+	config_cache xml libxml/parser.h libxslt/pattern.h libxslt/transform.h
 	config_cache ldap ldap.h lber.h
 	config_cache gif gif_lib.h
 	config_cache glut glut:glutMainLoop
diff --git a/app-emulation/wine/wine-0.9.7.ebuild b/app-emulation/wine/wine-0.9.7.ebuild
index 2cc7eb2afc7e..ffeee651dd59 100644
--- a/app-emulation/wine/wine-0.9.7.ebuild
+++ b/app-emulation/wine/wine-0.9.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.7.ebuild,v 1.6 2006/03/09 23:45:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.7.ebuild,v 1.7 2006/04/02 20:11:19 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/wine-${PV}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
-IUSE="alsa arts cups debug esd gif glut jack jpeg lcms ldap nas ncurses opengl oss scanner truetype xml2 X"
+IUSE="alsa arts cups debug esd gif glut jack jpeg lcms ldap nas ncurses opengl oss scanner truetype xml X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -38,7 +38,7 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	ldap? ( net-nds/openldap )
 	glut? ( virtual/glut )
 	lcms? ( media-libs/lcms )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	truetype? ( media-libs/freetype media-gfx/fontforge )
 	scanner? ( media-gfx/sane-backends )
 	amd64? (
@@ -93,7 +93,7 @@ src_compile() {
 	config_cache cups cups/cups.h
 	config_cache alsa alsa/asoundlib.h sys/asoundlib.h asound:snd_pcm_open
 	config_cache nas audio/audiolib.h audio/soundlib.h
-	config_cache xml2 libxml/parser.h libxslt/pattern.h libxslt/transform.h
+	config_cache xml libxml/parser.h libxslt/pattern.h libxslt/transform.h
 	config_cache ldap ldap.h lber.h
 	config_cache gif gif_lib.h
 	config_cache glut glut:glutMainLoop
diff --git a/app-emulation/wine/wine-0.9.8-r1.ebuild b/app-emulation/wine/wine-0.9.8-r1.ebuild
index d8ac9b110fb1..ba72a6d5eb86 100644
--- a/app-emulation/wine/wine-0.9.8-r1.ebuild
+++ b/app-emulation/wine/wine-0.9.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.8-r1.ebuild,v 1.6 2006/03/09 23:45:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.8-r1.ebuild,v 1.7 2006/04/02 20:11:19 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/wine-${PV}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
-IUSE="alsa arts cups debug esd gif glut jack jpeg lcms ldap nas ncurses opengl oss scanner truetype xml2 X"
+IUSE="alsa arts cups debug esd gif glut jack jpeg lcms ldap nas ncurses opengl oss scanner truetype xml X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -38,7 +38,7 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	ldap? ( net-nds/openldap )
 	glut? ( virtual/glut )
 	lcms? ( media-libs/lcms )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	truetype? ( media-libs/freetype media-gfx/fontforge )
 	scanner? ( media-gfx/sane-backends )
 	amd64? (
@@ -94,7 +94,7 @@ src_compile() {
 	config_cache cups cups/cups.h
 	config_cache alsa alsa/asoundlib.h sys/asoundlib.h asound:snd_pcm_open
 	config_cache nas audio/audiolib.h audio/soundlib.h
-	config_cache xml2 libxml/parser.h libxslt/pattern.h libxslt/transform.h
+	config_cache xml libxml/parser.h libxslt/pattern.h libxslt/transform.h
 	config_cache ldap ldap.h lber.h
 	config_cache gif gif_lib.h
 	config_cache glut glut:glutMainLoop
diff --git a/app-emulation/wine/wine-0.9.9.ebuild b/app-emulation/wine/wine-0.9.9.ebuild
index 57bb9660b605..a1ec959fcd4a 100644
--- a/app-emulation/wine/wine-0.9.9.ebuild
+++ b/app-emulation/wine/wine-0.9.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.9.ebuild,v 1.3 2006/03/09 23:45:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.9.ebuild,v 1.4 2006/04/02 20:11:19 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/wine-${PV}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="alsa arts cups debug esd gif glut jack jpeg lcms ldap nas ncurses opengl oss scanner truetype xml2 X"
+IUSE="alsa arts cups debug esd gif glut jack jpeg lcms ldap nas ncurses opengl oss scanner truetype xml X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -38,7 +38,7 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	ldap? ( net-nds/openldap )
 	glut? ( virtual/glut )
 	lcms? ( media-libs/lcms )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	truetype? ( media-libs/freetype media-gfx/fontforge )
 	scanner? ( media-gfx/sane-backends )
 	amd64? (
@@ -94,7 +94,7 @@ src_compile() {
 	config_cache cups cups/cups.h
 	config_cache alsa alsa/asoundlib.h sys/asoundlib.h asound:snd_pcm_open
 	config_cache nas audio/audiolib.h audio/soundlib.h
-	config_cache xml2 libxml/parser.h libxslt/pattern.h libxslt/transform.h
+	config_cache xml libxml/parser.h libxslt/pattern.h libxslt/transform.h
 	config_cache ldap ldap.h lber.h
 	config_cache gif gif_lib.h
 	config_cache glut glut:glutMainLoop
diff --git a/app-emulation/wine/wine-0.9.ebuild b/app-emulation/wine/wine-0.9.ebuild
index 67285855c5c0..c692e38ba8dc 100644
--- a/app-emulation/wine/wine-0.9.ebuild
+++ b/app-emulation/wine/wine-0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.ebuild,v 1.9 2006/03/09 23:45:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.ebuild,v 1.10 2006/04/02 20:11:19 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/wine-${PV}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
-IUSE="alsa arts cups debug esd gif glut jack jpeg lcms ldap nas ncurses opengl oss scanner truetype xml2 X"
+IUSE="alsa arts cups debug esd gif glut jack jpeg lcms ldap nas ncurses opengl oss scanner truetype xml X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -38,7 +38,7 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	ldap? ( net-nds/openldap )
 	glut? ( virtual/glut )
 	lcms? ( media-libs/lcms )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	truetype? ( media-libs/freetype media-gfx/fontforge )
 	scanner? ( media-gfx/sane-backends )
 	amd64? (
@@ -109,7 +109,7 @@ src_compile() {
 	config_cache cups cups/cups.h
 	config_cache alsa alsa/asoundlib.h sys/asoundlib.h asound:snd_pcm_open
 	config_cache nas audio/audiolib.h audio/soundlib.h
-	config_cache xml2 libxml/parser.h libxslt/pattern.h libxslt/transform.h
+	config_cache xml libxml/parser.h libxslt/pattern.h libxslt/transform.h
 	config_cache ldap ldap.h lber.h
 	config_cache gif gif_lib.h
 	config_cache glut glut:glutMainLoop
diff --git a/app-emulation/wine/wine-20050930.ebuild b/app-emulation/wine/wine-20050930.ebuild
index d5022d9c83a3..0c4784bd2162 100644
--- a/app-emulation/wine/wine-20050930.ebuild
+++ b/app-emulation/wine/wine-20050930.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050930.ebuild,v 1.14 2006/03/09 23:45:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050930.ebuild,v 1.15 2006/04/02 20:11:19 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/Wine-${PV}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-*"
-IUSE="alsa arts cups debug esd gif glut jack jpeg lcms ldap nas ncurses opengl oss scanner truetype xml2 X"
+IUSE="alsa arts cups debug esd gif glut jack jpeg lcms ldap nas ncurses opengl oss scanner truetype xml X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -38,7 +38,7 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	ldap? ( net-nds/openldap )
 	glut? ( virtual/glut )
 	lcms? ( media-libs/lcms )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	truetype? ( media-libs/freetype media-gfx/fontforge )
 	scanner? ( media-gfx/sane-backends )
 	amd64? (
@@ -111,7 +111,7 @@ src_compile() {
 	config_cache cups cups/cups.h
 	config_cache alsa alsa/asoundlib.h sys/asoundlib.h asound:snd_pcm_open
 	config_cache nas audio/audiolib.h audio/soundlib.h
-	config_cache xml2 libxml/parser.h libxslt/pattern.h libxslt/transform.h
+	config_cache xml libxml/parser.h libxslt/pattern.h libxslt/transform.h
 	config_cache ldap ldap.h lber.h
 	config_cache gif gif_lib.h
 	config_cache glut glut:glutMainLoop
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 47be258c9960..a5ed1fcbf0fe 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.10 2006/03/09 23:45:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.11 2006/04/02 20:11:19 vapier Exp $
 
 ECVS_SERVER="cvs.winehq.org:/home/wine"
 ECVS_MODULE="wine"
@@ -16,7 +16,7 @@ SRC_URI=""
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-*"
-IUSE="alsa arts cups debug esd gif glut jack jpeg lcms ldap nas ncurses opengl oss scanner truetype xml2 X"
+IUSE="alsa arts cups debug esd gif glut jack jpeg lcms ldap nas ncurses opengl oss scanner truetype xml X"
 RESTRICT="test" #72375
 
 RDEPEND=">=media-libs/freetype-2.0.0
@@ -43,7 +43,7 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	ldap? ( net-nds/openldap )
 	glut? ( virtual/glut )
 	lcms? ( media-libs/lcms )
-	xml2? ( dev-libs/libxml2 dev-libs/libxslt )
+	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	truetype? ( media-libs/freetype media-gfx/fontforge )
 	scanner? ( media-gfx/sane-backends )
 	amd64? (
@@ -99,7 +99,7 @@ src_compile() {
 	config_cache cups cups/cups.h
 	config_cache alsa alsa/asoundlib.h sys/asoundlib.h asound:snd_pcm_open
 	config_cache nas audio/audiolib.h audio/soundlib.h
-	config_cache xml2 libxml/parser.h libxslt/pattern.h libxslt/transform.h
+	config_cache xml libxml/parser.h libxslt/pattern.h libxslt/transform.h
 	config_cache ldap ldap.h lber.h
 	config_cache gif gif_lib.h
 	config_cache glut glut:glutMainLoop