Gentoo Archives: gentoo-commits

From: Andrey Grozin <grozin@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/routino/, sci-geosciences/routino/files/
Date: Wed, 29 Apr 2020 17:31:40
Message-Id: 1588181458.ed7ed0dae0b40b333a6f0cf863e8b2f2c931083a.grozin@gentoo
1 commit: ed7ed0dae0b40b333a6f0cf863e8b2f2c931083a
2 Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 29 17:30:58 2020 +0000
4 Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 29 17:30:58 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed7ed0da
7
8 sci-geosciences/routino: bump to 3.3.2
9
10 Package-Manager: Portage-2.3.99, Repoman-2.3.22
11 Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org>
12
13 sci-geosciences/routino/Manifest | 1 +
14 sci-geosciences/routino/files/routino-3.3.2.patch | 71 ++++++++++++++++++++++
15 sci-geosciences/routino/routino-3.3.2.ebuild | 73 +++++++++++++++++++++++
16 3 files changed, 145 insertions(+)
17
18 diff --git a/sci-geosciences/routino/Manifest b/sci-geosciences/routino/Manifest
19 index c07830274f8..aeda73e4768 100644
20 --- a/sci-geosciences/routino/Manifest
21 +++ b/sci-geosciences/routino/Manifest
22 @@ -1,2 +1,3 @@
23 DIST routino-3.1.1.tgz 1795118 BLAKE2B 4b8a44d917f2f71e333eb233eebee37de6d19adac7b31111f9b244e125d9a9a54bbbec5e166d53f3ac435f27dcb5633c9626e0ffc4025d5e8dc0cbaed6274800 SHA512 088f22e9297f485418ed369d00827690f86e224e331b69085513339870fe6d97cffef62aa5e7e14883800469beff4af4b0a581ba8bad78920a383d7152be6ede
24 DIST routino-3.2.tgz 2463662 BLAKE2B 4be17e83105d95052a9fbe0158b15bf5d64b4f720fb1bb61cbbb5fcd61451b933507e4dcc8867bff5e8602c6e681e916e45328d2a0ce766e9ab37366984cf378 SHA512 f5be46d9c026fcd92658490630d9ff6e4827e84ee57ccbaae48f54372da37ab78de24432ab9fa1d6860304a9a2ac86061eb876c12b39e821693282c4d4aaefcf
25 +DIST routino-3.3.2.tgz 2542029 BLAKE2B e74af857ef29d4ee4a08d8a2913180dfca747001f4afd59ad20a9ed355e654dc86d26fb1afb5486ece30ddf6b7cba7b60c52feae30af14086f2b4d5259451125 SHA512 5341a2ec063192754d641a4543260f4b3b3d84a7a9bfe745fca2082cdcc8bb7220bf37ed58aacf9e65eba4555432a6bdbb9747153a383dfff72e2aca01c66070
26
27 diff --git a/sci-geosciences/routino/files/routino-3.3.2.patch b/sci-geosciences/routino/files/routino-3.3.2.patch
28 new file mode 100644
29 index 00000000000..46c2986eea1
30 --- /dev/null
31 +++ b/sci-geosciences/routino/files/routino-3.3.2.patch
32 @@ -0,0 +1,71 @@
33 +diff -r -U3 routino-3.3.2.orig/Makefile routino-3.3.2/Makefile
34 +--- routino-3.3.2.orig/Makefile 2018-10-31 02:27:41.000000000 +0700
35 ++++ routino-3.3.2/Makefile 2020-04-29 20:59:05.239931544 +0700
36 +@@ -24,7 +24,7 @@
37 +
38 + # Sub-directories and sub-makefiles
39 +
40 +-SUBDIRS=src xml doc web extras python
41 ++SUBDIRS=src xml doc web extras
42 +
43 + ########
44 +
45 +diff -r -U3 routino-3.3.2.orig/Makefile.conf routino-3.3.2/Makefile.conf
46 +--- routino-3.3.2.orig/Makefile.conf 2019-04-13 17:52:02.000000000 +0700
47 ++++ routino-3.3.2/Makefile.conf 2020-04-29 20:58:35.352930803 +0700
48 +@@ -45,11 +45,11 @@
49 + # Installation locations (edit if required)
50 +
51 + ifneq ($(HOST),MINGW)
52 +- prefix=/usr/local
53 ++ prefix=/usr
54 + bindir=$(prefix)/bin
55 + incdir=$(prefix)/include
56 + libdir=$(prefix)/lib
57 +- docdir=$(prefix)/doc/routino
58 ++ docdir=$(prefix)/share/doc/${PF}
59 + datadir=$(prefix)/share/routino
60 + else
61 + prefix="c:/Program Files/Routino"
62 +@@ -82,10 +82,10 @@
63 + endif
64 +
65 + # Maths library
66 +-LDFLAGS=-lm
67 ++LDFLAGS+=-lm
68 +
69 + # Language dialect selection
70 +-CFLAGS=-std=c99
71 ++CFLAGS+=-std=c99
72 +
73 + # Warning options
74 + CFLAGS+=-Wall -Wmissing-prototypes -Wextra -Wno-unused-parameter -pedantic
75 +@@ -97,7 +97,7 @@
76 + endif
77 +
78 + # Optimisation options
79 +-CFLAGS+=-O3
80 ++#CFLAGS+=-O3
81 +
82 + # Fast maths option - makes test cases fail slightly
83 + CFLAGS+=-ffast-math
84 +@@ -138,7 +138,7 @@
85 + endif
86 +
87 + # Put the current directory in the shared library path for the router using libroutino
88 +-LDFLAGS_LDSO=-Wl,-R.
89 ++#LDFLAGS_LDSO=-Wl,-R.
90 +
91 +
92 + # Required for multi-threaded support (comment these two lines out if not required)
93 +@@ -159,8 +159,8 @@
94 +
95 +
96 + # Required for xz support (uncomment these two lines if required)
97 +-#CFLAGS+=-DUSE_XZ
98 +-#LDFLAGS+=-llzma
99 ++CFLAGS+=-DUSE_XZ
100 ++LDFLAGS+=-llzma
101 +
102 +
103 + # Required to use stdio with files > 2GiB on 32-bit system.
104
105 diff --git a/sci-geosciences/routino/routino-3.3.2.ebuild b/sci-geosciences/routino/routino-3.3.2.ebuild
106 new file mode 100644
107 index 00000000000..bdab33b5a51
108 --- /dev/null
109 +++ b/sci-geosciences/routino/routino-3.3.2.ebuild
110 @@ -0,0 +1,73 @@
111 +# Copyright 1999-2020 Gentoo Authors
112 +# Distributed under the terms of the GNU General Public License v2
113 +
114 +EAPI=7
115 +PYTHON_COMPAT=( python3_{6,7,8} )
116 +inherit toolchain-funcs distutils-r1
117 +
118 +DESCRIPTION="Routing application based on openstreetmap data"
119 +HOMEPAGE="http://www.routino.org/"
120 +SRC_URI="http://www.routino.org/download/${P}.tgz"
121 +LICENSE="AGPL-3+"
122 +SLOT="0"
123 +KEYWORDS="~amd64 ~x86"
124 +IUSE="python test"
125 +RESTRICT="!test? ( test )"
126 +REQUIRED_USE="${PYTHON_REQUIRED_USE}"
127 +DEPEND="python? ( ${PYTHON_DEPS}
128 + dev-lang/swig )"
129 +RDEPEND="python? ( ${PYTHON_DEPS} )"
130 +
131 +src_prepare() {
132 + eapply "${FILESDIR}"/${P}.patch
133 +
134 + sed -i -e "s@libdir=\(.*\)@libdir=\$(prefix)/$(get_libdir)@" \
135 + -e "s@CC=gcc@CC=$(tc-getCC)@" \
136 + -e "s@LD=gcc@LD=$(tc-getCC)@" \
137 + Makefile.conf || die "failed sed"
138 +
139 + eapply_user
140 +}
141 +
142 +src_compile() {
143 + emake -j1
144 + rm README.txt || die "rm README.txt failed"
145 + mv doc/README.txt . || die "mv doc/README.txt . failed"
146 + if use python; then
147 + pushd python > /dev/null
148 + python_compile() {
149 + rm -f build/.timestamp
150 + emake PYTHON=${EPYTHON}
151 + }
152 + python_foreach_impl python_compile
153 + popd > /dev/null
154 + fi
155 +}
156 +
157 +src_test() {
158 + emake test
159 +# if use python; then
160 +# pushd python > /dev/null
161 +# python_test() {
162 +# echo "######## ${EPYTHON} ########"
163 +# emake PYTHON=${EPYTHON} test
164 +# }
165 +# python_foreach_impl python_test
166 +# popd > /dev/null
167 +# fi
168 +}
169 +
170 +src_install() {
171 + default
172 + if use python; then
173 + pushd python > /dev/null
174 + python_install() {
175 + esetup.py install
176 + python_optimize
177 + }
178 + python_foreach_impl python_install
179 + newdoc README.txt README_python.txt
180 + popd > /dev/null
181 + fi
182 +
183 +}