gentoo resync : 20.12.2017

6 files changed, 8 insertions, 8 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index d7bad0cd97ff..e27895a1644b 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gdal-grass/Manifest b/sci-geosciences/gdal-grass/Manifest
index 1ea34808dbb3..eec36a7e3c19 100644
--- a/sci-geosciences/gdal-grass/Manifest
+++ b/sci-geosciences/gdal-grass/Manifest
@@ -1,5 +1,5 @@
 DIST gdal-grass-2.0.0.tar.gz 56286 BLAKE2B 191402442bc3c16f3d07f538b9eae266e75c74efbecb235dc11cb3529e4758fc8354ab5e65ec4a8805595c6f1209d70e5f76a7006d546eb3d2e8f9e4966842ff SHA512 cefa60773c2acd5c1627b896e3298d02f51979c12f70ce67b88c0b886a13de2f62821a3d3e50984f5c676ef37819c685795949b06db57004a0edf8039e898d7e
 DIST gdal-grass-2.1.0.tar.gz 54299 BLAKE2B 09b9a408584618cefcc989feebc75431ae3efed2c9f6504e65ccf28bbc02a6e5125cb049accece7fd598aeef0bb1d5cb572067fc5a764a49c99627132d650f65 SHA512 fb06b71839849de413f68beb8f2cd1c2273cc48b5205fe1b255ffc4976f8f913b4b226eba186a24f5b40fe5fbb1ceeab760d06915222e4a4b269a6fbc7bc9417
-EBUILD gdal-grass-2.0.0-r1.ebuild 1243 BLAKE2B 02058fa047776471cc50d260b2435d25296b160411073fd4b7bae3f762111d2c92011238211a70f272e90906869adbafad156bc72f2c1f9a1c82e3eee7bbd949 SHA512 0bc907a202bd935f4e5291feb6e64dbdda086f0dd9150b778675b64e3f6e1025e9ff8e9904a5dc581a7a638a390e1d1a98cf74092c94962d3fa445c2467dff44
-EBUILD gdal-grass-2.1.0.ebuild 1243 BLAKE2B 02058fa047776471cc50d260b2435d25296b160411073fd4b7bae3f762111d2c92011238211a70f272e90906869adbafad156bc72f2c1f9a1c82e3eee7bbd949 SHA512 0bc907a202bd935f4e5291feb6e64dbdda086f0dd9150b778675b64e3f6e1025e9ff8e9904a5dc581a7a638a390e1d1a98cf74092c94962d3fa445c2467dff44
+EBUILD gdal-grass-2.0.0-r1.ebuild 1245 BLAKE2B 6102d47e8ed2fa8f58a61f19a019cc6e2189b2c5626ea9f63b982687053bcbb509c201df317955c20449bf75df63a9fa21213da1b9333ec24ef22de48aa95621 SHA512 fd33279df18a30bcbecf42ca44dca2ff31f9bb526a83c4f61072b5cb9de0c0277a99fe01d5d5754efcf88d474736d09502ca7d0e848073fb84fa2548c4c2e775
+EBUILD gdal-grass-2.1.0.ebuild 1245 BLAKE2B 6102d47e8ed2fa8f58a61f19a019cc6e2189b2c5626ea9f63b982687053bcbb509c201df317955c20449bf75df63a9fa21213da1b9333ec24ef22de48aa95621 SHA512 fd33279df18a30bcbecf42ca44dca2ff31f9bb526a83c4f61072b5cb9de0c0277a99fe01d5d5754efcf88d474736d09502ca7d0e848073fb84fa2548c4c2e775
 MISC metadata.xml 483 BLAKE2B 1756639766f640eacbc48a2799070446dbbbf8444f2836c4818cd83015a7372f1a1db6b62763c3e38777cc6937f79ca128b97de7b12f61fca63f713e861b3ba6 SHA512 83e82a4e02986964a80b60fed33ac6828d7be430ac7296ddcfec13fc1e867b77d18a30f4e9043e335a80140fc358711ca289265ed20b603d9b6a9af74157dd62
