gentoo resync : 09.03.2018

21 files changed, 695 insertions, 16 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index e8a663a060cf..0f5acf30d512 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 34b003a0a37f..8254cf4a9455 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -2,5 +2,5 @@ AUX gdal-2.2.3-bashcomp-path.patch 621 BLAKE2B 0f825aa27d68e35afdcbd7c5d3239b6b6
 AUX gdal-2.2.3-json-c-0.13.patch 3733 BLAKE2B 34921f8e2717a446bead6d8b07c6a8e2455752bd4534d066c4bb6150f1cd03856269a8510535517cbf60e609053e470107e9ce62d58358afcb48aa819a546563 SHA512 f4beaa11431b1eb2c6986c3da24a696cdade04f025a9bdeb9726c392aecdf597126c7735b1b2c1175bd0de71a2441b2c1e5d01e597acd7869e9c75644660994d
 AUX gdal-2.2.3-soname.patch 2062 BLAKE2B 159b3d8eec126a141ff21c908d45193411bdbcc50e03386131c313cbd71861859a1b8a5a5648307868fee484b8a1dd816b580bb2304cb7e1e72e42df40cea042 SHA512 0f06d8de537ddc19c6c4ee800c0c4b084ceb04a47fd24f28c3095909219e27634e66086158f80f011ccfb7865fc559a966770bfa95d3a8fd144f3f8a3d34571d
 DIST gdal-2.2.3.tar.gz 13754766 BLAKE2B d9482e7ee40bb5558fbbb43b750dfb95344abe45142c19e1f767535d3fc127fa9d6ed4496d730a25cb4132980efbffb4685e8663798fa05515b8548edb689e42 SHA512 841e5ba3c1a442b678dcaabac719ea7707b817f3dc717a34430dc7ba1f2c27fa88e27b7a8645075fae6e16373b36e6c50f674bdd6b70d10059e6bc4be7a72046
-EBUILD gdal-2.2.3-r1.ebuild 7519 BLAKE2B a9c89375ce4204b9a5b4149cf33078f78687c1cd442acfce7c3a1dedc985eb39f4dd94b059df9b4eb5fbd3536a1487557bae6e5ff56d53ae0ddc88978b997f14 SHA512 543d4aee1eb21294a005d88d242c81b37f96d25059355fdd36c3a1366d60199060d1d7a2abd372062652fafe99bdce7cdde447845c10ca45193c1aef990c9e15
+EBUILD gdal-2.2.3-r1.ebuild 7518 BLAKE2B e45e61a635ea63a7de849d4b01f27d2f0a2f0602803735753f392f3864b33b7b03e2d45af6e68da12147cfd67d4e08a816f2510e03d2f869218db430b7d11caf SHA512 120f5290dff2b0ccbc99a13247062717f7d6cdb5a52f02e60861f32e834d5c534f916caad6c5acadc70238e9f7a2beeabc256bfe6b8b860eecbaf9e4b8cbc917
 MISC metadata.xml 1522 BLAKE2B b67678f81739e2fb2866cc6ca49545368fce4a85b145ba3f8228b8a39ecb2d7f75b55500f13768838c9ed11a47f586ab7b05eb31e2dbf6fcd4d29c5d8896107f SHA512 091112e555a5a77c5643cbd4465046bfd9fe287e209b42f5410787a2f1a2e4d7ec640efad93c277f0f6581db2264fa104d5aba2e8cbc4126c2c14fe4d86afcee
diff --git a/sci-libs/gdal/gdal-2.2.3-r1.ebuild b/sci-libs/gdal/gdal-2.2.3-r1.ebuild
index 9370d1a2cd68..aa2b79c9e5b7 100644
--- a/sci-libs/gdal/gdal-2.2.3-r1.ebuild
+++ b/sci-libs/gdal/gdal-2.2.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 
 SLOT="0/2.2"
 LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls"
 
 COMMON_DEPEND="
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index 86bcd876a8e3..d00e61b0f495 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,5 +1,5 @@
 DIST indilib-1.4.1.tar.gz 1529660 BLAKE2B e869ba6b7430515a88f536d1738a9e5beb2622fad20d47ef2e981f9f00eb46e8703b2ad7842dca00b784d972cae639db3c8bfbb301ecbec8d582f372dae2f360 SHA512 b1655070fbc71095215a06edc88b8fff247ed3dcab86c2af058978b209e48ce1701f3a6eef13d0b200be58abfcfdffe7800ecea35d820fc2fb158ea0f899833f
 DIST indilib-1.6.0.tar.gz 1726681 BLAKE2B fc746fe74b41467930f50f4aabe63d485372dc3f7e551bf8b91ec92694efc5a73a29495ee4931f84215a90afdd1deb3c12f87aaedc32d33e408114674e6d79ad SHA512 a086a63e15f5f6fb05a0d1569578f5fbd4d6ba6ff5a0aaff7bd475925d3858840753f1aa04e7429a22576f52432a19e93b781e821ea908db6b7352af85f30422
 EBUILD indilib-1.4.1.ebuild 845 BLAKE2B 67d815e51377ee5b154f91835e89352c77d5bdeccb69fe547da980a6be529ac08fdbaa07e69a505ffe542efc9793bb2fb63a2c7c88a95d9cecc6ef83ffe40824 SHA512 8bd626e97b2e8dff6081c62664be68cd5e42179315c5587a377e3a043d04dc416f89fbea44213e374d5470cd43866172f0bcd8f226b824e6ab8e16d7d21b4375
-EBUILD indilib-1.6.0.ebuild 1118 BLAKE2B 80c98094301156bbd7908f3ee3444b06ac529c43b6e488dce8b432571f894da0fa5323d2e74c1b0b09d03055bd505391c026dc7b81aab247d747c69ae1348bdb SHA512 992e6b768c3643e936108d4252f90c205e9176573326acc955918fc1e31da4bfcbc6a44ce3d7440b90a1ddf9d78494335e4a95fcb0f0426561306ede052ff413
+EBUILD indilib-1.6.0.ebuild 1107 BLAKE2B 413847725a1a8f32f42d919c3d2fe7c005f6aeeb28d148ad14494ac1fee314149fc5b4a238906b5c32dca998704f968425858623a32640ec73390f9628d905ce SHA512 c0126cdb25006c02d6f1f768879339cf3beb2238b699206edb601c9c725463f7ff3cab93545b44b7bda98141540be919ff4e30202ea2913456aa4b5d4f48cf92
 MISC metadata.xml 375 BLAKE2B 68a9fc46a21fd5e530412d36468b96bbf409de646206ec8e36bf35fd39ec9193464100f5cc3398c1bfac01a947a70970ecf2d505a1932070ff6ca12dc3a9db1e SHA512 b5dc385e3823484e4fdc5974ace09edb4c19272c159e086cdc6968cafda528b27623c3696dbe42e5a869c3b9b9060dcf99466d5ac9961363de2f05fdcc523448
