From 14aa1eb948fef023cd80ad09c603088171636b78 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Miroslav=20=C5=A0ulc?= Date: Fri, 9 Feb 2007 22:08:30 +0000 Subject: [PATCH] Corrected generation of javadoc - see bug #159149. Also corrected running of tests if JAVA_PKG_STRICT=true. Package-Manager: portage-2.1.2-r9 --- dev-java/commons-httpclient/ChangeLog | 10 ++++- dev-java/commons-httpclient/Manifest | 42 +++++++------------ .../commons-httpclient-3.0.1.ebuild | 31 ++++++++------ .../commons-httpclient-3.0.1-gentoo.patch | 13 +++++- .../files/digest-commons-httpclient-2.0.1 | 2 + 5 files changed, 56 insertions(+), 42 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 + 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 metadata.xml, commons-httpclient-2.0.1.ebuild, commons-httpclient-2.0.2.ebuild, diff --git a/dev-java/commons-httpclient/Manifest b/dev-java/commons-httpclient/Manifest index a2cba9a2d549..4deb151dbfe4 100644 --- a/dev-java/commons-httpclient/Manifest +++ b/dev-java/commons-httpclient/Manifest @@ -1,10 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX commons-httpclient-3.0.1-gentoo.patch 1734 RMD160 50f0b262596baa4cc813873021be9c226f2b6f6d SHA1 affbf08a6e9f2159ee8a8dcef9646c84dd22c470 SHA256 00645a5f430ff89eff9b632e2f3696e997141c3ec52ec9e1ea05fcab81340779 -MD5 14c0e0532ec404e2c90fee41b4e228f7 files/commons-httpclient-3.0.1-gentoo.patch 1734 -RMD160 50f0b262596baa4cc813873021be9c226f2b6f6d files/commons-httpclient-3.0.1-gentoo.patch 1734 -SHA256 00645a5f430ff89eff9b632e2f3696e997141c3ec52ec9e1ea05fcab81340779 files/commons-httpclient-3.0.1-gentoo.patch 1734 +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 +SHA256 78896bc33dbba5757f4130751d999356a329e3e669213fc047674dd510e1a043 files/commons-httpclient-3.0.1-gentoo.patch 2069 AUX gentoo.diff 444 RMD160 dc9f394e40e927641b0a5969608910c2a330faee SHA1 f6df83d13012a77d4d6977a3c35756e7c6e1a073 SHA256 a3c96f4db1dc2230c1d7c1c77649b45115447f756df9f520d41a10e86bbd89ad MD5 35bcb566781a909ae25bac9979bf497c files/gentoo.diff 444 RMD160 dc9f394e40e927641b0a5969608910c2a330faee files/gentoo.diff 444 @@ -13,7 +10,7 @@ AUX jikes.diff 955 RMD160 9700866ba2d106cfc9207b5670c05d723817e652 SHA1 7dae0547 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 +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 EBUILD commons-httpclient-2.0.1.ebuild 1528 RMD160 5f21af4644d226df50bd9def475c378b691ee4c6 SHA1 f0023b3938ac1753b549e71c4f33098817aaf8f7 SHA256 0db0a146bb3955a0ea6ebd6087b07b9a5c3d9603b865c39176efe9ed45a609c5 @@ -28,21 +25,21 @@ 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 1424 RMD160 e2e2a747c5c2bf9d191b657e9a21b0ec1c790333 SHA1 720ee093df9e5b5203963de7bb29d1c0bf627c06 SHA256 b11356e74adc584d4f10e19652510f052b615c076e88cc19ec1e7c90588f977b -MD5 0447c6e26c5db591b28c9e97f597056c commons-httpclient-3.0.1.ebuild 1424 -RMD160 e2e2a747c5c2bf9d191b657e9a21b0ec1c790333 commons-httpclient-3.0.1.ebuild 1424 -SHA256 b11356e74adc584d4f10e19652510f052b615c076e88cc19ec1e7c90588f977b commons-httpclient-3.0.1.ebuild 1424 -MISC ChangeLog 5749 RMD160 683811d29c38436f0e267f94523e429b1b3033f3 SHA1 83d12bc663dac46df5b97c0ba575af2fd0e87a5f SHA256 354aff0104de9477ecdc8ea6e4e22d33dda37c3b17e82d45592005447431d53b -MD5 29fe5904a3f1836316064ace4883e9e6 ChangeLog 5749 -RMD160 683811d29c38436f0e267f94523e429b1b3033f3 ChangeLog 5749 -SHA256 354aff0104de9477ecdc8ea6e4e22d33dda37c3b17e82d45592005447431d53b ChangeLog 5749 +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 5994 RMD160 a0828b148d9e5cfd10dada9e6fb4b055c44c005b SHA1 2fa2793162b31b5a0c96c62cb6a948dd01790474 SHA256 3e2d19a68e200745e5d7e633dd96e9f296202f52c12df367b2ce3b50d4e404b8 +MD5 faf15a7d69cc52b6f294d9c3ee201049 ChangeLog 5994 +RMD160 a0828b148d9e5cfd10dada9e6fb4b055c44c005b ChangeLog 5994 +SHA256 3e2d19a68e200745e5d7e633dd96e9f296202f52c12df367b2ce3b50d4e404b8 ChangeLog 5994 MISC metadata.xml 378 RMD160 1abc973a1cf1c8e88911cdef9d01063e0b818660 SHA1 1cede0993ae8a754ec684d30c12dacc90f778661 SHA256 63d0f7bf558971c11343a9b4efd06755686373a3953c6ff369e4bd4faaf9adab MD5 ca83d42c8a8001ceb75efeeee805267a metadata.xml 378 RMD160 1abc973a1cf1c8e88911cdef9d01063e0b818660 metadata.xml 378 SHA256 63d0f7bf558971c11343a9b4efd06755686373a3953c6ff369e4bd4faaf9adab metadata.xml 378 -MD5 22c430c6bf50bc578f8095df5fd64cc4 files/digest-commons-httpclient-2.0.1 81 -RMD160 ce4d74296358439f7944a358b7f4e85fd6a3e143 files/digest-commons-httpclient-2.0.1 81 -SHA256 39bd5edcbf76ba7d1b70845bca6c1279da67eb6a79e7753c1d2be8f4b69848f4 files/digest-commons-httpclient-2.0.1 81 +MD5 5a9a0cd5fbef45e7fc64e78e2231b32b files/digest-commons-httpclient-2.0.1 289 +RMD160 04df6973b9828d79ea127fe83beb86934868523b files/digest-commons-httpclient-2.0.1 289 +SHA256 7f5f7bb2f2112e24d8ff655d55561102feae9c5391431605ad8fbda423332840 files/digest-commons-httpclient-2.0.1 289 MD5 25d25d6d826624b872bcf76690c31ebd files/digest-commons-httpclient-2.0.2 289 RMD160 0b37e48d9e1a21b03325d4656bce29f35d1bb41b files/digest-commons-httpclient-2.0.2 289 SHA256 ce998d858d0bfffcdddb1319983b0f69f6954f032f7a5a09ce8fc5eaacb25b9e files/digest-commons-httpclient-2.0.2 289 @@ -52,10 +49,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 v1.4.6 (GNU/Linux) - -iD8DBQFFkXCVcxLzpIGCsLQRAiEiAKCJJ+vxRxXTcE2S+lrgIqGKxgxIxACdHkQr -4jb6Y5KP6BKHu5BZcqXFkXs= -=puIo ------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 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 @@ @@ -8,6 +8,15 @@ + +- + + @@ -154,6 +155,13 @@ 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 -- 2.26.2