Now using the xml use flag, in favor of xml2, as per bug #116346.

(Portage version: 2.1_pre7-r4)

6 files changed, 26 insertions, 21 deletions

diff --git a/dev-java/gnu-classpath/ChangeLog b/dev-java/gnu-classpath/ChangeLog
index 9bf86796df9c..936d8d59846d 100644
--- a/dev-java/gnu-classpath/ChangeLog
+++ b/dev-java/gnu-classpath/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/gnu-classpath
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.52 2006/04/02 14:03:26 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.53 2006/04/09 13:20:12 nichoj Exp $
+
+  09 Apr 2006; Joshua Nichols <nichoj@gentoo.org> gnu-classpath-0.14.ebuild,
+  gnu-classpath-0.18.ebuild, gnu-classpath-0.19.ebuild,
+  gnu-classpath-0.20.ebuild, gnu-classpath-0.90.ebuild:
+  Now using the xml use flag, in favor of xml2, as per bug #116346.
 
 *gnu-classpath-0.90 (02 Apr 2006)
 
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.14.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.14.ebuild
index 013b22c6be8c..80039944dd73 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.14.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.14.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/dev-java/gnu-classpath/gnu-classpath-0.14.ebuild,v 1.8 2006/02/16 05:46:35 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.14.ebuild,v 1.9 2006/04/09 13:20:12 nichoj Exp $
 
 DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the java programming language"
 SRC_URI="ftp://ftp.gnu.org/gnu/classpath/classpath-${PV}.tar.gz"
@@ -9,14 +9,14 @@ HOMEPAGE="http://www.gnu.org/software/classpath/"
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
 KEYWORDS="x86 ~sparc ppc amd64"
-IUSE="gtk xml2"
+IUSE="gtk xml"
 
 RDEPEND=">=virtual/jre-1.4
 	gtk? (
 		>=x11-libs/gtk+-2
 		>=media-libs/libart_lgpl-2.1
 	)
-	xml2? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )"
+	xml? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )"
 DEPEND=">=virtual/jdk-1.4
 	${RDEPEND}
 	app-arch/zip
@@ -29,7 +29,7 @@ src_compile() {
 		--enable-jni \
 		--with-jikes=/usr/bin/jikes \
 		$(use_enable gtk gtk-peer) \
-		$(use_enable xml2 xmlj) \
+		$(use_enable xml xmlj) \
 		--prefix=/usr/share/${PN} \
 		 CPPFLAGS="-I/usr/include/freetype2" \
 		 ${myjavac} || die "./configure failed"
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.18.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.18.ebuild
index a32786304248..59be06dad12c 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.18.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.18.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/dev-java/gnu-classpath/gnu-classpath-0.18.ebuild,v 1.7 2006/02/04 18:13:29 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.18.ebuild,v 1.8 2006/04/09 13:20:12 nichoj Exp $
 
 inherit eutils autotools
 
@@ -17,12 +17,12 @@ KEYWORDS="~x86 ~sparc ~ppc ~amd64 ~ppc64"
 #See their bug 24025
 
 #enable cairo support after >=0.5.0 is out of package.mask
-IUSE="examples gtk xml2"
+IUSE="examples gtk xml"
 
 #cairo? ( >=x11-libs/cairo-0.5.0 )
 RDEPEND="gtk? ( >=x11-libs/gtk+-2.4
 				>=dev-libs/glib-2.0 )
-		 xml2? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )"
+		 xml? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )"
 
 DEPEND="app-arch/zip
 		dev-java/jikes
