* [gentoo-commits] proj/sci:ccp4 commit in: sci-libs/cctbx/
@ 2013-06-10 11:25 Justin Lecher
0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher @ 2013-06-10 11:25 UTC (permalink / raw
To: gentoo-commits
commit: db23d0fc994c8fa3a450f1b8cf53b85f43443010
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 6 08:25:37 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jun 6 08:29:37 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=db23d0fc
sci-libs/cctbx: Fix deps, added dev-libs/antlr-c and block any earlier version of self
Package-Manager: portage-2.2.0_alpha177
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
---
sci-libs/cctbx/ChangeLog | 5 +----
sci-libs/cctbx/cctbx-2013.02.27.0005.ebuild | 2 ++
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/sci-libs/cctbx/ChangeLog b/sci-libs/cctbx/ChangeLog
index 9d8e3e8..22af15d 100644
--- a/sci-libs/cctbx/ChangeLog
+++ b/sci-libs/cctbx/ChangeLog
@@ -6,10 +6,7 @@
Handle static-libs
06 Jun 2013; Justin Lecher <jlec@gentoo.org> cctbx-2013.02.27.0005.ebuild:
- Handle static-libs
-
- 06 Jun 2013; Justin Lecher <jlec@gentoo.org> cctbx-2013.02.27.0005.ebuild:
- Handle static-libs
+ Fix deps, added dev-libs/antlr-c adn block any earlier version of self
02 Jun 2013; Justin Lecher <jlec@gentoo.org> cctbx-2012.05.08.2305.ebuild,
cctbx-2013.02.27.0005.ebuild:
diff --git a/sci-libs/cctbx/cctbx-2013.02.27.0005.ebuild b/sci-libs/cctbx/cctbx-2013.02.27.0005.ebuild
index f4b001d..e8af021 100644
--- a/sci-libs/cctbx/cctbx-2013.02.27.0005.ebuild
+++ b/sci-libs/cctbx/cctbx-2013.02.27.0005.ebuild
@@ -21,6 +21,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="+minimal static-libs"
RDEPEND="
+ dev-libs/antlr-c
>=dev-libs/boost-1.48[python,${PYTHON_USEDEP}]
sci-libs/clipper
sci-libs/fftw:2.1
@@ -29,6 +30,7 @@ RDEPEND="
sci-chemistry/cns
sci-chemistry/shelx )"
DEPEND="${RDEPEND}
+ !!<sci-libs/cctbx-${PV}
!prefix? ( >=dev-util/scons-1.2[${PYTHON_USEDEP}] )"
S="${WORKDIR}"
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] proj/sci:ccp4 commit in: sci-libs/cctbx/
@ 2013-06-06 8:24 Justin Lecher
0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher @ 2013-06-06 8:24 UTC (permalink / raw
To: gentoo-commits
commit: 2145dbd4ed3decb4d6162807e4e4b4d61df87809
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 6 08:18:47 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jun 6 08:18:47 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2145dbd4
sci-libs/cctbx: Handle static-libs
Package-Manager: portage-2.2.0_alpha177
---
sci-libs/cctbx/ChangeLog | 9 +++++++++
sci-libs/cctbx/cctbx-2013.02.27.0005.ebuild | 11 ++++++++++-
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/sci-libs/cctbx/ChangeLog b/sci-libs/cctbx/ChangeLog
index c67eab0..9d8e3e8 100644
--- a/sci-libs/cctbx/ChangeLog
+++ b/sci-libs/cctbx/ChangeLog
@@ -2,6 +2,15 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v 1.33 2013/03/19 07:07:15 jlec Exp $
+ 06 Jun 2013; Justin Lecher <jlec@gentoo.org> cctbx-2013.02.27.0005.ebuild:
+ Handle static-libs
+
+ 06 Jun 2013; Justin Lecher <jlec@gentoo.org> cctbx-2013.02.27.0005.ebuild:
+ Handle static-libs
+
+ 06 Jun 2013; Justin Lecher <jlec@gentoo.org> cctbx-2013.02.27.0005.ebuild:
+ Handle static-libs
+
02 Jun 2013; Justin Lecher <jlec@gentoo.org> cctbx-2012.05.08.2305.ebuild,
cctbx-2013.02.27.0005.ebuild:
Drop unavailable USE
diff --git a/sci-libs/cctbx/cctbx-2013.02.27.0005.ebuild b/sci-libs/cctbx/cctbx-2013.02.27.0005.ebuild
index a24c309..f4b001d 100644
--- a/sci-libs/cctbx/cctbx-2013.02.27.0005.ebuild
+++ b/sci-libs/cctbx/cctbx-2013.02.27.0005.ebuild
@@ -18,7 +18,7 @@ SRC_URI="http://cci.lbl.gov/cctbx_build/results/${MY_PV}/${PN}_bundle.tar.gz ->
LICENSE="cctbx-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+minimal"
+IUSE="+minimal static-libs"
RDEPEND="
>=dev-libs/boost-1.48[python,${PYTHON_USEDEP}]
@@ -76,3 +76,12 @@ python_prepare_all() {
distutils-r1_python_prepare_all
}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ if ! use static-libs; then
+ find "${ED}" -type f -name "*.a" -delete || die
+ fi
+ prune_libtool_files
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] proj/sci:ccp4 commit in: sci-libs/cctbx/
@ 2013-06-02 13:43 Justin Lecher
0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher @ 2013-06-02 13:43 UTC (permalink / raw
To: gentoo-commits
commit: e4e0220d4cea39f5260b88575f80df29ed0e364d
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 2 08:24:17 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Jun 2 08:27:37 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e4e0220d
Drop Fortran support. Was it needed ever?
Package-Manager: portage-2.2.0_alpha177
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
---
sci-libs/cctbx/ChangeLog | 4 ++++
sci-libs/cctbx/cctbx-2012.05.08.2305.ebuild | 7 ++-----
sci-libs/cctbx/cctbx-2013.02.27.0005.ebuild | 5 +----
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/sci-libs/cctbx/ChangeLog b/sci-libs/cctbx/ChangeLog
index 949d710..c67eab0 100644
--- a/sci-libs/cctbx/ChangeLog
+++ b/sci-libs/cctbx/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v 1.33 2013/03/19 07:07:15 jlec Exp $
+ 02 Jun 2013; Justin Lecher <jlec@gentoo.org> cctbx-2012.05.08.2305.ebuild,
+ cctbx-2013.02.27.0005.ebuild:
+ Drop unavailable USE
+
*cctbx-2013.02.27.0005 (01 Jun 2013)
*cctbx-2012.05.08.2305 (01 Jun 2013)
diff --git a/sci-libs/cctbx/cctbx-2012.05.08.2305.ebuild b/sci-libs/cctbx/cctbx-2012.05.08.2305.ebuild
index ac51db7..e7630a4 100644
--- a/sci-libs/cctbx/cctbx-2012.05.08.2305.ebuild
+++ b/sci-libs/cctbx/cctbx-2012.05.08.2305.ebuild
@@ -7,7 +7,7 @@ EAPI=5
DISTUTILS_SINGLE_IMPL=true
PYTHON_COMPAT=( python{2_6,2_7} )
-inherit distutils-r1 eutils fortran-2 multilib toolchain-funcs
+inherit distutils-r1 eutils multilib toolchain-funcs
MY_PV="${PV//./_}"
@@ -36,14 +36,11 @@ MY_S="${WORKDIR}"/cctbx_sources
MY_B="${WORKDIR}"/cctbx_build
pkg_setup() {
- use openmp && FORTRAN_NEED_OPENMP="1"
- if use openmp && ! tc-has-openmp; then
+ if ! tc-has-openmp; then
ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 and icc"
ewarn "If you want to build ${PN} with OpenMP, abort now,"
ewarn "and switch CC to an OpenMP capable compiler"
- FORTRAN_NEED_OPENMP=1
fi
- fortran-2_pkg_setup
python-single-r1_pkg_setup
}
diff --git a/sci-libs/cctbx/cctbx-2013.02.27.0005.ebuild b/sci-libs/cctbx/cctbx-2013.02.27.0005.ebuild
index ac51db7..a24c309 100644
--- a/sci-libs/cctbx/cctbx-2013.02.27.0005.ebuild
+++ b/sci-libs/cctbx/cctbx-2013.02.27.0005.ebuild
@@ -36,14 +36,11 @@ MY_S="${WORKDIR}"/cctbx_sources
MY_B="${WORKDIR}"/cctbx_build
pkg_setup() {
- use openmp && FORTRAN_NEED_OPENMP="1"
- if use openmp && ! tc-has-openmp; then
+ if ! tc-has-openmp; then
ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 and icc"
ewarn "If you want to build ${PN} with OpenMP, abort now,"
ewarn "and switch CC to an OpenMP capable compiler"
- FORTRAN_NEED_OPENMP=1
fi
- fortran-2_pkg_setup
python-single-r1_pkg_setup
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-06-10 11:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-10 11:25 [gentoo-commits] proj/sci:ccp4 commit in: sci-libs/cctbx/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2013-06-06 8:24 Justin Lecher
2013-06-02 13:43 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox