Ebuild cleanup and fix bug #210060.

Package-Manager: portage-2.1.4.1

4 files changed, 30 insertions, 16 deletions

diff --git a/dev-java/hessian/ChangeLog b/dev-java/hessian/ChangeLog
index 644023dbaa96..a4ac60e8eb26 100644
--- a/dev-java/hessian/ChangeLog
+++ b/dev-java/hessian/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/hessian
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hessian/ChangeLog,v 1.11 2008/02/14 01:16:18 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hessian/ChangeLog,v 1.12 2008/02/14 01:46:08 betelgeuse Exp $
+
+  14 Feb 2008; Petteri Räty <betelgeuse@gentoo.org> files/build-3.0.8.xml,
+  hessian-3.0.8-r5.ebuild:
+  Ebuild cleanup and fix bug #210060.
 
 *hessian-3.0.8-r5 (14 Feb 2008)
 
@@ -19,6 +23,11 @@
   hessian-3.0.8-r4.ebuild:
   Shortened DESCRIPTION and removed unused revisions.
 
+*hessian-3.0.8-r4 (16 Jan 2007)
+
+  16 Jan 2007; Petteri Räty <betelgeuse@gentoo.org +hessian-3.0.8-r4.ebuild:
+  Fix to compile with 1.5.
+
   28 Nov 2006; Joshua Nichols <nichoj@gentoo.org> hessian-3.0.8-r3.ebuild:
   Stabilized on amd64 (see bug #155622).
 
diff --git a/dev-java/hessian/Manifest b/dev-java/hessian/Manifest
index 14acb9383034..aa83a2ab3fb0 100644
--- a/dev-java/hessian/Manifest
+++ b/dev-java/hessian/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 3.0.8-java5.patch 1691 RMD160 6f648e6db6700ba6647f4cc0d418e32c2e6ce3f4 SHA1 22229718e352ee29ab572716cca571eece0afc65 SHA256 ec5c064b28d79c6a5d04d180c7fbb26f15c7f8f2d02fbf8cefa14c2595d32527
-AUX build-3.0.8.xml 1546 RMD160 ebd507967b0bb2fabe2aac044ef60e3785189654 SHA1 68699e0269a51d6f4eba82e5b15bd485974d8084 SHA256 db486d24f063b5ec263d6da56b52dd2a7cae686cb9c347fb9702cc0d3dda7868
+AUX build-3.0.8.xml 1517 RMD160 bcafb550ae521406f7b546c4da18786edb1058e2 SHA1 60f3cea2a833b675cda5e5e372134d8b5935a14b SHA256 5f5f81a6f5f732261976aae943109f4b313879ad5aa1c58941b23ae94569b564
 DIST hessian-3.0.8-src.jar 184076 RMD160 58fabf4adaf5fc508293c55a4451ab2dde48265a SHA1 98d3f6f1a9b94a5ba460c2d1a809c12921b86167 SHA256 467163cb89ca6f40d8fd8ccafd1ca9c8e3a4d670529acbc53c0e0efe29c2cb1b
 EBUILD hessian-3.0.8-r3.ebuild 1400 RMD160 8ab208c8c7c7cf2a48245407758da22294cc7d00 SHA1 abeb8c52c742570106384fdd10b457f249a1b571 SHA256 4e6514225dec1c5f68b71d1e980f511d42949afc77b42d0042b9d775688d0f18
-EBUILD hessian-3.0.8-r5.ebuild 1403 RMD160 7dfa32aac1f793a0973c4f22ee69453b3084bc1b SHA1 ba786dc744b05321f4cff74167965046fb4e92e1 SHA256 e4c543352517237c8e67cef27d8e80318136516576d10407c4c1fd8228f71aa7
-MISC ChangeLog 2475 RMD160 5d02e2586d42317b7da8e1452429cd5dba732c1d SHA1 3330c1fbe86a756512cf9c8b2859e6fb2d8982c0 SHA256 0322aa604fc08719dc4046f0b2eba72518cf9dfa999a34e6cd11da11f39b6931
+EBUILD hessian-3.0.8-r5.ebuild 1358 RMD160 4af3dc02877130a7fbc54919d24be84c917162ae SHA1 f3c1a35c36330f9e248b429a7b6fb50be815ba83 SHA256 df05d39a5d793fe6c132b36c560f3bf3ee652ad33d13d4562600e11ab0aebb8f
+MISC ChangeLog 2761 RMD160 617da20e6fb7ceca3f823cfc917bf6609a790e63 SHA1 6871e19d0ae3854a1da1071108b9d48cc40b283e SHA256 cd80f2fda1c337a34c80e5baa2a5c134b68d34ad9da96772ce784bd042ecff82
 MISC metadata.xml 490 RMD160 21fcfd8d13a61480dc43637a5a9dda264e0a935d SHA1 17851e5ce80c2ff84aa65a90a13f975654bb58d6 SHA256 648632b1d516e8bda1ea2b22dea20bbe787a43476c0f2abd711a084da421d7bb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHs51kcxLzpIGCsLQRAs2iAJ9nAkbB2d9lAYRXC6PQPL6EkzOHawCfVqK1
+J2yw1VnVgGOuxAwJDMrO/nY=
+=UOpe
+-----END PGP SIGNATURE-----
diff --git a/dev-java/hessian/files/build-3.0.8.xml b/dev-java/hessian/files/build-3.0.8.xml
index 4153ebfa4868..d3a85de83b8f 100644
--- a/dev-java/hessian/files/build-3.0.8.xml
+++ b/dev-java/hessian/files/build-3.0.8.xml
@@ -42,9 +42,7 @@
    </target>
 
    <target name="javadoc" depends="compile">
-      <javadoc destdir="${dist}/doc/api">
-      	<fileset dir="${src}"/>
-      </javadoc>
+	   <javadoc destdir="${dist}/doc/api" sourcepath="${src}"/>
    </target>
 
    <target name="clean">
diff --git a/dev-java/hessian/hessian-3.0.8-r5.ebuild b/dev-java/hessian/hessian-3.0.8-r5.ebuild
index 7586edd5ccca..65bf599a33b0 100644
--- a/dev-java/hessian/hessian-3.0.8-r5.ebuild
+++ b/dev-java/hessian/hessian-3.0.8-r5.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hessian/hessian-3.0.8-r5.ebuild,v 1.1 2008/02/14 01:16:18 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hessian/hessian-3.0.8-r5.ebuild,v 1.2 2008/02/14 01:46:08 betelgeuse Exp $
 
 EAPI=1
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
@@ -13,16 +14,14 @@ SRC_URI="http://www.caucho.com/hessian/download/${P}-src.jar"
 LICENSE="Apache-1.1"
 SLOT="3.0.8"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc source"
+IUSE=""
 
 COMMON_DEP="java-virtuals/servlet-api:2.3
-		~dev-java/caucho-services-${PV}"
+		dev-java/caucho-services:3.0"
 RDEPEND=">=virtual/jre-1.4
 	${COMMON_DEP}"
 DEPEND=">=virtual/jdk-1.4
 	app-arch/unzip
-	source? ( app-arch/zip )
-	dev-java/ant-core
 	${COMMON_DEP}"
 
 src_unpack() {
@@ -39,15 +38,13 @@ src_unpack() {
 	epatch "${FILESDIR}/3.0.8-java5.patch"
 
 	# No included ant script! Bad Java developer, bad!
-	cp ${FILESDIR}/build-${PV}.xml build.xml
+	cp "${FILESDIR}/build-${PV}.xml" build.xml
 
 	# Populate classpath
 	echo "classpath=$(java-pkg_getjars servlet-api-2.3):$(java-pkg_getjars caucho-services-3.0)" >> build.properties
 }
 
-src_compile() {
-	eant -Dproject.name=${PN} jar $(use_doc)
-}
+EANT_EXTRA_ARGS="-Dproject.name=${PN}"
 
 src_install() {
 	java-pkg_dojar dist/${PN}.jar