gentoo resync : 15.12.2019

3 files changed, 324 insertions, 2 deletions

diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 613e4e04d1d7..602d6efbb088 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -6,6 +6,7 @@ AUX gdal-2.4.1-poppler-0.76.patch 699 BLAKE2B 132ff0a3046734e851d12379d049b2e4fd
 AUX gdal-2.4.1-poppler-0.82.patch 2322 BLAKE2B a07590bdd3d910b6da8e99989f648251d891fe170ec5b6954d34a3986ce949f2c428f184d8ffbe6292cf6fb7915753db7e81b4993c71fe2b1e4016745c8595fd SHA512 9aca4c69c1df413666d58d75e9b235cc7039224e400188e982b5e9de22773b20829c09eb467069c9e56ea79aa4de2f0e1267d2ed4cd8bb1be7e0432f2c7297c2
 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 8193 BLAKE2B a07ad5889a6d80a2fa92aab151cb279769e19bdb7b85293cead93ebecfda9be6689eb762b7e4ad237ad8ab32cd6f3ce9d45e36865116f8b1e1b6e8ed27892ae1 SHA512 b626dc9c2568d76aec6ab7a1e16172d983661289cb3b531e84a3ece9862168c57316c8b1fe9ec177b17a8f811b039bc7e4a6d6eff5d2f1c9ac589b3e0c424365
+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
diff --git a/sci-libs/gdal/gdal-2.4.1-r1.ebuild b/sci-libs/gdal/gdal-2.4.1-r1.ebuild
index db767c561b77..afdbf3e0aa52 100644
--- a/sci-libs/gdal/gdal-2.4.1-r1.ebuild
+++ b/sci-libs/gdal/gdal-2.4.1-r1.ebuild
@@ -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"
+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="
diff --git a/sci-libs/gdal/gdal-2.4.1-r2.ebuild b/sci-libs/gdal/gdal-2.4.1-r2.ebuild
new file mode 100644
index 000000000000..fa26cc48e938
--- /dev/null
+++ b/sci-libs/gdal/gdal-2.4.1-r2.ebuild
@@ -0,0 +1,321 @@
+# Copyright 1999-2019 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} )
+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:= )
+	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.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 "${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)."
+}