gentoo resync : 29.10.2017

5 files changed, 93 insertions, 27 deletions

diff --git a/sci-geosciences/routino/Manifest b/sci-geosciences/routino/Manifest
index f8aff98b6c77..b48e6776b6ea 100644
--- a/sci-geosciences/routino/Manifest
+++ b/sci-geosciences/routino/Manifest
@@ -1,8 +1,8 @@
-AUX routino-3.1.1.patch 828 SHA256 e2e73cb49a809c30e3fc94fb49b092dcb0e91d228f640cd689ea949b5ed91b5a SHA512 a7ff4acf285144f714ec3d83201459709aa30929d98215812505dda4c1a8103cd3c75839d22019b24bc1648c035b2bd8f5c71a340f4a10c682e3f45b456ac399 WHIRLPOOL 13b458493dfb53dff6252c98c7f8df33cf4544f4386128c54382e39ef45814e8ebc029d01e7b8301678e95bf29b86a828f21928ecfa1967cce6f89342e24ee9e
-AUX routino-3.2.patch 774 SHA256 374e34c33dad36805842be7ddfe70d8ac9af953d590c35f713eab56ed5c88246 SHA512 0ffb2e3c9183c88e17e720491ab3b3078febcd15d7be777004d9ac2b80cc16225d60f24a0bafc5d36c73db3e8c822ad3f8717e992f4a5bee12b62b2dc710defb WHIRLPOOL c2e8403b39933f3126b9a101d9ce5b9bba9b8783ff05a3153e5d4cbfc7484a867d58d32c1cc9582dbb113cb81ef460790db6d621264d22eecdf2740f85c78420
+AUX routino-3.1.1.patch 1361 SHA256 14d9aeb3585979ccf2e67965297730e77511f9c6457ca9a3b095c8f0aef9ed93 SHA512 c1f12433b478adc05e74d4da2470c80788b788dd6bef16eec2c76a1d209adece11091b3862ccc4c1d0ee105c209f3f332a05181f0c1f83cb9528369a7f6b14b4 WHIRLPOOL 966e764e635e2606739df3aa8709c79a70c5d7bacc293230e5e9f6349e55d753fde740edd22cc25862d3f98d9e890d174a70ebad651c00dd234288f7e4600996
+AUX routino-3.2.patch 1357 SHA256 8af21e0b53b5ceeb1e0cf4cb5eaab9c329831ac83a5ebe814a9cfaf07fddae70 SHA512 f65f123985e858f9c9a1daac0ea0cde3c54387cc7a4c23064630e0e507f90ce767b4c6dd269fd4fddaa3ee1d2b2d55e91f7346f9ca89a001ee5e71155c9cf89d WHIRLPOOL bf9171293feeda7133acf21499c7c148855af84c0e3f8de103a1c64ef0e50e7f68f103bdb32f73c4029b5863478ad2f3693d43a9b77e95b3862ee05a8cc5ee8c
 DIST routino-3.1.1.tgz 1795118 SHA256 23b9fce43f0a85c9efe220c6c72026dd7b37f6a4a5153bb9dc4c4b0747c7f282 SHA512 088f22e9297f485418ed369d00827690f86e224e331b69085513339870fe6d97cffef62aa5e7e14883800469beff4af4b0a581ba8bad78920a383d7152be6ede WHIRLPOOL 914180a728120ba189ff9bc2bf51c64246f635f7cc2e6b6efecf4dbb2c76f9b61f6269225620b5a5204025c838a6fcd8ffc24953a8cf24c084edbbdfb24a6b58
 DIST routino-3.2.tgz 2463662 SHA256 e2a431eaffbafab630835966d342e4ae25d5edb94c8ed419200e1ffb50bc7552 SHA512 f5be46d9c026fcd92658490630d9ff6e4827e84ee57ccbaae48f54372da37ab78de24432ab9fa1d6860304a9a2ac86061eb876c12b39e821693282c4d4aaefcf WHIRLPOOL c30ea87987e60d5ef57591bcba8190ece3cc8acfba2cb62035785238119c0d84db65e9f53a2935d8cd2bb0c3d37cd9b8970e9c6ba897b0874f847db31f0858ee
