Corrected generation of javadoc - see bug #159149. Also corrected running of tests if JAVA_PKG_STRICT=true.

(Portage version: 2.1.2-r9)

4 files changed, 40 insertions, 16 deletions

diff --git a/dev-java/commons-httpclient/ChangeLog b/dev-java/commons-httpclient/ChangeLog
index 4c04db24a6f3..a6b2e763e38e 100644
--- a/dev-java/commons-httpclient/ChangeLog
+++ b/dev-java/commons-httpclient/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-httpclient
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/ChangeLog,v 1.36 2006/12/26 18:55:26 betelgeuse Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/ChangeLog,v 1.37 2007/02/09 22:08:30 fordfrog Exp $
+
+  09 Feb 2007; Miroslav Šulc <fordfrog@gentoo.org>
+  files/commons-httpclient-3.0.1-gentoo.patch,
+  commons-httpclient-3.0.1.ebuild:
+  Corrected generation of javadoc - see bug #159149. Also corrected running of
+  tests if JAVA_PKG_STRICT=true.
 
   26 Dec 2006; Petteri Räty <betelgeuse@gentoo.org> metadata.xml,
   commons-httpclient-2.0.1.ebuild, commons-httpclient-2.0.2.ebuild,
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.0.1.ebuild b/dev-java/commons-httpclient/commons-httpclient-3.0.1.ebuild
index f581a14d8524..01f97aa294f6 100644
--- a/dev-java/commons-httpclient/commons-httpclient-3.0.1.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-3.0.1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/commons-httpclient-3.0.1.ebuild,v 1.3 2006/12/26 18:55:26 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/commons-httpclient-3.0.1.ebuild,v 1.4 2007/02/09 22:08:30 fordfrog Exp $
 
-inherit java-pkg-2 java-ant-2 eutils
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
 
 MY_P=${P/_/-}
 DESCRIPTION="The Jakarta Commons HttpClient library"
@@ -12,21 +14,24 @@ SRC_URI="mirror://apache/jakarta/commons/httpclient/source/${MY_P}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="3"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="doc examples source test"
+IUSE="examples test"
 
-RDEPEND=">=virtual/jre-1.3
+COMMON_DEPEND="
 	dev-java/commons-logging
 	dev-java/commons-codec"
 
-DEPEND=">=virtual/jdk-1.3
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEPEND}"
+
+DEPEND=">=virtual/jdk-1.4
 	sys-apps/sed
 	test? (
-		dev-java/junit
+		=dev-java/junit-3.8*
 		dev-java/ant
 	)
 	!test? ( >=dev-java/ant-core-1.4 )
 	source? ( app-arch/zip )
-	${RDEPEND}"
+	${COMMON_DEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
@@ -43,9 +48,14 @@ src_compile() {
 	eant dist $(use_doc) $(use test && echo "-Dtest.entry=true")
 }
 
+src_test() {
+	java-pkg_jar-from --into lib junit
+	eant test
+}
+
 src_install() {
 	java-pkg_dojar dist/${PN}.jar dist/${PN}-contrib.jar
-	use doc && java-pkg_dohtml -r dist/docs/*
+	use doc && java-pkg_dojavadoc dist/docs
 	use source && java-pkg_dosrc src/java/* src/contrib/*
 
 	if use examples; then
@@ -53,6 +63,3 @@ src_install() {
 		cp -r src/examples/* ${D}/usr/share/doc/${PF}/examples
 	fi
 }
-src_test() {
-	eant test
-}
diff --git a/dev-java/commons-httpclient/files/commons-httpclient-3.0.1-gentoo.patch b/dev-java/commons-httpclient/files/commons-httpclient-3.0.1-gentoo.patch
index cfb5355f5e1a..c42bc5a215e5 100644
--- a/dev-java/commons-httpclient/files/commons-httpclient-3.0.1-gentoo.patch
+++ b/dev-java/commons-httpclient/files/commons-httpclient-3.0.1-gentoo.patch
@@ -1,5 +1,5 @@
---- build.xml.orig	2006-10-30 19:36:49.000000000 +0100
-+++ build.xml	2006-10-30 19:49:01.000000000 +0100
+--- build.xml.original	2007-02-09 22:45:29.000000000 +0100
++++ build.xml	2007-02-09 22:46:50.000000000 +0100
 @@ -127,6 +127,7 @@
      <mkdir dir="${build.home}/docs/api"/>
      <mkdir dir="${build.home}/tests"/>
@@ -8,6 +8,15 @@
    </target>
  
    <target name="static" depends="prepare"
+@@ -140,7 +141,7 @@
+ 
+ <!-- ========== Targets: "External" Targets =============================== -->
+ 
+-  <target name="dist" depends="compile,doc"
++  <target name="dist" depends="compile"
+           description="Create binary distribution">
+     <mkdir dir="${dist.home}"/>
+     <copy file="LICENSE.txt" todir="${dist.home}"/> 
 @@ -154,6 +155,13 @@
          <include name="LICENSE.txt"/>
        </metainf>
diff --git a/dev-java/commons-httpclient/files/digest-commons-httpclient-2.0.1 b/dev-java/commons-httpclient/files/digest-commons-httpclient-2.0.1
index db3e33b5d6f5..3b74cbe6880a 100644
--- a/dev-java/commons-httpclient/files/digest-commons-httpclient-2.0.1
+++ b/dev-java/commons-httpclient/files/digest-commons-httpclient-2.0.1
@@ -1 +1,3 @@
 MD5 b74f527e2eee22f1212cf2689b7a3761 commons-httpclient-2.0.1-src.tar.gz 1399272
+RMD160 f9387f9e5bba9a2161cd6d66a2594e70a7a20584 commons-httpclient-2.0.1-src.tar.gz 1399272
+SHA256 66381f811cd015359d806da9488a627bbf9803d3e0ef15e9a48f831eee39bdcb commons-httpclient-2.0.1-src.tar.gz 1399272