Change USE=xml2 to USE=xml #116346.

(Portage version: 2.1_pre7-r3)

15 files changed, 65 insertions, 57 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/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