diff --git a/sci-libs/indilib/indilib-1.6.0.ebuild b/sci-libs/indilib/indilib-1.6.0.ebuild
index e071e3c07b76..5db4cefb37e5 100644
--- a/sci-libs/indilib/indilib-1.6.0.ebuild
+++ b/sci-libs/indilib/indilib-1.6.0.ebuild
@@ -31,10 +31,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	sys-kernel/linux-headers
-	test? (
-		dev-cpp/gmock
-		dev-cpp/gtest
-	)
+	test? ( >=dev-cpp/gtest-1.8.0 )
 "
 
 DOCS=( AUTHORS ChangeLog COPYRIGHT README TODO )
diff --git a/sci-libs/libnova/Manifest b/sci-libs/libnova/Manifest
index 9585ce601119..27c7437726ea 100644
--- a/sci-libs/libnova/Manifest
+++ b/sci-libs/libnova/Manifest
@@ -4,5 +4,5 @@ DIST libnova-0.14.0.tar.gz 1547373 BLAKE2B 75078d77868419e3cc6d6a7b5c513ebbf3206
 DIST libnova-0.15.0.tar.gz 1533794 BLAKE2B e87ffd3b8a895ca7ac9913ad3aacff526718442546df5687f2156718f721665ffff27e69af4bcb65bac5df1fda89fc6fc8fe9876a4b74392986771cf157dc48c SHA512 77ab0ccbfe462c03a21e88656cb4d6389994ea1da0ee8da997f19a83d24ad8fd9e505e70e1580b75332e826e5b7859b5f2af4417f65eb811440493ba586f2574
 EBUILD libnova-0.12.3.ebuild 1127 BLAKE2B 6203f62ea6219ab024501af2f5e641f922b129076f1d60fc8e6a62fc1d679ff27c4b635f644bcfa24669a088aa03a10aa2174cec0315155363646ddd014fbf36 SHA512 d6490764d1558afb0fc4eec5d473e198924e6f983d4439931475f9348427b742fb30a12d9d2a082902a28b042e416acf52c8ec711323f76df42d63e505446a35
 EBUILD libnova-0.14.0.ebuild 823 BLAKE2B a96161abf24de6ef882ed02d0103140b6272cbe31de519f071ffd0e753f4ebacbd4adcfeb7cadcd86014ae70e0242b5baeec127ff74fd1e821e28e02476e18af SHA512 b8867669b87e048a909ed22f1d0d1bc017bc99645e8e5cbfcca3601e78d9385d8c73f929ee7b983d84dbe684a3ee1d8e0b0d147f85428153ad807968c4278ff5
-EBUILD libnova-0.15.0.ebuild 886 BLAKE2B c1ecb91220262354399b9db04c43f70d99bd0d9a238df4b0907dc35636c68bd12f8fd2c73a1818493c4494956f1cb6884b59d53c7eb4b1905aa67b115b0d00d3 SHA512 5caa861333809f2d29f3b66cbd0302e44dadba4da24b10b572006daca8475aa7568c3b9c5b7ecad7c4f354384713ad206b8facfe9cc1dd477d706853baf93fd9
+EBUILD libnova-0.15.0.ebuild 885 BLAKE2B b8096f62bf3c876cf23474ae5fcf1a46833afa624806f8050ad3c0add1f3931f9544db1088c31fa14263c80515d406cf4c07bd02297a34bbd93135db5f381183 SHA512 e56d1b18b575c4ac978997366f8a13e52f642ccb6d17d7f727fbaab4ddfcaf5d62a5baff836e618ac38ccb1ececb88f399dfa6eed18819d54e2fcd955b5b0c31
 MISC metadata.xml 637 BLAKE2B dff43562550feffed3b305c3aa5473a1ea4256c10f1db163b8e7af9f751611525d0720d18eff17a64dd3cd0de1a441a912b79e86e43e307d50b439cb95ccc480 SHA512 f94be1667b076464ade40edbc7fdc3e73ee743c518e862df1277914826e91d9adc075d1a756e6a48a309bc32da384dfc17d5973f1e2b9e116d48cda697c5ece8
diff --git a/sci-libs/libnova/libnova-0.15.0.ebuild b/sci-libs/libnova/libnova-0.15.0.ebuild
index ac3503b00341..aec842e9e598 100644
--- a/sci-libs/libnova/libnova-0.15.0.ebuild
+++ b/sci-libs/libnova/libnova-0.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/sci-libs/ogdi/Manifest b/sci-libs/ogdi/Manifest
index 8382e399dc6a..92f86dfb7897 100644
--- a/sci-libs/ogdi/Manifest
+++ b/sci-libs/ogdi/Manifest
@@ -1,11 +1,21 @@
 AUX ogdi-3.1.5-fpic.patch 7619 BLAKE2B 24e71ebb9a0ff536133f83dc4babbafe1e0a82002510a0a88df1ee3aaa5321d0a8f21a0bf4e89be0cd7b37fa12ad2a3bceaa48ed59dba5204ed48b5466992e81 SHA512 da978d0e38794c4b987e787c3fe2168fa4379e316390d7be7bb0490d0e0bdce54d59c105a03314b8e3f9ba450a2ba62ea07d11d89dc199c5f476da2225462251
 AUX ogdi-3.1.6-fpic.patch 961 BLAKE2B 6339c06958876010249514fb633186ba08eb749cc16c36ca2279f0685641b0b7a0cc2f4aa70994cfc20cba4107d05e969cb3bc2ae9627a1920557af3d292ce84 SHA512 9d5d89d907043b14f5a18b6e036a1784b657ae6dd824d03067ab3e1e4e777ad55286e9addf15c9499523d7b2fdb743d329660f64a54e5140961c567135b40579