@@ -50,7 +50,7 @@ src_compile() {
 	econf ${compiler} \
 		$(use_enable examples) \
 		$(use_enable gtk gtk-peer) \
-		$(use_enable xml2 xmlj) \
+		$(use_enable xml xmlj) \
 		--enable-jni \
 		|| die "configure failed"
 
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.19.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.19.ebuild
index ccde90c46edd..a15b0800705e 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.19.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.19.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/dev-java/gnu-classpath/gnu-classpath-0.19.ebuild,v 1.5 2006/02/05 14:25:43 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.19.ebuild,v 1.6 2006/04/09 13:20:12 nichoj Exp $
 
 inherit eutils autotools
 
@@ -16,7 +16,7 @@ KEYWORDS="~x86 ~amd64 ~ppc"
 # Add the doc use flag after the upstream build system is improved
 # See their bug 24025
 
-IUSE="alsa cairo debug dssi examples gtk xml2"
+IUSE="alsa cairo debug dssi examples gtk xml"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
 		dssi? ( >=media-libs/dssi-0.9 )
@@ -32,7 +32,7 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
 				   )
 				cairo? ( >=x11-libs/cairo-0.5.0 )
 		     )
-		xml2? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )"
+		xml? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )"
 
 DEPEND="app-arch/zip
 		dev-java/jikes
@@ -72,7 +72,7 @@ src_compile() {
 		$(use_enable debug ) \
 		$(use_enable examples) \
 		$(use_enable gtk gtk-peer) \
-		$(use_enable xml2 xmlj) \
+		$(use_enable xml xmlj) \
 		$(use_enable dssi ) \
 		--enable-jni \
 		--disable-dependency-tracking \
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.20.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.20.ebuild
index fa51a4e40f6a..a33e8e83d9b7 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.20.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.20.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/dev-java/gnu-classpath/gnu-classpath-0.20.ebuild,v 1.3 2006/02/05 14:25:43 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.20.ebuild,v 1.4 2006/04/09 13:20:12 nichoj Exp $
 
 inherit eutils
 
@@ -16,7 +16,7 @@ KEYWORDS="~x86 ~amd64 ~ppc"
 # Add the doc use flag after the upstream build system is improved
 # See their bug 24025
 
-IUSE="alsa cairo debug dssi examples gtk xml2"
+IUSE="alsa cairo debug dssi examples gtk xml"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
 		dssi? ( >=media-libs/dssi-0.9 )
@@ -32,7 +32,7 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
 				   )
 				cairo? ( >=x11-libs/cairo-0.5.0 )
 		     )
-		xml2? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )"
+		xml? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )"
 
 DEPEND="app-arch/zip
 		dev-java/jikes
@@ -61,7 +61,7 @@ src_compile() {
 		$(use_enable debug ) \
 		$(use_enable examples) \
 		$(use_enable gtk gtk-peer) \
-		$(use_enable xml2 xmlj) \
+		$(use_enable xml xmlj) \
 		$(use_enable dssi ) \
 		--enable-jni \
 		--disable-dependency-tracking \
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.90.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.90.ebuild
index 48e2912c8188..17638e4fe284 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.90.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.90.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/dev-java/gnu-classpath/gnu-classpath-0.90.ebuild,v 1.1 2006/04/02 14:03:26 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.90.ebuild,v 1.2 2006/04/09 13:20:12 nichoj Exp $
 
 inherit eutils
 
@@ -16,7 +16,7 @@ KEYWORDS="~x86 ~amd64 ~ppc"
 # Add the doc use flag after the upstream build system is improved
 # See their bug 24025
 
-IUSE="alsa cairo debug dssi examples gtk xml2"
+IUSE="alsa cairo debug dssi examples gtk xml"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
 		dssi? ( >=media-libs/dssi-0.9 )
@@ -32,7 +32,7 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
 				   )
 				cairo? ( >=x11-libs/cairo-0.5.0 )
 		     )
-		xml2? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )"
+		xml? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )"
 
 DEPEND="app-arch/zip
 		dev-java/jikes
@@ -61,7 +61,7 @@ src_compile() {
 		$(use_enable debug ) \
 		$(use_enable examples) \
 		$(use_enable gtk gtk-peer) \
-		$(use_enable xml2 xmlj) \
+		$(use_enable xml xmlj) \
 		$(use_enable dssi ) \
 		--enable-jni \
 		--disable-dependency-tracking \