Switch to java-pkg_dojavadoc so that they are installed to the right location. Also cleanup the ebuild.

(Portage version: 2.1.3)

2 files changed, 14 insertions, 21 deletions

diff --git a/dev-java/jldap/ChangeLog b/dev-java/jldap/ChangeLog
index fb48a7f32a7a..4bd53fb91521 100644
--- a/dev-java/jldap/ChangeLog
+++ b/dev-java/jldap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jldap
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jldap/ChangeLog,v 1.10 2007/07/24 08:08:30 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jldap/ChangeLog,v 1.11 2007/08/15 15:35:29 betelgeuse Exp $
+
+  15 Aug 2007; Petteri Räty <betelgeuse@gentoo.org> jldap-20060300.ebuild:
+  Switch to java-pkg_dojavadoc so that they are installed to the right
+  location. Also cleanup the ebuild.
 
   24 Jul 2007; Christian Faulhammer <opfer@gentoo.org>
   jldap-20060300.ebuild:
diff --git a/dev-java/jldap/jldap-20060300.ebuild b/dev-java/jldap/jldap-20060300.ebuild
index 73cd0c1a24a8..4470b6d75539 100644
--- a/dev-java/jldap/jldap-20060300.ebuild
+++ b/dev-java/jldap/jldap-20060300.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jldap/jldap-20060300.ebuild,v 1.3 2007/07/24 08:08:30 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jldap/jldap-20060300.ebuild,v 1.4 2007/08/15 15:35:29 betelgeuse Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -28,10 +28,6 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}/200603-javac.xml.patch"
 
-}
-
-src_compile() {
-
 	java-ant_bsfix_one "${S}/javac.xml"
 
 	mkdir "${S}/ext"
@@ -39,28 +35,21 @@ src_compile() {
 	java-pkg_jar-from commons-httpclient
 	java-pkg_jar-from openspml
 	java-pkg_jar-from openspml2
-
-	cd "${S}"
-	local antflags="release"
-	use doc && antflags="${antflags} doc"
-
-	eant ${antflags}
-
 }
 
-src_install() {
-
-	dodoc README
-	dodoc README.dsml
+EANT_BUILD_TARGET="release"
+EANT_DOC_TARGET="doc"
 
+src_install() {
 	java-pkg_dojar lib/ldap.jar
 
+	dodoc README README.dsml || die
+	dohtml *.html || die
+
 	if use doc; then
-		dohtml *.html
-		dodoc design/*
-		java-pkg_dohtml -r doc/*
+		dodoc design/* || die
+		java-pkg_dojavadoc doc
 	fi
 
 	use source && java-pkg_dosrc org com
-
 }