gentoo resync : 25.04.2020

10 files changed, 0 insertions, 1073 deletions

diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 4d1f21927951..5a5bd941abf5 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,18 +1,7 @@
-AUX gdal-2.2.3-bashcomp-path.patch 621 BLAKE2B 0f825aa27d68e35afdcbd7c5d3239b6b63e1c9b2814acc307e0b5082e7326f495102d10c4b2bdc86b17b7f4ae8ae11231c99215d87fc59217115f0fd92fc96f0 SHA512 16ed7bbd5569166c80cf4d8beba81195a177ee36bcd7e14ca6d00e3add6fe57c7980cbe1853747325443699daa331fc23e53fc86150b6c7cf871ef4812936c39
 AUX gdal-2.2.3-soname.patch 2031 BLAKE2B adc05d4e426083af16c153011d1bccb2a6d7334eac2911faffdc373765cd21a69505928b14cf9896b7f7b23acefc574abd5c85d20b6376aee6a7bb87d775d30b SHA512 8d4cf1f7a69002c7d2789a5abb3c4d10a0d687566e8acd2ea208e994870eff2cb03975812c435eaa0dc13e1e2f42e2151dcb23ea0470242b1e79aa6892a13cdd
 AUX gdal-2.3.0-curl.patch 471 BLAKE2B 551c9fba5cd49afef45ae271f20b8440214b06f569893cf8dfba73bd5682a9494e8ff1d3c81c1784019e49149d56aa4a4f4ced77db2d1a29f12eaec3f4fbce72 SHA512 a23a7df486ed2fe0c000a87405ad56ed48107a957ce29bd6692df26ef93e493b2221b856720721cafeba9646c4c959e154549c87e1012a8a65389343d267dbe6
-AUX gdal-2.4.1-poppler-0.75.patch 5452 BLAKE2B 7cb3b1e84f2f1ff91af49cb4292047f055aeff5a45c8f0d4c440c99d2ab746d32500f11c040f0eaba72b8da9122ab5fc3b5d50dc082c60281354652ab65fff9f SHA512 7482a8a160f514c31c11d101e1f8a2c32dcc862b3c7bc76ac11712bca7c3088975b4fefae33a6d68a847a5e54982b8d02d6bdc8dee27dd0d5efea0f6d28590ed
-AUX gdal-2.4.1-poppler-0.76.patch 699 BLAKE2B 132ff0a3046734e851d12379d049b2e4fdbefcd4bb6949ddf9fa18b856b1ae20d2a2ec9dbcc0d973097cd2ba5f6e72e852b26a93997ffe4b428fe79d44b5c1cf SHA512 09cdd963dbc5e09d211663f54b1cef72eeeda7484ad10b08862907df60aefc068d840e80d4fd0aa0776a03edca89e8affb8b614c4db02085e854bb4a14342d4f
-AUX gdal-2.4.1-poppler-0.82.patch 2322 BLAKE2B a07590bdd3d910b6da8e99989f648251d891fe170ec5b6954d34a3986ce949f2c428f184d8ffbe6292cf6fb7915753db7e81b4993c71fe2b1e4016745c8595fd SHA512 9aca4c69c1df413666d58d75e9b235cc7039224e400188e982b5e9de22773b20829c09eb467069c9e56ea79aa4de2f0e1267d2ed4cd8bb1be7e0432f2c7297c2
-AUX gdal-2.4.1-poppler-0.83-1.patch 993 BLAKE2B 8ecf716c8f64c6ee51be6cc8e1ebfe242d5fc2d4b8f5ec2b116c52137bc3bfbec24b7260533f610777f106e8fc5d302828ba615435568342025ba365f68f52e6 SHA512 3ff3f08c18cd9980e947948b19ea229608bbc2e59dba39c40d374d417104155b956e4077c0ef4f0dfd0625c1af54f9cdc19d812345495716c82690f3e2beff2b
-AUX gdal-2.4.1-poppler-0.83-2.patch 1501 BLAKE2B 3b85001fe0e9c01bf97cd94da3ce063c5b43aa5c6e258dbe3f81d6d179fb668597945ac2c5c66a8f84c2235f40a66bd12ebb811d9b5f0d56dcd5d3aa5beeea59 SHA512 953b8f819275f882820e0346617b522d35da4a756ecdb889e3862a7526addcf1794f9d1f9c4fcf70b4876fe20e0b3127827df48fe50d841c07f89a8f6bf9356c
-AUX gdal-2.4.1-swig-4.patch 4239 BLAKE2B d3bfc88aa79fa94015816cd6e620b7520c765379668542dc1fa5c20192898e9e25fcd1a4cc7aed98fca8d07dc1e0a06b6bcd60fa19049af738f061f7537a7129 SHA512 7db4206ce24a35b4b71859310cc4218fd02c3c2900892fc51950d7ddb90b5e743dc42fe4fe545404063ffeb2f0eaa4319f616a200ed3e92723ed04db4300f7c0
 AUX gdal-3.0.2-complete.patch 3533 BLAKE2B 5b62041f4be9f8a846f35f8d54e4cf6eb5d0902a009197d1d994e500a0e23e57149dff28d7baa20817d40db103b37c93b7ab88f54b12f7e2b324dc1d5c6f61e5 SHA512 c7ade447b857977f8949de2d44dde34ab581b11603afbb9f1e2fcaffa65941aa037a69a34b1915d33f1cde6bfec92ff91859b80bfdc06a27cdcc25733c9b60a1
 AUX gdal-3.0.2-datadir.patch 2516 BLAKE2B 5d67889e468cee04f780e9f15cb167d27dbf955db9464155170afdcd2fc72744ab699c8a7de34872b1dd085268f7ee80a54d73397503919955f6898f0b161560 SHA512 327f2a7e6b2d2665153350a6419bec9396b51f6374bcffb8101986f740363b47ae2db9c2fb7b6e3c0f512bdfd502a1abb531be178d27b4138948018cd1564532
-DIST gdal-2.4.1.tar.gz 14546610 BLAKE2B 92404336339c6f46877f3e6599af6fc67a53714888ff66fc0142efa8ddf185ad34d9ec337dcbad67f059041da31e70073a9e41872a7332fd9977552d79fcbc61 SHA512 b25e49f343986af6f37e0bec6dc3084cbcf1a0080da5cfd91d1a58c1d9ffd2ac355299d66534e63e89358cbb15ecd0f2ae934d91bbd2a3749889dadaf266e483
-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 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/files/gdal-2.2.3-bashcomp-path.patch b/sci-libs/gdal/files/gdal-2.2.3-bashcomp-path.patch
deleted file mode 100644
index 620b05fecbd1..000000000000
--- a/sci-libs/gdal/files/gdal-2.2.3-bashcomp-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Fixes Gentoo-bug #641866
-
---- a/scripts/GNUmakefile
-+++ b/scripts/GNUmakefile
-@@ -6,5 +6,5 @@
- install:
- 	if test "x`pkg-config --version 2>/dev/null`" != "x" -a "x`pkg-config --variable=compatdir bash-completion`" != "x"; then \
--		$(INSTALL_DIR) $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion` ; \
--		cp gdal-bash-completion.sh $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion`; \
-+		$(INSTALL_DIR) $(DESTDIR)`pkg-config --variable=completionsdir bash-completion` ; \
-+		cp gdal-bash-completion.sh $(DESTDIR)`pkg-config --variable=completionsdir bash-completion`/gdal.sh; \
- 	fi
diff --git a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.75.patch b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.75.patch
deleted file mode 100644
index 49824022b3be..000000000000
--- a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.75.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From 5c12d11614a325317ceaa7c0567070b3e4188275 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Tue, 26 Mar 2019 12:43:59 +0100
-Subject: [PATCH] Add support for Poppler 0.75.0 (fixes #1388)
-
----
- gdal/frmts/pdf/pdfio.h       |  5 ---
- gdal/frmts/pdf/pdfobject.cpp | 59 ++++++++----------------------------
- 2 files changed, 12 insertions(+), 52 deletions(-)
-
-diff --git a/frmts/pdf/pdfio.h b/frmts/pdf/pdfio.h
-index 7ae15c88aa3..ec13b8fe94c 100644
---- a/frmts/pdf/pdfio.h
-+++ b/frmts/pdf/pdfio.h
-@@ -93,11 +93,6 @@ class VSIPDFFileStream final: public BaseStream
-         virtual void       close() override;
- 
-     private:
--        /* getChars/hasGetChars added in poppler 0.15.0
--         * POPPLER_BASE_STREAM_HAS_TWO_ARGS true from poppler 0.16,
--         * This test will be wrong for poppler 0.15 or 0.16,
--         * but will still compile correctly.
--         */
-         virtual GBool hasGetChars() override;
-         virtual int getChars(int nChars, Guchar *buffer) override;
- 
-diff --git a/frmts/pdf/pdfobject.cpp b/frmts/pdf/pdfobject.cpp
---- a/frmts/pdf/pdfobject.cpp
-+++ b/frmts/pdf/pdfobject.cpp
-@@ -1195,7 +1195,7 @@ GDALPDFObject* GDALPDFDictionaryPoppler::Get(const char* pszKey)
-         return oIter->second;
- 
- #if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 58
--    Object o = m_poDict->lookupNF(((char*)pszKey));
-+    auto&& o(m_poDict->lookupNF(((char*)pszKey)));
-     if (!o.isNull())
-     {
-         int nRefNum = 0;
-@@ -1204,7 +1204,7 @@ GDALPDFObject* GDALPDFDictionaryPoppler::Get(const char* pszKey)
-         {
-             nRefNum = o.getRefNum();
-             nRefGen = o.getRefGen();
--            Object o2 = m_poDict->lookup((char*)pszKey);
-+            Object o2(m_poDict->lookup((char*)pszKey));
-             if( !o2.isNull() )
-             {
-                 GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o2)), TRUE);
-@@ -1215,7 +1215,7 @@ GDALPDFObject* GDALPDFDictionaryPoppler::Get(const char* pszKey)
-         }
-         else
-         {
--            GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o)), TRUE);
-+            GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o.copy())), TRUE);
-             poObj->SetRefNumAndGen(nRefNum, nRefGen);
-             m_map[pszKey] = poObj;
-             return poObj;
-@@ -1329,7 +1329,7 @@ GDALPDFObject* GDALPDFArrayPoppler::Get(int nIndex)
-         return m_v[nIndex];
- 
- #if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 58
--    Object o = m_poArray->getNF(nIndex);
-+    auto&& o(m_poArray->getNF(nIndex));
-     if( !o.isNull() )
-     {
-         int nRefNum = 0;
-@@ -1338,7 +1338,7 @@ GDALPDFObject* GDALPDFArrayPoppler::Get(int nIndex)
-         {
-             nRefNum = o.getRefNum();
-             nRefGen = o.getRefGen();
--            Object o2 = m_poArray->get(nIndex);
-+            Object o2(m_poArray->get(nIndex));
-             if( !o2.isNull() )
-             {
-                 GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o2)), TRUE);
-@@ -1349,7 +1349,7 @@ GDALPDFObject* GDALPDFArrayPoppler::Get(int nIndex)
-         }
-         else
-         {
--            GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o)), TRUE);
-+            GDALPDFObjectPoppler* poObj = new GDALPDFObjectPoppler(new Object(std::move(o.copy())), TRUE);
-             poObj->SetRefNumAndGen(nRefNum, nRefGen);
-             m_v[nIndex] = poObj;
-             return poObj;
-@@ -1416,8 +1416,6 @@ int GDALPDFStreamPoppler::GetLength()
- 
- char* GDALPDFStreamPoppler::GetBytes()
- {
--    /* fillGooString() available in poppler >= 0.16.0 */
--#ifdef POPPLER_BASE_STREAM_HAS_TWO_ARGS
-     GooString* gstr = new GooString();
-     m_poStream->fillGooString(gstr);
- 
-@@ -1427,7 +1425,12 @@ char* GDALPDFStreamPoppler::GetBytes()
-         char* pszContent = (char*) VSIMalloc(m_nLength + 1);
-         if (pszContent)
-         {
--            memcpy(pszContent, gstr->getCString(), m_nLength);
-+#if (POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 72)
-+            const char* srcStr = gstr->c_str();
-+#else
-+            const char* srcStr = gstr->getCString();
-+#endif
-+            memcpy(pszContent, srcStr, m_nLength);
-             pszContent[m_nLength] = '\0';
-         }
-         delete gstr;
-@@ -1438,41 +1441,6 @@ char* GDALPDFStreamPoppler::GetBytes()
-         delete gstr;
-         return nullptr;
-     }
--#else
--    int i;
--    int nLengthAlloc = 0;
--    char* pszContent = nullptr;
--    if( m_nLength >= 0 )
--    {
--        pszContent = (char*) VSIMalloc(m_nLength + 1);
--        if (!pszContent)
--            return nullptr;
--        nLengthAlloc = m_nLength;
--    }
--    m_poStream->reset();
--    for(i = 0; ; ++i )
--    {
--        int nVal = m_poStream->getChar();
--        if (nVal == EOF)
--            break;
--        if( i >= nLengthAlloc )
--        {
--            nLengthAlloc = 32 + nLengthAlloc + nLengthAlloc / 3;
--            char* pszContentNew = (char*) VSIRealloc(pszContent, nLengthAlloc + 1);
--            if( pszContentNew == nullptr )
--            {
--                CPLFree(pszContent);
--                m_nLength = 0;
--                return nullptr;
--            }
--            pszContent = pszContentNew;
--        }
--        pszContent[i] = (GByte)nVal;
--    }
--    m_nLength = i;
--    pszContent[i] = '\0';
--    return pszContent;
--#endif
- }
- 
- #endif // HAVE_POPPLER
diff --git a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.76.patch b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.76.patch
deleted file mode 100644
index f15e540932d1..000000000000
--- a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.76.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 8958528f9b5737581afa7249b0e16f2ff89d727e Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sun, 21 Apr 2019 12:19:56 +0200
-Subject: [PATCH] PDF: add support for Poppler 0.76.0
-
----
- gdal/frmts/pdf/pdfsdk_headers.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/frmts/pdf/pdfsdk_headers.h b/frmts/pdf/pdfsdk_headers.h
-index 41e48ae91d6..1f77429bf9b 100644
---- a/frmts/pdf/pdfsdk_headers.h
-+++ b/frmts/pdf/pdfsdk_headers.h
-@@ -55,7 +55,10 @@
- #else
- typedef unsigned char Guchar;
- #endif
-+
-+#if !(POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 76)
- #include <goo/GooList.h>
-+#endif
- 
- /* begin of poppler xpdf includes */
- #include <poppler/Object.h>
diff --git a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.82.patch b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.82.patch
deleted file mode 100644
index 740856814f86..000000000000
--- a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.82.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 20c3fc7cb4a4ec2a67642bd83ddb6e403488b0fe Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Tue, 22 Oct 2019 13:11:57 +0200
-Subject: [PATCH] PDF: fix build against Poppler 0.82.0dev
-
----
- gdal/frmts/pdf/pdfdataset.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
-index 15537ca7fd7..8f944c40d30 100644
---- a/frmts/pdf/pdfdataset.cpp
-+++ b/frmts/pdf/pdfdataset.cpp
-@@ -205,7 +205,11 @@ class GDALPDFOutputDev : public SplashOutputDev
-         virtual void drawChar(GfxState *state, double x, double y,
-                               double dx, double dy,
-                               double originX, double originY,
--                              CharCode code, int nBytes, Unicode *u, int uLen) override
-+                              CharCode code, int nBytes,
-+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 82
-+                              const
-+#endif
-+                              Unicode *u, int uLen) override
-         {
-             if (bEnableText)
-                 SplashOutputDev::drawChar(state, x, y, dx, dy,
-From 94daceefebd464858888ddc85170c1a8c4bd50d7 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sun, 29 Sep 2019 23:55:18 +0200
-Subject: [PATCH] PDF: fix build against Poppler 0.82.0dev
-
----
- gdal/frmts/pdf/pdfdataset.cpp | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
-index 3d68f92abe8..b3db5374227 100644
---- a/frmts/pdf/pdfdataset.cpp
-+++ b/frmts/pdf/pdfdataset.cpp
-@@ -265,7 +265,12 @@ class GDALPDFOutputDev : public SplashOutputDev
- 
-         virtual void drawImage(GfxState *state, Object *ref, Stream *str,
-                                int width, int height, GfxImageColorMap *colorMap,
--                               GBool interpolate, int *maskColors, GBool inlineImg) override
-+                               GBool interpolate,
-+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 82
-+                               const
-+#endif
-+                               int *maskColors,
-+                               GBool inlineImg) override
-         {
-             if (bEnableBitmap)
-                 SplashOutputDev::drawImage(state, ref, str,
diff --git a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-1.patch b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-1.patch
deleted file mode 100644
index f077f4632386..000000000000
--- a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-1.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 1f8fa16f58cfe0364099ddad0e1d86522d8de41a Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Wed, 13 Nov 2019 14:07:22 +0100
-Subject: [PATCH] PDF: fix build against Poppler 0.83.0dev
-
----
- gdal/frmts/pdf/pdfdataset.cpp | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
-index 8f944c40d30..88017953de5 100644
---- a/frmts/pdf/pdfdataset.cpp
-+++ b/frmts/pdf/pdfdataset.cpp
-@@ -4267,7 +4267,13 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
-         CPLMutexHolderD(&hGlobalParamsMutex);
-         /* poppler global variable */
-         if (globalParams == nullptr)
-+        {
-+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 83
-+            globalParams.reset(new GlobalParams());
-+#else
-             globalParams = new GlobalParams();
-+#endif
-+        }
- 
-         globalParams->setPrintCommands(CPLTestBool(
-             CPLGetConfigOption("GDAL_PDF_PRINT_COMMANDS", "FALSE")));
diff --git a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-2.patch b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-2.patch
deleted file mode 100644
index 74614e925f6d..000000000000
--- a/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 7318576fc7037412b755f038f8148f2d299587aa Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Tue, 26 Nov 2019 14:33:32 +0100
-Subject: [PATCH] PDF: fix to build against latest Poppler master (0.83dev)
-
----
- gdal/frmts/pdf/pdfio.cpp | 3 +++
- gdal/frmts/pdf/pdfio.h   | 7 ++++++-
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/frmts/pdf/pdfio.cpp b/frmts/pdf/pdfio.cpp
-index 917e92330ae..c0b9dad93cb 100644
---- a/frmts/pdf/pdfio.cpp
-+++ b/frmts/pdf/pdfio.cpp
-@@ -170,6 +170,9 @@ getStart_ret_type VSIPDFFileStream::getStart()
- /************************************************************************/
- 
- StreamKind VSIPDFFileStream::getKind()
-+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 83
-+                                        const
-+#endif
- {
-     return strFile;
- }
-diff --git a/frmts/pdf/pdfio.h b/frmts/pdf/pdfio.h
-index aa34ab7210d..23344d33f77 100644
---- a/frmts/pdf/pdfio.h
-+++ b/frmts/pdf/pdfio.h
-@@ -81,7 +81,12 @@ class VSIPDFFileStream final: public BaseStream
-         virtual void       setPos(setPos_offset_type pos, int dir = 0) override;
-         virtual void       moveStart(moveStart_delta_type delta) override;
- 
--        virtual StreamKind getKind() override;
-+        virtual StreamKind getKind()
-+#if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 83
-+            const
-+#endif
-+            override;
-+
-         virtual GooString *getFileName() override;
- 
-         virtual int        getChar() override;
diff --git a/sci-libs/gdal/files/gdal-2.4.1-swig-4.patch b/sci-libs/gdal/files/gdal-2.4.1-swig-4.patch
deleted file mode 100644
index 9d104e60f60a..000000000000
--- a/sci-libs/gdal/files/gdal-2.4.1-swig-4.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From 7a2c9f9348e1bf6bd95033d0b4da09a243fd9e6d Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Mon, 8 Jul 2019 14:34:55 +0200
-Subject: [PATCH] Python bindings: add compatibility with SWIG 4.0 (based on
- patch by @perestoronin, fixes #1702)
-
----
- gdal/swig/include/gdal_array.i                  |  6 ++++++
- gdal/swig/include/python/typemaps_python.i      |  9 ++++++++-
- gdal/swig/python/extensions/gdal_array_wrap.cpp | 15 ++++++++++++++-
- gdal/swig/python/extensions/gdal_wrap.cpp       |  9 ++++++++-
- 4 files changed, 36 insertions(+), 3 deletions(-)
-
-diff --git a/swig/include/gdal_array.i b/swig/include/gdal_array.i
-index c4f6f19b610..bf053eb2476 100644
---- a/swig/include/gdal_array.i
-+++ b/swig/include/gdal_array.i
-@@ -899,12 +899,18 @@ retStringAndCPLFree* GetArrayFilename(PyArrayObject *psArray)
-     }
- 
-     /* Keep a reference to the VirtualMem object */
-+%#if SWIGVERSION >= 0x040000
-+%#define obj0 swig_obj[0]
-+%#endif
- %#if NPY_API_VERSION >= 0x00000007
-     PyArray_SetBaseObject(ar, obj0);
- %#else
-     PyArray_BASE(ar) = obj0;
- %#endif
-     Py_INCREF(obj0);
-+%#if SWIGVERSION >= 0x040000
-+%#undef obj0
-+%#endif
-     Py_DECREF($result);
-     $result = (PyObject*) ar;
- }
-diff --git a/swig/include/python/typemaps_python.i b/swig/include/python/typemaps_python.i
-index 5c9f36ab278..9266422e9c4 100644
---- a/swig/include/python/typemaps_python.i
-+++ b/swig/include/python/typemaps_python.i
-@@ -2104,7 +2104,14 @@ DecomposeSequenceOf4DCoordinates( PyObject *seq, int nCount, double *x, double *
- %#if PY_VERSION_HEX >= 0x02070000
-   /* %typemap(argout) (void** pptr, size_t* pnsize, GDALDataType* pdatatype, int* preadonly)*/
-   Py_buffer *buf=(Py_buffer*)malloc(sizeof(Py_buffer));
--  if (PyBuffer_FillInfo(buf,  obj0,  *($1), *($2), *($4), PyBUF_ND)) {
-+
-+  if (PyBuffer_FillInfo(buf,
-+%#if SWIGVERSION >= 0x040000
-+                        swig_obj[0],
-+%#else
-+                        obj0,
-+%#endif
-+                        *($1), *($2), *($4), PyBUF_ND)) {
-     // error, handle
-   }
-   if( *($3) == GDT_Byte )
-diff --git a/swig/python/extensions/gdal_array_wrap.cpp b/swig/python/extensions/gdal_array_wrap.cpp
-index 807e12dd4a0..4435803e6d9 100644
---- a/swig/python/extensions/gdal_array_wrap.cpp
-+++ b/swig/python/extensions/gdal_array_wrap.cpp
-@@ -4598,7 +4598,14 @@ SWIGINTERN PyObject *_wrap_VirtualMem_GetAddr(PyObject *SWIGUNUSEDPARM(self), Py
- #if PY_VERSION_HEX >= 0x02070000
-     /* %typemap(argout) (void** pptr, size_t* pnsize, GDALDataType* pdatatype, int* preadonly)*/
-     Py_buffer *buf=(Py_buffer*)malloc(sizeof(Py_buffer));
--    if (PyBuffer_FillInfo(buf,  obj0,  *(arg2), *(arg3), *(arg5), PyBUF_ND)) {
-+    
-+    if (PyBuffer_FillInfo(buf,
-+    #if SWIGVERSION >= 0x040000
-+        swig_obj[0],
-+    #else
-+        obj0,
-+    #endif
-+        *(arg2), *(arg3), *(arg5), PyBUF_ND)) {
-       // error, handle
-     }
-     if( *(arg4) == GDT_Byte )
-@@ -5597,12 +5604,18 @@ SWIGINTERN PyObject *_wrap_VirtualMemGetArray(PyObject *SWIGUNUSEDPARM(self), Py
-     }
-     
-     /* Keep a reference to the VirtualMem object */
-+#if SWIGVERSION >= 0x040000
-+#define obj0 swig_obj[0]
-+#endif
- #if NPY_API_VERSION >= 0x00000007
-     PyArray_SetBaseObject(ar, obj0);
- #else
-     PyArray_BASE(ar) = obj0;
- #endif
-     Py_INCREF(obj0);
-+#if SWIGVERSION >= 0x040000
-+#undef obj0
-+#endif
-     Py_DECREF(resultobj);
-     resultobj = (PyObject*) ar;
-   }
-diff --git a/swig/python/extensions/gdal_wrap.cpp b/swig/python/extensions/gdal_wrap.cpp
-index 37cb635339e..f2f014fd0b5 100644
---- a/swig/python/extensions/gdal_wrap.cpp
-+++ b/swig/python/extensions/gdal_wrap.cpp
-@@ -15238,7 +15238,14 @@ SWIGINTERN PyObject *_wrap_VirtualMem_GetAddr(PyObject *SWIGUNUSEDPARM(self), Py
- #if PY_VERSION_HEX >= 0x02070000
-     /* %typemap(argout) (void** pptr, size_t* pnsize, GDALDataType* pdatatype, int* preadonly)*/
-     Py_buffer *buf=(Py_buffer*)malloc(sizeof(Py_buffer));
--    if (PyBuffer_FillInfo(buf,  obj0,  *(arg2), *(arg3), *(arg5), PyBUF_ND)) {
-+    
-+    if (PyBuffer_FillInfo(buf,
-+    #if SWIGVERSION >= 0x040000
-+        swig_obj[0],
-+    #else
-+        obj0,
-+    #endif
-+        *(arg2), *(arg3), *(arg5), PyBUF_ND)) {
-       // error, handle
-     }
-     if( *(arg4) == GDT_Byte )
diff --git a/sci-libs/gdal/gdal-2.4.1-r1.ebuild b/sci-libs/gdal/gdal-2.4.1-r1.ebuild
deleted file mode 100644
index ee52cca2e4d8..000000000000
--- a/sci-libs/gdal/gdal-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,322 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python3_{6,7} )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools perl-module distutils-r1 toolchain-funcs flag-o-matic java-pkg-opt-2
-
-DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="https://gdal.org/"
-SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
-
-SLOT="0/2.3"
-LICENSE="BSD Info-ZIP MIT"
-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"
-
-COMMON_DEPEND="
-	dev-libs/expat
-	dev-libs/json-c:=
-	dev-libs/libpcre
-	dev-libs/libxml2:=
-	media-libs/tiff:0=
-	sci-libs/libgeotiff:=
-	sys-libs/zlib:=[minizip(+)]
-	armadillo? ( sci-libs/armadillo:=[lapack] )
-	curl? ( net-misc/curl )
-	fits? ( sci-libs/cfitsio:= )
-	geos? ( >=sci-libs/geos-2.2.1 )
-	gif? ( media-libs/giflib:= )
-	gml? ( >=dev-libs/xerces-c-3.1 )
-	hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
-	jpeg? ( virtual/jpeg:0= )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lzma? ( || (
-		app-arch/xz-utils
-		app-arch/lzma
-	) )
-	mdb? ( dev-java/jackcess:1 )
-	mysql? ( virtual/mysql )
-	netcdf? ( sci-libs/netcdf:= )
-	odbc? ( dev-db/unixODBC )
-	ogdi? ( sci-libs/ogdi )
-	opencl? ( virtual/opencl )
-	oracle? ( dev-db/oracle-instantclient:= )
-	pdf? ( app-text/poppler:= )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	postgres? ( >=dev-db/postgresql-8.4:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	spatialite? ( dev-db/spatialite )
-	sqlite? ( dev-db/sqlite:3 )
-	webp? ( media-libs/libwebp:= )
-	xls? ( dev-libs/freexl )
-	zstd? ( app-arch/zstd:= )"
-
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.7:* )"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-	java? ( >=virtual/jdk-1.7:* )
-	perl? ( dev-lang/swig:0 )
-	python? (
-		dev-lang/swig:0
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)"
-
-REQUIRED_USE="
-	mdb? ( java )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	spatialite? ( sqlite )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.3-soname.patch"
-	"${FILESDIR}/${PN}-2.2.3-bashcomp-path.patch" # bug 641866
-	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
-	"${FILESDIR}/${P}-poppler-0.75.patch"
-	"${FILESDIR}/${P}-poppler-0.76.patch"
-	"${FILESDIR}/${P}-swig-4.patch" # bug 689110
-	"${FILESDIR}/${P}-poppler-0.82.patch"
-)
-
-src_prepare() {
-	# fix datadir and docdir placement
-	sed -e "s:@datadir@:@datadir@/gdal:" \
-		-e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
-		-i "${S}"/GDALmake.opt.in || die
-
-	# the second sed expression should fix bug 371075
-	sed -e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
-		-e "s:--prefix=\$(DESTDIR):--prefix=:" \
-		-i "${S}"/swig/python/GNUmakefile || die
-
-	# Fix spatialite/sqlite include issue
-	sed -e 's:spatialite/sqlite3.h:sqlite3.h:g' \
-		-i ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die
-
-	# Fix freexl configure check
-	sed -e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
-		-i configure.ac || die
-
-	sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
-		-i configure.ac || die
-
-	sed -e 's:^ar:$(AR):g' \
-		-i ogr/ogrsf_frmts/sdts/install-libs.sh || die
-
-	# updated for newer swig (must specify the path to input files)
-	sed -e "s: gdal_array.i: ../include/gdal_array.i:" \
-		-e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
-		-i swig/python/GNUmakefile || die "sed python makefile failed"
-	sed -e "s:library_dirs = :library_dirs = /usr/$(get_libdir):g" \
-		-i swig/python/setup.cfg || die "sed python setup.cfg failed"
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# bug 619148
-	append-cxxflags -std=c++14
-
-	local myconf=(
-		# charls - not packaged in Gentoo ebuild repository
-		# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
-		# bsb - legal issues
-		# ingres - same story as oracle oci
-		# jasper - disabled because unmaintained and vulnerable; openjpeg will be used as JPEG-2000 provider instead
-		# podofo - we use poppler instead they are exclusive for each other
-		# tiff is a hard dep
-		--includedir="${EPREFIX}/usr/include/${PN}"
-		--disable-pdf-plugin
-		--disable-static
-		--enable-shared
-		--with-expat
-		--with-cryptopp=no
-		--with-geotiff
-		--with-grib
-		--with-hide-internal-symbols
-		--with-libjson-c="${EPREFIX}/usr/"
-		--with-libtiff
-		--with-libtool
-		--with-libz="${EPREFIX}/usr/"
-		--with-gnm
-		--without-bsb
-		--without-charls
-		--without-dods-root
-		--without-ecw
-		--without-epsilon
-		--without-fgdb
-		--without-fme
-		--without-gta
-		--without-grass
-		--without-hdf4
-		--without-idb
-		--without-ingres
-		--without-jasper
-		--without-jp2lura
-		--without-jp2mrsid
-		--without-kakadu
-		--without-kea
-		--without-libkml
-		--without-mongocxx
-		--without-mrsid
-		--without-mrsid_lidar
-		--without-msg
-		--without-mrf
-		--without-rasdaman
-		--without-rasterlite2
-		--without-pcraster
-		--without-pdfium
-		--without-podofo
-		--without-qhull
-		--without-sde
-		--without-sfcgal
-		--without-sosi
-		--without-teigha
-		--disable-lto
-		$(use_enable debug)
-		$(use_with armadillo)
-		$(use_with aux-xml pam)
-		$(use_with curl)
-		$(use_with fits cfitsio)
-		$(use_with geos)
-		$(use_with gif)
-		$(use_with gml xerces)
-		$(use_with hdf5)
-		$(use_with jpeg pcidsk) # pcidsk is internal, because there is no such library yreleased developer by gdal
-		$(use_with jpeg)
-		$(use_with jpeg2k openjpeg)
-		$(use_with lzma liblzma)
-		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config)
-		$(use_with netcdf)
-		$(use_with oracle oci)
-		$(use_with odbc)
-		$(use_with ogdi ogdi "${EPREFIX}"/usr)
-		$(use_with opencl)
-		$(use_with pdf poppler)
-		$(use_with perl)
-		$(use_with png)
-		$(use_with postgres pg)
-		$(use_with python)
-		$(use_with spatialite)
-		$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
-		$(use_with threads)
-		$(use_with webp)
-		$(use_with xls freexl)
-		$(use_with zstd)
-	)
-
-	tc-export AR RANLIB
-
-	if use java; then
-		myconf+=(
-			--with-java=$(java-config --jdk-home 2>/dev/null)
-			--with-jvm-lib=dlopen
-			$(use_with mdb)
-		)
-	else
-		myconf+=( --without-java --without-mdb )
-	fi
-
-	if use sqlite; then
-		append-libs -lsqlite3
-	fi
-
-	# bug #632660
-	if use ogdi; then
-		tc-export PKG_CONFIG
-		append-cflags $(${PKG_CONFIG} --cflags libtirpc)
-		append-cxxflags $(${PKG_CONFIG} --cflags libtirpc)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	# mysql-config puts this in (and boy is it a PITA to get it out)
-	if use mysql; then
-		sed -e "s: -rdynamic : :" \
-			-i GDALmake.opt || die "sed LIBS failed"
-	fi
-}
-
-src_compile() {
-	if use perl; then
-		rm "${S}"/swig/perl/*_wrap.cpp || die
-		emake -C "${S}"/swig/perl generate
-	fi
-
-	# gdal-config needed before generating Python bindings
-	default
-
-	if use perl ; then
-		pushd "${S}"/swig/perl > /dev/null || die
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null || die
-	fi
-
-	if use python; then
-		rm -f "${S}"/swig/python/*_wrap.cpp || die
-		emake -C "${S}"/swig/python generate
-		pushd "${S}"/swig/python > /dev/null || die
-		distutils-r1_src_compile
-		popd > /dev/null || die
-	fi
-
-	use doc && emake docs
-}
-
-src_install() {
-	if use perl ; then
-		pushd "${S}"/swig/perl > /dev/null || die
-		myinst=( DESTDIR="${D}" )
-		perl-module_src_install
-		popd > /dev/null || die
-		sed -e 's:BINDINGS        =       \(.*\) perl:BINDINGS        =       \1:g' \
-			-i GDALmake.opt || die
-	fi
-
-	use perl && perl_delete_localpod
-
-	local DOCS=( Doxyfile HOWTO-RELEASE NEWS )
-	use doc && HTML_DOCS=( html/. )
-
-	default
-
-	python_install() {
-		distutils-r1_python_install
-		python_doscript scripts/*.py
-	}
-
-	if use python; then
-		# Don't clash with gdal's docs
-		unset DOCS HTML_DOCS
-
-		pushd "${S}"/swig/python > /dev/null || die
-		distutils-r1_src_install
-		popd > /dev/null || die
-
-		newdoc swig/python/README.txt README-python.txt
-
-		insinto /usr/share/${PN}/samples
-		doins -r swig/python/samples/
-	fi
-
-	doman "${S}"/man/man*/*
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog "Check available image and data formats after building with"
-	elog "gdalinfo and ogrinfo (using the --formats switch)."
-}
diff --git a/sci-libs/gdal/gdal-2.4.3.ebuild b/sci-libs/gdal/gdal-2.4.3.ebuild
deleted file mode 100644
index 77fa8dd5ff87..000000000000
--- a/sci-libs/gdal/gdal-2.4.3.ebuild
+++ /dev/null
@@ -1,319 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_OPTIONAL=1
-inherit autotools perl-module distutils-r1 flag-o-matic java-pkg-opt-2 toolchain-funcs
-
-DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="https://gdal.org/"
-SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
-
-SLOT="0/2.3"
-LICENSE="BSD Info-ZIP MIT"
-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="
-	mdb? ( java )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	spatialite? ( sqlite )
-"
-
-BDEPEND="
-	doc? ( app-doc/doxygen )
-	java? ( >=virtual/jdk-1.7:* )
-	perl? ( dev-lang/swig:0 )
-	python? (
-		dev-lang/swig:0
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)"
-
-DEPEND="
-	dev-libs/expat
-	dev-libs/json-c:=
-	dev-libs/libpcre
-	dev-libs/libxml2:=
-	media-libs/tiff:0=
-	sci-libs/libgeotiff:=
-	sys-libs/zlib[minizip(+)]
-	armadillo? ( sci-libs/armadillo:=[lapack] )
-	curl? ( net-misc/curl )
-	fits? ( sci-libs/cfitsio:= )
-	geos? ( >=sci-libs/geos-2.2.1 )
-	gif? ( media-libs/giflib:= )
-	gml? ( >=dev-libs/xerces-c-3.1 )
-	hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
-	jpeg? ( virtual/jpeg:0= )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lzma? ( || (
-		app-arch/xz-utils
-		app-arch/lzma
-	) )
-	mdb? ( dev-java/jackcess:1 )
-	mysql? ( virtual/mysql )
-	netcdf? ( sci-libs/netcdf:= )
-	odbc? ( dev-db/unixODBC )
-	ogdi? ( sci-libs/ogdi )
-	opencl? ( virtual/opencl )
-	oracle? ( dev-db/oracle-instantclient:= )
-	pdf? ( <app-text/poppler-0.85.0:= )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	postgres? ( >=dev-db/postgresql-8.4:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	spatialite? ( dev-db/spatialite )
-	sqlite? ( dev-db/sqlite:3 )
-	webp? ( media-libs/libwebp:= )
-	xls? ( dev-libs/freexl )
-	zstd? ( app-arch/zstd:= )"
-
-RDEPEND="${DEPEND}
-	java? ( >=virtual/jre-1.7:* )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.3-soname.patch
-	"${FILESDIR}"/${PN}-2.2.3-bashcomp-path.patch # bug 641866
-	"${FILESDIR}"/${PN}-2.4.1-swig-4.patch # bug 689110
-	"${FILESDIR}"/${PN}-2.4.1-poppler-0.82.patch
-	"${FILESDIR}"/${PN}-2.4.1-poppler-0.83-{1,2}.patch # bug 703790
-)
-
-src_prepare() {
-	# fix datadir and docdir placement
-	sed -e "s:@datadir@:@datadir@/gdal:" \
-		-e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
-		-i GDALmake.opt.in || die
-
-	# the second sed expression should fix bug 371075
-	sed -e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
-		-e "s:--prefix=\$(DESTDIR):--prefix=:" \
-		-i swig/python/GNUmakefile || die
-
-	# Fix spatialite/sqlite include issue
-	sed -e 's:spatialite/sqlite3.h:sqlite3.h:g' \
-		-i ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die
-
-	# Fix freexl configure check
-	sed -e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
-		-i configure.ac || die
-
-	sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
-		-i configure.ac || die
-
-	sed -e 's:^ar:$(AR):g' \
-		-i ogr/ogrsf_frmts/sdts/install-libs.sh || die
-
-	# updated for newer swig (must specify the path to input files)
-	sed -e "s: gdal_array.i: ../include/gdal_array.i:" \
-		-e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
-		-i swig/python/GNUmakefile || die "sed python makefile failed"
-	sed -e "s:library_dirs = :library_dirs = /usr/$(get_libdir):g" \
-		-i swig/python/setup.cfg || die "sed python setup.cfg failed"
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# bug 619148
-	append-cxxflags -std=c++14
-
-	local myconf=(
-		# charls - not packaged in Gentoo ebuild repository
-		# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
-		# bsb - legal issues
-		# ingres - same story as oracle oci
-		# jasper - disabled because unmaintained and vulnerable; openjpeg will be used as JPEG-2000 provider instead
-		# podofo - we use poppler instead they are exclusive for each other
-		# tiff is a hard dep
-		--includedir="${EPREFIX}"/usr/include/${PN}
-		--disable-pdf-plugin
-		--disable-static
-		--enable-shared
-		--with-expat
-		--with-cryptopp=no
-		--with-geotiff
-		--with-grib
-		--with-hide-internal-symbols
-		--with-libjson-c="${EPREFIX}"/usr/
-		--with-libtiff
-		--with-libtool
-		--with-libz="${EPREFIX}"/usr/
-		--with-gnm
-		--without-bsb
-		--without-charls
-		--without-dods-root
-		--without-ecw
-		--without-epsilon
-		--without-fgdb
-		--without-fme
-		--without-gta
-		--without-grass
-		--without-hdf4
-		--without-idb
-		--without-ingres
-		--without-jasper
-		--without-jp2lura
-		--without-jp2mrsid
-		--without-kakadu
-		--without-kea
-		--without-libkml
-		--without-mongocxx
-		--without-mrsid
-		--without-mrsid_lidar
-		--without-msg
-		--without-mrf
-		--without-rasdaman
-		--without-rasterlite2
-		--without-pcraster
-		--without-pdfium
-		--without-podofo
-		--without-qhull
-		--without-sde
-		--without-sfcgal
-		--without-sosi
-		--without-teigha
-		--disable-lto
-		$(use_enable debug)
-		$(use_with armadillo)
-		$(use_with aux-xml pam)
-		$(use_with curl)
-		$(use_with fits cfitsio)
-		$(use_with geos)
-		$(use_with gif)
-		$(use_with gml xerces)
-		$(use_with hdf5)
-		$(use_with jpeg pcidsk) # pcidsk is internal, because there is no such library yreleased developer by gdal
-		$(use_with jpeg)
-		$(use_with jpeg2k openjpeg)
-		$(use_with lzma liblzma)
-		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config)
-		$(use_with netcdf)
-		$(use_with oracle oci)
-		$(use_with odbc)
-		$(use_with ogdi ogdi "${EPREFIX}"/usr)
-		$(use_with opencl)
-		$(use_with pdf poppler)
-		$(use_with perl)
-		$(use_with png)
-		$(use_with postgres pg)
-		$(use_with python)
-		$(use_with spatialite)
-		$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
-		$(use_with threads)
-		$(use_with webp)
-		$(use_with xls freexl)
-		$(use_with zstd)
-	)
-
-	tc-export AR RANLIB
-
-	if use java; then
-		myconf+=(
-			--with-java=$(java-config --jdk-home 2>/dev/null)
-			--with-jvm-lib=dlopen
-			$(use_with mdb)
-		)
-	else
-		myconf+=( --without-java --without-mdb )
-	fi
-
-	if use sqlite; then
-		append-libs -lsqlite3
-	fi
-
-	# bug #632660
-	if use ogdi; then
-		tc-export PKG_CONFIG
-		append-cflags $(${PKG_CONFIG} --cflags libtirpc)
-		append-cxxflags $(${PKG_CONFIG} --cflags libtirpc)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	# mysql-config puts this in (and boy is it a PITA to get it out)
-	if use mysql; then
-		sed -e "s: -rdynamic : :" \
-			-i GDALmake.opt || die "sed LIBS failed"
-	fi
-}
-
-src_compile() {
-	if use perl; then
-		rm "${S}"/swig/perl/*_wrap.cpp || die
-		emake -C "${S}"/swig/perl generate
-	fi
-
-	# gdal-config needed before generating Python bindings
-	default
-
-	if use perl ; then
-		pushd "${S}"/swig/perl > /dev/null || die
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null || die
-	fi
-
-	if use python; then
-		rm -f "${S}"/swig/python/*_wrap.cpp || die
-		emake -C "${S}"/swig/python generate
-		pushd "${S}"/swig/python > /dev/null || die
-		distutils-r1_src_compile
-		popd > /dev/null || die
-	fi
-
-	use doc && emake docs
-}
-
-src_install() {
-	if use perl ; then
-		pushd "${S}"/swig/perl > /dev/null || die
-		myinst=( DESTDIR="${D}" )
-		perl-module_src_install
-		popd > /dev/null || die
-		sed -e 's:BINDINGS        =       \(.*\) perl:BINDINGS        =       \1:g' \
-			-i GDALmake.opt || die
-	fi
-
-	use perl && perl_delete_localpod
-
-	local DOCS=( Doxyfile HOWTO-RELEASE NEWS )
-	use doc && HTML_DOCS=( html/. )
-
-	default
-
-	python_install() {
-		distutils-r1_python_install
-		python_doscript scripts/*.py
-	}
-
-	if use python; then
-		# Don't clash with gdal's docs
-		unset DOCS HTML_DOCS
-
-		pushd "${S}"/swig/python > /dev/null || die
-		distutils-r1_src_install
-		popd > /dev/null || die
-
-		newdoc swig/python/README.rst README-python.rst
-
-		insinto /usr/share/${PN}/samples
-		doins -r swig/python/samples/
-	fi
-
-	doman "${S}"/man/man*/*
-	find "${D}" -name '*.la' -type f -delete || die
-}
-
-pkg_postinst() {
-	elog "Check available image and data formats after building with"
-	elog "gdalinfo and ogrinfo (using the --formats switch)."
-}