1 |
commit: dac56003499b308be453b361702faf7c87fc9933 |
2 |
Author: Johann Schmitz <johann <AT> j-schmitz <DOT> net> |
3 |
AuthorDate: Fri Dec 27 18:07:19 2013 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 27 18:07:19 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=dac56003 |
7 |
|
8 |
Fixed ebuild fits-1.11.0 |
9 |
|
10 |
Package-Manager: portage-2.2.7 |
11 |
|
12 |
--- |
13 |
dev-java/fits/ChangeLog | 6 ++++ |
14 |
.../{fits-1.11.0.ebuild => fits-1.11.0-r1.ebuild} | 33 ++++++++++++++++------ |
15 |
2 files changed, 31 insertions(+), 8 deletions(-) |
16 |
|
17 |
diff --git a/dev-java/fits/ChangeLog b/dev-java/fits/ChangeLog |
18 |
index f3920cf..def761b 100644 |
19 |
--- a/dev-java/fits/ChangeLog |
20 |
+++ b/dev-java/fits/ChangeLog |
21 |
@@ -2,6 +2,12 @@ |
22 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
23 |
# $Header: $ |
24 |
|
25 |
+*fits-1.11.0-r1 (27 Dec 2013) |
26 |
+ |
27 |
+ 27 Dec 2013; Johann Schmitz <ercpe@g.o> +fits-1.11.0-r1.ebuild, |
28 |
+ -fits-1.11.0.ebuild: |
29 |
+ Fixed ebuild fits-1.11.0 |
30 |
+ |
31 |
*fits-1.11.0 (25 Jun 2013) |
32 |
|
33 |
25 Jun 2013; Sébastien Fabbro <bicatali@g.o> +fits-1.11.0.ebuild, |
34 |
|
35 |
diff --git a/dev-java/fits/fits-1.11.0.ebuild b/dev-java/fits/fits-1.11.0-r1.ebuild |
36 |
similarity index 52% |
37 |
rename from dev-java/fits/fits-1.11.0.ebuild |
38 |
rename to dev-java/fits/fits-1.11.0-r1.ebuild |
39 |
index a4ab801..450cd27 100644 |
40 |
--- a/dev-java/fits/fits-1.11.0.ebuild |
41 |
+++ b/dev-java/fits/fits-1.11.0-r1.ebuild |
42 |
@@ -3,8 +3,10 @@ |
43 |
# $Header: $ |
44 |
|
45 |
EAPI=5 |
46 |
+ |
47 |
JAVA_PKG_IUSE="doc source test" |
48 |
-inherit eutils java-pkg-2 java-ant-2 |
49 |
+ |
50 |
+inherit java-pkg-2 java-ant-2 |
51 |
|
52 |
DESCRIPTION="Java library for FITS input/output" |
53 |
HOMEPAGE="http://fits.gsfc.nasa.gov/fits_libraries.html#java_tam" |
54 |
@@ -20,14 +22,13 @@ RDEPEND=">=virtual/jre-1.5 |
55 |
${CDEPEND}" |
56 |
DEPEND=">=virtual/jdk-1.5 |
57 |
test? ( |
58 |
- dev-java/ant-junit4 |
59 |
- dev-java/hamcrest-core |
60 |
+ dev-java/ant-junit4:0 |
61 |
) |
62 |
${CDEPEND}" |
63 |
|
64 |
-EANT_EXTRA_ARGS="-Dpacakge.version=${PV}" |
65 |
-EANT_GENTOO_CLASSPATH="junit-4" |
66 |
+EANT_EXTRA_ARGS="-Dpackage.version=${PV}" |
67 |
JAVA_ANT_REWRITE_CLASSPATH="true" |
68 |
+EANT_GENTOO_CLASSPATH="junit-4" |
69 |
|
70 |
src_unpack() { |
71 |
mkdir -p ${P}/src && cd ${P}/src |
72 |
@@ -40,15 +41,31 @@ java_prepare() { |
73 |
epatch \ |
74 |
"${FILESDIR}"/01-Use-getResource-to-access-CompressTest-data-for-unit.patch \ |
75 |
"${FILESDIR}"/02-Update-ArrayFuncsTest.java-to-JUnit-4.patch |
76 |
+ |
77 |
+ if ! use test; then |
78 |
+ find "${S}" -name "*Test.java" -o -name "*Tester.java" | xargs rm || die |
79 |
+ fi |
80 |
+ |
81 |
+ # from http://heasarc.gsfc.nasa.gov/docs/heasarc/fits/java/v1.0/NOTE.v111.0: |
82 |
+ # The source code JAR (fits_src.jar) includes a number of new classes for |
83 |
+ # which the corresponding class files are not included in fits.jar. These |
84 |
+ # classes are pre-alpha versions of support for tile compressed data that |
85 |
+ # is being developed. Interested Users may take a look at these, but they |
86 |
+ # definitely are not expected to work today. |
87 |
+ rm src/nom/tam/image/comp/Quantizer.java \ |
88 |
+ src/nom/tam/image/comp/RealStats.java \ |
89 |
+ src/nom/tam/image/comp/TiledImageHDU.java \ |
90 |
+ src/nom/tam/image/QuantizeRandoms.java \ |
91 |
+ src/nom/tam/image/TileDescriptor.java \ |
92 |
+ src/nom/tam/image/TileLooper.java || die |
93 |
} |
94 |
|
95 |
src_test() { |
96 |
- ANT_TASKS="ant-junit4" eant test |
97 |
+ ANT_TASKS="ant-junit4" java-pkg-2_src_test |
98 |
} |
99 |
|
100 |
src_install() { |
101 |
- java-pkg_newjar build/${PN}.jar ${PN}.jar |
102 |
+ java-pkg_dojar build/${PN}.jar |
103 |
use doc && java-pkg_dojavadoc doc/api |
104 |
use source && java-pkg_dosrc src/* |
105 |
- #use examples && java-pkg_doexamples src/java/examples |
106 |
} |