commit:     a37e8f4bc5cc89ff7af836e805a65d319917064b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 20 19:18:59 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 23 19:52:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a37e8f4b

sci-geosciences/routino: python3_9, python optional, tests pass, style

Bug: https://bugs.gentoo.org/771345
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/routino/routino-3.3.2.ebuild | 31 ++++++++++++++++++----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/sci-geosciences/routino/routino-3.3.2.ebuild 
b/sci-geosciences/routino/routino-3.3.2.ebuild
index c910d4194d2..0ea8e4a10d4 100644
--- a/sci-geosciences/routino/routino-3.3.2.ebuild
+++ b/sci-geosciences/routino/routino-3.3.2.ebuild
@@ -1,32 +1,41 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit toolchain-funcs distutils-r1
 
 DESCRIPTION="Routing application based on openstreetmap data"
-HOMEPAGE="http://www.routino.org/";
-SRC_URI="http://www.routino.org/download/${P}.tgz";
+HOMEPAGE="https://routino.org/";
+SRC_URI="https://routino.org/download/${P}.tgz";
+
 LICENSE="AGPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="python test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-DEPEND="python? ( ${PYTHON_DEPS}
-       dev-lang/swig )"
+
+DEPEND="
+       python? (
+               ${PYTHON_DEPS}
+               dev-lang/swig
+       )
+"
 RDEPEND="python? ( ${PYTHON_DEPS} )"
 
+PATCHES=( "${FILESDIR}"/${P}.patch )
+
 src_prepare() {
-       eapply "${FILESDIR}"/${P}.patch
+       default
 
        sed -i -e "s@libdir=\(.*\)@libdir=\$(prefix)/$(get_libdir)@" \
                -e "s@CC=gcc@CC=$(tc-getCC)@" \
                -e "s@LD=gcc@LD=$(tc-getCC)@" \
                Makefile.conf || die "failed sed"
-
-       eapply_user
 }
 
 src_compile() {
@@ -36,7 +45,7 @@ src_compile() {
        if use python; then
                pushd python > /dev/null
                python_compile() {
-                       rm -f build/.timestamp
+                       rm -f build/.timestamp || die
                        emake PYTHON=${EPYTHON}
                }
                python_foreach_impl python_compile

Reply via email to