| 1 |
commit: dfd76253e0e6238d6675c560b8cca8acbce76a40 |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 28 08:42:54 2013 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 28 08:42:54 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=dfd76253 |
| 7 |
|
| 8 |
dev-java/fits: Add missing die; Some cosmetics |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.7 |
| 11 |
|
| 12 |
--- |
| 13 |
dev-java/fits/ChangeLog | 4 ++++ |
| 14 |
dev-java/fits/fits-1.11.0-r1.ebuild | 18 ++++++++---------- |
| 15 |
dev-java/fits/metadata.xml | 4 ++-- |
| 16 |
3 files changed, 14 insertions(+), 12 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-java/fits/ChangeLog b/dev-java/fits/ChangeLog |
| 19 |
index def761b..1128e1b 100644 |
| 20 |
--- a/dev-java/fits/ChangeLog |
| 21 |
+++ b/dev-java/fits/ChangeLog |
| 22 |
@@ -2,6 +2,10 @@ |
| 23 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 24 |
# $Header: $ |
| 25 |
|
| 26 |
+ 28 Dec 2013; Justin Lecher <jlec@g.o> fits-1.11.0-r1.ebuild, |
| 27 |
+ metadata.xml: |
| 28 |
+ Add missing die; Some cosmetics |
| 29 |
+ |
| 30 |
*fits-1.11.0-r1 (27 Dec 2013) |
| 31 |
|
| 32 |
27 Dec 2013; Johann Schmitz <ercpe@g.o> +fits-1.11.0-r1.ebuild, |
| 33 |
|
| 34 |
diff --git a/dev-java/fits/fits-1.11.0-r1.ebuild b/dev-java/fits/fits-1.11.0-r1.ebuild |
| 35 |
index 450cd27..2fa8a18 100644 |
| 36 |
--- a/dev-java/fits/fits-1.11.0-r1.ebuild |
| 37 |
+++ b/dev-java/fits/fits-1.11.0-r1.ebuild |
| 38 |
@@ -18,32 +18,30 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 39 |
IUSE="" |
| 40 |
|
| 41 |
CDEPEND="dev-java/junit:4" |
| 42 |
-RDEPEND=">=virtual/jre-1.5 |
| 43 |
- ${CDEPEND}" |
| 44 |
-DEPEND=">=virtual/jdk-1.5 |
| 45 |
- test? ( |
| 46 |
- dev-java/ant-junit4:0 |
| 47 |
- ) |
| 48 |
- ${CDEPEND}" |
| 49 |
+RDEPEND="${CDEPEND} |
| 50 |
+ >=virtual/jre-1.5" |
| 51 |
+DEPEND="${CDEPEND} |
| 52 |
+ >=virtual/jdk-1.5 |
| 53 |
+ test? ( dev-java/ant-junit4:0 )" |
| 54 |
|
| 55 |
EANT_EXTRA_ARGS="-Dpackage.version=${PV}" |
| 56 |
JAVA_ANT_REWRITE_CLASSPATH="true" |
| 57 |
EANT_GENTOO_CLASSPATH="junit-4" |
| 58 |
|
| 59 |
src_unpack() { |
| 60 |
- mkdir -p ${P}/src && cd ${P}/src |
| 61 |
+ mkdir -p ${P}/src && cd ${P}/src || die |
| 62 |
unpack ${A} |
| 63 |
} |
| 64 |
|
| 65 |
java_prepare() { |
| 66 |
- cd "${S}" |
| 67 |
+ cd "${S}" || die |
| 68 |
cp "${FILESDIR}"/README.Gentoo "${FILESDIR}"/build.xml . || die |
| 69 |
epatch \ |
| 70 |
"${FILESDIR}"/01-Use-getResource-to-access-CompressTest-data-for-unit.patch \ |
| 71 |
"${FILESDIR}"/02-Update-ArrayFuncsTest.java-to-JUnit-4.patch |
| 72 |
|
| 73 |
if ! use test; then |
| 74 |
- find "${S}" -name "*Test.java" -o -name "*Tester.java" | xargs rm || die |
| 75 |
+ find "${S}" \( -name "*Test.java" -o -name "*Tester.java" \) -print -delete || die |
| 76 |
fi |
| 77 |
|
| 78 |
# from http://heasarc.gsfc.nasa.gov/docs/heasarc/fits/java/v1.0/NOTE.v111.0: |
| 79 |
|
| 80 |
diff --git a/dev-java/fits/metadata.xml b/dev-java/fits/metadata.xml |
| 81 |
index 8363e16..060700d 100644 |
| 82 |
--- a/dev-java/fits/metadata.xml |
| 83 |
+++ b/dev-java/fits/metadata.xml |
| 84 |
@@ -1,8 +1,8 @@ |
| 85 |
<?xml version="1.0" encoding="UTF-8"?> |
| 86 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 87 |
<pkgmetadata> |
| 88 |
-<herd>sci</herd> |
| 89 |
-<longdescription lang='en'> |
| 90 |
+ <herd>sci</herd> |
| 91 |
+ <longdescription lang="en"> |
| 92 |
Java library which provides I/O for FITS images and binary tables. The Java |
| 93 |
libraries support all basic FITS formats and gzip compressed |
| 94 |
files. Support for access to data subsets is included and the |
Archives