gentoo resync : 25.08.2020

3 files changed, 46 insertions, 2 deletions

diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 5a5bd941abf5..acf58f9137ca 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -2,6 +2,7 @@ AUX gdal-2.2.3-soname.patch 2031 BLAKE2B adc05d4e426083af16c153011d1bccb2a6d7334
 AUX gdal-2.3.0-curl.patch 471 BLAKE2B 551c9fba5cd49afef45ae271f20b8440214b06f569893cf8dfba73bd5682a9494e8ff1d3c81c1784019e49149d56aa4a4f4ced77db2d1a29f12eaec3f4fbce72 SHA512 a23a7df486ed2fe0c000a87405ad56ed48107a957ce29bd6692df26ef93e493b2221b856720721cafeba9646c4c959e154549c87e1012a8a65389343d267dbe6
 AUX gdal-3.0.2-complete.patch 3533 BLAKE2B 5b62041f4be9f8a846f35f8d54e4cf6eb5d0902a009197d1d994e500a0e23e57149dff28d7baa20817d40db103b37c93b7ab88f54b12f7e2b324dc1d5c6f61e5 SHA512 c7ade447b857977f8949de2d44dde34ab581b11603afbb9f1e2fcaffa65941aa037a69a34b1915d33f1cde6bfec92ff91859b80bfdc06a27cdcc25733c9b60a1
 AUX gdal-3.0.2-datadir.patch 2516 BLAKE2B 5d67889e468cee04f780e9f15cb167d27dbf955db9464155170afdcd2fc72744ab699c8a7de34872b1dd085268f7ee80a54d73397503919955f6898f0b161560 SHA512 327f2a7e6b2d2665153350a6419bec9396b51f6374bcffb8101986f740363b47ae2db9c2fb7b6e3c0f512bdfd502a1abb531be178d27b4138948018cd1564532
+AUX gdal-3.0.4-poppler-20.08.patch 1857 BLAKE2B 676b951dae6a374e2897549ff604fb8e7d49bae5aa1d5b51f808a6e9098f951eacc5d5ce736ab2346da2fb2d8c1c12592d8011d1f1d379321a5bc535f7b876b4 SHA512 a1e3d63885cceee3dc56febcbd8837818e956207b9fe9da3409b19d972ee338a0c22b7ad8694f742a94fdf5c26597099a5cfaf8d5212f641b32174bbdd31fd8c
 DIST gdal-3.0.4.tar.gz 14379480 BLAKE2B 1ced7f791608be2ea1aede8705826135a015a3bf376af087b10e0b17a6884c141df4b24654eeac136afd959c1360ce0cf1f1312438093ca305fa38a242d7e364 SHA512 bc5032a123a2cc90145fef8b467a4c9b78ddf7b4d850ceaae8350aacc3f6f23e13dd52219844a2b930b59d000854d3f2cce117643d62ead176b71939f4760ce9
-EBUILD gdal-3.0.4-r1.ebuild 7305 BLAKE2B 91aeba00048f346e542a228020fa6bc8c6f4e6f55c3b2b581a175669889b415f66c6120166dfadde0a0b230bb02fe813f0b6fef1affb334c89cdfc49ca95b5ea SHA512 a98c91005dc6714352a2ca5f18f8487aca49ab3240abde0f30035b6ec48408f7e3d4a1d714b0d414060c23c3c366834e577546f2944154b275045e4c58772d48
+EBUILD gdal-3.0.4-r1.ebuild 7360 BLAKE2B b870ded1680c0f1d9ccf47fce7ca85682d73eed11f007839b8203eea43893f3b08a5356b55cf85c42812a62973551de9b5d83f88044536c0639bc0c9a75f5b18 SHA512 01aac1edcc6d4c83beff43ef4b3ae9bed64331eade66847b7c2bbefa5ec2dcae570a5a513cd5f35a959ab4a745b024636383f65af42dbf68f2201eab9771da02
 MISC metadata.xml 1420 BLAKE2B 1887e48a94b0d8596913fda0e102c0e23768e1fe9df32f8f0387c5966d9e9b1e0bdd6d06f6d281660494c871d887ed20d4254f1aaa9b23cda9830f7a4810ef00 SHA512 be3a0fdc46e1b022fce052908ce7f43399f1be9d4f4b1cf23e3cca8e43d6280d1f8f820fe1d0ac1d65d2dacde1ddc859c1ce3b8d067e0f6114ab3900abc419eb
