From c9580ec0eec64f17dee2491854575b3a70f77cbd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petteri=20R=C3=A4ty?= Date: Fri, 13 Apr 2007 08:52:46 +0000 Subject: [PATCH] Use java-pkg_dojavadoc. Package-Manager: portage-2.1.2.3 --- dev-java/concurrent-util/ChangeLog | 8 ++++++-- .../concurrent-util-1.3.4-r1.ebuild | 17 +++++++---------- dev-java/xpp2/ChangeLog | 7 +++++-- dev-java/xpp2/xpp2-2.1.10-r1.ebuild | 10 ++++++---- 4 files changed, 24 insertions(+), 18 deletions(-) diff --git a/dev-java/concurrent-util/ChangeLog b/dev-java/concurrent-util/ChangeLog index a707bbbe5d0a..104d23df85ac 100644 --- a/dev-java/concurrent-util/ChangeLog +++ b/dev-java/concurrent-util/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/concurrent-util -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/concurrent-util/ChangeLog,v 1.13 2006/10/05 15:34:44 gustavoz Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/concurrent-util/ChangeLog,v 1.14 2007/04/13 08:48:23 betelgeuse Exp $ + + 13 Apr 2007; Petteri Räty + concurrent-util-1.3.4-r1.ebuild: + Use java-pkg_dojavadoc. 05 Oct 2006; Gustavo Zacarias concurrent-util-1.3.4.ebuild, concurrent-util-1.3.4-r1.ebuild: diff --git a/dev-java/concurrent-util/concurrent-util-1.3.4-r1.ebuild b/dev-java/concurrent-util/concurrent-util-1.3.4-r1.ebuild index 17bb08635e4f..25f5d131e015 100644 --- a/dev-java/concurrent-util/concurrent-util-1.3.4-r1.ebuild +++ b/dev-java/concurrent-util/concurrent-util-1.3.4-r1.ebuild @@ -1,6 +1,8 @@ -# 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/concurrent-util/concurrent-util-1.3.4-r1.ebuild,v 1.3 2006/10/05 15:34:44 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/concurrent-util/concurrent-util-1.3.4-r1.ebuild,v 1.4 2007/04/13 08:48:23 betelgeuse Exp $ + +JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-ant-2 @@ -11,14 +13,9 @@ LICENSE="as-is" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" RDEPEND=">=virtual/jre-1.2" -DEPEND=">=virtual/jdk-1.2 - >=dev-java/ant-core-1.5 - source? ( app-arch/zip )" -IUSE="doc source" +DEPEND=">=virtual/jdk-1.2" -src_compile() { - eant $(use_doc doc) jar -} +EANT_DOC_TARGET="doc" src_install() { java-pkg_dojar build/lib/concurrent.jar @@ -26,7 +23,7 @@ src_install() { if use doc ; then cd build - java-pkg_dohtml -r javadoc + java-pkg_dojavadoc javadoc insinto /usr/share/doc/${PF}/demo doins demo/* fi diff --git a/dev-java/xpp2/ChangeLog b/dev-java/xpp2/ChangeLog index 07670fd518c9..27c954fad6c5 100644 --- a/dev-java/xpp2/ChangeLog +++ b/dev-java/xpp2/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/xpp2 -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xpp2/ChangeLog,v 1.13 2007/01/04 05:54:17 tgall Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/xpp2/ChangeLog,v 1.14 2007/04/13 08:52:46 betelgeuse Exp $ + + 13 Apr 2007; Petteri Räty xpp2-2.1.10-r1.ebuild: + Use java-pkg_dojavadoc. 03 Jan 2007; Tom Gall xpp2-2.1.10.ebuild: stable on ppc64 diff --git a/dev-java/xpp2/xpp2-2.1.10-r1.ebuild b/dev-java/xpp2/xpp2-2.1.10-r1.ebuild index d2b60d001c4a..ee687eaf40c8 100644 --- a/dev-java/xpp2/xpp2-2.1.10-r1.ebuild +++ b/dev-java/xpp2/xpp2-2.1.10-r1.ebuild @@ -1,6 +1,8 @@ -# 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/xpp2/xpp2-2.1.10-r1.ebuild,v 1.5 2006/12/09 09:26:48 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xpp2/xpp2-2.1.10-r1.ebuild,v 1.6 2007/04/13 08:52:46 betelgeuse Exp $ + +JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-ant-2 @@ -13,7 +15,7 @@ SRC_URI="http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/${MY_PN}2/${MY_P LICENSE="as-is" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" -IUSE="doc source" +IUSE="" S="${WORKDIR}/${MY_P}" CDEPEND=">=dev-java/xerces-2.7" @@ -52,7 +54,7 @@ src_install() { java-pkg_newjar build/lib/${MY_PN}-x2-${PV}.jar ${MY_PN}-x2.jar dohtml README.html - use doc && java-pkg_dohtml -r doc/api + use doc && java-pkg_dojavadoc doc/api use source && java-pkg_dosrc src/java/* } -- 2.26.2