sci-geosciences/routino: bump to 3.3.2

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andrey Grozin <grozin@gentoo.org>
This commit is contained in:
Andrey Grozin
2020-04-30 00:30:58 +07:00
parent 9ec5ca3a11
commit ed7ed0dae0
3 changed files with 145 additions and 0 deletions

View File

@@ -1,2 +1,3 @@
DIST routino-3.1.1.tgz 1795118 BLAKE2B 4b8a44d917f2f71e333eb233eebee37de6d19adac7b31111f9b244e125d9a9a54bbbec5e166d53f3ac435f27dcb5633c9626e0ffc4025d5e8dc0cbaed6274800 SHA512 088f22e9297f485418ed369d00827690f86e224e331b69085513339870fe6d97cffef62aa5e7e14883800469beff4af4b0a581ba8bad78920a383d7152be6ede
DIST routino-3.2.tgz 2463662 BLAKE2B 4be17e83105d95052a9fbe0158b15bf5d64b4f720fb1bb61cbbb5fcd61451b933507e4dcc8867bff5e8602c6e681e916e45328d2a0ce766e9ab37366984cf378 SHA512 f5be46d9c026fcd92658490630d9ff6e4827e84ee57ccbaae48f54372da37ab78de24432ab9fa1d6860304a9a2ac86061eb876c12b39e821693282c4d4aaefcf
DIST routino-3.3.2.tgz 2542029 BLAKE2B e74af857ef29d4ee4a08d8a2913180dfca747001f4afd59ad20a9ed355e654dc86d26fb1afb5486ece30ddf6b7cba7b60c52feae30af14086f2b4d5259451125 SHA512 5341a2ec063192754d641a4543260f4b3b3d84a7a9bfe745fca2082cdcc8bb7220bf37ed58aacf9e65eba4555432a6bdbb9747153a383dfff72e2aca01c66070

View File

@@ -0,0 +1,71 @@
diff -r -U3 routino-3.3.2.orig/Makefile routino-3.3.2/Makefile
--- routino-3.3.2.orig/Makefile 2018-10-31 02:27:41.000000000 +0700
+++ routino-3.3.2/Makefile 2020-04-29 20:59:05.239931544 +0700
@@ -24,7 +24,7 @@
# Sub-directories and sub-makefiles
-SUBDIRS=src xml doc web extras python
+SUBDIRS=src xml doc web extras
########
diff -r -U3 routino-3.3.2.orig/Makefile.conf routino-3.3.2/Makefile.conf
--- routino-3.3.2.orig/Makefile.conf 2019-04-13 17:52:02.000000000 +0700
+++ routino-3.3.2/Makefile.conf 2020-04-29 20:58:35.352930803 +0700
@@ -45,11 +45,11 @@
# Installation locations (edit if required)
ifneq ($(HOST),MINGW)
- prefix=/usr/local
+ prefix=/usr
bindir=$(prefix)/bin
incdir=$(prefix)/include
libdir=$(prefix)/lib
- docdir=$(prefix)/doc/routino
+ docdir=$(prefix)/share/doc/${PF}
datadir=$(prefix)/share/routino
else
prefix="c:/Program Files/Routino"
@@ -82,10 +82,10 @@
endif
# Maths library
-LDFLAGS=-lm
+LDFLAGS+=-lm
# Language dialect selection
-CFLAGS=-std=c99
+CFLAGS+=-std=c99
# Warning options
CFLAGS+=-Wall -Wmissing-prototypes -Wextra -Wno-unused-parameter -pedantic
@@ -97,7 +97,7 @@
endif
# Optimisation options
-CFLAGS+=-O3
+#CFLAGS+=-O3
# Fast maths option - makes test cases fail slightly
CFLAGS+=-ffast-math
@@ -138,7 +138,7 @@
endif
# Put the current directory in the shared library path for the router using libroutino
-LDFLAGS_LDSO=-Wl,-R.
+#LDFLAGS_LDSO=-Wl,-R.
# Required for multi-threaded support (comment these two lines out if not required)
@@ -159,8 +159,8 @@
# Required for xz support (uncomment these two lines if required)
-#CFLAGS+=-DUSE_XZ
-#LDFLAGS+=-llzma
+CFLAGS+=-DUSE_XZ
+LDFLAGS+=-llzma
# Required to use stdio with files > 2GiB on 32-bit system.

View File

@@ -0,0 +1,73 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} )
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"
LICENSE="AGPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="python test"
RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="python? ( ${PYTHON_DEPS}
dev-lang/swig )"
RDEPEND="python? ( ${PYTHON_DEPS} )"
src_prepare() {
eapply "${FILESDIR}"/${P}.patch
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() {
emake -j1
rm README.txt || die "rm README.txt failed"
mv doc/README.txt . || die "mv doc/README.txt . failed"
if use python; then
pushd python > /dev/null
python_compile() {
rm -f build/.timestamp
emake PYTHON=${EPYTHON}
}
python_foreach_impl python_compile
popd > /dev/null
fi
}
src_test() {
emake test
# if use python; then
# pushd python > /dev/null
# python_test() {
# echo "######## ${EPYTHON} ########"
# emake PYTHON=${EPYTHON} test
# }
# python_foreach_impl python_test
# popd > /dev/null
# fi
}
src_install() {
default
if use python; then
pushd python > /dev/null
python_install() {
esetup.py install
python_optimize
}
python_foreach_impl python_install
newdoc README.txt README_python.txt
popd > /dev/null
fi
}