gentoo resync : 14.05.2020

3 files changed, 147 insertions, 0 deletions

diff --git a/sci-geosciences/routino/Manifest b/sci-geosciences/routino/Manifest
index b5fcf38de2ea..532008a3901c 100644
--- a/sci-geosciences/routino/Manifest
+++ b/sci-geosciences/routino/Manifest
@@ -1,7 +1,10 @@
 AUX routino-3.1.1.patch 1361 BLAKE2B fd8d68da8ea0d95d434d7b43b3e9ccd89d7b43696e1feea7d6a4440d452b8c4b7f9b6fc684a2683525f4f29c8af6c8b7442f590ceda98be590315f5ace61c174 SHA512 c1f12433b478adc05e74d4da2470c80788b788dd6bef16eec2c76a1d209adece11091b3862ccc4c1d0ee105c209f3f332a05181f0c1f83cb9528369a7f6b14b4
 AUX routino-3.2.patch 1357 BLAKE2B d921a025e377c5a8edb2ae9bd0ba634b7b40b159b97079a64de09ba04cc8b5ec80916fa8e596f85dd2f81959d921ad851537512ebda9a4a7f1d0314d8209ba25 SHA512 f65f123985e858f9c9a1daac0ea0cde3c54387cc7a4c23064630e0e507f90ce767b4c6dd269fd4fddaa3ee1d2b2d55e91f7346f9ca89a001ee5e71155c9cf89d
+AUX routino-3.3.2.patch 1771 BLAKE2B a40ebca2cbc81f479eca69222e679a1abef4c42bd3db8417bd8bcc62c8d15a5ed2f43ae8b55e56870ca037b98de2c424f258d139dff11c0128ac60940f09ace6 SHA512 52cbd47e68b25a7c735d32a4bb51436ea45867cdb9f86bc3a55304674b80d33dcc41f845527659db345e118f2f56036a2265a98a177744b4cb1029c7a18e202e
 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
 EBUILD routino-3.1.1.ebuild 659 BLAKE2B 6e61c569be646d4970b5c18cd9495988f78cfaed9477008be9d13ce1512d152849b6e12116ef2094cfdc526f6940b27b596b58dc356d53b0db6e2578c89137e9 SHA512 fd1dfd7fc8fc5821e8e7ac976aa04f3d1737509415a5a2451174e6dbe74c8ed5f1638d13cde17bdd1eedfc87c60b638470b49f42cf3e7e0787371395ff92eaba
 EBUILD routino-3.2.ebuild 719 BLAKE2B 2ebcbe7a5356b375512a682696f4bc39eb337f4a9f87362af1f003dd6c99423c4ce168fa2896590abcfc860412068d84ee80face8b3c871499042ab51c092ab6 SHA512 ea8d262efbe278b659b935bce78dcba5b1418d76edaf8f296c62315ee33533e8dd4d218b1f65f87399de63bb7762fe4a0e2cd2752ea3740993d5cdf23e40d1c4
+EBUILD routino-3.3.2.ebuild 1582 BLAKE2B 7c40bf697e1a30b813f5380d3292ac082125e1fe47764f510f6d16b57707e46c4801ccd12c178883293a6922cb521a309a7b2c7502e56dab45a260c37dd836d9 SHA512 204f1baf45703698331da9b38a4f841d18c25ae4383420bc94a5f94ec0771ccdf7021402bcecdc0c795efa732083510a1ac07c8d1bd93872cdd8fa7941967c76
 MISC metadata.xml 893 BLAKE2B cdfadafcae0c3898788652b567a8145efb0f98aa819df589d32c49ead219222691b19361b90c8bc5153fef1659d3c2d7e6933a21fcb86db9dfa37ab774d8d2b5 SHA512 84bd42eadbfae10a8762f0d8e28d410d2bf6c69a02e38cf870a846b5f7431130116658e22de5b2411cca0965e027d2f5c71e02bcf6b5ce1e1a804f1c235f60ff
diff --git a/sci-geosciences/routino/files/routino-3.3.2.patch b/sci-geosciences/routino/files/routino-3.3.2.patch
new file mode 100644
index 000000000000..46c2986eea16
--- /dev/null
+++ b/sci-geosciences/routino/files/routino-3.3.2.patch
@@ -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.
diff --git a/sci-geosciences/routino/routino-3.3.2.ebuild b/sci-geosciences/routino/routino-3.3.2.ebuild
new file mode 100644
index 000000000000..bdab33b5a513
--- /dev/null
+++ b/sci-geosciences/routino/routino-3.3.2.ebuild
@@ -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
+
+}