From: "Sebastien Fabbro" <bicatali@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/casacore/
Date: Fri, 7 Jul 2017 20:40:04 +0000 (UTC) [thread overview]
Message-ID: <1499459989.d177b3ff53dc5b2e8ae9f8b0d63b70721fdcaf3a.bicatali@gentoo> (raw)
commit: d177b3ff53dc5b2e8ae9f8b0d63b70721fdcaf3a
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 7 20:35:57 2017 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Fri Jul 7 20:39:49 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d177b3ff
sci-astronomy/casacore: fixed for multiple python building
Package-Manager: Portage-2.3.6, Repoman-2.3.2
...acore-2.3.0.ebuild => casacore-2.3.0-r1.ebuild} | 30 +++++++++++++++++-----
1 file changed, 23 insertions(+), 7 deletions(-)
diff --git a/sci-astronomy/casacore/casacore-2.3.0.ebuild b/sci-astronomy/casacore/casacore-2.3.0-r1.ebuild
similarity index 80%
rename from sci-astronomy/casacore/casacore-2.3.0.ebuild
rename to sci-astronomy/casacore/casacore-2.3.0-r1.ebuild
index 60732fa5e8d..18e6cc0dcc7 100644
--- a/sci-astronomy/casacore/casacore-2.3.0.ebuild
+++ b/sci-astronomy/casacore/casacore-2.3.0-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
inherit cmake-utils eutils toolchain-funcs fortran-2 python-r1
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
SLOT="0"
-IUSE="c++11 +data doc fftw hdf5 openmp python threads test"
+IUSE="+c++11 +data doc fftw hdf5 openmp python threads test"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="
@@ -59,18 +59,19 @@ pkg_pretend() {
use openmp && tc-check-openmp
}
-pkg_setup() {
- use python && python-r1_pkg_setup
- fortran-2_pkg_setup
+src_prepare() {
+ cmake-utils_src_prepare
+ sed -e '/python-py/s/^.*$/find_package(Boost REQUIRED COMPONENTS python)/' \
+ -e 's/3.5/3.6 3.5/' \
+ -i python3/CMakeLists.txt || die
}
src_configure() {
has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
local mycmakeargs=(
-DENABLE_SHARED=ON
- -DPYTHON_EXECUTABLE="${PYTHON}"
+ -DBUILD_PYTHON=OFF
-DDATA_DIR="${EPREFIX}/usr/share/casa/data"
- -DBUILD_PYTHON="$(usex python)"
-DBUILD_TESTING="$(usex test)"
-DCXX11="$(usex c++11)"
-DUSE_FFTW3="$(usex fftw)"
@@ -78,6 +79,20 @@ src_configure() {
-DUSE_OPENMP="$(usex openmp)"
-DUSE_THREADS="$(usex threads)"
)
+ python_set_options() {
+ if python_is_python3; then
+ mycmakeargs+=(
+ -DPYTHON3_EXECUTABLE="${PYTHON}"
+ -DBUILD_PYTHON3=ON
+ )
+ else
+ mycmakeargs+=(
+ -DPYTHON2_EXECUTABLE="${PYTHON}"
+ -DBUILD_PYTHON=ON
+ )
+ fi
+ }
+ use python && python_foreach_impl python_set_options
cmake-utils_src_configure
}
@@ -93,5 +108,6 @@ src_install(){
if use doc; then
insinto /usr/share/doc/${PF}
doins -r doc/html
+ docompress -x /usr/share/doc/${PF}/html
fi
}
next reply other threads:[~2017-07-07 20:40 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-07 20:40 Sebastien Fabbro [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-07-07 20:40 [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/casacore/ Sebastien Fabbro
2016-03-02 18:32 Sebastien Fabbro
2015-09-01 20:06 Tobias Klausmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1499459989.d177b3ff53dc5b2e8ae9f8b0d63b70721fdcaf3a.bicatali@gentoo \
--to=bicatali@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox