From: Petteri Räty Date: Sun, 14 Jan 2007 12:49:45 +0000 (+0000) Subject: Fixed to work with JAVA_PKG_STRICT, ant-core is a RDEPEND too, sun-jdk-1.6 can't... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5e05d568e7f4b518a6ce2a6cf118f841288b2e81;p=gentoo.git 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. Package-Manager: portage-2.1.2_rc4-r7 --- 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 + 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 metadata.xml, antenna-0.9.13-r1.ebuild: diff --git a/dev-java/antenna/Manifest b/dev-java/antenna/Manifest index 18ec335d0c1a..2dbc376a473d 100644 --- a/dev-java/antenna/Manifest +++ b/dev-java/antenna/Manifest @@ -1,16 +1,19 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX antenna-0.9.13-ant.patch 3893 RMD160 843561997b09401bf4430f99fa19b2453372aa29 SHA1 3553e0120531cde581e95abe1f5260d63659b3a0 SHA256 dcb5e693ce80aa944873eb3baa6ac6287157412dc1c4dd0e3bbf7853d936db53 MD5 77471f48c99f338771643a79d2941764 files/antenna-0.9.13-ant.patch 3893 RMD160 843561997b09401bf4430f99fa19b2453372aa29 files/antenna-0.9.13-ant.patch 3893 SHA256 dcb5e693ce80aa944873eb3baa6ac6287157412dc1c4dd0e3bbf7853d936db53 files/antenna-0.9.13-ant.patch 3893 -DIST antenna-src-0.9.13.zip 119536 RMD160 de4a506fe292b88160d2df156f701c8eda1d79d1 SHA256 dbc17fc08a7788da7ac6c42f3a7c49fa78227c3dd9d6d225534c7336a710fe23 -EBUILD antenna-0.9.13-r1.ebuild 1257 RMD160 82b0d411e530bb488edb142a9bdf11f942f994fa SHA1 6fd4755f317697fa88f2048ef67a6b167d3378f4 SHA256 2131c9700f69c1dc6bb621c4fc2904d6a86dd4b3935f45ff89010b1459691937 -MD5 a0c495e3dd0ce91266137c46f50c146d antenna-0.9.13-r1.ebuild 1257 -RMD160 82b0d411e530bb488edb142a9bdf11f942f994fa antenna-0.9.13-r1.ebuild 1257 -SHA256 2131c9700f69c1dc6bb621c4fc2904d6a86dd4b3935f45ff89010b1459691937 antenna-0.9.13-r1.ebuild 1257 -MISC ChangeLog 658 RMD160 561ea21a4cf7051bf67cfee5ca2c0658803677bc SHA1 41467c94e134285b44c2c507471d77a8dc9e7f47 SHA256 2e8b7ba1545eb5e0cef5f94119dad7f14c9b10fbfd86a94d384ef829dbd9a08b -MD5 2965733bb8bee403d7925f61a2552289 ChangeLog 658 -RMD160 561ea21a4cf7051bf67cfee5ca2c0658803677bc ChangeLog 658 -SHA256 2e8b7ba1545eb5e0cef5f94119dad7f14c9b10fbfd86a94d384ef829dbd9a08b ChangeLog 658 +DIST antenna-src-0.9.13.zip 119536 RMD160 de4a506fe292b88160d2df156f701c8eda1d79d1 SHA1 b7f5e749dcde86ae7e0f7f52c4b04f18fad4a061 SHA256 dbc17fc08a7788da7ac6c42f3a7c49fa78227c3dd9d6d225534c7336a710fe23 +EBUILD antenna-0.9.13-r1.ebuild 1341 RMD160 9373e6a232b59e7600a63851097cd3b166a4bcd1 SHA1 365367e95dd385f5aa7635327c0b8197ecb3743d SHA256 d4990a10c101165bcff34810076ec9ec50ca2af47364afb2aef913cf5aef5360 +MD5 d373faefe0fa7a5e39d879bf4e58ff5d antenna-0.9.13-r1.ebuild 1341 +RMD160 9373e6a232b59e7600a63851097cd3b166a4bcd1 antenna-0.9.13-r1.ebuild 1341 +SHA256 d4990a10c101165bcff34810076ec9ec50ca2af47364afb2aef913cf5aef5360 antenna-0.9.13-r1.ebuild 1341 +MISC ChangeLog 890 RMD160 f184edbe131297d14f1be1efbf5c9c7f69f158c4 SHA1 ba64be6c8bd3efc2e0ddd6006d661b4cf0791a49 SHA256 eaeb2b3c1c405bde20d46c1779de79139e2e896fe2b7064cda9155194187f559 +MD5 62bb70cc6aed9b76f0f22b69856e6a73 ChangeLog 890 +RMD160 f184edbe131297d14f1be1efbf5c9c7f69f158c4 ChangeLog 890 +SHA256 eaeb2b3c1c405bde20d46c1779de79139e2e896fe2b7064cda9155194187f559 ChangeLog 890 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158 @@ -18,3 +21,10 @@ SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata MD5 eda94272b805f1d530d18f0932e60c92 files/digest-antenna-0.9.13-r1 247 RMD160 41b0859dab4cba69bfd393a0dffdf9a4367c1dd5 files/digest-antenna-0.9.13-r1 247 SHA256 7a3dbf1af466171960ace729dff6f0f72c8f8eb3c16b6da1a2f5be7aa6d97973 files/digest-antenna-0.9.13-r1 247 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iD8DBQFFqib0cxLzpIGCsLQRAiA5AJ9jE8UCmj2in8Etpyuhp2lm1F+FYQCeNeTx +OmlsS1MJPKcAJK5DoAnvzPY= +=7xdf +-----END PGP SIGNATURE----- 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 }