diff --git a/sci-libs/gdal/files/gdal-3.0.4-poppler-20.08.patch b/sci-libs/gdal/files/gdal-3.0.4-poppler-20.08.patch
new file mode 100644
index 000000000000..0fd8051c365c
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.0.4-poppler-20.08.patch
@@ -0,0 +1,42 @@
+From 2b863dbabdc2a7d724f9fdf3e6ff20a142b619f6 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Mon, 3 Aug 2020 14:52:25 +0200
+Subject: [PATCH] Unix build: fix detection of minor version number of Poppler
+ with the new YY.MM.X numbering scheme (fixes #2823) (#2825)
+
+Authored-by: @chris2553
+---
+ a/configure    | 4 ++--
+ b/configure.ac | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure b/configure
+index 4d618db8149..69d46182a26 100755
+--- a/configure
++++ b/configure
+@@ -40824,8 +40824,8 @@ $as_echo "yes" >&6; }
+ fi
+     if test "$POPPLER_VERSION" != ""; then
+         HAVE_POPPLER=yes
+-        POPPLER_MAJOR_VERSION=`expr $POPPLER_VERSION : '\([0-9]*\)'`
+-        POPPLER_MINOR_VERSION=`expr $POPPLER_VERSION : '[0-9]*\.\([0-9]*\)'`
++        POPPLER_MAJOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f1`
++        POPPLER_MINOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f2 | sed -e 's/^0//'`
+         POPPLER_CFLAGS=`echo $POPPLER_CFLAGS $POPPLER_CFLAGS | sed "s/include\/poppler/include/"`
+     fi
+ else
+diff --git a/configure.ac b/configure.ac
+index 0f4124e6431..7f337e77c1d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4966,8 +4966,8 @@ if test "$with_poppler" != "no" -a "$with_poppler" != ""; then
+             [POPPLER_VERSION=`$PKG_CONFIG --modversion poppler`], [POPPLER_VERSION=])
+     if test "$POPPLER_VERSION" != ""; then
+         HAVE_POPPLER=yes
+-        POPPLER_MAJOR_VERSION=`expr $POPPLER_VERSION : '\([[0-9]]*\)'`
+-        POPPLER_MINOR_VERSION=`expr $POPPLER_VERSION : '[[0-9]]*\.\([[0-9]]*\)'`
++        POPPLER_MAJOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f1`
++        POPPLER_MINOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f2 | sed -e 's/^0//'`
+         POPPLER_CFLAGS=`echo $POPPLER_CFLAGS $POPPLER_CFLAGS | sed "s/include\/poppler/include/"`
+     fi
+ else
diff --git a/sci-libs/gdal/gdal-3.0.4-r1.ebuild b/sci-libs/gdal/gdal-3.0.4-r1.ebuild
index b8e390e8e00a..7a83f0bb9fc5 100644
--- a/sci-libs/gdal/gdal-3.0.4-r1.ebuild
+++ b/sci-libs/gdal/gdal-3.0.4-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_OPTIONAL=1
 inherit autotools bash-completion-r1 perl-module distutils-r1 flag-o-matic java-pkg-opt-2 toolchain-funcs
 
@@ -89,6 +89,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
 	"${FILESDIR}/${PN}-3.0.2-complete.patch"
 	"${FILESDIR}/${PN}-3.0.2-datadir.patch"
+	"${FILESDIR}/${P}-poppler-20.08.patch" # bug 735828
 )
 
 src_prepare() {