Stylistic cleanup.

Package-Manager: portage-2.1.2.4

3 files changed, 31 insertions, 22 deletions

diff --git a/dev-java/commons-httpclient/ChangeLog b/dev-java/commons-httpclient/ChangeLog
index b79efbc935c2..37f3b7e210c4 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.38 2007/03/26 20:06:15 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/ChangeLog,v 1.39 2007/04/27 11:39:14 betelgeuse Exp $
+
+  27 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
+  commons-httpclient-2.0.2-r1.ebuild:
+  Stylistic cleanup.
 
   26 Mar 2007; Peter Weller <welp@gentoo.org>
   commons-httpclient-2.0.2-r1.ebuild:
diff --git a/dev-java/commons-httpclient/Manifest b/dev-java/commons-httpclient/Manifest
index 6112a183152d..569f22817a06 100644
--- a/dev-java/commons-httpclient/Manifest
+++ b/dev-java/commons-httpclient/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -17,10 +20,10 @@ EBUILD commons-httpclient-2.0.1.ebuild 1528 RMD160 5f21af4644d226df50bd9def475c3
 MD5 e1fa3fe999deeb6ca057a0ef0f91727e commons-httpclient-2.0.1.ebuild 1528
 RMD160 5f21af4644d226df50bd9def475c378b691ee4c6 commons-httpclient-2.0.1.ebuild 1528
 SHA256 0db0a146bb3955a0ea6ebd6087b07b9a5c3d9603b865c39176efe9ed45a609c5 commons-httpclient-2.0.1.ebuild 1528
-EBUILD commons-httpclient-2.0.2-r1.ebuild 1475 RMD160 a423ee7d0a6addffc37d82e4f90eb8a9f48e7496 SHA1 f1c8e867c9ebf4a1be10510afa222ee086fab55f SHA256 dba55318a244973ebe3261e90a994f7a5e1cc949826a25d5f82ba111f235843c
-MD5 29baf9d336a1d64046e799ce6d3378ae commons-httpclient-2.0.2-r1.ebuild 1475
-RMD160 a423ee7d0a6addffc37d82e4f90eb8a9f48e7496 commons-httpclient-2.0.2-r1.ebuild 1475
-SHA256 dba55318a244973ebe3261e90a994f7a5e1cc949826a25d5f82ba111f235843c commons-httpclient-2.0.2-r1.ebuild 1475
+EBUILD commons-httpclient-2.0.2-r1.ebuild 1308 RMD160 c8e58da3de07c84ef25c1001e1bc5709d71c4ad3 SHA1 9e34bf78326eb496c61a7547733acdcc6e6f6f4d SHA256 da98a88fc174086f2ad371ae6ca110047251ca178f936b446bf3a17e8267719e
+MD5 bd727ae360965a0d6a51a2ece1f5d50d commons-httpclient-2.0.2-r1.ebuild 1308
+RMD160 c8e58da3de07c84ef25c1001e1bc5709d71c4ad3 commons-httpclient-2.0.2-r1.ebuild 1308
+SHA256 da98a88fc174086f2ad371ae6ca110047251ca178f936b446bf3a17e8267719e commons-httpclient-2.0.2-r1.ebuild 1308
 EBUILD commons-httpclient-2.0.2.ebuild 1540 RMD160 cd9236f07468f27a143328b2ab5bb20bd29515dd SHA1 f0f0d4741a55e873f4e9f5075f813bd157ebdcdd SHA256 2d147afdb01a620aa988d9db7e2bddd0859bc9e69803a3805e356deadf15d055
 MD5 a3e8e318158ff2871705525c5c31bfd2 commons-httpclient-2.0.2.ebuild 1540
 RMD160 cd9236f07468f27a143328b2ab5bb20bd29515dd commons-httpclient-2.0.2.ebuild 1540
@@ -29,10 +32,10 @@ EBUILD commons-httpclient-3.0.1.ebuild 1515 RMD160 5232abb938b48bd44c4ab1e0675c1
 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 6097 RMD160 936a6bcba63de140f4dce238225dc8289f58369b SHA1 f62c349d416e5535c575af563cd22533febb18fa SHA256 aea80bd3971decf9c6331002d57733be2a36db7c70562fd85786965abebbe1c2
-MD5 eed6d0c02ca1b02262a5ce59bce3a05c ChangeLog 6097
-RMD160 936a6bcba63de140f4dce238225dc8289f58369b ChangeLog 6097
-SHA256 aea80bd3971decf9c6331002d57733be2a36db7c70562fd85786965abebbe1c2 ChangeLog 6097
+MISC ChangeLog 6216 RMD160 fdc3bccc555cfcce7ba4276d197de2553e4222dd SHA1 a07103667c7847a7edb934af68afbf44991ec97a SHA256 3212da8887399012c4f4d0f63b25137cb6b12cc980df63849100ba2e7ba1448c
+MD5 46ed1a5bbc4efe9337c190f5018389a8 ChangeLog 6216
+RMD160 fdc3bccc555cfcce7ba4276d197de2553e4222dd ChangeLog 6216
+SHA256 3212da8887399012c4f4d0f63b25137cb6b12cc980df63849100ba2e7ba1448c ChangeLog 6216
 MISC metadata.xml 378 RMD160 1abc973a1cf1c8e88911cdef9d01063e0b818660 SHA1 1cede0993ae8a754ec684d30c12dacc90f778661 SHA256 63d0f7bf558971c11343a9b4efd06755686373a3953c6ff369e4bd4faaf9adab
 MD5 ca83d42c8a8001ceb75efeeee805267a metadata.xml 378
 RMD160 1abc973a1cf1c8e88911cdef9d01063e0b818660 metadata.xml 378
@@ -49,3 +52,10 @@ 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-2.0.2-r1.ebuild b/dev-java/commons-httpclient/commons-httpclient-2.0.2-r1.ebuild
index 36e78ad71b65..b1e9ebfe105b 100644
--- a/dev-java/commons-httpclient/commons-httpclient-2.0.2-r1.ebuild
+++ b/dev-java/commons-httpclient/commons-httpclient-2.0.2-r1.ebuild
@@ -1,6 +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-2.0.2-r1.ebuild,v 1.4 2007/03/26 20:06:15 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/commons-httpclient-2.0.2-r1.ebuild,v 1.5 2007/04/27 11:39:14 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2 eutils
 
@@ -11,20 +13,17 @@ SRC_URI="mirror://apache/jakarta/commons/httpclient/source/${P/_/-}-src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="doc source"
+IUSE=""
 
 RDEPEND=">=virtual/jre-1.3
 	dev-java/commons-logging"
 
 DEPEND=">=virtual/jdk-1.3
-	${RDEPEND}
-	sys-apps/sed
-	>=dev-java/ant-core-1.4
-	source? ( app-arch/zip )"
+	${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	#make jikes happy
 	#if use jikes; then
@@ -33,15 +32,11 @@ src_unpack() {
 	#		|| die "failed to sed"
 	#fi
 
-	epatch ${FILESDIR}/gentoo.diff || die "patching failed"
+	epatch "${FILESDIR}/gentoo.diff"
 	echo "commons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" >> build.properties
 }
 
-src_compile() {
-	local antflags="dist"
-	use doc && antflags="${antflags} javadoc"
-	eant ${antflags} || die "compilation failed"
-}
+EANT_BUILD_TARGET="dist"
 
 src_install() {
 	java-pkg_dojar dist/${PN}.jar