From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A125E139695 for ; Fri, 7 Jul 2017 20:40:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AB57E234087; Fri, 7 Jul 2017 20:40:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7E2A2234087 for ; Fri, 7 Jul 2017 20:40:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 69296341841 for ; Fri, 7 Jul 2017 20:40:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0A9A47497 for ; Fri, 7 Jul 2017 20:40:04 +0000 (UTC) From: "Sebastien Fabbro" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastien Fabbro" Message-ID: <1499459989.d177b3ff53dc5b2e8ae9f8b0d63b70721fdcaf3a.bicatali@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/casacore/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-astronomy/casacore/casacore-2.3.0-r1.ebuild sci-astronomy/casacore/casacore-2.3.0.ebuild X-VCS-Directories: sci-astronomy/casacore/ X-VCS-Committer: bicatali X-VCS-Committer-Name: Sebastien Fabbro X-VCS-Revision: d177b3ff53dc5b2e8ae9f8b0d63b70721fdcaf3a X-VCS-Branch: master Date: Fri, 7 Jul 2017 20:40:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: dccd44b7-b4e3-425a-8569-dc2a2b7f05a7 X-Archives-Hash: 40615f6e0ae43bd70d610c306211ac86 commit: d177b3ff53dc5b2e8ae9f8b0d63b70721fdcaf3a Author: Sébastien Fabbro gentoo org> AuthorDate: Fri Jul 7 20:35:57 2017 +0000 Commit: Sebastien Fabbro gentoo 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 }