commit:     aa62522e1a37007d98e7c6c5b8fcee2c871f5a99
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 30 22:38:31 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 30 22:46:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa62522e

sci-libs/gdal: 3.0.4 version bump

Fixes build against app-text/poppler-0.85.0

Closes: https://bugs.gentoo.org/686732
Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-libs/gdal/Manifest          |   1 +
 sci-libs/gdal/gdal-3.0.4.ebuild | 303 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 304 insertions(+)

diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 06a7010fbf8..de46191ac3a 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,3 +1,4 @@
 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.2.tar.gz 14348856 BLAKE2B 
a52b3c5f1177b85ca991fd5dd27e4238a6ff066fa28842ffbddea8617a3f897d9525035a1cf9237365dbc4657037b3eb0a740cd0e65fe4c83b0c76ffe23c0e56
 SHA512 
eb35e28106f2f422fd5021261ef44864574f6a6be23e679cc5ae44be910f978769fc24fa15367ad4058fb3170cdd2985a6c4caedc3510dde8a6d163091cf3ab0
+DIST gdal-3.0.4.tar.gz 14379480 BLAKE2B 
1ced7f791608be2ea1aede8705826135a015a3bf376af087b10e0b17a6884c141df4b24654eeac136afd959c1360ce0cf1f1312438093ca305fa38a242d7e364
 SHA512 
bc5032a123a2cc90145fef8b467a4c9b78ddf7b4d850ceaae8350aacc3f6f23e13dd52219844a2b930b59d000854d3f2cce117643d62ead176b71939f4760ce9

diff --git a/sci-libs/gdal/gdal-3.0.4.ebuild b/sci-libs/gdal/gdal-3.0.4.ebuild
new file mode 100644
index 00000000000..eea42e45743
--- /dev/null
+++ b/sci-libs/gdal/gdal-3.0.4.ebuild
@@ -0,0 +1,303 @@
+# 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 bash-completion-r1 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="
+       virtual/pkgconfig
+       doc? ( app-doc/doxygen )
+       java? (
+               dev-java/ant-core
+               dev-lang/swig:0
+               >=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:2
+       media-libs/tiff
+       >=sci-libs/libgeotiff-1.5.1-r1:=
+       >=sci-libs/proj-6.0.0:=
+       sys-libs/zlib[minizip(+)]
+       armadillo? ( sci-libs/armadillo:=[lapack] )
+       curl? ( net-misc/curl )
+       fits? ( sci-libs/cfitsio:= )
+       geos? ( >=sci-libs/geos-3.8.0 )
+       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="${DEPEND}
+       java? ( >=virtual/jre-1.7:* )
+"
+
+PATCHES=(
+       "${FILESDIR}/${PN}-2.2.3-soname.patch"
+       "${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
+       "${FILESDIR}/${PN}-3.0.2-complete.patch"
+       "${FILESDIR}/${PN}-3.0.2-datadir.patch"
+)
+
+src_prepare() {
+       default
+
+       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
+
+       # SWIG: Use of the include path to find the input file is deprecated 
and will not work with ccache.
+       sed -e "s: gdal_array.i: ../include/gdal_array.i:" \
+               -i swig/python/GNUmakefile || die "sed python makefile failed"
+
+       eautoreconf
+}
+
+src_configure() {
+       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-lto
+               --disable-static
+               --disable-driver-bsb
+               --disable-driver-mrf
+               --disable-pdf-plugin
+               --enable-shared
+               --enable-driver-grib
+               --with-bash-completion="$(get_bashcompdir)"
+               --with-cpp14
+               --with-cryptopp=no
+               --with-expat
+               --with-geotiff
+               --with-gnm
+               --with-hide-internal-symbols
+               --with-libjson-c="${EPREFIX}"/usr/
+               --with-libtiff
+               --with-libtool
+               --with-libz="${EPREFIX}"/usr/
+               --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-rasdaman
+               --without-rasterlite2
+               --without-pcraster
+               --without-pdfium
+               --without-perl
+               --without-podofo
+               --without-python
+               --without-qhull
+               --without-sde
+               --without-sfcgal
+               --without-sosi
+               --without-teigha
+               $(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 released 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 png)
+               $(use_with postgres pg)
+               $(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 java; then
+               pushd "${S}"/swig/java > /dev/null || die
+               emake
+               popd > /dev/null || die
+       fi
+
+       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() {
+       local DOCS=( NEWS )
+       use doc && local HTML_DOCS=( html/. )
+
+       default
+
+       use java && java-pkg_dojar "${S}"/swig/java/gdal.jar
+
+       if use perl; then
+               pushd "${S}"/swig/perl > /dev/null || die
+               myinst=( DESTDIR="${D}" )
+               perl-module_src_install
+               popd > /dev/null || die
+               perl_delete_localpod
+       fi
+
+       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)."
+}

Reply via email to