dropped junit tests since they tend to fail, fixes #81617

(Portage version: 2.0.51.19)

3 files changed, 19 insertions, 19 deletions

diff --git a/dev-java/commons-lang/ChangeLog b/dev-java/commons-lang/ChangeLog
index ff21ee44a457..d16d66f09cb4 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-lang/ChangeLog,v 1.25 2005/02/06 17:16:40 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-lang/ChangeLog,v 1.26 2005/03/24 19:37:05 luckyduck Exp $
+
+  24 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  commons-lang-2.0-r1.ebuild:
+  dropped junit tests since they tend to fail, fixes #81617
 
   06 Feb 2005; Markus Rothe <corsair@gentoo.org> commons-lang-2.0-r1.ebuild:
   Stable on ppc64
diff --git a/dev-java/commons-lang/Manifest b/dev-java/commons-lang/Manifest
index 7e51a1236722..33857366823c 100644
--- a/dev-java/commons-lang/Manifest
+++ b/dev-java/commons-lang/Manifest
@@ -1,4 +1,4 @@
 MD5 c60577fa7cd388fdab9c0aa9d25bd706 ChangeLog 3095
-MD5 19533f381879b7881a3555e576bf53f1 commons-lang-2.0-r1.ebuild 1248
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 8d58f2f8c64f63f3d649e375e5b2734b commons-lang-2.0-r1.ebuild 1120
 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 a1e6b2afde17..b5a2ad1459a8 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-2005 Gentoo Foundation
 # 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.13 2005/02/06 17:16:40 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-lang/commons-lang-2.0-r1.ebuild,v 1.14 2005/03/24 19:37:05 luckyduck Exp $
 
 inherit java-pkg
 
@@ -9,34 +9,30 @@ 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 )"
-	#jikes? ( dev-java/jikes )
+	jikes? ( dev-java/jikes )"
 RDEPEND=">=virtual/jre-1.3"
 LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="x86 ppc sparc amd64 ppc64"
-IUSE="doc junit" #jikes
+IUSE="doc jikes source"
 
-S="${WORKDIR}/${PN}-${PV}-src"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	use junit && echo "junit.jar=`java-config -p junit`" >> build.properties
-}
+S="${WORKDIR}/${P}-src"
 
 src_compile() {
 	local antflags="jar"
-	#use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	use doc && antflags="${antflags} javadoc"
-	use junit && antflags="${antflags} test"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	ant ${antflags} || die "compilation failed"
 }
 
 src_install() {
 	mv dist/${P}.jar dist/${PN}.jar
-	java-pkg_dojar dist/*.jar
-	dodoc RELEASE-NOTES.txt
-	dohtml DEVELOPERS-GUIDE.html PROPOSAL.html STATUS.html
-	use doc && java-pkg_dohtml -r dist/docs/
+	java-pkg_dojar dist/${PN}.jar
+
+	if use doc; then
+		dodoc RELEASE-NOTES.txt
+		java-pkg_dohtml DEVELOPERS-GUIDE.html PROPOSAL.html STATUS.html
+		java-pkg_dohtml -r dist/docs/
+	fi
+	use source && java-pkg_dosrc src/java/*
 }