diff --git a/sci-geosciences/gdal-grass/gdal-grass-2.0.0-r1.ebuild b/sci-geosciences/gdal-grass/gdal-grass-2.0.0-r1.ebuild
index 15f158c06f4f..0b8f94b06435 100644
--- a/sci-geosciences/gdal-grass/gdal-grass-2.0.0-r1.ebuild
+++ b/sci-geosciences/gdal-grass/gdal-grass-2.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-libs/expat
-	dev-libs/json-c
+	dev-libs/json-c:=
 	virtual/jpeg
 	media-libs/tiff
 	sci-libs/libgeotiff
diff --git a/sci-geosciences/gdal-grass/gdal-grass-2.1.0.ebuild b/sci-geosciences/gdal-grass/gdal-grass-2.1.0.ebuild
index 15f158c06f4f..0b8f94b06435 100644
--- a/sci-geosciences/gdal-grass/gdal-grass-2.1.0.ebuild
+++ b/sci-geosciences/gdal-grass/gdal-grass-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-libs/expat
-	dev-libs/json-c
+	dev-libs/json-c:=
 	virtual/jpeg
 	media-libs/tiff
 	sci-libs/libgeotiff
diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest
index 03085a51d1cf..87906caf9bae 100644
--- a/sci-geosciences/osm2pgsql/Manifest
+++ b/sci-geosciences/osm2pgsql/Manifest
@@ -1,4 +1,4 @@
 DIST osm2pgsql-0.94.0.tar.gz 1203310 BLAKE2B df9af84aab13bfd79763238e89dfc216401be2460be468a2f5467513dfcbd48650d779586f9cefd4100d6404f430a2401326919e9a1c72d86b80c6526881f206 SHA512 eceb5de7679048f51a9ad1be4ecf5b2d26da827b3eb8d6b0e86657603c8bf8a6f8d6f665c8ff8db91070a2966057f2deed5e4a3cc8bfb28e60a6031454e4758e
-EBUILD osm2pgsql-0.94.0.ebuild 866 BLAKE2B 2fac51a12eb0fb3cc6f3b68c20a5ce8347a1b098eb33a701cfc22f6f69ecd8290347b554010e222c9463dce6437f66f4836a376c369a37486264e1f5ee316bba SHA512 2ece09c58afa949f288e4da1f158cd40dcfbeaa8aa74e1c284bf16ed3ad82967be54804bf4b8a6b39b00cc3d02e73a7516c9042dcd27af4936cb817dfc9b93bd
+EBUILD osm2pgsql-0.94.0.ebuild 865 BLAKE2B f6db8ba65c070a13af1f02269d63c77b60a01bb56ae349a7bc21318c5413c270c03c2ed2dc4d798dc30df3ac80555c4ebff594454325370cc739a18d45bcd2fe SHA512 cf04e72a6f6976f5cee7ffa65b7fd967ea4796bc117ffc92a3f11c8caf059396df1c8ecd82aa85d499494af82eb47ca1f5fd33178fe3cb2a7d0b66d180fe016d
 EBUILD osm2pgsql-99999999.ebuild 812 BLAKE2B 3f4fd25082adf137822d07ac89cb27f5a8c7d9e80437ad047241e6589e90f746aacf5d7332093a8604b566ac41d638530b47efaf2c33382856e7bdbe48f4be5e SHA512 a70c0352ec4299ddc7df14d5d10c3756d569958ca78789989ee55460e0918315a076157e03477b6054a5614e1f537ba9fe9bd680d5102f49f3135f0c1b5475e1
 MISC metadata.xml 793 BLAKE2B d74e55e2b2cd946a65cba5bd3f0ba953edf8528d6d30037fbd69640d7379ced6e07a0e81e57f02f2e49afde4a55b07c21cb5430de1d42a682e10bfd964ab7939 SHA512 2f76c2c5946179da213b0bf193e89f110c46818ab77a4dea41df1fc78d1527ace8ff81a3887ebb47e6ee0a799e0ee037364e22bfdd5ce72feb765209b6a3fcd6
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.94.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.94.0.ebuild
index 801da8b39d7e..41228c63339b 100644
--- a/sci-geosciences/osm2pgsql/osm2pgsql-0.94.0.ebuild
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-0.94.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="+lua"
 
 COMMON_DEPEND="