Tweak style, install also user documentation with javadocs.

Package-Manager: portage-2.1.2.4

4 files changed, 25 insertions, 51 deletions

diff --git a/dev-java/commons-httpclient/ChangeLog b/dev-java/commons-httpclient/ChangeLog
index 37f3b7e210c4..073bd170a54d 100644
--- a/dev-java/commons-httpclient/ChangeLog
+++ b/dev-java/commons-httpclient/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-httpclient
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/ChangeLog,v 1.39 2007/04/27 11:39:14 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/ChangeLog,v 1.40 2007/04/27 12:33:34 caster Exp $
+
+  27 Apr 2007; Vlastimil Babka <caster@gentoo.org> -files/jikes.diff,
+  commons-httpclient-3.0.1.ebuild:
+  Tweak style, install also user documentation with javadocs.
 
   27 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
   commons-httpclient-2.0.2-r1.ebuild:
diff --git a/dev-java/commons-httpclient/Manifest b/dev-java/commons-httpclient/Manifest
index 569f22817a06..ed271ca5ab9e 100644
--- a/dev-java/commons-httpclient/Manifest
+++ b/dev-java/commons-httpclient/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX commons-httpclient-3.0.1-gentoo.patch 2069 RMD160 dc213e6bed0673216f49052a4d6b80c3b3f558cc SHA1 229253b993ec1f305133b7e384f56688e59938a2 SHA256 78896bc33dbba5757f4130751d999356a329e3e669213fc047674dd510e1a043
 MD5 99e1a7deea4b3481f71c29c8564bdf99 files/commons-httpclient-3.0.1-gentoo.patch 2069
 RMD160 dc213e6bed0673216f49052a4d6b80c3b3f558cc files/commons-httpclient-3.0.1-gentoo.patch 2069
@@ -9,10 +6,6 @@ AUX gentoo.diff 444 RMD160 dc9f394e40e927641b0a5969608910c2a330faee SHA1 f6df83d
 MD5 35bcb566781a909ae25bac9979bf497c files/gentoo.diff 444
 RMD160 dc9f394e40e927641b0a5969608910c2a330faee files/gentoo.diff 444
 SHA256 a3c96f4db1dc2230c1d7c1c77649b45115447f756df9f520d41a10e86bbd89ad files/gentoo.diff 444
-AUX jikes.diff 955 RMD160 9700866ba2d106cfc9207b5670c05d723817e652 SHA1 7dae0547962f611f05ece4f4c4088b49b8ed86e1 SHA256 a2a8df8a5330511743d00c3cf929ee89012ad6b32b97d64862260828ad25333f
-MD5 20316ee59dc3bf35dd5c04778ae6882f files/jikes.diff 955
-RMD160 9700866ba2d106cfc9207b5670c05d723817e652 files/jikes.diff 955
-SHA256 a2a8df8a5330511743d00c3cf929ee89012ad6b32b97d64862260828ad25333f files/jikes.diff 955
 DIST commons-httpclient-2.0.1-src.tar.gz 1399272 RMD160 f9387f9e5bba9a2161cd6d66a2594e70a7a20584 SHA1 8cbf691ed8802e0fbb2069d00828be5444b00260 SHA256 66381f811cd015359d806da9488a627bbf9803d3e0ef15e9a48f831eee39bdcb
 DIST commons-httpclient-2.0.2-src.tar.gz 1447937 RMD160 82c5637e06fc96f2db4ee14ad6fc158ea5f297ed SHA1 c6813d3ed0d2fa61389bf84fb5393af482b5f150 SHA256 279ee55c339e512e6a9ecefe52170c8f65e0d532c3a71cfc7ad5c5cdf964a102
 DIST commons-httpclient-3.0.1-src.tar.gz 1698379 RMD160 5b02f6731718a590dbace90e6e494a9568a7abdb SHA1 6deb04b60ec3093f0c8ee56b7bbc6980435b319c SHA256 6a26b4dfb9bfacf9849793d6edf997079b2230e5523f7aa9274a7d1d2fb1f2a8
