gentoo Easter resync : 12.04.2020

3 files changed, 4 insertions, 4 deletions

diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 993ddfd1ac36..4d1f21927951 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -13,6 +13,6 @@ DIST gdal-2.4.1.tar.gz 14546610 BLAKE2B 92404336339c6f46877f3e6599af6fc67a537148
 DIST gdal-2.4.3.tar.gz 14726748 BLAKE2B 104c29912a96b03d0913be40f91a844b2f04f1e972b1ae8764bd277e7d51960b45d4a67a8f9240130de7ce8752f69f4172ca9a54bb11e70635aa55b6c6924cb5 SHA512 e532ce86c92724300ab443c42dd8cec0e74e41411a54d30222f98faa10623b31e616eda44da8f406ed01f3fc3c72c76e8ceb80c1dff733f8efcaa2e2e18132f6
 DIST gdal-3.0.4.tar.gz 14379480 BLAKE2B 1ced7f791608be2ea1aede8705826135a015a3bf376af087b10e0b17a6884c141df4b24654eeac136afd959c1360ce0cf1f1312438093ca305fa38a242d7e364 SHA512 bc5032a123a2cc90145fef8b467a4c9b78ddf7b4d850ceaae8350aacc3f6f23e13dd52219844a2b930b59d000854d3f2cce117643d62ead176b71939f4760ce9
 EBUILD gdal-2.4.1-r1.ebuild 8176 BLAKE2B 0ccaedec2cdd24e0b572483595445ade24d1dada60540137840d4e6947d238ff675dff191aaa6dbb569736721d71f297cb2c7cfcec709a872194f07313dfedd8 SHA512 f8642e106d247e8e5ba7b8d89fbad81cb767655fd6ebcb1ae6f0cabb8b75de83d48108c37d9805cc040861288cb696843dc0e609eff1cea7c0c55f3f769f1b19
-EBUILD gdal-2.4.3.ebuild 8090 BLAKE2B 67afb5d2471e6c10ac1e76d3dfd352f27e58f232531272b5f8ee3008b6191d7e4b3b1930bf6b0e0c676a96ed60c942b91ece9f7f9c738c378e98f5b7c85f8d3c SHA512 2786af2efab67820db7ebadc6bbccff701a278efd351277831e85a36359f154862f8237bfd27990ee2eb3dd274903c7218d56f98d582b569e881fc40b48b0fc9
-EBUILD gdal-3.0.4-r1.ebuild 7308 BLAKE2B fbfaf6ecbe7f267048421ce2e19fc947761a807da3245a5362cc2bab1ab972f4f310a853d610a335b0a94693728f65b4f689f89d2110cb27b7ad45a32896b407 SHA512 96f19c51995c8eeb0dcc65e2e75b33658b653176bbd779ff76d8249380c7df36527e3f6af7cc1bbc78707e4c7884ca50b3f5c6459c3f80869d1f0c43868c94c5
+EBUILD gdal-2.4.3.ebuild 8098 BLAKE2B 6af448cbf507f843f9732149e6b94caeadd3114df9d03082d3ff345f0182be58b9521c2b5f337dbd97e6dbaf0b12723c038ea8ae283cfbb5b7d17b0d81e8794f SHA512 21587d67b306a5adfb357f9299bb8fc537d5c3a5bf1c2c903a7f041f6d1b6602a88e5ecfd3446080f274b94b2e00a31bb422bb3df4dae322f11b0c06230d2f48
+EBUILD gdal-3.0.4-r1.ebuild 7305 BLAKE2B 91aeba00048f346e542a228020fa6bc8c6f4e6f55c3b2b581a175669889b415f66c6120166dfadde0a0b230bb02fe813f0b6fef1affb334c89cdfc49ca95b5ea SHA512 a98c91005dc6714352a2ca5f18f8487aca49ab3240abde0f30035b6ec48408f7e3d4a1d714b0d414060c23c3c366834e577546f2944154b275045e4c58772d48
 MISC metadata.xml 1420 BLAKE2B 1887e48a94b0d8596913fda0e102c0e23768e1fe9df32f8f0387c5966d9e9b1e0bdd6d06f6d281660494c871d887ed20d4254f1aaa9b23cda9830f7a4810ef00 SHA512 be3a0fdc46e1b022fce052908ce7f43399f1be9d4f4b1cf23e3cca8e43d6280d1f8f820fe1d0ac1d65d2dacde1ddc859c1ce3b8d067e0f6114ab3900abc419eb
diff --git a/sci-libs/gdal/gdal-2.4.3.ebuild b/sci-libs/gdal/gdal-2.4.3.ebuild
index b1cd05478bd4..77fa8dd5ff87 100644
--- a/sci-libs/gdal/gdal-2.4.3.ebuild
+++ b/sci-libs/gdal/gdal-2.4.3.ebuild
@@ -60,7 +60,7 @@ DEPEND="
 	ogdi? ( sci-libs/ogdi )
 	opencl? ( virtual/opencl )
 	oracle? ( dev-db/oracle-instantclient:= )
-	pdf? ( app-text/poppler:= )
+	pdf? ( <app-text/poppler-0.85.0:= )
 	perl? ( dev-lang/perl:= )
 	png? ( media-libs/libpng:0= )
 	postgres? ( >=dev-db/postgresql-8.4:= )
diff --git a/sci-libs/gdal/gdal-3.0.4-r1.ebuild b/sci-libs/gdal/gdal-3.0.4-r1.ebuild
index 5bb8ddce5ea9..b8e390e8e00a 100644
--- a/sci-libs/gdal/gdal-3.0.4-r1.ebuild
+++ b/sci-libs/gdal/gdal-3.0.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 
 SLOT="0/3.0"
 LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="armadillo +aux-xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
 
 REQUIRED_USE="