cleanups

4 files changed, 7 insertions, 70 deletions

diff --git a/dev-java/xerces/ChangeLog b/dev-java/xerces/ChangeLog
index fdd72c830182..f3c66fcc91a5 100644
--- a/dev-java/xerces/ChangeLog
+++ b/dev-java/xerces/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/xerces
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.30 2004/09/17 11:41:56 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.31 2004/09/21 14:14:28 axxo Exp $
+
+  21 Sep 2004; Thomas Matthijs <axxo@gentoo.org> -xerces-2.6.0.ebuild,
+  xerces-2.6.2-r1.ebuild:
+  cleanup
 
 *xerces-1.3.1 (17 Sep 2004)
 
diff --git a/dev-java/xerces/files/digest-xerces-2.6.0 b/dev-java/xerces/files/digest-xerces-2.6.0
deleted file mode 100644
index e4f6906e1d7c..000000000000
--- a/dev-java/xerces/files/digest-xerces-2.6.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 cedd031587ce38db6fc23ef67923de4b Xerces-J-src.2.6.0.tar.gz 1544173
-MD5 32f6d726216609cc24edacb8afd586e9 Xerces-J-tools.2.6.0.tar.gz 3657400
diff --git a/dev-java/xerces/xerces-2.6.0.ebuild b/dev-java/xerces/xerces-2.6.0.ebuild
deleted file mode 100644
index 847ad57221fc..000000000000
--- a/dev-java/xerces/xerces-2.6.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.11 2004/09/10 19:51:32 axxo 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"
-SRC_URI="mirror://apache/xml/xerces-j/Xerces-J-src.${PV}.tar.gz
-	mirror://apache/xml/xerces-j/Xerces-J-tools.${PV}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="x86 ppc sparc amd64"
-
-DEPEND=">=dev-java/ant-core-1.5.2"
-RDEPEND=">=virtual/jdk-1.3"
-
-src_unpack() {
-	unpack ${A}
-	mv tools ${S}
-}
-
-src_compile() {
-	addpredict /dev/random
-	if 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 use doc ; then
-		dodir /usr/share/doc/${P}
-		cp -a samples ${D}/usr/share/doc/${P}
-		dohtml -r build/docs/javadocs
-	fi
-}
-
-pkg_postinst() {
-	if use doc ; then
-		einfo "                                                          "
-		einfo " API Documentation is in /usr/share/doc/${PN}-${PV}.      "
-		einfo "                                                          "
-		einfo " Online Documentation:                                    "
-		einfo "     http://xml.apache.org/xerces2-j/api.html             "
-		einfo "                                                          "
-		epause 5
-	else
-		einfo "                                                          "
-		einfo " Online Documentation:                                    "
-		einfo "     http://xml.apache.org/xerces2-j/api.html             "
-		einfo "                                                          "
-		epause 5
-	fi
-}
-
diff --git a/dev-java/xerces/xerces-2.6.2-r1.ebuild b/dev-java/xerces/xerces-2.6.2-r1.ebuild
index de91b59232ea..6d4ca088ab9a 100644
--- a/dev-java/xerces/xerces-2.6.2-r1.ebuild
+++ b/dev-java/xerces/xerces-2.6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.6.2-r1.ebuild,v 1.7 2004/09/10 19:51:32 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.6.2-r1.ebuild,v 1.8 2004/09/21 14:14:28 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/xml/xerces-j/Xerces-J-src.${PV}.tar.gz
 
 LICENSE="Apache-1.1"
 SLOT="2"
-KEYWORDS="x86 ppc sparc ~amd64"
+KEYWORDS="x86 ppc sparc amd64"
 
 DEPEND=">=dev-java/ant-core-1.5.2"
 RDEPEND=">=virtual/jdk-1.3"