Clean ups and not using jakarta-commons.eclass anymore.

6 files changed, 16 insertions, 42 deletions

diff --git a/dev-java/commons-lang/ChangeLog b/dev-java/commons-lang/ChangeLog
index cd39eb874fd1..e39418ea5d48 100644
--- a/dev-java/commons-lang/ChangeLog
+++ b/dev-java/commons-lang/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-lang
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-lang/ChangeLog,v 1.13 2004/03/15 15:28:48 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-lang/ChangeLog,v 1.14 2004/03/17 05:21:17 zx Exp $
+
+  20 Mar 2004; Chris Aniszczyk <zx@gentoo.org> commons-lang-2.0-r1.ebuild,
+  commons-lang-2.0.ebuild:
+  Not using jakarta-commons.eclass anymore, it's broken. Clean up.
 
 *commons-lang-2.0-r1 (29 Feb 2004)
 
diff --git a/dev-java/commons-lang/Manifest b/dev-java/commons-lang/Manifest
index a7a7f606a35a..c28e9731e538 100644
--- a/dev-java/commons-lang/Manifest
+++ b/dev-java/commons-lang/Manifest
@@ -1,6 +1,4 @@
-MD5 fb3989666819462a13689d60265eed13 commons-lang-2.0.ebuild 803
-MD5 e3b88e60a65ba8ae1ff6f4117da83387 ChangeLog 1799
+MD5 bcc89be01e00a56b988971e7076d252e ChangeLog 1966
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 d6ed88cf05bc9579aecf368e3bacac8f commons-lang-2.0-r1.ebuild 1109
-MD5 07c97be405d9ddaa1bbf5c24825fbb86 files/digest-commons-lang-2.0 72
+MD5 a633ea7749a0feca2e03850741e34fef commons-lang-2.0-r1.ebuild 1107
 MD5 07c97be405d9ddaa1bbf5c24825fbb86 files/digest-commons-lang-2.0-r1 72
diff --git a/dev-java/commons-lang/commons-lang-2.0-r1.ebuild b/dev-java/commons-lang/commons-lang-2.0-r1.ebuild
index 8669eceeec94..dc8401324e49 100644
--- a/dev-java/commons-lang/commons-lang-2.0-r1.ebuild
+++ b/dev-java/commons-lang/commons-lang-2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-lang/commons-lang-2.0-r1.ebuild,v 1.1 2004/03/01 04:53:48 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-lang/commons-lang-2.0-r1.ebuild,v 1.2 2004/03/17 05:21:17 zx Exp $
 
 inherit java-pkg
 
@@ -9,21 +9,17 @@ HOMEPAGE="http://jakarta.apache.org/commons/lang.html"
 SRC_URI="mirror://apache/jakarta/commons/lang/source/${P}-src.tar.gz"
 DEPEND=">=virtual/jdk-1.3
 	>=dev-java/ant-1.4
+	jikes? ( dev-java/jikes )
 	junit? ( >=dev-java/junit-3.7 )"
 RDEPEND=">=virtual/jre-1.3"
 LICENSE="Apache-1.1"
 SLOT="0"
+RESTRICT="nomirror"
 KEYWORDS="~x86 ~ppc ~sparc"
 IUSE="doc jikes junit"
 
 S="${WORKDIR}/${PN}-${PV}-src"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	echo "junit.jar=`java-config -p junit`" >> build.properties
-}
-
 src_compile() {
 	local antflags="jar"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
@@ -33,8 +29,9 @@ src_compile() {
 }
 
 src_install() {
-	mv dist/commons-lang-2.0.jar dist/${PN}.jar
+	mv dist/${P}.jar dist/${PN}.jar
 	java-pkg_dojar dist/*.jar
-	dohtml *.html
-	use doc && dohtml -r dist/docs/*
+	dodoc RELEASE-NOTES.txt
+	dohtml DEVELOPERS-GUIDE.html PROPOSAL.html STATUS.html
+	use doc && dohtml -r dist/docs/
 }
diff --git a/dev-java/commons-lang/commons-lang-2.0.ebuild b/dev-java/commons-lang/commons-lang-2.0.ebuild
deleted file mode 100644
index 81638efc3652..000000000000
--- a/dev-java/commons-lang/commons-lang-2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-lang/commons-lang-2.0.ebuild,v 1.2 2004/03/01 04:53:48 zx Exp $
-
-inherit jakarta-commons
-
-S="${WORKDIR}/${PN}-${PV}-src"
-DESCRIPTION="Jakarta components to manipulate core java classes"
-HOMEPAGE="http://jakarta.apache.org/commons/lang.html"
-SRC_URI="mirror://apache/jakarta/commons/lang/source/${P}-src.tar.gz"
-DEPEND=">=virtual/jdk-1.3
-	>=dev-java/ant-1.4
-	junit? ( >=dev-java/junit-3.7 )"
-RDEPEND=">=virtual/jre-1.3"
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
-IUSE="doc jikes junit"
-
-src_compile() {
-	cp LICENSE.txt ../LICENSE
-	jakarta-commons_src_compile myconf make
-	use doc && jakarta-commons_src_compile makedoc
-}
diff --git a/dev-java/commons-lang/files/digest-commons-lang-2.0 b/dev-java/commons-lang/files/digest-commons-lang-2.0
deleted file mode 100644
index 372fd0253970..000000000000
--- a/dev-java/commons-lang/files/digest-commons-lang-2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 200a40d46fe6a60af76acf973298b8fe commons-lang-2.0-src.tar.gz 440989
diff --git a/dev-java/gnu-jaxp/Manifest b/dev-java/gnu-jaxp/Manifest
index 5348d3ae9ebf..5b9eec17dc9b 100644
--- a/dev-java/gnu-jaxp/Manifest
+++ b/dev-java/gnu-jaxp/Manifest
@@ -1,4 +1,4 @@
-MD5 30a5227e7cad362bd0babfc25e82c1ba gnu-jaxp-1.0_beta1.ebuild 750
-MD5 4f0215424a1a3f93c0db6922f9e4ad69 ChangeLog 617
+MD5 23622442715c5a28a8ac7d2dfe1fac1b gnu-jaxp-1.0_beta1.ebuild 764
+MD5 95cf3b34799d81b2520ea21e6e2fd5b2 ChangeLog 616
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 ccfb07c99005781e9b7c4c232604b056 files/digest-gnu-jaxp-1.0_beta1 134