Clean up.

8 files changed, 20 insertions, 76 deletions

diff --git a/dev-java/batik/ChangeLog b/dev-java/batik/ChangeLog
index 7ac1bc557db1..e5071f4ba33d 100644
--- a/dev-java/batik/ChangeLog
+++ b/dev-java/batik/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/batik
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.5 2004/02/15 20:32:25 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.6 2004/04/05 05:28:14 zx Exp $
+
+  05 Apr 2004; Chris Aniszczyk <zx@gentoo.org> batik-1.1.1.ebuild:
+  Clean up.
 
   15 Feb 2004; Chris Aniszczyk <zx@gentoo.org> batik-1.5.ebuild:
   Minor fix.
diff --git a/dev-java/batik/batik-1.1.1.ebuild b/dev-java/batik/batik-1.1.1.ebuild
deleted file mode 100644
index caf58bda2332..000000000000
--- a/dev-java/batik/batik-1.1.1.ebuild
+++ /dev/null
@@ -1,32 +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/batik/batik-1.1.1.ebuild,v 1.5 2003/09/08 07:20:54 msterret Exp $
-
-S=${WORKDIR}/xml-batik
-DESCRIPTION="Batik is a Java(tm) technology based toolkit for applications or applets that want to use images in the Scalable Vector Graphics (SVG) format for various purposes, such as viewing, generation or manipulation."
-SRC_URI="http://xml.apache.org/batik/dist/${PN}-src-${PV}.zip"
-HOMEPAGE="http://xml.apache.org/batik/"
-IUSE=""
-DEPEND=">=virtual/jdk-1.3
-	dev-java/ant"
-REDEPND=">=virtual/jdk-1.3"
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc"
-
-src_unpack() {
-	jar xvf ${DISTDIR}/${PN}-src-${PV}.zip
-}
-
-src_compile() {
-	ant jars
-}
-
-src_install () {
-
-	dojar ${P}/batik*.jar
-	dojar ${P}/lib/*.jar
-
-	dodoc README LICENSE LICENSE.rhino
-	dohtml -r ${P}/docs/
-}
diff --git a/dev-java/batik/files/digest-batik-1.1.1 b/dev-java/batik/files/digest-batik-1.1.1
deleted file mode 100644
index 30431086759a..000000000000
--- a/dev-java/batik/files/digest-batik-1.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8601c9cba32607393c1556c1e1200b53 batik-src-1.1.1.zip 8102101
diff --git a/dev-java/dom4j/ChangeLog b/dev-java/dom4j/ChangeLog
index e5cf8e0f2c62..c5ba08f9f17a 100644
--- a/dev-java/dom4j/ChangeLog
+++ b/dev-java/dom4j/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/dom4j
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/ChangeLog,v 1.8 2004/03/18 13:10:23 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/ChangeLog,v 1.9 2004/04/05 05:24:25 zx Exp $
+
+  05 Apr 2004; Chris Aniszczyk <zx@gentoo.org> dom4j-1.3.ebuild,
+  dom4j-1.4.ebuild:
+  Clean up.
 
   18 Mar 2004; David Holm <dholm@gentoo.org> dom4j-1.4.ebuild:
   Added to ~ppc.
diff --git a/dev-java/dom4j/Manifest b/dev-java/dom4j/Manifest
index 1eb5a0ed4034..3265fd73add3 100644
--- a/dev-java/dom4j/Manifest
+++ b/dev-java/dom4j/Manifest
@@ -1,6 +1,7 @@
-MD5 95b34c33782a4f5889059e1690dd3379 ChangeLog 971
-MD5 5a7e7a75f0bb7d6c7cc4df32e949964a dom4j-1.3.ebuild 932
-MD5 6cacf5a8cb2c4d4f7f58aea7672b1a17 dom4j-1.4.ebuild 920
+MD5 c3a1bdb484bf9a76b27af22ce8319ef1 dom4j-1.4.ebuild 831
+MD5 0f6c750948c287527f45a2233e7a4cd0 dom4j-1.5_beta1.ebuild 846
+MD5 26bfd27baf35705a19c5b550b2b75c58 ChangeLog 970
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 e014e03fafaf72b765338825ea8d5eee files/digest-dom4j-1.5_beta1 70
 MD5 7d71370cb081914c96dc2a16d19ebbc5 files/digest-dom4j-1.3 63
 MD5 48544058c2c90c92b7e7a2bd9c9de6d0 files/digest-dom4j-1.4 63
diff --git a/dev-java/dom4j/dom4j-1.3.ebuild b/dev-java/dom4j/dom4j-1.3.ebuild
deleted file mode 100644
index 21ab7747a0d8..000000000000
--- a/dev-java/dom4j/dom4j-1.3.ebuild
+++ /dev/null
@@ -1,28 +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/dom4j/dom4j-1.3.ebuild,v 1.7 2003/08/05 18:51:54 vapier Exp $
-
-DESCRIPTION="easy to use, open source library for working with XML, XPath and XSLT on the Java platform using the Java Collections Framework and with full support for DOM, SAX and JAXP."
-HOMEPAGE="http://dom4j.sourceforge.net/"
-SRC_URI="mirror://sourceforge/dom4j/${P}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND=">=virtual/jdk-1.3"
-RDEPEND=">=virtual/jdk-1.3"
-
-src_compile() {
-	cd ${WORKDIR}/dom4j-patched-${PV}
-	sh build.sh || die "Compilation Failed"
-}
-
-src_install() {
-	cd ${WORKDIR}/dom4j-patched-${PV}
-	# If you need another jar change the name
-	# of the file in dojar to the one you need
-	mv build/dom4j.jar build/dom4j-${PV}.jar
-	dojar build/dom4j-${PV}.jar
-	dohtml -r build/doc/*
-}
diff --git a/dev-java/dom4j/dom4j-1.4.ebuild b/dev-java/dom4j/dom4j-1.4.ebuild
index b63fcc44169b..ba99b84fd518 100644
--- a/dev-java/dom4j/dom4j-1.4.ebuild
+++ b/dev-java/dom4j/dom4j-1.4.ebuild
@@ -1,15 +1,16 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/dom4j-1.4.ebuild,v 1.3 2004/03/18 13:10:23 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dom4j/dom4j-1.4.ebuild,v 1.4 2004/04/05 05:24:25 zx Exp $
 
-DESCRIPTION="easy to use, open source library for working with XML, XPath and XSLT on the Java platform using the Java Collections Framework and with full support for DOM, SAX and JAXP."
+inherit java-pkg
+
+DESCRIPTION="Easy to use, open source library for working with XML, XPath and XSLT on the Java platform using the Java Collections Framework and with full support for DOM, SAX and JAXP."
 HOMEPAGE="http://dom4j.sourceforge.net/"
 SRC_URI="mirror://sourceforge/dom4j/${P}.tar.gz"
-
 LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="x86 ~ppc"
-
+IUSE="doc"
 DEPEND=">=virtual/jdk-1.3"
 RDEPEND=">=virtual/jdk-1.3"
 
@@ -20,9 +21,6 @@ src_compile() {
 
 src_install() {
 	cd ${WORKDIR}/dom4j-${PV}
-	# If you need another jar change the name
-	# of the file in dojar to the one you need
-	mv build/dom4j.jar build/dom4j-${PV}.jar
-	dojar build/dom4j-${PV}.jar
-	dohtml -r build/doc/*
+	java-pkg_dojar build/${PN}.jar
+	use doc && dohtml -r build/doc/*
 }
diff --git a/dev-java/dom4j/files/digest-dom4j-1.3 b/dev-java/dom4j/files/digest-dom4j-1.3
deleted file mode 100644
index 5bce8298167c..000000000000
--- a/dev-java/dom4j/files/digest-dom4j-1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2d05858028d16af14a073f2f191f1ff7 dom4j-1.3.tar.gz 11577482