+AUX ogdi-3.2.0-acinclude.patch 508 BLAKE2B 97ab24d0f836b3da111f88455734e681f203932c98ec85319e49843575e4ed224d04f319a7fd6069c9ea6b08ece00838c82236a9425e90e9262fbe144c1d5765 SHA512 6782744a2d7ae0e2a11d6b600777e10891c4ff68f2e32d205b8e96b79dcbdde4d863a25ed263705df54e48ed1fedeffcee085ec12fc769fe53a22f7cb863441c
+AUX ogdi-3.2.0-aclocal.patch 2048 BLAKE2B 91fe93c2ab1adb8d9561411a3668f093ba6922586f9401d7abbc449fea057ba6315595604eba123fa8149d608358f15d6ff1c4c2b4765c41377c2c91ddb77a57 SHA512 a63e00f5e1706169311d43e00c2baa78d017eee728dd1bafad10aa3d9f7332ecdb5bfea1b24df888dd06d9de1f09339da68ea8ed663e9f1fa97665459b2099f1
+AUX ogdi-3.2.0-endianess.patch 1028 BLAKE2B 25ea3bb0991b201bbfae2597ae622e2cd0a18749d274e6553e7dcd31cd2befb15f2bea1dd073f8d6d3bac568aeafbdaac6b04b7fcb0597733a97ea926bbd9a49 SHA512 3a4ee5ee69f27fbad6170f1e3142a70ba529bd81a9b3209d1cb005a2ebf1c04f782194f20e8a046a19ec817c81ee04a9f7ab192321f8dc9590f4f8823c71d38e
+AUX ogdi-3.2.0-fpic.patch 896 BLAKE2B ef7056cd60c3cb046137b7dc6bfea37fe711c9b41feb5c1bb40acd1b5fc8fb63178149e6d72c4a89940d45b4164d7cd93e26f003c845ce59862096fbcfb1e87e SHA512 71b429563254762a485ac05b9efdb4da29bc1c909b19d830b06a680722eee0991f0448d1885c9c96dad53e4a821257404f8b95bbb0d54a8fbca2300987d9f244
+AUX ogdi-3.2.0-ldflags.patch 700 BLAKE2B 6a2b494e35644dfa544ed000c4b3139b03a495e6a782bc8ad42fb1038b89b6e436222a1425b8a6ac7ca70e7680beadba4996de600202454e0e13c8f31b18ed63 SHA512 0d1c8c9bbff63abcfb713c4a2df627e9b00278eb00e89e3aecbeb87a6f9d4196687fd4eb5829248c352dd41f16db4060285bf4e1ea75df2f7c3f51dc314446d8
+AUX ogdi-3.2.0-optimisation.patch 247 BLAKE2B 097d0e9615352512f5322b7e11826fe4352728f020b76c4c7dcbb58c6cc9903165ac49ec442c773a97bb575271f37e88a5f22951aae507afa0483c6b512d5488 SHA512 894dd439f0599e68117a82e461e75e5e48efde1bcd165fde727339b3d5855a17fab1f721663154a8d8626e38607237d8136e41a57b6b390f061762dd317b2e3c
+AUX ogdi-3.2.0-rpc.patch 11640 BLAKE2B 86809477603e9842e9c80e59b83769ef7a67e05aa5fd8db5795639aa0387a3f7324405bf4ea532a522154f88a4fd29469b7bdbef3285771b4c54c625c33f32a0 SHA512 b16647603aec1a2bc5fdcdf17234d78c62d882777187ba4896d7ea7ef96025c663f585866fa70e432700faa1963c2d2643f6b83791a90f4c38fc1e426b84889a
+AUX ogdi-3.2.0-tcl.patch 320 BLAKE2B 4cf742b86210f4b78f9cfd304e6ed928fdeb26aebc541d3de3017939b75f08ec47676e5c91466a9ec667830b7cebacd334878cb30ba4d0937ab9f5408bb1333f SHA512 19f08d16caab2cc456b608f89f100830de6c2b7d13336240a9738c5435fe6065a946c4929dab386889363d392dd701dc5be5c1a1d6b589c31721caa5fddf97b8
 AUX ogdi-3.2.0_beta2-64b.patch 289 BLAKE2B 7b35827d1d06037d25a17a8d9dc4bb288e653847b763a0ea21823fa7e0ead371c8f7fd3431cd840ac8027efb16d736ee562c72fbd45b22b0d4b3a383329501e7 SHA512 fa79643dda054c1dad1e398d429c638eba31e572e265b3eec10408116d68eeafb65b0fedb0c0710beed58c506c810e2ef432b1f998a73cb70421fb8c796e2e91
 AUX ogdi-3.2.0_beta2-endianess.patch 590 BLAKE2B 4af94feb2e6b3345d9e440f48f1ac98f71792a832010f5666c38335b55b0215248ec568a52d61dfbae3e5804122a8fa4d95751108de85125182dcb440417e337 SHA512 7d4508610cc34d2552c4135226e2418d6e634ff6f85a9423534a3f2275392e5097399decc4bb9b8f4f02e7a23b7f7a4507182541c814e73efd5544292469e50e
 AUX ogdi-3.2.0_beta2-proj480.patch 9939 BLAKE2B bcefedd0043c8535adc8d5e3362f38514ec91a220444145b1c27b1a41b45191364f52130a46e91e371571bf4a5f7a4df64f798c7d526fa29a250b67690044989 SHA512 3ac6c554c8f89252b8ff6f8f9ff3824ec1c453b1ac395d41e395ccd1c15c659dfbb77d0a6110edf2cd20a1c738f70e444a566cd6bee7ead2bc563d773c77c737
 AUX ogdi-3.2.0_beta2-subdirs.patch 905 BLAKE2B 69db0794449ca68b61ba8723585a2d055836f2bfd031023073b515a326ca04215833c9ab1ef1d73f1bd5392a56d2479ba71d9a24fea42f5a41f239a3ec6c55db SHA512 b6e6f50dafdb6aea991b8ece37953a9910b3fa790dcb68108ba7316c81de3cffae1413afb9d9126457550fa46bded8a7613c8be27fcd9956c8c17b5b64065732
 DIST ogdi-3.1.5.tar.gz 913902 BLAKE2B ec60b620823b0ac77823b4c41f828d7edb8651d4ddfdb377c98030b0d58b723b7488d27fff80fc35f7b5040e13022bc8d54e266ec0e2ec2271d96a8902237ccc SHA512 fd77106a25b07bbaba23cab2e9e5298d7df62faf50c9ead72c4def683c4097717559b816a476ddfa16823f23d418a474ec49937b961ba06f606880f3338d6cfd
 DIST ogdi-3.2.0.beta2.tar.gz 956839 BLAKE2B d0729d42f3224d9911bb09f8cf2f150204950739547bf8ed5349c8ed63e7ab7a4e17298fe8bbf45fc17f5781e86925ab35d8356d396ffe7f35a4cf20803fce04 SHA512 2159dfd010be9da63cf009beee7f6571cd13c4f08d1a69a5d945dd64878347b28455eb5376f184e2d91fa4a3bd409446ccbd706aa9000d3d7d2ac4b6e30ced93
