Moving 2.6 to stable since 2.5 doesnt compile with blackdown.

5 files changed, 10 insertions, 54 deletions

diff --git a/dev-java/xerces/ChangeLog b/dev-java/xerces/ChangeLog
index 44284fb57f13..91cbe8f0e8b3 100644
--- a/dev-java/xerces/ChangeLog
+++ b/dev-java/xerces/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/xerces
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.13 2003/12/02 04:18:31 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.14 2003/12/16 02:11:31 strider Exp $
+
+  15 Dec 2003; Adrian Almenar <strider@gentoo.org> xerces-2.5.0.ebuild:
+  Moving 2.6 to stable since 2.5 doesnt compile with blackdown.
 
 *xerces-2.6.0 (01 Dec 2003)
 
diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
index 1a41b439809a..1c7989b2b1ca 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -1,6 +1,4 @@
-MD5 034fd618c8d9eacea93f3ea81e758be3 xerces-2.5.0.ebuild 1183
-MD5 e33cabb0bb40a3958467a52cbf1b6c86 ChangeLog 2383
+MD5 14706f411dbb2f27dc2b29918763618d ChangeLog 2520
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 8258f9740c07bda9e688327cb23cee30 xerces-2.6.0.ebuild 1190
-MD5 4390c3834dfc898bef6d4d4cbc277fce files/digest-xerces-2.5.0 144
+MD5 218054337eb626947955fc42a8588189 xerces-2.6.0.ebuild 1187
 MD5 1fcb1a39009fabe31915e46883eb55b9 files/digest-xerces-2.6.0 144
diff --git a/dev-java/xerces/files/digest-xerces-2.5.0 b/dev-java/xerces/files/digest-xerces-2.5.0
deleted file mode 100644
index a701465cba4e..000000000000
--- a/dev-java/xerces/files/digest-xerces-2.5.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7e43e4a1e8ac92131758490ab998d524 Xerces-J-src.2.5.0.tar.gz 1490467
-MD5 ce5b921b6c4e0e4d3b14a30b9296c7cd Xerces-J-tools.2.5.0.tar.gz 3655338
diff --git a/dev-java/xerces/xerces-2.5.0.ebuild b/dev-java/xerces/xerces-2.5.0.ebuild
deleted file mode 100644
index 7cafb068fac1..000000000000
--- a/dev-java/xerces/xerces-2.5.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.5.0.ebuild,v 1.3 2003/09/09 02:37:55 strider Exp $
-
-inherit java-pkg eutils
-
-S=${WORKDIR}/xerces-${PV//./_}
-DESCRIPTION="The next generation of high performance, fully compliant XML parsers in the Apache Xerces family"
-HOMEPAGE="http://xml.apache.org/xerces2-j/index.html"
-SRC_URI="http://xml.apache.org/dist/xerces-j/Xerces-J-src.${PV}.tar.gz
-	http://xml.apache.org/dist/xerces-j/Xerces-J-tools.${PV}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~alpha"
-IUSE="doc"
-
-DEPEND=">=dev-java/ant-1.5.2"
-RDEPEND=">=virtual/jdk-1.3"
-
-src_unpack() {
-	unpack ${A}
-	mv tools ${S}
-}
-
-src_compile() {
-	if [ -n "`use doc`" ] ; then
-		sh build.sh jars sampjar javadocs || die "Compile failed."
-	else
-		sh build.sh jars sampjar || die "Compile failed."
-	fi
-}
-
-src_install() {
-	java-pkg_dojar build/x*.jar
-	dodoc TODO STATUS README LICENSE ISSUES
-	dohtml Readme.html
-
-	if [ -n "`use doc`" ] ; then
-		dodir /usr/share/doc/${P}
-		cp -a samples ${D}/usr/share/doc/${P}
-		dohtml -r build/docs/javadocs
-	fi
-}
diff --git a/dev-java/xerces/xerces-2.6.0.ebuild b/dev-java/xerces/xerces-2.6.0.ebuild
index 8c044f297bc9..f9273abe9dc1 100644
--- a/dev-java/xerces/xerces-2.6.0.ebuild
+++ b/dev-java/xerces/xerces-2.6.0.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.6.0.ebuild,v 1.1 2003/12/02 04:18:31 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.6.0.ebuild,v 1.2 2003/12/16 02:11:31 strider Exp $
 
 inherit java-pkg eutils
 
+IUSE="doc"
+
 S=${WORKDIR}/xerces-${PV//./_}
 DESCRIPTION="The next generation of high performance, fully compliant XML parsers in the Apache Xerces family"
 HOMEPAGE="http://xml.apache.org/xerces2-j/index.html"
@@ -12,8 +14,7 @@ SRC_URI="mirror://apache/xml/xerces-j/Xerces-J-src.${PV}.tar.gz
 
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-IUSE="doc"
+KEYWORDS="x86 ppc sparc alpha"
 
 DEPEND=">=dev-java/ant-1.5.2"
 RDEPEND=">=virtual/jdk-1.3"