@@ -28,14 +21,14 @@ EBUILD commons-httpclient-2.0.2.ebuild 1540 RMD160 cd9236f07468f27a143328b2ab5bb
 MD5 a3e8e318158ff2871705525c5c31bfd2 commons-httpclient-2.0.2.ebuild 1540
 RMD160 cd9236f07468f27a143328b2ab5bb20bd29515dd commons-httpclient-2.0.2.ebuild 1540
 SHA256 2d147afdb01a620aa988d9db7e2bddd0859bc9e69803a3805e356deadf15d055 commons-httpclient-2.0.2.ebuild 1540
-EBUILD commons-httpclient-3.0.1.ebuild 1515 RMD160 5232abb938b48bd44c4ab1e0675c1b5f98056101 SHA1 ade552d752182871944f3902b33f351813c0569f SHA256 7262cb2fc9800f71fcd96db293818b1b76fa8bb2eb9f81ef4b681f35a4994c6e
-MD5 1114ed857ba3548956f1eea93139853e commons-httpclient-3.0.1.ebuild 1515
-RMD160 5232abb938b48bd44c4ab1e0675c1b5f98056101 commons-httpclient-3.0.1.ebuild 1515
-SHA256 7262cb2fc9800f71fcd96db293818b1b76fa8bb2eb9f81ef4b681f35a4994c6e commons-httpclient-3.0.1.ebuild 1515
-MISC ChangeLog 6216 RMD160 fdc3bccc555cfcce7ba4276d197de2553e4222dd SHA1 a07103667c7847a7edb934af68afbf44991ec97a SHA256 3212da8887399012c4f4d0f63b25137cb6b12cc980df63849100ba2e7ba1448c
-MD5 46ed1a5bbc4efe9337c190f5018389a8 ChangeLog 6216
-RMD160 fdc3bccc555cfcce7ba4276d197de2553e4222dd ChangeLog 6216
-SHA256 3212da8887399012c4f4d0f63b25137cb6b12cc980df63849100ba2e7ba1448c ChangeLog 6216
+EBUILD commons-httpclient-3.0.1.ebuild 1486 RMD160 89e0775c97f4aee800ec23869f4a03a4310ba60a SHA1 61b1011ab209dc5727a6efd8ea8ce84a6b8a7689 SHA256 218c0fa1457e939ba05a894f07a6dd469f34592031d540ca588c3043d3c00e4b
+MD5 4945cb9e3ad6c39f4d148ba64e4e5d7f commons-httpclient-3.0.1.ebuild 1486
+RMD160 89e0775c97f4aee800ec23869f4a03a4310ba60a commons-httpclient-3.0.1.ebuild 1486
+SHA256 218c0fa1457e939ba05a894f07a6dd469f34592031d540ca588c3043d3c00e4b commons-httpclient-3.0.1.ebuild 1486
+MISC ChangeLog 6380 RMD160 d82ca877c67f08d3dcfa320e9dadfc23f0ea002e SHA1 83ac313745ff373395a81435e751681b6d760105 SHA256 63a3a0a1264b93511e10d225966a3ef9e91ae9d3f87fbc09aff662132c688262
+MD5 2fbefa4338dd682b3e8667981d3b8b1e ChangeLog 6380
+RMD160 d82ca877c67f08d3dcfa320e9dadfc23f0ea002e ChangeLog 6380
+SHA256 63a3a0a1264b93511e10d225966a3ef9e91ae9d3f87fbc09aff662132c688262 ChangeLog 6380
 MISC metadata.xml 378 RMD160 1abc973a1cf1c8e88911cdef9d01063e0b818660 SHA1 1cede0993ae8a754ec684d30c12dacc90f778661 SHA256 63d0f7bf558971c11343a9b4efd06755686373a3953c6ff369e4bd4faaf9adab
 MD5 ca83d42c8a8001ceb75efeeee805267a metadata.xml 378
 RMD160 1abc973a1cf1c8e88911cdef9d01063e0b818660 metadata.xml 378
