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 349E0138350 for ; Mon, 6 Apr 2020 17:42:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 388D0E1119; Mon, 6 Apr 2020 17:42:35 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 1ECCFE1119 for ; Mon, 6 Apr 2020 17:42:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 311E634F074 for ; Mon, 6 Apr 2020 17:42:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8287B19B for ; Mon, 6 Apr 2020 17:42:31 +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: <1586194940.ae2581bc50c1b570091c341f570d0df859d2dddb.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: sci-geosciences/geographiclib/ X-VCS-Repository: repo/proj/guru X-VCS-Files: sci-geosciences/geographiclib/geographiclib-1.50.ebuild X-VCS-Directories: sci-geosciences/geographiclib/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: ae2581bc50c1b570091c341f570d0df859d2dddb X-VCS-Branch: dev Date: Mon, 6 Apr 2020 17:42:31 +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: 2f56d20a-a0a0-4120-b9b8-2856cdaafa2b X-Archives-Hash: 361173ad8170329bfdea5ca5565b51ae Message-ID: <20200406174231.gnEZYDpd5tGdigdp6rc3IM6nz57Awb9hSSj5Y7l_sQg@z> commit: ae2581bc50c1b570091c341f570d0df859d2dddb Author: Andrew Ammerlaan riseup net> AuthorDate: Mon Apr 6 17:42:20 2020 +0000 Commit: Andrew Ammerlaan riseup net> CommitDate: Mon Apr 6 17:42:20 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ae2581bc sci-geosciences: do not die is use doc doing this: use x && do_thing || die makes the build die is use -x so don't do that Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Andrew Ammerlaan riseup.net> sci-geosciences/geographiclib/geographiclib-1.50.ebuild | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sci-geosciences/geographiclib/geographiclib-1.50.ebuild b/sci-geosciences/geographiclib/geographiclib-1.50.ebuild index 7f8a351..64a438f 100644 --- a/sci-geosciences/geographiclib/geographiclib-1.50.ebuild +++ b/sci-geosciences/geographiclib/geographiclib-1.50.ebuild @@ -110,6 +110,8 @@ DEPEND=" S="${WORKDIR}/${MY_P}" distutils_enable_tests setup.py +# there are additional docs in the python dir +distutils_enable_sphinx python/doc src_prepare() { #TODO: strip cflags @@ -152,6 +154,7 @@ src_compile() { cd "python" || die python_foreach_impl distutils-r1_python_compile cd ".." || die + use doc && build_sphinx python/doc fi } @@ -176,6 +179,10 @@ src_install() { cmake_src_install + # remove python things added by the cmake_src_install function + # these are installed in the wrong python dir + rm -rf "${D}/usr/$(get_libdir)/python" || die + # if use python we re-add these python files correctly if use python; then cd "python" || die python_foreach_impl distutils-r1_python_install @@ -184,8 +191,7 @@ src_install() { #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 + # Installs to wrong doc dir for some reason + # Also happens with USE="-doc" + mv "${D}/usr/share/doc/${MY_PN}" "${D}/usr/share/doc/${P}" || die }