Use EANT_GENTOO_CLASSPATH to avoid a call `java-pkg_getjar` in dev-java/fits.

That's what EANT_GETNTOO_CLASSPATH is for, and having a calling a
function (such as `java-pkg_getjar`) outside any of the src_*()
wrappers is not a good idea.

Also:
* Save the download as `${P}-src.jar` instead of `${P}_src.jar`.
* Fix the `java-pkg_newjar` calling syntax (I'd swapped the order).

diff --git a/dev-java/fits/Manifest b/dev-java/fits/Manifest
index 6f710cb038492f55a3aff3379c4a6755cf75459e..7fedd49700e055f09aa850e8a73d730d2146841a 100644 (file)
--- a/dev-java/fits/Manifest
+++ b/dev-java/fits/Manifest
@@ -2,7 +2,7 @@ AUX 01-Use-getResource-to-access-CompressTest-data-for-unit.patch 4661 RMD160 aa
 AUX 02-Update-ArrayFuncsTest.java-to-JUnit-4.patch 7206 RMD160 96a7f0b30a8f215e5895d9c4c6f7c6ed9ad61602 SHA1 5edfe76d0abb7f91335a953239ad4016c21a1f84 SHA256 3d62e65233b4893b96e806afb6a9141402ffacbd134c9766e80c8a3f5e66d6d3
 AUX README.Gentoo 1872 RMD160 d1dd74e452a146eda2a7cbd2a77ebb56a553306e SHA1 a808f13153d79e45312981bdd1b70db9831cfecf SHA256 eff5ce2b235af399f751566aa395ca7b803b7314e3adb652f7ae395653ac8628
 AUX build.xml 2897 RMD160 fcaaa0650bad44e260c866ad9c7e1dee45880937 SHA1 27a7fb63e437cfbe7ac60e476d0cdbb76785e782 SHA256 f639ce36f9f9d55b61a36915992ef724eb5d3fbf5237eb61f0d43b2cfa33ee26
-DIST fits-1.06.0_src.jar 174797 RMD160 af8bfea7039bc5ab9b3ad32be6d67f9145066005 SHA1 763c81042b8586ddba96e44a94fbd0d9e68217e4 SHA256 924c39f98114720917f2914e886d9f87050632a48769c289b0dffbbb646b7fcf
-EBUILD fits-1.06.0.ebuild 1372 RMD160 e4f037e82ca1ef3cdfc4d94dd4caaa58a48f229f SHA1 8974e740d68e0bf032f3e86f6a908fc69f622b8d SHA256 911f53381382ecda73f7667583ff0d41401c9f5b2c4dc68b399baf6ebdc0c6c3
+DIST fits-1.06.0-src.jar 174797 RMD160 af8bfea7039bc5ab9b3ad32be6d67f9145066005 SHA1 763c81042b8586ddba96e44a94fbd0d9e68217e4 SHA256 924c39f98114720917f2914e886d9f87050632a48769c289b0dffbbb646b7fcf
+EBUILD fits-1.06.0.ebuild 1388 RMD160 d6f2a2b938647a860d2362b6f419bed29a1f3643 SHA1 31942057016c8e2899b50b1aea0f75eb28a30dfd SHA256 a73a3012a660ef236f12797166b574531c633ae73382f7f48bf45e4e424ea9fe
 MISC ChangeLog 418 RMD160 97fe025c39bcfc9da3c7a4697fc241ffa2135fc8 SHA1 12b1fa785671ced034b7107bc61da6861f665e4f SHA256 0246d12afba4f365370399c6d360fa1344a73dd20c1ef03dbf15395b32a053a6
 MISC metadata.xml 247 RMD160 6735f3a5dd2d7a2b70589d1693f35d54291b7147 SHA1 c015969fe50967340dd050a44cb9f8a30b5e34a5 SHA256 9e65060e5f9d0a50d28c7a69d9c27fed6c3037fdd3e420cc276627fde2794f72

diff --git a/dev-java/fits/fits-1.06.0.ebuild b/dev-java/fits/fits-1.06.0.ebuild
index 984b67ad3c0ec283317f24c03316d9daff15cde6..335c43ad7a49a2908faea5eb7ae9cb98c0278d82 100644 (file)
--- a/dev-java/fits/fits-1.06.0.ebuild
+++ b/dev-java/fits/fits-1.06.0.ebuild
@@ -8,7 +8,7 @@ inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="Java library for FITS (image format) input/output"
 HOMEPAGE="http://fits.gsfc.nasa.gov/fits_libraries.html#java_tam"
-SRC_URI="http://heasarc.gsfc.nasa.gov/docs/heasarc/${PN}/java/v1.0/v${PV}/fits_src.jar -> ${P}_src.jar"
+SRC_URI="http://heasarc.gsfc.nasa.gov/docs/heasarc/${PN}/java/v1.0/v${PV}/fits_src.jar -> ${P}-src.jar"
 
 LICENSE="public-domain"
 SLOT="0"
@@ -27,8 +27,9 @@ DEPEND=">=virtual/jdk-1.5
        )
        ${COMMON_DEP}"
 
-EANT_EXTRA_ARGS="-Dpacakge.version=${PV}
-       -Djunit.jar=$(java-pkg_getjar junit-4 junit.jar)"
+EANT_EXTRA_ARGS="-Dpacakge.version=${PV}"
+EANT_GENTOO_CLASSPATH="junit-4"
+JAVA_ANT_REWRITE_CLASSPATH="true"
 
 src_unpack() {
        mkdir -p "${P}/src"
@@ -50,7 +51,7 @@ src_test() {
 }
 
 src_install() {
-       java-pkg_newjar ${PN}.jar build/${PN}.jar
+       java-pkg_newjar build/${PN}.jar ${PN}.jar
        use doc && java-pkg_dojavadoc doc/api
        use source && java-pkg_dosrc src/*
        #use examples && java-pkg_doexamples src/java/examples