diff options
| author |   Martin Mokrejs <mmokrejs@fold.natur.cuni.cz> | 2011-12-12 12:57:30 +0100 |
|---|---|---|
| committer | Martin Mokrejs <mmokrejs@fold.natur.cuni.cz> | 2011-12-12 12:57:30 +0100 |
| commit | 27543e53210e1cd1d2d2fbc72441c86129cc5a2d (patch) | |
| tree | 49757023158d9e564a63ef7402eeff1ce6aa7df7 /sci-biology/estscan | |
| parent | fix sanbox violations on some systems (diff) | |
| download | sci-27543e53210e1cd1d2d2fbc72441c86129cc5a2d.tar.gz sci-27543e53210e1cd1d2d2fbc72441c86129cc5a2d.tar.bz2 sci-27543e53210e1cd1d2d2fbc72441c86129cc5a2d.zip | |
ebuild cleanup, works, releasing for testing
Diffstat (limited to 'sci-biology/estscan')
| -rw-r--r-- | sci-biology/estscan/ChangeLog | 4 | ||||
| -rw-r--r-- | sci-biology/estscan/Manifest | 6 | ||||
| -rw-r--r-- | sci-biology/estscan/estscan-3.0.3.ebuild | 34 | ||||
| -rw-r--r-- | sci-biology/estscan/metadata.xml | 1 |
4 files changed, 29 insertions, 16 deletions
diff --git a/sci-biology/estscan/ChangeLog b/sci-biology/estscan/ChangeLog index bce0bfa39..b42f65c79 100644 --- a/sci-biology/estscan/ChangeLog +++ b/sci-biology/estscan/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 12 Dec 2011; Martin Mokrejs <mmokrejs@fold.natur.cuni.cz> + estscan-3.0.3.ebuild: + ebuild cleanup, works, releasing for testing estscan-3.0.3.ebuild + 30 Jul 2011; Martin Mokrejs <mmokrejs@fold.natur.cuni.cz> estscan-3.0.3.ebuild: some ebuild cleanup estscan-3.0.3.ebuild diff --git a/sci-biology/estscan/Manifest b/sci-biology/estscan/Manifest index 1fdd337f7..75dcb3a9f 100644 --- a/sci-biology/estscan/Manifest +++ b/sci-biology/estscan/Manifest @@ -7,6 +7,6 @@ DIST Mm.smat.gz 62711 RMD160 30cf8dd0d944afcae7dd05b30bc08820e303c7c4 SHA1 2d0d5 DIST Rn.smat.gz 32388 RMD160 4ff99c8502aa914c85aeaf19f98bc7362ab70cb0 SHA1 060e66141a19302e805323322ab219d990cf4592 SHA256 2e0a9b3347a8d216a026f98e38243d207e683bc50ac5be35c4c24f5ee1803cb8 DIST estscan-3.0.3.tar.gz 46412 RMD160 dc5e12e8196837585c405163f643e2da0c84bd79 SHA1 8af2128aaa02c50d1d3cfa75188fac038381975c SHA256 037dc8770681ed12406a789ea292462a4ce5d89b0e906a1a3340aa4debc71e2f DIST user_guide_fev_07.pdf 327005 RMD160 99f838a2c61c82a5078fb49e06ab8c8a7a8c1509 SHA1 335b3bacf0af8947db57324a702d335e72d58abd SHA256 416998f9fc282a53679fd56585b468ccebc4463e61ee5e989d9b426ed6f725fd -EBUILD estscan-3.0.3.ebuild 3934 RMD160 b30e11d2b638afeb8f400949e66d6e74701043f8 SHA1 f1c3fe99f57796cbc859a7e42d62d1d971372a6b SHA256 6eb53fcf71e6e9b5070f6d268143bb7f60038b064bd861a70882cac8b08ae2cf -MISC ChangeLog 490 RMD160 658879ed6fe982e758a447d2ab7db7d47e71702f SHA1 3d3cd938b76d67f655e5c81389517f1d5a53fe89 SHA256 9bf7dc9d26ab70d67a01b49de4991dda0633e1f67f218e4d13385458d328c424 -MISC metadata.xml 326 RMD160 cdc20d05766f861cff6889339611ca1c22579631 SHA1 dddeeb441b46d5437d1883f7c44ea26ad704344e SHA256 530e03907f86440fdc52832f744b709dde2ee85492cad7b8a263544a93ea0bea +EBUILD estscan-3.0.3.ebuild 4085 RMD160 23dd3c25bd464cbd8814196e3de46a622c666a49 SHA1 343d2f9345d3881589998c35175cf18e7b3cb6f2 SHA256 df4b210ae9ba8de87fc5c69ef60476d67aaa38bc42d26043c7c9c9cea7a7b923 +MISC ChangeLog 643 RMD160 6320a3a48969bf229d45c0e9d4cb411baa84230e SHA1 5f0dc3c09262b20dac2a417caa2614f254a7a7e2 SHA256 c2f1bd59199c839fb23763b6984e19a0a00a9ff81a24c899a003663e4025dfa0 +MISC metadata.xml 269 RMD160 53c242e331b0a82669ca7913da16dac854ab8dca SHA1 bc75ba3b0f5607ac5f396d3e8a99daf5ded5a7de SHA256 13472fd0615d2b381dbe36666fe1bbf3b1c34770aa409c6101b38741b4586f85 diff --git a/sci-biology/estscan/estscan-3.0.3.ebuild b/sci-biology/estscan/estscan-3.0.3.ebuild index 913303a8e..83e92d15b 100644 --- a/sci-biology/estscan/estscan-3.0.3.ebuild +++ b/sci-biology/estscan/estscan-3.0.3.ebuild @@ -21,15 +21,13 @@ SRC_URI=" SLOT="0" LICENSE="estscan" -KEYWORDS="" -#KEYWORDS="~x86 ~amd64" -IUSE="intel" +KEYWORDS="~x86 ~amd64" +IUSE="icc ifc" DEPEND=" virtual/fortran - intel? ( - dev-lang/icc - dev-lang/ifc ) + icc? ( dev-lang/icc ) + ifc? ( dev-lang/ifc ) dev-perl/BTLib" RDEPEND="${DEPEND}" @@ -47,11 +45,17 @@ src_prepare() { if ! use icc; then sed \ - -e 's/^ CFLAGS = -O2/#CFLAGS = ${CFLAGS}/' \ + -e 's/^ CFLAGS = -O2/#CFLAGS = ${CFLAGS}/' -i "${P}"/Makefile || die + fi + + if ! use ifc; then + sed \ -e 's/^ FFLAGS = -O2/#FFLAGS = ${FFLAGS}/' \ -e "s/^ F77 = g77/F77 = $(tc-getF77)/" -i "${P}"/Makefile \ || die - else + fi + + if use icc; then # FIXME: I would use $(tc-getCC) instead of hard-coded icc but it gives # me gcc instead, same for $(tc-getF77) # Moreover, the if/else logic here should separate users having only icc @@ -63,14 +67,20 @@ src_prepare() { # Same for FFLAGS. sed \ -e "s:^# CC = icc:CC = icc:" \ - -e "s:^# CFLAGS = -O3 -ipo -axP:#CFLAGS = -O3 -ipo -axP:" \ - -e "s:^# FFLAGS = -O3 -ipo -axP:#FFLAGS = -O3 -ipo -axP:" \ + -e "s:^# CFLAGS = -O3 -ipo -axP:#CFLAGS = -O3 -ipo -axP:" \ -e "s/^ CFLAGS = -O2/#CFLAGS = -O2/" \ + -e "s/^ CC = gcc/# CC = gcc/" \ + -i "${P}"/Makefile || die "sed failed to fix CFLAGS and CC" + + fi + + if use ifc; then + sed \ + -e "s:^# FFLAGS = -O3 -ipo -axP:#FFLAGS = -O3 -ipo -axP:" \ -e "s/^# F77 = ifort/F77 = gfortran/" \ -e "s/^ FFLAGS = -O2/#FFLAGS = -O2/" \ - -e "s/^ CC = gcc/# CC = gcc/" \ -e "s/^ F77 = g77/# F77 = g77/" \ - -i "${P}"/Makefile || die "sed failed to fix CFLAGS, FFLAGS, CC, F77" + -i "${P}"/Makefile || die "sed failed to fix FFLAGS and F77" fi } diff --git a/sci-biology/estscan/metadata.xml b/sci-biology/estscan/metadata.xml index a68ccd86c..07b525505 100644 --- a/sci-biology/estscan/metadata.xml +++ b/sci-biology/estscan/metadata.xml @@ -6,5 +6,4 @@ <email>mmokrejs@fold.natur.cuni.cz</email> <name>Martin Mokrejs</name> </maintainer> -<use><flag name='intel'> Use intel compiler</flag></use> </pkgmetadata> |