aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2013-12-28 09:42:54 +0100
committerJustin Lecher <jlec@gentoo.org>2013-12-28 09:42:54 +0100
commitdfd76253e0e6238d6675c560b8cca8acbce76a40 (patch)
treec0f16cc3d5c64f9fee4ce9830645f3a104462c23 /dev-java/fits
parentFixed ebuild fits-1.11.0 (diff)
downloadsci-dfd76253e0e6238d6675c560b8cca8acbce76a40.tar.gz
sci-dfd76253e0e6238d6675c560b8cca8acbce76a40.tar.bz2
sci-dfd76253e0e6238d6675c560b8cca8acbce76a40.zip
dev-java/fits: Add missing die; Some cosmetics
Package-Manager: portage-2.2.7
Diffstat (limited to 'dev-java/fits')
-rw-r--r--dev-java/fits/ChangeLog4
-rw-r--r--dev-java/fits/fits-1.11.0-r1.ebuild18
-rw-r--r--dev-java/fits/metadata.xml4
3 files changed, 14 insertions, 12 deletions
diff --git a/dev-java/fits/ChangeLog b/dev-java/fits/ChangeLog
index def761b2f..1128e1b1a 100644
--- a/dev-java/fits/ChangeLog
+++ b/dev-java/fits/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 28 Dec 2013; Justin Lecher <jlec@gentoo.org> fits-1.11.0-r1.ebuild,
+ metadata.xml:
+ Add missing die; Some cosmetics
+
*fits-1.11.0-r1 (27 Dec 2013)
27 Dec 2013; Johann Schmitz <ercpe@gentoo.org> +fits-1.11.0-r1.ebuild,
diff --git a/dev-java/fits/fits-1.11.0-r1.ebuild b/dev-java/fits/fits-1.11.0-r1.ebuild
index 450cd270a..2fa8a1885 100644
--- a/dev-java/fits/fits-1.11.0-r1.ebuild
+++ b/dev-java/fits/fits-1.11.0-r1.ebuild
@@ -18,32 +18,30 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
CDEPEND="dev-java/junit:4"
-RDEPEND=">=virtual/jre-1.5
- ${CDEPEND}"
-DEPEND=">=virtual/jdk-1.5
- test? (
- dev-java/ant-junit4:0
- )
- ${CDEPEND}"
+RDEPEND="${CDEPEND}
+ >=virtual/jre-1.5"
+DEPEND="${CDEPEND}
+ >=virtual/jdk-1.5
+ test? ( dev-java/ant-junit4:0 )"
EANT_EXTRA_ARGS="-Dpackage.version=${PV}"
JAVA_ANT_REWRITE_CLASSPATH="true"
EANT_GENTOO_CLASSPATH="junit-4"
src_unpack() {
- mkdir -p ${P}/src && cd ${P}/src
+ mkdir -p ${P}/src && cd ${P}/src || die
unpack ${A}
}
java_prepare() {
- cd "${S}"
+ cd "${S}" || die
cp "${FILESDIR}"/README.Gentoo "${FILESDIR}"/build.xml . || die
epatch \
"${FILESDIR}"/01-Use-getResource-to-access-CompressTest-data-for-unit.patch \
"${FILESDIR}"/02-Update-ArrayFuncsTest.java-to-JUnit-4.patch
if ! use test; then
- find "${S}" -name "*Test.java" -o -name "*Tester.java" | xargs rm || die
+ find "${S}" \( -name "*Test.java" -o -name "*Tester.java" \) -print -delete || die
fi
# from http://heasarc.gsfc.nasa.gov/docs/heasarc/fits/java/v1.0/NOTE.v111.0:
diff --git a/dev-java/fits/metadata.xml b/dev-java/fits/metadata.xml
index 8363e16ef..060700ddb 100644
--- a/dev-java/fits/metadata.xml
+++ b/dev-java/fits/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci</herd>
-<longdescription lang='en'>
+ <herd>sci</herd>
+ <longdescription lang="en">
Java library which provides I/O for FITS images and binary tables. The Java
libraries support all basic FITS formats and gzip compressed
files. Support for access to data subsets is included and the