From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 445D91387B1 for ; Sat, 28 Dec 2013 08:43:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3EF1FE0A83; Sat, 28 Dec 2013 08:43:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9ECBEE0A83 for ; Sat, 28 Dec 2013 08:43:42 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8FBF333F76C for ; Sat, 28 Dec 2013 08:43:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E4E1D11043E for ; Sat, 28 Dec 2013 08:43:39 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1388220174.dfd76253e0e6238d6675c560b8cca8acbce76a40.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: dev-java/fits/ X-VCS-Repository: proj/sci X-VCS-Files: dev-java/fits/ChangeLog dev-java/fits/fits-1.11.0-r1.ebuild dev-java/fits/metadata.xml X-VCS-Directories: dev-java/fits/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: dfd76253e0e6238d6675c560b8cca8acbce76a40 X-VCS-Branch: master Date: Sat, 28 Dec 2013 08:43:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2f9b3b1f-c204-4e6b-af41-f7a49ecaa16f X-Archives-Hash: 07b0cf16bbbe03d27f2d2b9830412717 commit: dfd76253e0e6238d6675c560b8cca8acbce76a40 Author: Justin Lecher gentoo org> AuthorDate: Sat Dec 28 08:42:54 2013 +0000 Commit: Justin Lecher gentoo org> CommitDate: Sat Dec 28 08:42:54 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=dfd76253 dev-java/fits: Add missing die; Some cosmetics Package-Manager: portage-2.2.7 --- dev-java/fits/ChangeLog | 4 ++++ dev-java/fits/fits-1.11.0-r1.ebuild | 18 ++++++++---------- dev-java/fits/metadata.xml | 4 ++-- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dev-java/fits/ChangeLog b/dev-java/fits/ChangeLog index def761b..1128e1b 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 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 +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 450cd27..2fa8a18 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 8363e16..060700d 100644 --- a/dev-java/fits/metadata.xml +++ b/dev-java/fits/metadata.xml @@ -1,8 +1,8 @@ -sci - + sci + 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