Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:ccp4 commit in: sci-libs/cctbx/
Date: Sun, 02 Jun 2013 13:43:21
Message-Id: 1370161657.e4e0220d4cea39f5260b88575f80df29ed0e364d.jlec@gentoo
1 commit: e4e0220d4cea39f5260b88575f80df29ed0e364d
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 2 08:24:17 2013 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 2 08:27:37 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e4e0220d
7
8 Drop Fortran support. Was it needed ever?
9
10 Package-Manager: portage-2.2.0_alpha177
11 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
12
13 ---
14 sci-libs/cctbx/ChangeLog | 4 ++++
15 sci-libs/cctbx/cctbx-2012.05.08.2305.ebuild | 7 ++-----
16 sci-libs/cctbx/cctbx-2013.02.27.0005.ebuild | 5 +----
17 3 files changed, 7 insertions(+), 9 deletions(-)
18
19 diff --git a/sci-libs/cctbx/ChangeLog b/sci-libs/cctbx/ChangeLog
20 index 949d710..c67eab0 100644
21 --- a/sci-libs/cctbx/ChangeLog
22 +++ b/sci-libs/cctbx/ChangeLog
23 @@ -2,6 +2,10 @@
24 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
25 # $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v 1.33 2013/03/19 07:07:15 jlec Exp $
26
27 + 02 Jun 2013; Justin Lecher <jlec@g.o> cctbx-2012.05.08.2305.ebuild,
28 + cctbx-2013.02.27.0005.ebuild:
29 + Drop unavailable USE
30 +
31 *cctbx-2013.02.27.0005 (01 Jun 2013)
32 *cctbx-2012.05.08.2305 (01 Jun 2013)
33
34
35 diff --git a/sci-libs/cctbx/cctbx-2012.05.08.2305.ebuild b/sci-libs/cctbx/cctbx-2012.05.08.2305.ebuild
36 index ac51db7..e7630a4 100644
37 --- a/sci-libs/cctbx/cctbx-2012.05.08.2305.ebuild
38 +++ b/sci-libs/cctbx/cctbx-2012.05.08.2305.ebuild
39 @@ -7,7 +7,7 @@ EAPI=5
40 DISTUTILS_SINGLE_IMPL=true
41 PYTHON_COMPAT=( python{2_6,2_7} )
42
43 -inherit distutils-r1 eutils fortran-2 multilib toolchain-funcs
44 +inherit distutils-r1 eutils multilib toolchain-funcs
45
46 MY_PV="${PV//./_}"
47
48 @@ -36,14 +36,11 @@ MY_S="${WORKDIR}"/cctbx_sources
49 MY_B="${WORKDIR}"/cctbx_build
50
51 pkg_setup() {
52 - use openmp && FORTRAN_NEED_OPENMP="1"
53 - if use openmp && ! tc-has-openmp; then
54 + if ! tc-has-openmp; then
55 ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 and icc"
56 ewarn "If you want to build ${PN} with OpenMP, abort now,"
57 ewarn "and switch CC to an OpenMP capable compiler"
58 - FORTRAN_NEED_OPENMP=1
59 fi
60 - fortran-2_pkg_setup
61 python-single-r1_pkg_setup
62 }
63
64
65 diff --git a/sci-libs/cctbx/cctbx-2013.02.27.0005.ebuild b/sci-libs/cctbx/cctbx-2013.02.27.0005.ebuild
66 index ac51db7..a24c309 100644
67 --- a/sci-libs/cctbx/cctbx-2013.02.27.0005.ebuild
68 +++ b/sci-libs/cctbx/cctbx-2013.02.27.0005.ebuild
69 @@ -36,14 +36,11 @@ MY_S="${WORKDIR}"/cctbx_sources
70 MY_B="${WORKDIR}"/cctbx_build
71
72 pkg_setup() {
73 - use openmp && FORTRAN_NEED_OPENMP="1"
74 - if use openmp && ! tc-has-openmp; then
75 + if ! tc-has-openmp; then
76 ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 and icc"
77 ewarn "If you want to build ${PN} with OpenMP, abort now,"
78 ewarn "and switch CC to an OpenMP capable compiler"
79 - FORTRAN_NEED_OPENMP=1
80 fi
81 - fortran-2_pkg_setup
82 python-single-r1_pkg_setup
83 }