| 1 |
commit: 9ade240ecd85543324a3150cccfb227bfd43c0ef |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 25 16:25:18 2012 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 25 16:25:18 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9ade240e |
| 7 |
|
| 8 |
sci-astronomy/zpeg: Drop unnessecarry virtual/fortran dep |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.0_alpha141 |
| 11 |
|
| 12 |
--- |
| 13 |
sci-astronomy/zpeg/ChangeLog | 3 +++ |
| 14 |
sci-astronomy/zpeg/metadata.xml | 10 +++++----- |
| 15 |
sci-astronomy/zpeg/zpeg-5.23.ebuild | 16 ++++++++-------- |
| 16 |
3 files changed, 16 insertions(+), 13 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sci-astronomy/zpeg/ChangeLog b/sci-astronomy/zpeg/ChangeLog |
| 19 |
index 72e4b6d..8b18903 100644 |
| 20 |
--- a/sci-astronomy/zpeg/ChangeLog |
| 21 |
+++ b/sci-astronomy/zpeg/ChangeLog |
| 22 |
@@ -2,6 +2,9 @@ |
| 23 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 24 |
# $Header: $ |
| 25 |
|
| 26 |
+ 25 Oct 2012; Justin Lecher <jlec@g.o> zpeg-5.23.ebuild, metadata.xml: |
| 27 |
+ Drop unnessecarry virtual/fortran dep |
| 28 |
+ |
| 29 |
*zpeg-5.23 (26 Jul 2012) |
| 30 |
|
| 31 |
26 Jul 2012; Sébastien Fabbro <bicatali@g.o> +metadata.xml, |
| 32 |
|
| 33 |
diff --git a/sci-astronomy/zpeg/metadata.xml b/sci-astronomy/zpeg/metadata.xml |
| 34 |
index 46307f8..5f43060 100644 |
| 35 |
--- a/sci-astronomy/zpeg/metadata.xml |
| 36 |
+++ b/sci-astronomy/zpeg/metadata.xml |
| 37 |
@@ -1,14 +1,14 @@ |
| 38 |
<?xml version="1.0" encoding="UTF-8"?> |
| 39 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 40 |
<pkgmetadata> |
| 41 |
-<herd>sci-astronomy</herd> |
| 42 |
-<longdescription lang="en"> |
| 43 |
+ <herd>sci-astronomy</herd> |
| 44 |
+ <longdescription lang="en"> |
| 45 |
Z-PEG is a software anybody can use to compute photometric |
| 46 |
redshifts. In short, Z-PEG performs a chi square minimization of the |
| 47 |
distance between observed photometric bands and synthetic photometry |
| 48 |
from galaxies simulated by the evolutionary code PEGASE. |
| 49 |
</longdescription> |
| 50 |
-<use> |
| 51 |
-<flag name='gdl'>Install GDL/IDL plotting routines</flag> |
| 52 |
-</use> |
| 53 |
+ <use> |
| 54 |
+ <flag name="gdl">Install GDL/IDL plotting routines</flag> |
| 55 |
+ </use> |
| 56 |
</pkgmetadata> |
| 57 |
|
| 58 |
diff --git a/sci-astronomy/zpeg/zpeg-5.23.ebuild b/sci-astronomy/zpeg/zpeg-5.23.ebuild |
| 59 |
index 51792f9..23b0a84 100644 |
| 60 |
--- a/sci-astronomy/zpeg/zpeg-5.23.ebuild |
| 61 |
+++ b/sci-astronomy/zpeg/zpeg-5.23.ebuild |
| 62 |
@@ -2,7 +2,7 @@ |
| 63 |
# Distributed under the terms of the GNU General Public License v2 |
| 64 |
# $Header: $ |
| 65 |
|
| 66 |
-EAPI=4 |
| 67 |
+EAPI=5 |
| 68 |
|
| 69 |
inherit fortran-2 |
| 70 |
|
| 71 |
@@ -12,13 +12,13 @@ DESCRIPTION="Galaxy photometric redshifts from evolutionary synthesis" |
| 72 |
HOMEPAGE="http://imacdlb.iap.fr:8080/cgi-bin/zpeg/zpeg.pl" |
| 73 |
SRC_URI="ftp://ftp.iap.fr/pub/from_users/leborgne/${PN}/${MYP}.tar.gz" |
| 74 |
|
| 75 |
-LICENSE="GPL-2" |
| 76 |
SLOT="0" |
| 77 |
+LICENSE="GPL-2" |
| 78 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 79 |
IUSE="gdl" |
| 80 |
|
| 81 |
RDEPEND="gdl? ( dev-lang/gdl )" |
| 82 |
-DEPEND="virtual/fortran" |
| 83 |
+DEPEND="" |
| 84 |
|
| 85 |
S="${WORKDIR}/${MYP}" |
| 86 |
|
| 87 |
@@ -26,7 +26,7 @@ FORTRAN_STANDARD="90" |
| 88 |
|
| 89 |
src_prepare() { |
| 90 |
# save configure for tests |
| 91 |
- cp configure{,.orig} |
| 92 |
+ cp configure{,.orig} || die |
| 93 |
# install data in FHS |
| 94 |
sed -i \ |
| 95 |
-e "s:ZPEG_ROOT=.*:ZPEG_ROOT=${EPREFIX}/usr/share/${PN}:" \ |
| 96 |
@@ -34,19 +34,19 @@ src_prepare() { |
| 97 |
} |
| 98 |
|
| 99 |
src_compile() { |
| 100 |
- # not worth debugging parallell build failures which is due to |
| 101 |
+ # not worth debugging parallel build failures which is due to |
| 102 |
# fortran modules missing dependencies) |
| 103 |
emake -j1 -C src |
| 104 |
} |
| 105 |
|
| 106 |
src_test() { |
| 107 |
# test only works with hardcoded path, so reconfigure and recompile |
| 108 |
- mv bin/zpeg{,.orig} |
| 109 |
- mv configure{.orig,} |
| 110 |
+ mv bin/zpeg{,.orig} || die |
| 111 |
+ mv configure{.orig,} || die |
| 112 |
emake -C src clean && econf && emake -j1 -C src |
| 113 |
cd test |
| 114 |
../bin/zpeg -V ZPEG1_cata.cat -o hdf.zpeg -p hdf.par -t hdf.par.tmp || die |
| 115 |
- mv bin/zpeg{.orig,} |
| 116 |
+ mv bin/zpeg{.orig,} || die |
| 117 |
} |
| 118 |
|
| 119 |
src_install() { |
Archives