* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/routino/files/, sci-geosciences/routino/
@ 2016-07-16 12:05 Andrey Grozin
0 siblings, 0 replies; 2+ messages in thread
From: Andrey Grozin @ 2016-07-16 12:05 UTC (permalink / raw
To: gentoo-commits
commit: c7cda63359123c2d9e9d3e66cefbf21d53289a17
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 16 11:55:57 2016 +0000
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Sat Jul 16 11:55:57 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7cda633
sci-geosciences/routino: bump to 3.1.1
Package-Manager: portage-2.3.0
sci-geosciences/routino/Manifest | 1 +
sci-geosciences/routino/files/routino-3.1.1.patch | 34 +++++++++++++++++++++++
sci-geosciences/routino/routino-3.1.1.ebuild | 24 ++++++++++++++++
3 files changed, 59 insertions(+)
diff --git a/sci-geosciences/routino/Manifest b/sci-geosciences/routino/Manifest
index 222a9cc..4e42f1d 100644
--- a/sci-geosciences/routino/Manifest
+++ b/sci-geosciences/routino/Manifest
@@ -1 +1,2 @@
DIST routino-3.0_p1.tgz 957022 SHA256 037892a09cf2bb790d895d218a80c221e9595a3943ca35163c71ed93b111431e SHA512 be6275e8fcc0fe535a0940ba26fdf8e8ecfde768e4b2baaabf088a39431dc259933c3aa02ff3e28c5bf145402d18e6369a16d2c7a50fd1b84695dd31c155341f WHIRLPOOL 1e097aaa00437e08b485f4ce9d027cb31f3e320b5f61883a230ad235ccea8ca53c79bf0e428013434b91d0533f1212c43dd8a9f05eec2394cced070f83eb61ef
+DIST routino-3.1.1.tgz 1795118 SHA256 23b9fce43f0a85c9efe220c6c72026dd7b37f6a4a5153bb9dc4c4b0747c7f282 SHA512 088f22e9297f485418ed369d00827690f86e224e331b69085513339870fe6d97cffef62aa5e7e14883800469beff4af4b0a581ba8bad78920a383d7152be6ede WHIRLPOOL 914180a728120ba189ff9bc2bf51c64246f635f7cc2e6b6efecf4dbb2c76f9b61f6269225620b5a5204025c838a6fcd8ffc24953a8cf24c084edbbdfb24a6b58
diff --git a/sci-geosciences/routino/files/routino-3.1.1.patch b/sci-geosciences/routino/files/routino-3.1.1.patch
new file mode 100644
index 0000000..15ba41b
--- /dev/null
+++ b/sci-geosciences/routino/files/routino-3.1.1.patch
@@ -0,0 +1,34 @@
+diff -r -U1 routino-3.1.1.orig/Makefile.conf routino-3.1.1/Makefile.conf
+--- routino-3.1.1.orig/Makefile.conf 2016-03-05 19:49:21.000000000 +0600
++++ routino-3.1.1/Makefile.conf 2016-07-16 20:09:22.208869580 +0600
+@@ -47,3 +47,3 @@
+ ifneq ($(HOST),MINGW)
+-prefix=/usr/local
++prefix=/usr
+ bindir=$(prefix)/bin
+@@ -51,3 +51,3 @@
+ libdir=$(prefix)/lib
+-docdir=$(prefix)/doc/routino
++docdir=$(prefix)/share/doc/$(PF)
+ datadir=$(prefix)/share/routino
+@@ -76,6 +76,6 @@
+ # Maths library
+-LDFLAGS=-lm
++LDFLAGS+=-lm
+
+ # Language dialect selection
+-CFLAGS=-std=c99
++CFLAGS+=-std=c99
+
+@@ -85,3 +85,3 @@
+ # Optimisation options
+-CFLAGS+=-O3
++#CFLAGS+=-O3
+ CFLAGS+=-ffast-math
+@@ -141,4 +141,4 @@
+ # Required for xz support (uncomment these two lines if required)
+-#CFLAGS+=-DUSE_XZ
+-#LDFLAGS+=-llzma
++CFLAGS+=-DUSE_XZ
++LDFLAGS+=-llzma
+
diff --git a/sci-geosciences/routino/routino-3.1.1.ebuild b/sci-geosciences/routino/routino-3.1.1.ebuild
new file mode 100644
index 0000000..adc5f96
--- /dev/null
+++ b/sci-geosciences/routino/routino-3.1.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=6
+
+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=""
+DEPEND=""
+PATCHES=( "${FILESDIR}"/${P}.patch )
+
+src_configure() {
+ :
+}
+
+src_compile() {
+ emake -j1
+ rm README.txt
+ mv doc/rm README.txt .
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/routino/files/, sci-geosciences/routino/
@ 2017-10-24 10:25 Andrey Grozin
0 siblings, 0 replies; 2+ messages in thread
From: Andrey Grozin @ 2017-10-24 10:25 UTC (permalink / raw
To: gentoo-commits
commit: 8b549d5e1df24d0d3a36e7454b84d04f7bec281b
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 24 10:24:30 2017 +0000
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Tue Oct 24 10:24:30 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b549d5e
sci-geosciences/routino: making QA checks happy
Suggested-by: Fabio Rossi <rossi.f <AT> inwind.it>
Closes: https://bugs.gentoo.org/628398
Package-Manager: Portage-2.3.11, Repoman-2.3.3
sci-geosciences/routino/files/routino-3.1.1.patch | 38 +++++++++++++++-----
sci-geosciences/routino/files/routino-3.2.patch | 42 ++++++++++++++++++-----
sci-geosciences/routino/routino-3.1.1.ebuild | 17 ++++++---
sci-geosciences/routino/routino-3.2.ebuild | 15 ++++++--
4 files changed, 89 insertions(+), 23 deletions(-)
diff --git a/sci-geosciences/routino/files/routino-3.1.1.patch b/sci-geosciences/routino/files/routino-3.1.1.patch
index 15ba41b73fe..ac54fcf9f88 100644
--- a/sci-geosciences/routino/files/routino-3.1.1.patch
+++ b/sci-geosciences/routino/files/routino-3.1.1.patch
@@ -1,17 +1,22 @@
-diff -r -U1 routino-3.1.1.orig/Makefile.conf routino-3.1.1/Makefile.conf
---- routino-3.1.1.orig/Makefile.conf 2016-03-05 19:49:21.000000000 +0600
-+++ routino-3.1.1/Makefile.conf 2016-07-16 20:09:22.208869580 +0600
-@@ -47,3 +47,3 @@
+--- routino-3.1.1/Makefile.conf 2017-10-22 15:55:10.420531850 +0200
++++ routino-3.1.1/Makefile.conf.new 2017-10-22 15:55:32.180533067 +0200
+@@ -45,11 +45,11 @@
+ # Installation locations (edit if required)
+
ifneq ($(HOST),MINGW)
-prefix=/usr/local
+prefix=/usr
bindir=$(prefix)/bin
-@@ -51,3 +51,3 @@
+ incdir=$(prefix)/include
libdir=$(prefix)/lib
-docdir=$(prefix)/doc/routino
+docdir=$(prefix)/share/doc/$(PF)
datadir=$(prefix)/share/routino
-@@ -76,6 +76,6 @@
+ else
+ prefix="c:/Program Files/Routino"
+@@ -74,16 +74,16 @@
+
+
# Maths library
-LDFLAGS=-lm
+LDFLAGS+=-lm
@@ -20,15 +25,32 @@ diff -r -U1 routino-3.1.1.orig/Makefile.conf routino-3.1.1/Makefile.conf
-CFLAGS=-std=c99
+CFLAGS+=-std=c99
-@@ -85,3 +85,3 @@
+ # Warning options
+ CFLAGS+=-Wall -Wmissing-prototypes -Wextra -Wno-unused-parameter -pedantic
+
# Optimisation options
-CFLAGS+=-O3
+#CFLAGS+=-O3
CFLAGS+=-ffast-math
-@@ -141,4 +141,4 @@
+
+ # Optimisation option (only works if compilation and execution use exactly the same CPU architecture).
+@@ -118,7 +118,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)
+@@ -139,8 +139,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/files/routino-3.2.patch b/sci-geosciences/routino/files/routino-3.2.patch
index 484b61b68f1..81b6c4d938c 100644
--- a/sci-geosciences/routino/files/routino-3.2.patch
+++ b/sci-geosciences/routino/files/routino-3.2.patch
@@ -1,30 +1,56 @@
-diff -r -U1 routino-3.2.orig/Makefile.conf routino-3.2/Makefile.conf
---- routino-3.2.orig/Makefile.conf 2016-11-22 20:22:52.000000000 +0100
-+++ routino-3.2/Makefile.conf 2017-04-01 23:58:23.835905270 +0200
-@@ -47,3 +47,3 @@
+--- routino-3.2/Makefile.conf 2017-10-22 16:03:29.917559780 +0200
++++ routino-3.2/Makefile.conf.new 2017-10-22 16:04:23.877562797 +0200
+@@ -45,11 +45,11 @@
+ # Installation locations (edit if required)
+
ifneq ($(HOST),MINGW)
-prefix=/usr/local
+prefix=/usr
bindir=$(prefix)/bin
-@@ -51,3 +51,3 @@
+ incdir=$(prefix)/include
libdir=$(prefix)/lib
-docdir=$(prefix)/doc/routino
+docdir=$(prefix)/share/doc/$(PF)
datadir=$(prefix)/share/routino
-@@ -79,3 +79,3 @@
+ else
+ prefix="c:/Program Files/Routino"
+@@ -74,16 +74,16 @@
+
+
+ # Maths library
+-LDFLAGS=-lm
++LDFLAGS+=-lm
+
# Language dialect selection
-CFLAGS=-std=c99
+CFLAGS+=-std=c99
-@@ -85,3 +85,3 @@
+ # Warning options
+ CFLAGS+=-Wall -Wmissing-prototypes -Wextra -Wno-unused-parameter -pedantic
+
# Optimisation options
-CFLAGS+=-O3
+#CFLAGS+=-O3
CFLAGS+=-ffast-math
-@@ -141,4 +141,4 @@
+
+ # Optimisation option (only works if compilation and execution use exactly the same CPU architecture).
+@@ -118,7 +118,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)
+@@ -139,8 +139,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.1.1.ebuild b/sci-geosciences/routino/routino-3.1.1.ebuild
index 54aadaee9dd..724e40b2079 100644
--- a/sci-geosciences/routino/routino-3.1.1.ebuild
+++ b/sci-geosciences/routino/routino-3.1.1.ebuild
@@ -1,7 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+
EAPI=6
+inherit toolchain-funcs
+
DESCRIPTION="Routing application based on openstreetmap data"
HOMEPAGE="http://www.routino.org/"
SRC_URI="http://www.routino.org/download/${P}.tgz"
@@ -10,10 +13,16 @@ SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
DEPEND=""
-PATCHES=( "${FILESDIR}"/${P}.patch )
-src_configure() {
- :
+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() {
diff --git a/sci-geosciences/routino/routino-3.2.ebuild b/sci-geosciences/routino/routino-3.2.ebuild
index cb1ceff2cd3..19512b20efa 100644
--- a/sci-geosciences/routino/routino-3.2.ebuild
+++ b/sci-geosciences/routino/routino-3.2.ebuild
@@ -1,7 +1,10 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+
EAPI=6
+inherit toolchain-funcs
+
DESCRIPTION="Routing application based on openstreetmap data"
HOMEPAGE="http://www.routino.org/"
SRC_URI="http://www.routino.org/download/${P}.tgz"
@@ -10,10 +13,16 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND=""
-PATCHES=( "${FILESDIR}"/${P}.patch )
-src_configure() {
- :
+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() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-10-24 10:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-24 10:25 [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/routino/files/, sci-geosciences/routino/ Andrey Grozin
-- strict thread matches above, loose matches on Subject: below --
2016-07-16 12:05 Andrey Grozin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox