diff options
Diffstat (limited to 'sci-libs/gdal')
| -rw-r--r-- | sci-libs/gdal/Manifest | 13 | ||||
| -rw-r--r-- | sci-libs/gdal/files/gdal-2.2.3-soname.patch | 8 | ||||
| -rw-r--r-- | sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-1.patch | 27 | ||||
| -rw-r--r-- | sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-2.patch | 42 | ||||
| -rw-r--r-- | sci-libs/gdal/gdal-2.4.1-r1.ebuild | 10 | ||||
| -rw-r--r-- | sci-libs/gdal/gdal-2.4.1-r2.ebuild | 9 | ||||
| -rw-r--r-- | sci-libs/gdal/gdal-2.4.3.ebuild (renamed from sci-libs/gdal/gdal-2.4.1.ebuild) | 73 | ||||
| -rw-r--r-- | sci-libs/gdal/metadata.xml | 3 |
8 files changed, 128 insertions, 57 deletions
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest index 602d6efbb088..bae5a41ea627 100644 --- a/sci-libs/gdal/Manifest +++ b/sci-libs/gdal/Manifest @@ -1,12 +1,15 @@ AUX gdal-2.2.3-bashcomp-path.patch 621 BLAKE2B 0f825aa27d68e35afdcbd7c5d3239b6b63e1c9b2814acc307e0b5082e7326f495102d10c4b2bdc86b17b7f4ae8ae11231c99215d87fc59217115f0fd92fc96f0 SHA512 16ed7bbd5569166c80cf4d8beba81195a177ee36bcd7e14ca6d00e3add6fe57c7980cbe1853747325443699daa331fc23e53fc86150b6c7cf871ef4812936c39 -AUX gdal-2.2.3-soname.patch 2062 BLAKE2B 159b3d8eec126a141ff21c908d45193411bdbcc50e03386131c313cbd71861859a1b8a5a5648307868fee484b8a1dd816b580bb2304cb7e1e72e42df40cea042 SHA512 0f06d8de537ddc19c6c4ee800c0c4b084ceb04a47fd24f28c3095909219e27634e66086158f80f011ccfb7865fc559a966770bfa95d3a8fd144f3f8a3d34571d +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 DIST gdal-2.4.1.tar.gz 14546610 BLAKE2B 92404336339c6f46877f3e6599af6fc67a53714888ff66fc0142efa8ddf185ad34d9ec337dcbad67f059041da31e70073a9e41872a7332fd9977552d79fcbc61 SHA512 b25e49f343986af6f37e0bec6dc3084cbcf1a0080da5cfd91d1a58c1d9ffd2ac355299d66534e63e89358cbb15ecd0f2ae934d91bbd2a3749889dadaf266e483 -EBUILD gdal-2.4.1-r1.ebuild 8189 BLAKE2B 59c1dbf53b587eac521f11a24a79a08d13c0b421578ad216591620b962b34bc23398c5b3b98394b26912d8363d28bb346f35a02d553befe98e3995b4002cef07 SHA512 5b4e122ad6171abf17079455a4a23f64f0f124839a7ad5e7d597a01432f43573739261e6135dd664905b79212cda2a74f96260c338b69ab0c26902370cb58631 -EBUILD gdal-2.4.1-r2.ebuild 8162 BLAKE2B 31ca4811a298d47055acefcf80f4de8440cb8ffe1100972174128800e5518072423745da30b279eef705defd9a49014dee346c640b2958a8a529d3848a4fb8f0 SHA512 a37e8f09e3a40f563e59e309cd41ffad28f3d2e3fadf2c8a03d65685ebb65990442deefd0358ddf163f983b7737bd4344cbefd752c1afceaa56c51cb6bafb096 -EBUILD gdal-2.4.1.ebuild 8103 BLAKE2B 64c0da0778d1d685931f26d5503ea2842094b9d2575d11d81f4bfc494087917079bc458c2cef6237fa666f7290912b2990311bffca1d4a4170891c3d9fcc50c0 SHA512 41fb4a70b214b754b47168b0518b7f2265c1d879d3b99229ff658586c25edd4c1bed086dacb1cd644595cd996ec9e4bff52b04b7bd65a4d6f4924cbec905e09a -MISC metadata.xml 1522 BLAKE2B b67678f81739e2fb2866cc6ca49545368fce4a85b145ba3f8228b8a39ecb2d7f75b55500f13768838c9ed11a47f586ab7b05eb31e2dbf6fcd4d29c5d8896107f SHA512 091112e555a5a77c5643cbd4465046bfd9fe287e209b42f5410787a2f1a2e4d7ec640efad93c277f0f6581db2264fa104d5aba2e8cbc4126c2c14fe4d86afcee +DIST gdal-2.4.3.tar.gz 14726748 BLAKE2B 104c29912a96b03d0913be40f91a844b2f04f1e972b1ae8764bd277e7d51960b45d4a67a8f9240130de7ce8752f69f4172ca9a54bb11e70635aa55b6c6924cb5 SHA512 e532ce86c92724300ab443c42dd8cec0e74e41411a54d30222f98faa10623b31e616eda44da8f406ed01f3fc3c72c76e8ceb80c1dff733f8efcaa2e2e18132f6 +EBUILD gdal-2.4.1-r1.ebuild 8176 BLAKE2B 0ccaedec2cdd24e0b572483595445ade24d1dada60540137840d4e6947d238ff675dff191aaa6dbb569736721d71f297cb2c7cfcec709a872194f07313dfedd8 SHA512 f8642e106d247e8e5ba7b8d89fbad81cb767655fd6ebcb1ae6f0cabb8b75de83d48108c37d9805cc040861288cb696843dc0e609eff1cea7c0c55f3f769f1b19 +EBUILD gdal-2.4.1-r2.ebuild 8218 BLAKE2B 7e7698933dbbf6044c4fa55eb933664fe3650ed3b64b36e4053efa688870e19bfb41fc17a378c86563147326b295dbce59b13bdd9c5b04e42fb4207f62884704 SHA512 fbf469b9278e075e47b4fb66c472e57f04ce5189b897adf650205dd3566122da6bdcd4c274da44275a6acca9cc95881c2629d6ede197630fd8e1f49880a170be +EBUILD gdal-2.4.3.ebuild 8094 BLAKE2B c4c019b3ddf2c7cc7da69ee8b701c9c9ba67a863d372d7e417f349527cd364ecfecdcb4a232f726db1849dbf3d954ec2ecb23733de224f95a97bb021acb39144 SHA512 23f1b6fa1129c3f0e95a9f21ed51c928e95e739f34146190a62b14254d7fd812a61fdc62cfb7c5b3d54865b027596fb6e1d67511f61d0b67c31194a05d9b28fa +MISC metadata.xml 1420 BLAKE2B 1887e48a94b0d8596913fda0e102c0e23768e1fe9df32f8f0387c5966d9e9b1e0bdd6d06f6d281660494c871d887ed20d4254f1aaa9b23cda9830f7a4810ef00 SHA512 be3a0fdc46e1b022fce052908ce7f43399f1be9d4f4b1cf23e3cca8e43d6280d1f8f820fe1d0ac1d65d2dacde1ddc859c1ce3b8d067e0f6114ab3900abc419eb diff --git a/sci-libs/gdal/files/gdal-2.2.3-soname.patch b/sci-libs/gdal/files/gdal-2.2.3-soname.patch index f2746bdf5e30..4cceee5ec928 100644 --- a/sci-libs/gdal/files/gdal-2.2.3-soname.patch +++ b/sci-libs/gdal/files/gdal-2.2.3-soname.patch @@ -3,8 +3,8 @@ Set SONAME and unbreak compilation on Darwin Author: Fabian Groffen <grobian@gentoo.org> Author: Dennis Schridde <devurandom@gmx.net> ---- old/GDALmake.opt.in.orig 2008-02-02 18:25:48.000000000 -0800 -+++ new/GDALmake.opt.in 2008-02-02 18:54:53.000000000 -0800 +--- a/GDALmake.opt.in 2008-02-02 18:25:48.000000000 -0800 ++++ b/GDALmake.opt.in 2008-02-02 18:54:53.000000000 -0800 @@ -97,6 +97,14 @@ GDAL_SLIB = $(GDAL_ROOT)/libgdal.$(SO_EXT) GDAL_SLIB_LINK = -L$(GDAL_ROOT) -lgdal @@ -20,8 +20,8 @@ Author: Dennis Schridde <devurandom@gmx.net> # Mac OS X Framework definition MACOSX_FRAMEWORK = @MACOSX_FRAMEWORK@ ---- gdal-2.0.3.old/GNUmakefile -+++ gdal-2.0.3/GNUmakefile +--- a/GNUmakefile ++++ b/GNUmakefile @@ -208,7 +208,7 @@ else ifeq ($(HAVE_LD_SHARED),yes) 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 new file mode 100644 index 000000000000..f077f4632386 --- /dev/null +++ b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-1.patch @@ -0,0 +1,27 @@ +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 new file mode 100644 index 000000000000..74614e925f6d --- /dev/null +++ b/sci-libs/gdal/files/gdal-2.4.1-poppler-0.83-2.patch @@ -0,0 +1,42 @@ +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/gdal-2.4.1-r1.ebuild b/sci-libs/gdal/gdal-2.4.1-r1.ebuild index afdbf3e0aa52..ee52cca2e4d8 100644 --- a/sci-libs/gdal/gdal-2.4.1-r1.ebuild +++ b/sci-libs/gdal/gdal-2.4.1-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2019 Gentoo Authors +# 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=( python2_7 python3_{5,6,7} ) +PYTHON_COMPAT=( python3_{6,7} ) DISTUTILS_OPTIONAL=1 inherit autotools perl-module distutils-r1 toolchain-funcs flag-o-matic java-pkg-opt-2 @@ -15,8 +15,8 @@ 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" +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 @@ -187,7 +187,7 @@ src_configure() { --disable-lto $(use_enable debug) $(use_with armadillo) - $(use_with aux_xml pam) + $(use_with aux-xml pam) $(use_with curl) $(use_with fits cfitsio) $(use_with geos) diff --git a/sci-libs/gdal/gdal-2.4.1-r2.ebuild b/sci-libs/gdal/gdal-2.4.1-r2.ebuild index fa26cc48e938..ef434fe5b011 100644 --- a/sci-libs/gdal/gdal-2.4.1-r2.ebuild +++ b/sci-libs/gdal/gdal-2.4.1-r2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2019 Gentoo Authors +# 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_{5,6,7,8} ) +PYTHON_COMPAT=( python3_{6,7,8} ) DISTUTILS_OPTIONAL=1 inherit autotools perl-module distutils-r1 flag-o-matic java-pkg-opt-2 toolchain-funcs @@ -15,7 +15,7 @@ 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" +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 ) @@ -85,6 +85,7 @@ PATCHES=( "${FILESDIR}/${P}-poppler-0.76.patch" "${FILESDIR}/${P}-swig-4.patch" # bug 689110 "${FILESDIR}/${P}-poppler-0.82.patch" + "${FILESDIR}"/${P}-poppler-0.83-{1,2}.patch # bug 703790 ) src_prepare() { @@ -186,7 +187,7 @@ src_configure() { --disable-lto $(use_enable debug) $(use_with armadillo) - $(use_with aux_xml pam) + $(use_with aux-xml pam) $(use_with curl) $(use_with fits cfitsio) $(use_with geos) diff --git a/sci-libs/gdal/gdal-2.4.1.ebuild b/sci-libs/gdal/gdal-2.4.3.ebuild index 7d215149c2c3..0f880af5e68e 100644 --- a/sci-libs/gdal/gdal-2.4.1.ebuild +++ b/sci-libs/gdal/gdal-2.4.3.ebuild @@ -1,13 +1,12 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GENTOO_DEPEND_ON_PERL="no" -PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) +PYTHON_COMPAT=( python3_{6,7,8} ) DISTUTILS_OPTIONAL=1 - -inherit autotools perl-module distutils-r1 toolchain-funcs flag-o-matic java-pkg-opt-2 +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/" @@ -15,17 +14,32 @@ 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" +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}] + )" -COMMON_DEPEND=" +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(+)] + sys-libs/zlib[minizip(+)] armadillo? ( sci-libs/armadillo:=[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio:= ) @@ -60,42 +74,27 @@ COMMON_DEPEND=" xls? ( dev-libs/freexl ) zstd? ( app-arch/zstd:= )" -RDEPEND="${COMMON_DEPEND} +RDEPEND="${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}"/${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 "${S}"/GDALmake.opt.in || die + -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 "${S}"/swig/python/GNUmakefile || die + -i swig/python/GNUmakefile || die # Fix spatialite/sqlite include issue sed -e 's:spatialite/sqlite3.h:sqlite3.h:g' \ @@ -135,7 +134,7 @@ src_configure() { # 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}" + --includedir="${EPREFIX}"/usr/include/${PN} --disable-pdf-plugin --disable-static --enable-shared @@ -144,10 +143,10 @@ src_configure() { --with-geotiff --with-grib --with-hide-internal-symbols - --with-libjson-c="${EPREFIX}/usr/" + --with-libjson-c="${EPREFIX}"/usr/ --with-libtiff --with-libtool - --with-libz="${EPREFIX}/usr/" + --with-libz="${EPREFIX}"/usr/ --with-gnm --without-bsb --without-charls @@ -185,7 +184,7 @@ src_configure() { --disable-lto $(use_enable debug) $(use_with armadillo) - $(use_with aux_xml pam) + $(use_with aux-xml pam) $(use_with curl) $(use_with fits cfitsio) $(use_with geos) @@ -304,14 +303,14 @@ src_install() { distutils-r1_src_install popd > /dev/null || die - newdoc swig/python/README.txt README-python.txt + newdoc swig/python/README.rst README-python.rst insinto /usr/share/${PN}/samples doins -r swig/python/samples/ fi doman "${S}"/man/man*/* - find "${ED}" -name '*.la' -delete || die + find "${D}" -name '*.la' -type f -delete || die } pkg_postinst() { diff --git a/sci-libs/gdal/metadata.xml b/sci-libs/gdal/metadata.xml index 7088f71ba0f1..44e078ca7dfa 100644 --- a/sci-libs/gdal/metadata.xml +++ b/sci-libs/gdal/metadata.xml @@ -15,11 +15,10 @@ </slots> <use> <flag name="armadillo">Use <pkg>sci-libs/armadillo</pkg> for faster TPS transform computation</flag> - <flag name="aux_xml">Enable Portable Auxilliary Metadata generation</flag> + <flag name="aux-xml">Enable Portable Auxilliary Metadata generation</flag> <flag name="fits">Enable support for NASA's <pkg>sci-libs/cfitsio</pkg> library</flag> <flag name="geos">Add support for geometry engine (<pkg>sci-libs/geos</pkg>)</flag> <flag name="gml">Enable support for <pkg>dev-libs/xerces-c</pkg> C++ API</flag> - <flag name="hdf5">Add support for the Hierarchical Data Format v5 (<pkg>sci-libs/hdf5</pkg>)</flag> <flag name="mdb">Enable support for Microsoft Access database</flag> <flag name="ogdi">Enable support for the open geographic datastore interface (<pkg>sci-libs/ogdi</pkg>)</flag> <flag name="opencl">Enable OpenCL support</flag> |