diff options
-rw-r--r-- | dev-java/concurrent-util/ChangeLog | 8 | ||||
-rw-r--r-- | dev-java/concurrent-util/concurrent-util-1.3.4-r1.ebuild | 17 |
2 files changed, 13 insertions, 12 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 <betelgeuse@gentoo.org> + concurrent-util-1.3.4-r1.ebuild: + Use java-pkg_dojavadoc. 05 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org> 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 |