6 files changed, 35 insertions, 15 deletions
diff --git a/dev-java/gnu-classpath/ChangeLog b/dev-java/gnu-classpath/ChangeLog
index ea8b54960601..adfee8b784d6 100644
--- a/dev-java/gnu-classpath/ChangeLog
+++ b/dev-java/gnu-classpath/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/gnu-classpath
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.29 2005/04/22 08:28:01 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.30 2005/05/12 15:41:56 luckyduck Exp $
+
+*gnu-classpath-0.15 (12 May 2005)
+
+  12 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -gnu-classpath-0.12.ebuild, gnu-classpath-0.13.ebuild,
+  +gnu-classpath-0.15.ebuild:
+  new upstream version, fixes #92070. marked 0.13 stable on amd64, ppc and x86
 
   22 Apr 2005; Simon Stelling <blubb@gentoo.org> gnu-classpath-0.12.ebuild:
   stable on amd64
diff --git a/dev-java/gnu-classpath/Manifest b/dev-java/gnu-classpath/Manifest
index 1b1b841289f8..c1061dbe4cb0 100644
--- a/dev-java/gnu-classpath/Manifest
+++ b/dev-java/gnu-classpath/Manifest
@@ -1,8 +1,18 @@
-MD5 09fe2bfafc11b10ceca4a824df4a0f93 ChangeLog 3800
-MD5 8f2279a9abb8d2c773fa13f1ed435089 gnu-classpath-0.12.ebuild 1112
-MD5 c0ae2900a2be347ff38325dd06eb571b gnu-classpath-0.13.ebuild 1282
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a54bef82be228fcad143d0f549eaa6aa gnu-classpath-0.13.ebuild 1279
+MD5 9275d3f3eaf2c62c635e4aacf4d0e834 gnu-classpath-0.15.ebuild 1282
 MD5 1b1e24effad7122902de9ccd4f395d90 gnu-classpath-0.14.ebuild 1282
+MD5 080809b047542bcb9e86962dd1fa98a9 ChangeLog 4058
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 ac56afc45d280e84f189a734b0720aa2 files/digest-gnu-classpath-0.12 67
 MD5 44f281c7cf47c19fe1359a1ebda60db5 files/digest-gnu-classpath-0.13 67
 MD5 9b2c43cfbb9e8d325407a9ddd2068a5d files/digest-gnu-classpath-0.14 67
+MD5 2690159fdd3e679de05cd6daed73f4da files/digest-gnu-classpath-0.15 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCg3lY06ebR+OMO78RAvt8AJ9KbjaiFp54vx3Ak03rhEqSs0GwYwCgkxAF
+ItH3C122pKcv0aaKP89Pidc=
+=2mer
+-----END PGP SIGNATURE-----
diff --git a/dev-java/gnu-classpath/files/digest-gnu-classpath-0.12 b/dev-java/gnu-classpath/files/digest-gnu-classpath-0.12
deleted file mode 100644
index 66278a07c646..000000000000
--- a/dev-java/gnu-classpath/files/digest-gnu-classpath-0.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ce1f7fbe6f2e3b738bae3b46f01a9670 classpath-0.12.tar.gz 4129732
diff --git a/dev-java/gnu-classpath/files/digest-gnu-classpath-0.15 b/dev-java/gnu-classpath/files/digest-gnu-classpath-0.15
new file mode 100644
index 000000000000..8b1e07082e87
--- /dev/null
+++ b/dev-java/gnu-classpath/files/digest-gnu-classpath-0.15
@@ -0,0 +1 @@
+MD5 036c23aec7cb53a43b7b9dc63a92fbbe classpath-0.15.tar.gz 5564571
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.13.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.13.ebuild
index f5bf92e80afa..960ec5092661 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.13.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.13.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/dev-java/gnu-classpath/gnu-classpath-0.13.ebuild,v 1.2 2005/01/26 18:31:28 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.13.ebuild,v 1.3 2005/05/12 15:41:56 luckyduck 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"
@@ -14,7 +14,7 @@ DEPEND=">=virtual/jdk-1.4
 	jikes? ( dev-java/jikes )"
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+KEYWORDS="x86 ~sparc ppc amd64"
 S=${WORKDIR}/classpath-${PV}
 
 src_compile() {
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.12.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.15.ebuild
index bf1883dc3c5a..377b2a2341a9 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.12.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.15.ebuild
@@ -1,19 +1,20 @@
 # Copyright 1999-2005 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.12.ebuild,v 1.5 2005/04/22 08:28:01 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.15.ebuild,v 1.1 2005/05/12 15:41:56 luckyduck 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"
 HOMEPAGE="http://www.gnu.org/software/classpath/"
-IUSE="jikes gtk"
+IUSE="jikes gtk xml2"
 RDEPEND=">=virtual/jre-1.4
-	gtk? ( media-libs/gdk-pixbuf >=x11-libs/gtk+-2 >=media-libs/libart_lgpl-2.1 )"
+	gtk? ( media-libs/gdk-pixbuf >=x11-libs/gtk+-2 >=media-libs/libart_lgpl-2.1)
+	xml2? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )"
 DEPEND=">=virtual/jdk-1.4
 	app-arch/zip
 	jikes? ( dev-java/jikes )"
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc amd64"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64"
 S=${WORKDIR}/classpath-${PV}
 
 src_compile() {
@@ -21,14 +22,16 @@ src_compile() {
 	local myc=""
 	use jikes && myjavac="--with-jikes=/usr/bin/jikes"
 	use gtk && myc="${myc} --enable-gtk-peer" || myc="${myc} --disable-gtk-peer"
+	use xml2 && myc="${myc} --enable-xmlj"
+
 	econf \
 		--enable-jni \
 		${myc} \
 		--prefix=/usr/share/${PN}\
-		 ${myjavac} || die
-	emake || die
+		 ${myjavac} || die "./configure failed"
+	emake || die "make failed"
 }
 
 src_install () {
-	einstall || die
+	einstall || die "make install failed"
 }