@@ -52,10 +45,3 @@ SHA256 ce998d858d0bfffcdddb1319983b0f69f6954f032f7a5a09ce8fc5eaacb25b9e files/di
 MD5 0cbffba28b281e05d0126b80fd3c9d10 files/digest-commons-httpclient-3.0.1 289
 RMD160 8b95b84606fc07a9051356fa76117135cfa08fce files/digest-commons-httpclient-3.0.1 289
 SHA256 746bba8a177792a98471ab35b5849e68de637f254999828eeca4f6add03a1b06 files/digest-commons-httpclient-3.0.1 289
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGMeDncxLzpIGCsLQRAg6hAJ9vi5j0tFz+1t3QQM0f2DbNHXcP+gCgje3w
-ScaixEfYB4BAFtxSq1CS6vU=
-=LaAO
------END PGP SIGNATURE-----
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 01f97aa294f6..d16d2687d092 100644
--- a/dev-java/commons-httpclient/commons-httpclient-3.0.1.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-3.0.1.ebuild
@@ -1,9 +1,8 @@
 # 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.4 2007/02/09 22:08:30 fordfrog Exp $
-
-JAVA_PKG_IUSE="doc source"
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/commons-httpclient-3.0.1.ebuild,v 1.5 2007/04/27 12:33:34 caster Exp $
 
+JAVA_PKG_IUSE="doc examples source test"
 inherit java-pkg-2 java-ant-2
 
 MY_P=${P/_/-}
@@ -14,23 +13,18 @@ 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="examples test"
+IUSE=""
 
 COMMON_DEPEND="
 	dev-java/commons-logging
 	dev-java/commons-codec"
-
 RDEPEND=">=virtual/jre-1.4
 	${COMMON_DEPEND}"
-
 DEPEND=">=virtual/jdk-1.4
-	sys-apps/sed
 	test? (
 		=dev-java/junit-3.8*
 		dev-java/ant
 	)
-	!test? ( >=dev-java/ant-core-1.4 )
-	source? ( app-arch/zip )
 	${COMMON_DEPEND}"
 
 S=${WORKDIR}/${MY_P}
@@ -38,6 +32,10 @@ S=${WORKDIR}/${MY_P}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+
+	# the generated docs go to docs/api
+	rm -rf docs/apidocs
+
 	epatch ${FILESDIR}/${P}-gentoo.patch
 	mkdir lib && cd lib
 	java-pkg_jar-from commons-logging
@@ -45,7 +43,7 @@ src_unpack() {
 }
 
 src_compile() {
-	eant dist $(use_doc) $(use test && echo "-Dtest.entry=true")
+	eant dist $(use_doc doc) $(use test && echo "-Dtest.entry=true")
 }
 
 src_test() {
@@ -55,11 +53,9 @@ src_test() {
 
 src_install() {
 	java-pkg_dojar dist/${PN}.jar dist/${PN}-contrib.jar
-	use doc && java-pkg_dojavadoc dist/docs
-	use source && java-pkg_dosrc src/java/* src/contrib/*
 
-	if use examples; then
-		dodir /usr/share/doc/${PF}/examples
-		cp -r src/examples/* ${D}/usr/share/doc/${PF}/examples
-	fi
+	# contains both html docs and javadoc in correct subdir
+	use doc && java-pkg_dohtml -r dist/docs/*
+	use source && java-pkg_dosrc src/java/* src/contrib/*
+	use examples && java-pkg_doexamples src/examples
 }
diff --git a/dev-java/commons-httpclient/files/jikes.diff b/dev-java/commons-httpclient/files/jikes.diff
deleted file mode 100644
index 35d9e2d5a888..000000000000
--- a/dev-java/commons-httpclient/files/jikes.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uprN commons-httpclient-2.0.orig/src/java/org/apache/commons/httpclient/MultiThreadedHttpConnectionManager.java commons-httpclient-2.0/src/java/org/apache/commons/httpclient/MultiThreadedHttpConnectionManager.java
---- commons-httpclient-2.0.orig/src/java/org/apache/commons/httpclient/MultiThreadedHttpConnectionManager.java	2004-12-24 23:22:12.974827736 +0100
-+++ commons-httpclient-2.0/src/java/org/apache/commons/httpclient/MultiThreadedHttpConnectionManager.java	2004-12-24 23:23:04.863939392 +0100
-@@ -725,7 +725,7 @@ public class MultiThreadedHttpConnection
-     private static class ConnectionSource {
-         
-         /** The connection pool that created the connection */
--        public ConnectionPool connectionPool;
-+        public org.apache.commons.httpclient.MultiThreadedHttpConnectionManager.ConnectionPool connectionPool;
- 
-         /** The connection's host configuration */
-         public HostConfiguration hostConfiguration;