diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2007-01-14 12:49:45 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2007-01-14 12:49:45 +0000 |
| commit | 5c937e2ab4c41dafed13c0ac0a25b6394d9ce919 (patch) | |
| tree | b908a750a4da693cf2fbd9f9360018236528758c /dev-java/antenna | |
| parent | Stable on x86. (diff) | |
| download | gentoo-2-5c937e2ab4c41dafed13c0ac0a25b6394d9ce919.tar.gz gentoo-2-5c937e2ab4c41dafed13c0ac0a25b6394d9ce919.tar.bz2 gentoo-2-5c937e2ab4c41dafed13c0ac0a25b6394d9ce919.zip | |
Fixed to work with JAVA_PKG_STRICT, ant-core is a RDEPEND too, sun-jdk-1.6 can't build javadocs for this ebuild, javadocs were not installed.
(Portage version: 2.1.2_rc4-r7)
Diffstat (limited to 'dev-java/antenna')
| -rw-r--r-- | dev-java/antenna/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-java/antenna/antenna-0.9.13-r1.ebuild | 24 |
2 files changed, 20 insertions, 13 deletions
diff --git a/dev-java/antenna/ChangeLog b/dev-java/antenna/ChangeLog index 0527a48b0c69..df54f1c9b400 100644 --- a/dev-java/antenna/ChangeLog +++ b/dev-java/antenna/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/antenna -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/antenna/ChangeLog,v 1.3 2006/09/13 22:11:26 nichoj Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/antenna/ChangeLog,v 1.4 2007/01/14 12:49:45 betelgeuse Exp $ + + 14 Jan 2007; Petteri Räty <betelgeuse@gentoo.org> + antenna-0.9.13-r1.ebuild: + Fixed to work with JAVA_PKG_STRICT, ant-core is a RDEPEND too, sun-jdk-1.6 + can't build javadocs for this ebuild, javadocs were not installed. 13 Sep 2006; Joshua Nichols <nichoj@gentoo.org> metadata.xml, antenna-0.9.13-r1.ebuild: diff --git a/dev-java/antenna/antenna-0.9.13-r1.ebuild b/dev-java/antenna/antenna-0.9.13-r1.ebuild index a683b4aea8e7..e1347e32c642 100644 --- a/dev-java/antenna/antenna-0.9.13-r1.ebuild +++ b/dev-java/antenna/antenna-0.9.13-r1.ebuild @@ -1,6 +1,6 @@ -# 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/antenna/antenna-0.9.13-r1.ebuild,v 1.3 2006/09/13 22:11:26 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/antenna/antenna-0.9.13-r1.ebuild,v 1.4 2007/01/14 12:49:45 betelgeuse Exp $ inherit java-pkg-2 java-ant-2 eutils @@ -15,11 +15,17 @@ SLOT="0" KEYWORDS="~x86" IUSE="doc" -DEPEND=">=virtual/jdk-1.4 +COMMON_DEP=" + dev-java/ant-core + ~dev-java/servletapi-2.3" + +DEPEND=" + !doc? ( >=virtual/jdk-1.4 ) + doc? ( || ( =virtual/jdk-1.4* =virtual/jdk-1.5* ) ) app-arch/unzip - dev-java/ant-core" + ${COMMON_DEP}" RDEPEND=">=virtual/jre-1.4 - ~dev-java/servletapi-2.3" + ${COMMON_DEP}" src_unpack() { mkdir ${S} && cd ${S} @@ -34,14 +40,10 @@ src_unpack() { cat > build.properties <<-END project.name=${PN} project.version=${PV} - classpath.servlet=$(java-pkg_getjars servletapi-2.3) + classpath.servlet=$(java-pkg_getjars servletapi-2.3,ant-core) END } -src_compile() { - eant jar $(use_doc) -} - src_install() { java-pkg_newjar dist/${PN}-bin-${PV}.jar ${PN}.jar @@ -50,6 +52,6 @@ src_install() { if use doc; then java-pkg_dohtml doc/* - java-pkg_dohtml -r dist/doc/api + java-pkg_dojavadoc build/doc/api fi } |