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 4C427138350 for ; Sun, 5 Apr 2020 11:01:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C5230E0AC7; Sun, 5 Apr 2020 11:01:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 98EABE0AC7 for ; Sun, 5 Apr 2020 11:01:19 +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 7130534F000 for ; Sun, 5 Apr 2020 11:01:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 727561C5 for ; Sun, 5 Apr 2020 11:01:15 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1586038340.2baf045e3e5e57ac7b9b921d34178ef69280c3c8.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: sci-geosciences/geographiclib/ X-VCS-Repository: repo/proj/guru X-VCS-Files: sci-geosciences/geographiclib/geographiclib-1.50.ebuild sci-geosciences/geographiclib/metadata.xml X-VCS-Directories: sci-geosciences/geographiclib/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 2baf045e3e5e57ac7b9b921d34178ef69280c3c8 X-VCS-Branch: master Date: Sun, 5 Apr 2020 11:01:15 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d99b6aad-72bf-4a74-b156-9861d5361e0f X-Archives-Hash: 0eb8e191c93ba1eb03a265c3562ae083 commit: 2baf045e3e5e57ac7b9b921d34178ef69280c3c8 Author: Alessandro Barbieri gmail com> AuthorDate: Sat Apr 4 22:11:49 2020 +0000 Commit: Andrew Ammerlaan riseup net> CommitDate: Sat Apr 4 22:12:20 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2baf045e sci-geosciences/geographiclib: fixed python and doc install Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Alessandro Barbieri gmail.com> .../geographiclib/geographiclib-1.50.ebuild | 32 ++++++++++------------ sci-geosciences/geographiclib/metadata.xml | 2 +- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/sci-geosciences/geographiclib/geographiclib-1.50.ebuild b/sci-geosciences/geographiclib/geographiclib-1.50.ebuild index a880de3..7f8a351 100644 --- a/sci-geosciences/geographiclib/geographiclib-1.50.ebuild +++ b/sci-geosciences/geographiclib/geographiclib-1.50.ebuild @@ -94,8 +94,6 @@ LICENSE=" magnetic? ( public-domain ) " -RESTRICT="primaryuri" - RDEPEND=" >=dev-libs/boost-1.65.0 " @@ -118,9 +116,6 @@ src_prepare() { # sed -i "s|CXXFLAGS = -g -Wall -Wextra -O3 -std=c++0x||" tools/Makefile.mk || die # sed -i "s|CXXFLAGS = -g -Wall -Wextra -O3 -std=c++0x||" src/Makefile.mk || die - default - - # FATAL: cmake_src_prepare has not been run cmake_src_prepare if use python; then @@ -138,7 +133,7 @@ src_configure() { use precision_quad && precision="4" use precision_single && precision="1" - export GEODATAPATH="/usr/share/GeographicLib" + export GEODATAPATH="/usr/share/${P}" local mycmakeargs=( -DGEOGRAPHICLIB_DOCUMENTATION=$(usex doc ON OFF) @@ -146,31 +141,29 @@ src_configure() { -DUSE_BOOST_FOR_EXAMPLES=$(usex boost ON OFF) -DGEOGRAPHICLIB_PRECISION="${precision}" -DGEOGRAPHICLIB_DATA="${GEODATAPATH}" - -DCMAKE_INSTALL_PREFIX="/usr" ) - cmake_src_configure } src_compile() { + cmake_src_compile + if use python; then cd "python" || die python_foreach_impl distutils-r1_python_compile cd ".." || die fi - - default } src_test() { + # Only 1 failing test in the C code, python passes for me + cmake_src_test + if use python; then cd "python" || die python_foreach_impl python_test cd ".." || die fi - - # Only 1 failing test in the C code, python passes for me - default } src_install() { @@ -181,13 +174,18 @@ src_install() { insinto "${GEODATAPATH}/magnetic" use magnetic && doins -r "${WORKDIR}"/magnetic/. + cmake_src_install + if use python; then cd "python" || die - distutils-r1_python_install_all + python_foreach_impl distutils-r1_python_install cd ".." fi - # Access denied, make file needs patching - # to correctly install in ${D} - default + #TODO: find out if java stuff need something + + rm -rf "${D}/usr/$(get_libdir)/python" || die + + use doc && mkdir -p "${D}/usr/share/${P}" || die + use doc && mv "${D}/usr/share/doc/${MY_PN}" "${D}/usr/share/${P}/doc" || die } diff --git a/sci-geosciences/geographiclib/metadata.xml b/sci-geosciences/geographiclib/metadata.xml index 589c87f..2687621 100644 --- a/sci-geosciences/geographiclib/metadata.xml +++ b/sci-geosciences/geographiclib/metadata.xml @@ -12,7 +12,7 @@ Boost library is searched for in order to build the NearestNeighbor example Install the gravity models - Install the geoids datasets + Install the geoid datasets Install the magnetic field models http://earth-info.nga.mil/GandG/wgs84/gravitymod/wgs84_180/wgs84_180.html 30' grid http://earth-info.nga.mil/GandG/wgs84/gravitymod/wgs84_180/wgs84_180.html 15' grid