+DIST ogdi-3.2.0.tar.gz 976004 BLAKE2B 535f05b3145c49ce72adcd86cd9ded1c8d8d12e051feb4e1898d8ddabbff1cf27f609326ccdb3a1cbff523b277f99e9d8c3678d2ed565dd81e6c5d956ed2dcca SHA512 b29d52b733c15927d2c93df10632d9bf6288614b944c02a5e1a67f3f971263bcb07460b301fb5db389ed15fc5f38a1f3c0263c4b1441f2ea4809bb61b3e67ef0
 EBUILD ogdi-3.1.5-r1.ebuild 1098 BLAKE2B 4f7480e8dde7baec9438ccff389539888e7647a1be0a8161d10b1f1dbae9d821097f48d13cc7b259f0cdf5f650bf3cbf91b07ef906aca319518a6d997108386b SHA512 7d373f422f366df27e8a4e565852d99f0f5b8dcaa52aadc61053fba77e059ac05836fef81c20d1e32fce8a72e6d600235de4d490665cdb507f1058623d4af6d9
+EBUILD ogdi-3.2.0.ebuild 1723 BLAKE2B 218c93f2cece955f364319a33d8d5cba22830c278209fa90272a9c1270d885099ff670c2421e644b57f7d4280bedf292c781109d326209f30c50688c34f87c3d SHA512 38e235bbf8cf1bb94d8b18d8dc55a2aef741df30b616424afe68c9571bb26b811b773d7a29f23d6e3f4967f40568e92d2e046ae2ce2e16548631bba839e92224
 EBUILD ogdi-3.2.0_beta2.ebuild 1555 BLAKE2B 83c43c0d97b0cae8e69e17b91860aaec8c26772f2c8e9703c96d63627dd0930c42bae1846a68e969e931badccd0c4b68784347cc5c8103335ba02b2ae7686b98 SHA512 f73e49a47290430708e4eabfe5aebf83c12d88b71d9f7c542b0f5b5525eb57533479c9ca2c098ec9c3cdb6681a4ae7b36766737bdedd4ce27cbcdfa7fb114372
 MISC metadata.xml 337 BLAKE2B 01ea83d967f6073198b6a96775ed63b603dcd4736a3a3faa8d8e5e891d2b4fb25ef436425fe51be91d4d81702f392c7f28274738b7d672a82d681159e28b87dd SHA512 958474862734f915497c1e574254cd2152009f436b59dd57be9bcd5ad0ae2949dba1f6275ad3a68b3a6d60863093df2bf2bcfffdea51b591e9c1864231899221
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0-acinclude.patch b/sci-libs/ogdi/files/ogdi-3.2.0-acinclude.patch
new file mode 100644
index 000000000000..6952e7d349df
--- /dev/null
+++ b/sci-libs/ogdi/files/ogdi-3.2.0-acinclude.patch
@@ -0,0 +1,18 @@
+From 9e56a8be9e228b466d6464f09349a8ea2c3ec637 Mon Sep 17 00:00:00 2001
+From: Dennis Schridde <devurandom@gmx.net>
+Date: Tue, 28 Nov 2017 23:23:11 +0100
+Subject: [PATCH 2/6] Rename aclocal.m4 to acinclude.m4 to prevent clash with
+ actual aclocal generated file
+
+---
+ aclocal.m4 => acinclude.m4 | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename aclocal.m4 => acinclude.m4 (100%)
+
+diff --git a/aclocal.m4 b/acinclude.m4
+similarity index 100%
+rename from aclocal.m4
+rename to acinclude.m4
+-- 
+2.15.0
+
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0-aclocal.patch b/sci-libs/ogdi/files/ogdi-3.2.0-aclocal.patch
new file mode 100644
index 000000000000..bc39b7753d3b
--- /dev/null
+++ b/sci-libs/ogdi/files/ogdi-3.2.0-aclocal.patch
@@ -0,0 +1,77 @@
+From 2f8d760ac4470e22f2f4965aa3282ea21ffa1f17 Mon Sep 17 00:00:00 2001
+From: Dennis Schridde <devurandom@gmx.net>
+Date: Tue, 28 Nov 2017 23:21:39 +0100
+Subject: [PATCH 3/6] Apply stricter quoting to macros defined in acinclude.m4
+
+Refer to the automake manual for details on why recent versions of aclocal are
+ more strict:
+ https://www.gnu.org/software/automake/manual/automake.html#Extending-aclocal
+---
+ acinclude.m4 | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 163a446..9d3308e 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -1,4 +1,4 @@
+-AC_DEFUN(AC_COMPILER_WFLAGS,
++AC_DEFUN([AC_COMPILER_WFLAGS],
+ [
+ 	# Remove -g from compile flags, we will add via CFG variable if
+ 	# we need it.
+@@ -8,17 +8,17 @@ AC_DEFUN(AC_COMPILER_WFLAGS,
+ 	# check for GNU compiler, and use -Wall
+ 	if test "$GCC" = "yes"; then
+ 		C_WFLAGS="-Wall"
+-		AC_DEFINE(USE_GNUCC)
++		AC_DEFINE([USE_GNUCC])
+ 	fi
+ 	if test "$GXX" = "yes"; then
+ 		CXX_WFLAGS="-Wall"
+-		AC_DEFINE(USE_GNUCC)
++		AC_DEFINE([USE_GNUCC])
+ 	fi
+-	AC_SUBST(CXX_WFLAGS,$CXX_WFLAGS)
+-	AC_SUBST(C_WFLAGS,$C_WFLAGS)
++	AC_SUBST([CXX_WFLAGS],$CXX_WFLAGS)
++	AC_SUBST([C_WFLAGS],$C_WFLAGS)
+ ])
+ 
+-AC_DEFUN(AC_COMPILER_PIC,
++AC_DEFUN([AC_COMPILER_PIC],
+ [
+ 	echo 'void f(){}' > conftest.c
+ 	if test -z "`${CC-cc} -fPIC -c conftest.c 2>&1`"; then
+@@ -33,8 +33,8 @@ AC_DEFUN(AC_COMPILER_PIC,
+ 	fi
+ 	rm -f conftest*
+ 
+-	AC_SUBST(CXX_PIC,$CXX_PIC)
+-	AC_SUBST(C_PIC,$C_PIC)
++	AC_SUBST([CXX_PIC],$CXX_PIC)
++	AC_SUBST([C_PIC],$C_PIC)
+ ])
+ 
+ dnl
+@@ -42,7 +42,7 @@ dnl Try to find something to link shared libraries with.  Use "c++ -shared"
+ dnl in preference to "ld -shared" because it will link in required c++
+ dnl run time support for us. 
+ dnl
+-AC_DEFUN(AC_LD_SHARED,
++AC_DEFUN([AC_LD_SHARED],
+ [
+   echo 'void g(); int main(){ g(); return 0; }' > conftest1.c
+ 
+@@ -88,7 +88,7 @@ AC_DEFUN(AC_LD_SHARED,
+   fi
+   rm -f conftest* libconftest* 
+ 
+-  AC_SUBST(LD_SHARED,$LD_SHARED)
++  AC_SUBST([LD_SHARED],$LD_SHARED)
+ ])
+ 
+ 
+-- 
+2.15.0
+
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0-endianess.patch b/sci-libs/ogdi/files/ogdi-3.2.0-endianess.patch
new file mode 100644
index 000000000000..c1293fa66525
--- /dev/null
+++ b/sci-libs/ogdi/files/ogdi-3.2.0-endianess.patch
@@ -0,0 +1,34 @@
+From 0cc56791fa5f43a399adcea438d7254611573f2d Mon Sep 17 00:00:00 2001
+From: Dennis Schridde <devurandom@gmx.net>
+Date: Tue, 28 Nov 2017 21:53:51 +0100
+Subject: [PATCH 1/6] Use endian.h to determine endianness
+
+glibc and others have an endian.h header that contains a __BYTE_ORDER macro,
+ which can be used to determine endianness.  The header might also be called
+ sys/endian.h on some systems.
+---
+ vpflib/include/machine.h | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/vpflib/include/machine.h b/vpflib/include/machine.h
+index 808522d..cee8774 100644
+--- a/vpflib/include/machine.h
++++ b/vpflib/include/machine.h
+@@ -15,10 +15,11 @@ typedef struct
+     long            output;
+ } xBYTE_ORDER;
+ 
+-#if SYS_BIG_ENDIAN == 1
+-#define MACHINE_BYTE_ORDER MOST_SIGNIFICANT
+-#else
++#include <endian.h>
++#if __BYTE_ORDER == __LITTLE_ENDIAN
+ #define MACHINE_BYTE_ORDER LEAST_SIGNIFICANT
++#elif __BYTE_ORDER == __BIG_ENDIAN
++#define MACHINE_BYTE_ORDER MOST_SIGNIFICANT
+ #endif
+ 
+ #ifdef _WINDOWS
+-- 
+2.15.0
+
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0-fpic.patch b/sci-libs/ogdi/files/ogdi-3.2.0-fpic.patch
new file mode 100644
index 000000000000..a9cad1ef8a7a
--- /dev/null
+++ b/sci-libs/ogdi/files/ogdi-3.2.0-fpic.patch
@@ -0,0 +1,27 @@
+From a4a7fdb81c7b78159541d1e027275b8b4893cc4a Mon Sep 17 00:00:00 2001
+From: Dennis Schridde <devurandom@gmx.net>
+Date: Tue, 28 Nov 2017 23:03:34 +0100
+Subject: [PATCH 5/6] Compile everything with -fPIC if required
+
+Previously only objects directly compiled for shared objects were compiled
+ with -fPIC, but static objects linked into shared objects also need this flag.
+---
+ config/generic.mak.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config/generic.mak.in b/config/generic.mak.in
+index 699166b..3b671d7 100644
+--- a/config/generic.mak.in
++++ b/config/generic.mak.in
+@@ -35,7 +35,7 @@ AR		= ar cr
+ # Compilation and linking flags
+ #
+ SHLIB_CFLAGS	= @C_PIC@
+-COMMON_CFLAGS	= $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1
++COMMON_CFLAGS	= $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1 @C_PIC@
+ 
+ SHLIB_LDFLAGS	= -shared 
+ COMMON_LDFLAGS  = $(OPTIMIZATION) 
+-- 
+2.15.0
+
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0-ldflags.patch b/sci-libs/ogdi/files/ogdi-3.2.0-ldflags.patch
new file mode 100644
index 000000000000..a21a12d354fa
--- /dev/null
+++ b/sci-libs/ogdi/files/ogdi-3.2.0-ldflags.patch
@@ -0,0 +1,25 @@
+From 216529de46898bdeda075f084f4f62c796bfef87 Mon Sep 17 00:00:00 2001
+From: Dennis Schridde <devurandom@gmx.net>
+Date: Tue, 28 Nov 2017 23:53:03 +0100
+Subject: [PATCH 4/6] Respect LDFLAGS provided to ./configure
+
+---
+ config/generic.mak.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config/generic.mak.in b/config/generic.mak.in
+index 699166b..86b7fa2 100644
+--- a/config/generic.mak.in
++++ b/config/generic.mak.in
+@@ -38,7 +38,7 @@ SHLIB_CFLAGS	= @C_PIC@
+ COMMON_CFLAGS	= $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1
+ 
+ SHLIB_LDFLAGS	= -shared 
+-COMMON_LDFLAGS  = $(OPTIMIZATION) 
++COMMON_LDFLAGS  = $(OPTIMIZATION) @LDFLAGS@
+ 
+ RPC_INCLUDES = @RPC_INCLUDES@
+ 
+-- 
+2.15.0
+
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0-optimisation.patch b/sci-libs/ogdi/files/ogdi-3.2.0-optimisation.patch
new file mode 100644
index 000000000000..6dd25fe6d7c2
--- /dev/null
+++ b/sci-libs/ogdi/files/ogdi-3.2.0-optimisation.patch
@@ -0,0 +1,13 @@
+diff --git a/config/unix.mak b/config/unix.mak
+index e3af578..927b0fc 100644
+--- a/config/unix.mak
++++ b/config/unix.mak
+@@ -55,7 +55,7 @@ LINK_SW		= -L
+ ifeq ($(CFG),debug)
+ OPTIMIZATION	= -g
+ else
+-OPTIMIZATION	= -O
++OPTIMIZATION	= 
+ endif
+ 
+ #
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0-rpc.patch b/sci-libs/ogdi/files/ogdi-3.2.0-rpc.patch
new file mode 100644
index 000000000000..1569003d4e4d
--- /dev/null
+++ b/sci-libs/ogdi/files/ogdi-3.2.0-rpc.patch
@@ -0,0 +1,390 @@
+From 52b4a972c164d6900584f147ba4bf73f02e0bbe7 Mon Sep 17 00:00:00 2001
+From: Dennis Schridde <devurandom@gmx.net>
+Date: Tue, 28 Nov 2017 23:25:41 +0100
+Subject: [PATCH 6/6] Fall back to libtirpc if libc does not provide rpc/rpc.h
+
+---
+ config/generic.mak.in |   4 +-
+ configure             | 245 +++++++++++++++++++++++++++++++++++++++++++++++++-
+ configure.in          |   6 ++
+ ogdi-config.in        |   4 +-
+ ogdi.pc.in            |   4 +-
+ 5 files changed, 255 insertions(+), 8 deletions(-)
+
+diff --git a/config/generic.mak.in b/config/generic.mak.in
+index 3b671d7..6ff7e33 100644
+--- a/config/generic.mak.in
++++ b/config/generic.mak.in
+@@ -35,7 +35,7 @@ AR		= ar cr
+ # Compilation and linking flags
+ #
+ SHLIB_CFLAGS	= @C_PIC@
+-COMMON_CFLAGS	= $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1 @C_PIC@
++COMMON_CFLAGS	= $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1 @C_PIC@ @RPC_CFLAGS@
+ 
+ SHLIB_LDFLAGS	= -shared 
+ COMMON_LDFLAGS  = $(OPTIMIZATION) 
+@@ -61,7 +61,7 @@ INST_BIN	= @bindir@
+ #
+ #RPC_LINKLIB	= -lrpcsvc -lnsl -lsocket
+ #RPC_LINKLIB	=	-ldl -ldbmalloc
+-RPC_LINKLIB	=	@LIBS@
++RPC_LINKLIB	=	@LIBS@ @RPC_LIBS@
+ 
+ #
+ # Endian definition, could be little or big
+diff --git a/configure b/configure
+index d7acc10..c6459e0 100755
+--- a/configure
++++ b/configure
+@@ -634,6 +634,8 @@ PROJ_INCLUDE
+ PROJ_SETTING
+ BIG_ENDIAN
+ RPC_INCLUDES
++RPC_LIBS
++RPC_CFLAGS
+ EGREP
+ GREP
+ CPP
+@@ -643,6 +645,9 @@ CXX_PIC
+ C_WFLAGS
+ CXX_WFLAGS
+ HAVE_ICONV
++PKG_CONFIG_LIBDIR
++PKG_CONFIG_PATH
++PKG_CONFIG
+ OBJEXT
+ EXEEXT
+ ac_ct_CC
+@@ -714,7 +719,12 @@ CFLAGS
+ LDFLAGS
+ LIBS
+ CPPFLAGS
+-CPP'
++PKG_CONFIG
++PKG_CONFIG_PATH
++PKG_CONFIG_LIBDIR
++CPP
++RPC_CFLAGS
++RPC_LIBS'
+ 
+ 
+ # Initialize some variables set by options.
+@@ -1343,7 +1353,14 @@ Some influential environment variables:
+   LIBS        libraries to pass to the linker, e.g. -l<library>
+   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+               you have headers in a nonstandard directory <include dir>
++  PKG_CONFIG  path to pkg-config utility
++  PKG_CONFIG_PATH
++              directories to add to pkg-config's search path
++  PKG_CONFIG_LIBDIR
++              path overriding pkg-config's built-in search path
+   CPP         C preprocessor
++  RPC_CFLAGS  C compiler flags for RPC, overriding pkg-config
++  RPC_LIBS    linker flags for RPC, overriding pkg-config
+ 
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+@@ -2867,6 +2884,126 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+ 
++
++
++
++
++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++	if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
++set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_path_PKG_CONFIG+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  case $PKG_CONFIG in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
++
++  ;;
++esac
++fi
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
++if test -n "$PKG_CONFIG"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
++$as_echo "$PKG_CONFIG" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_path_PKG_CONFIG"; then
++  ac_pt_PKG_CONFIG=$PKG_CONFIG
++  # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  case $ac_pt_PKG_CONFIG in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
++
++  ;;
++esac
++fi
++ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
++if test -n "$ac_pt_PKG_CONFIG"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
++$as_echo "$ac_pt_PKG_CONFIG" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++  if test "x$ac_pt_PKG_CONFIG" = x; then
++    PKG_CONFIG=""
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    PKG_CONFIG=$ac_pt_PKG_CONFIG
++  fi
++else
++  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
++fi
++
++fi
++if test -n "$PKG_CONFIG"; then
++	_pkg_min_version=0.9.0
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
++$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
++	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++	else
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++		PKG_CONFIG=""
++	fi
++fi
++
++
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
+ if ${ac_cv_lib_dl_dlopen+:} false; then :
+@@ -3045,7 +3182,6 @@ HAVE_ICONV=$HAVE_ICONV
+ 
+ 
+ 
+-
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -3443,6 +3579,111 @@ fi
+ done
+ 
+ 
++for ac_header in rpc/rpc.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "rpc/rpc.h" "ac_cv_header_rpc_rpc_h" "$ac_includes_default"
++if test "x$ac_cv_header_rpc_rpc_h" = xyes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_RPC_RPC_H 1
++_ACEOF
++
++else
++
++pkg_failed=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libtirpc" >&5
++$as_echo_n "checking for libtirpc... " >&6; }
++
++if test -n "$RPC_CFLAGS"; then
++    pkg_cv_RPC_CFLAGS="$RPC_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++    if test -n "$PKG_CONFIG" && \
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtirpc\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "libtirpc") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
++  pkg_cv_RPC_CFLAGS=`$PKG_CONFIG --cflags "libtirpc" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
++else
++  pkg_failed=yes
++fi
++ else
++    pkg_failed=untried
++fi
++if test -n "$RPC_LIBS"; then
++    pkg_cv_RPC_LIBS="$RPC_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++    if test -n "$PKG_CONFIG" && \
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtirpc\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "libtirpc") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
++  pkg_cv_RPC_LIBS=`$PKG_CONFIG --libs "libtirpc" 2>/dev/null`
++		      test "x$?" != "x0" && pkg_failed=yes
++else
++  pkg_failed=yes
++fi
++ else
++    pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++        _pkg_short_errors_supported=yes
++else
++        _pkg_short_errors_supported=no
++fi
++        if test $_pkg_short_errors_supported = yes; then
++	        RPC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libtirpc" 2>&1`
++        else
++	        RPC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libtirpc" 2>&1`
++        fi
++	# Put the nasty error message in config.log where it belongs
++	echo "$RPC_PKG_ERRORS" >&5
++
++	as_fn_error $? "Package requirements (libtirpc) were not met:
++
++$RPC_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables RPC_CFLAGS
++and RPC_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details." "$LINENO" 5
++elif test $pkg_failed = untried; then
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables RPC_CFLAGS
++and RPC_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details" "$LINENO" 5; }
++else
++	RPC_CFLAGS=$pkg_cv_RPC_CFLAGS
++	RPC_LIBS=$pkg_cv_RPC_LIBS
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++
++fi
++fi
++
++done
++
++
+ for ac_header in rpc/pmap_clnt.h float.h dlfcn.h
+ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+diff --git a/configure.in b/configure.in
+index 68b1c92..d5fe134 100644
+--- a/configure.in
++++ b/configure.in
+@@ -23,6 +23,7 @@ fi
+ 
+ dnl Checks for programs.
+ AC_PROG_CC
++PKG_PROG_PKG_CONFIG
+ 
+ dnl We always want to check /usr/local for stuff.
+ dnl LIBS="$LIBS -L/usr/local/lib"
+@@ -38,6 +39,11 @@ AC_COMPILER_WFLAGS
+ AC_COMPILER_PIC
+ AC_LD_SHARED
+ 
++dnl ---------------------------------------------------------------------------
++dnl	Do we have rpc/rpc.h
++dnl ---------------------------------------------------------------------------
++AC_CHECK_HEADERS([rpc/rpc.h],,
++	[PKG_CHECK_MODULES([RPC], [libtirpc])])
+ 
+ dnl ---------------------------------------------------------------------------
+ dnl	Do we have rpc/pmap_clnt.h, float.h, dlfcn.h?
+diff --git a/ogdi-config.in b/ogdi-config.in
+index f3c9a03..c6dfc50 100644
+--- a/ogdi-config.in
++++ b/ogdi-config.in
+@@ -13,8 +13,8 @@ exec_prefix="@exec_prefix@"
+ libdir="@libdir@"
+ includedir="@includedir@/ogdi"
+ libs="-logdi"
+-all_libs="-logdi -lproj -lexpat -lz"
+-I_opts="-I${includedir}"
++all_libs="-logdi -lproj -lexpat -lz @RPC_LIBS@"
++I_opts="-I${includedir} @RPC_CFLAGS@"
+ L_opts=""
+ R_opts=""
+ cppflags=""
+diff --git a/ogdi.pc.in b/ogdi.pc.in
+index 8b919de..1f290d9 100644
+--- a/ogdi.pc.in
++++ b/ogdi.pc.in
+@@ -6,7 +6,7 @@ includedir=@includedir@
+ Name: ogdi
+ Description: Open Geographic Datastore Interface
+ Version: @OGDI_VERSION@
+-Cflags: -I${includedir}/ogdi
++Cflags: -I${includedir}/ogdi @RPC_CFLAGS@
+ Libs: -L${libdir} -logdi
+-Libs.private: -lproj -lexpat -lz
++Libs.private: -lproj -lexpat -lz @RPC_LIBS@
+ 
+-- 
+2.15.0
+
diff --git a/sci-libs/ogdi/files/ogdi-3.2.0-tcl.patch b/sci-libs/ogdi/files/ogdi-3.2.0-tcl.patch
new file mode 100644
index 000000000000..5d6917b0e01b
--- /dev/null
+++ b/sci-libs/ogdi/files/ogdi-3.2.0-tcl.patch
@@ -0,0 +1,14 @@
+diff --git a/config/generic.mak.in b/config/generic.mak.in
+index 1cb74f5..2e9cabe 100644
+--- a/config/generic.mak.in
++++ b/config/generic.mak.in
+@@ -46,8 +46,8 @@ AR		= ar cr
+ RPC_INCLUDES = @RPC_INCLUDES@
+ 
+ UCB_STATICLIB = 
+ 
+-TCL_INCLUDE = -I/usr/include/tcl8.3
++TCL_INCLUDE = -I${prefix}/include
+ TCL_LINKLIB =
+ 
+ #
diff --git a/sci-libs/ogdi/ogdi-3.2.0.ebuild b/sci-libs/ogdi/ogdi-3.2.0.ebuild
new file mode 100644
index 000000000000..e844f7644e53
--- /dev/null
+++ b/sci-libs/ogdi/ogdi-3.2.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P=${P/_/.}
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Open Geographical Datastore Interface, a GIS support library"
+HOMEPAGE="http://ogdi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ogdi/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+DEPEND="
+	net-libs/libtirpc
+	dev-libs/expat
+	>=sci-libs/proj-4.9.0
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.0_beta2-subdirs.patch
+	"${FILESDIR}"/${P}-acinclude.patch
+	"${FILESDIR}"/${P}-aclocal.patch
+	"${FILESDIR}"/${P}-endianess.patch
+	"${FILESDIR}"/${P}-fpic.patch
+	"${FILESDIR}"/${P}-ldflags.patch
+	"${FILESDIR}"/${P}-optimisation.patch
+	"${FILESDIR}"/${P}-rpc.patch
+	"${FILESDIR}"/${P}-tcl.patch
+)
+
+src_prepare() {
+	default
+	rm -rf external
+	sed 's:O2:O9:g' -i configure || die
+}
+
+src_configure() {
+	export TOPDIR="${S}"
+	export TARGET=$(uname)
+	export CFG="release"
+	export LD_LIBRARY_PATH=$TOPDIR/bin/${TARGET}
+
+	econf \
+		--with-projlib="-L${EPREFIX}/usr/$(get_libdir) -lproj" \
+		--with-zlib --with-expat
+}
+
+src_compile() {
+	# bug #299239
+	emake -j1 \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getCC)" \
+		SHLIB_LD="$(tc-getCC)"
+}
+
+src_install() {
+	mv "${S}"/bin/${TARGET}/*.so* "${S}"/lib/Linux/. || die "lib move failed"
+	dobin "${S}"/bin/${TARGET}/*
+	insinto /usr/include
+	doins ogdi/include/ecs.h ogdi/include/ecs_util.h
+	dolib.so lib/${TARGET}/lib*
+	use static-libs && dolib.a lib/${TARGET}/static/*.a
+#	dosym libogdi31.so /usr/$(get_libdir)/libogdi.so || die "symlink failed"
+	dodoc ChangeLog NEWS README
+}
diff --git a/sci-libs/parmgridgen/Manifest b/sci-libs/parmgridgen/Manifest
index e71777b60788..a8da239b90db 100644
--- a/sci-libs/parmgridgen/Manifest
+++ b/sci-libs/parmgridgen/Manifest
@@ -3,6 +3,6 @@ AUX parmgridgen-1.0-autotools.patch 15980 BLAKE2B 17ad43d00cc80bc699e8434b2c5d88
 AUX parmgridgen-1.0-format-security.patch 1338 BLAKE2B 2b857f31ecb59afc9bb52272283dc6c7db9915e7fa3c9f4386abdb21f0f3965b099f360e843c164fedcecf4c090ef37d056c2959d07983be696324edc862a0db SHA512 5f7e3e2417f6764e8faa4c5db89d317ea741be14f3051ac3ba1f99b31cc48fab534d14f2c2d2f6fc240f5352c1f82c31fdecc3eea5ca99812fbc7fd332c24033
 AUX parmgridgen-1.0-impl-fct.patch 2207 BLAKE2B c9665f969730628a8811f24b5c5d8ce43cbc5c202ec4d277bdf770760f0cbdeaf5a4cef7ac94a52b3d04666b4e48911e39e49c917b40d56fe1344cfa82a76f2f SHA512 078690430ffefcc56a3f84942ee49e06663b1be995ba8be5755930e5bf1eb76fdaaf27eb1756474911ad9ada2250f3bf3ecfff9de240e2142cd5ea46083f001d
 DIST ParMGridGen-1.0.tar.gz 2623528 BLAKE2B 982e6d7a0df3b9c101993ecf397c75f10d0cf390914ccca6f02efbe5ae190c65bc31e5770bd57ff375a8e3a3aab878c56da50af4f3e5f0f422044137d90ddff8 SHA512 e12ea3c923dd900c92ba4f2639daacc6c3596c5ea3c8d366b269c4c21247b10e6400c384321cfc65b486e4f8217dcd43f43eee27570b1fe1375deb02e255cb16
-EBUILD parmgridgen-1.0-r1.ebuild 883 BLAKE2B bb3725e35203250496766d9bc23e281bc200bb1b5cb2714ce5a53b8318f0d37341a35dde2507870153c4c6e2668fcd75dc8713e6fa117cb8e80279fee047f426 SHA512 4a6c84be28ad08d6b3c071cf7eb3c9ef6ba0678b2e75aba58e9ff910dd6c50d8d9eba67f5b7e153aabf3362dbdf7d8edacdd4307f115b035873fdf2a88893381
+EBUILD parmgridgen-1.0-r1.ebuild 882 BLAKE2B cea3acbdb3d549f2f2e2e25c256171ec03b1c286b9a846a3950ea62531bdb5be9b7312e4ecc61cc19e3b9668c6547957de439bf2f9a7d818bcb4902083ed55bc SHA512 4a82148929fd9e713e43d135a8ba26f81dd9da88ee425160844bebc125cd628c0f1304d222e7b00fa47e26914652ee17a28baf52a9908333118ca637df79d4f8
 EBUILD parmgridgen-1.0.ebuild 753 BLAKE2B 69c013bc95f832e473f30ba46f62c32e884ac7bbb86e7ad28cabc012aef852aab5ff0cec59f0e7f40ebaa9fa3773e545c83cb4fb520cc9bf0a09ac0f3d6f113b SHA512 147c3676e89ebc6b7130e9e74ea3e4bf39f808c6a44d6cc7840d133c704e8fd84b9ee6eb4d7a7faa154512dda7394d6998f5dfde7ca68ebb58ea741444f2778f
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/sci-libs/parmgridgen/parmgridgen-1.0-r1.ebuild b/sci-libs/parmgridgen/parmgridgen-1.0-r1.ebuild
index c94cad2a63ac..a86859128043 100644
--- a/sci-libs/parmgridgen/parmgridgen-1.0-r1.ebuild
+++ b/sci-libs/parmgridgen/parmgridgen-1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://www-users.cs.umn.edu/~moulitsa/download/${MYP}.tar.gz"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="static-libs"
 
 RESTRICT="mirror bindist"
diff --git a/sci-libs/shogun/Manifest b/sci-libs/shogun/Manifest
index acf6a1775a55..41f81c3a0369 100644
--- a/sci-libs/shogun/Manifest
+++ b/sci-libs/shogun/Manifest
@@ -2,5 +2,5 @@ AUX shogun-4.1.0-remove-C-linkage.patch 825 BLAKE2B c95a7a322b669aa51a9a33470088
 AUX shogun-5.0.0-fix-buildsystem.patch 2889 BLAKE2B 63593dcf5f077310c31983446d5060c15c23d45d3eb5e3780c0d7a53074ccef57da79fb115ce67b109ed94f2e58aa1e5804bdbd1d0d0a13c05de716de7ed1058 SHA512 3119a95e8fe76804eb113361e09260bbb951679faeb3360d378c0a9afcdbf322ac75f02da6e4c799102949abbd97006f2bbb7550b5f5b01fa8b4335ac530f377
 DIST shogun-5.0.0.tar.bz2 2448509 BLAKE2B 85352d782740b4c671bb6081e0445bb7e801e27e36fdc0f82658b937fd6658c41016e4a91841ddb09ae9062b77d32f290f56b191318c1c34bf0812d1b9a8b364 SHA512 fa8d9dee4596acce12022540a6927cbdb62e08f8468c8be3790de07ebf3a53055032bcc532b28334ca83284c38f2b0153602634f12bafe4019acb9121b9ff236
 DIST shogun-data-0.9.tar.bz2 287533841 BLAKE2B 796830262205961b88715f4eb60a47ff2ad108426b7af8e4e1a0733920962ad8154a1ab9892356e9793be24d415fcbc358960210f089a0173f55a0091ea3c0d1 SHA512 ab501640e2db650603899c857866b451fac5c7bbbc7b4ef98559581928869cea49aa326dfca1bb398eee7ebc8843dcc8ee3105c9f462718f1af672aac6b9340a
-EBUILD shogun-5.0.0.ebuild 3854 BLAKE2B 89530c7d3820e53633b6cc6740e7ab7a09daed0d83517286cdd479ceb50e80a87ce523abadef8a46172611b66688de62ac98f715f78320018b6bed3ce4fd0faf SHA512 24d638e5c341426c2264b4a16734cb29b77a116da212ce34f68b1e09cce567b926472563b317e8e11d877a1698a2b072b1996aa97bd5a62f521e39654ee8b412
+EBUILD shogun-5.0.0.ebuild 3862 BLAKE2B 867685b94d16e7b08f210a1c45a6da3fffaba9d6f340c1f1903557167c81a35e56b3cdfb2eb05488e61e160d5c166011949764115e18dc7e4b49850b61f7f3fc SHA512 062ca56de5c9c1f2967f73fc758c7b47946aa04a73724b359b97a066178f747893d322301731edf84110ccd15f0a25423e9da13f96fcc21002b7f2ba1212430d
 MISC metadata.xml 1627 BLAKE2B 871fc71cd8ae67ef94fa060b50f249b233333ec934db4d8ad238f24408e491f071d1271903f57ad2548923b2091c0f2738a7ce3f269d5c24fd10300aaf179047 SHA512 babaf4f8a5d4a7d83e678d2ba1cb4f29a15a928740e7c2b312fe03ffd2c909f1f867a071573954269a03bd8f915f38f82c4c11782573ae08be6ec053cf3b54c6
diff --git a/sci-libs/shogun/shogun-5.0.0.ebuild b/sci-libs/shogun/shogun-5.0.0.ebuild
index faf9808fd09f..78fb3ea3a38d 100644
--- a/sci-libs/shogun/shogun-5.0.0.ebuild
+++ b/sci-libs/shogun/shogun-5.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -76,7 +76,7 @@ DEPEND="${RDEPEND}
 	ruby? ( >=dev-lang/swig-3.0.12 )
 	test? (
 		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-cpp/gmock
+		>=dev-cpp/gtest-1.8.0
 	)"
 
 # javamodular needs jblas (painful to package properly)