-EBUILD routino-3.1.1.ebuild 459 SHA256 8c843fde4d6662aea7cf7fdc349c325587a3be1c2b6a74449e982b4518bc83f1 SHA512 143c56bf79d8e1bd62d4c180bdea711c4b67831d8fe5bae162b6bdfa33fe01d092772f16fce23e0a2fc5a6a228e25c7f81edf19e2af5506f989c01955a9b1742 WHIRLPOOL 9d4f9caefbe368f9c8176b5bec008cb06daa76f368205f87df6bb5bb7b35e090b6213738abdba97575cb6e4e05dc39961b71dc7b10e61ed4d39a114ba8f1f9f3
-EBUILD routino-3.2.ebuild 461 SHA256 356983ddeaa999404b1e7ca10a059fdd365473b3a43ca41aab92eab51735f8f5 SHA512 35a464426fa5c408842a73ca46b91e643689b66d0c8877b0781d4be04ece378b0bc352ade48dc5ebc520ee0589032e09c18b0b3928fb6b0a1af372371d9fa76d WHIRLPOOL edcbe0f08de87beb1f91aad70d0a1f255a257022bbecd7192ce91808f4ea0995784d0630b3af40e69477228787220639f58654a0c4f09f7238d55eb37bab4692
+EBUILD routino-3.1.1.ebuild 659 SHA256 ca750fd06eb2c084a1e9308509a900576655c3e3f702dbd9c96cc12b23860701 SHA512 fd1dfd7fc8fc5821e8e7ac976aa04f3d1737509415a5a2451174e6dbe74c8ed5f1638d13cde17bdd1eedfc87c60b638470b49f42cf3e7e0787371395ff92eaba WHIRLPOOL 682299e1b9de5cbbe6054222bbabbb52ac77ada9fa8a3a5defc99f1991f05c0680ce49aa583e6cf1e9d0b249d2255771828a61287dd35b85384efed498ed01a0
+EBUILD routino-3.2.ebuild 661 SHA256 2278b0f5916d85dd8918d2470a5e3b335048402c462f18d00aa2cc6ed19ca48c SHA512 21e36482dfd5145b037ac165881030d9e9ba3bccab480fbca82b32cbf8b0e68662a28bd1a5630d2573f8ff85160c6cfeaa9f3f90df184913c1f984dd5ea1bb1a WHIRLPOOL 43f402b1636e21e8289b9bd19f23a1a77a8f5cc6ac0a3949b02e63c6bca7a6a69eea781151673a939866e6b2097f4f0450ecd376089ff910ab249f75350277bc
 MISC ChangeLog 1223 SHA256 a18015d346097a1e7254ac7fbf768f0e97e7774beb8c66e162f6ab603e4a013f SHA512 16324ad3437549e317af53bd45e354d78b2ba225c3b612e3ca21e5fc0192266a6ff45d998fe071a9571d39ab541d44a870a0b5715da8806763730ce03ff7c98f WHIRLPOOL c8a0a7cec5792d531cad7530e41edb621e172fdaaa63fe6a089f9dc1c075305095b7ad13f56d0acc43715ba05f23f7a278f3133f3cd0528d42394a047ad24681
 MISC metadata.xml 893 SHA256 15702f35b5bbdd59fc05edaf5274c86cd5777ed9f861d409b88801882b7748e1 SHA512 84bd42eadbfae10a8762f0d8e28d410d2bf6c69a02e38cf870a846b5f7431130116658e22de5b2411cca0965e027d2f5c71e02bcf6b5ce1e1a804f1c235f60ff WHIRLPOOL 04fcbc8f5256cb792e05ca3c9abd47f7c6d943faa9d1b1434734ed4e25b345760ebc3edc0055d9fa33fab3ebb021324b59dc5e98289cdffb1a0f3c28cc6598e0
diff --git a/sci-geosciences/routino/files/routino-3.1.1.patch b/sci-geosciences/routino/files/routino-3.1.1.patch
index 15ba41b73feb..ac54fcf9f887 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 484b61b68f10..81b6c4d938c9 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 54aadaee9dd2..724e40b20799 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 cb1ceff2cd3c..19512b20efa7 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() {