gentoo resync : 30.06.2018

4 files changed, 293 insertions, 4 deletions

diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index effd6d3403a8..986193e58ec7 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -3,6 +3,8 @@ AUX gdal-2.2.3-goocast.patch 540 BLAKE2B 3e80e54dc29d90529a6c705e434b6bd0f99bcc3
 AUX gdal-2.2.3-json-c-0.13.patch 3733 BLAKE2B 34921f8e2717a446bead6d8b07c6a8e2455752bd4534d066c4bb6150f1cd03856269a8510535517cbf60e609053e470107e9ce62d58358afcb48aa819a546563 SHA512 f4beaa11431b1eb2c6986c3da24a696cdade04f025a9bdeb9726c392aecdf597126c7735b1b2c1175bd0de71a2441b2c1e5d01e597acd7869e9c75644660994d
 AUX gdal-2.2.3-soname.patch 2062 BLAKE2B 159b3d8eec126a141ff21c908d45193411bdbcc50e03386131c313cbd71861859a1b8a5a5648307868fee484b8a1dd816b580bb2304cb7e1e72e42df40cea042 SHA512 0f06d8de537ddc19c6c4ee800c0c4b084ceb04a47fd24f28c3095909219e27634e66086158f80f011ccfb7865fc559a966770bfa95d3a8fd144f3f8a3d34571d
 DIST gdal-2.2.3.tar.gz 13754766 BLAKE2B d9482e7ee40bb5558fbbb43b750dfb95344abe45142c19e1f767535d3fc127fa9d6ed4496d730a25cb4132980efbffb4685e8663798fa05515b8548edb689e42 SHA512 841e5ba3c1a442b678dcaabac719ea7707b817f3dc717a34430dc7ba1f2c27fa88e27b7a8645075fae6e16373b36e6c50f674bdd6b70d10059e6bc4be7a72046
-EBUILD gdal-2.2.3-r1.ebuild 7556 BLAKE2B e8f07d634b9db3159a282d5e47b48a125ee2048ebb7378ac7e772b46c792fe482f557d408b18c15ca879ecae967c54f835d20c49accaf4434413a6581a3109b3 SHA512 955f994cbf9ac8b3e4ca1fc0f03727aabd93b868ea29d83503efd05d864c044ff4942a365a4e16b38f4f56b8705e0e2b48977e244e6580a29728771828817e40
-EBUILD gdal-2.2.3-r2.ebuild 7607 BLAKE2B cbd3aed4d0c7dc1ae88eff6bed02e2d23aa997d152512a3164bfe3064254aafde2327f9ccf95085b7fd5f01d6ea7b6b8ceec326195ca4b1422a31b24afb01ca5 SHA512 c31835c25043dbddb926549fab3ef7717218c1843740ade90e9785d789f64fb5aa9779f9b0997941154c8af8f97956a2a109bf9f794b5509d445dbf307a5fa45
+DIST gdal-2.3.0.tar.gz 14423820 BLAKE2B 6c67c66b2f68699249ccd4df2cb1e3b7042e94003b730e64bd8b8eec726a32da9485cab29552bd34c23831686ec3e879edd1848a2339c8289580ce282a287992 SHA512 b37e433be0b7a587ea9f9e5e720295e4cd1406f6c8ca770f5fedcd7fdc797e01e576eb887034b38f93f04a4e76c0ce84792bc7d91a49fea4122231a37ace812f
+EBUILD gdal-2.2.3-r1.ebuild 7528 BLAKE2B db6fd16c9fa5679cfde4ef85b5ec6ecc161052dbd990da6e6eeae9934f300172bccd020e114067e90ad4ba25714741f24923379246ae29cc1ebdffe69bee0cdc SHA512 444f2a99ca963a4e1359fd888053a7cd8754534c12e4cd28bb4441aeeecc4fe869442eefbc7bcaa23347ee12cff568859f497a6411d0b0de86e3dbc2dd38f9d7
+EBUILD gdal-2.2.3-r2.ebuild 7579 BLAKE2B 3b6d969b924315db0563ba43b1f5b6370f5682c019095b8febdadf8c78807a85a81dd548fafb1826d91b6eddcf694f72f1f873fbfb42ba23a4a0da084e7ad047 SHA512 11f91a0186a6a35d16725894c9f330027eae6124e3903295183f673068c75cfcf08e5c578873bff22017a14a77f67e390c08a7ab75cccc2f154883a624afca12
+EBUILD gdal-2.3.0.ebuild 7549 BLAKE2B 0efb6f7c76c1348d438acd59e85e0c22f6327e438d7dd6279606d517835cf873a1584573822e283a4822267f5c2fe54ff611403f4a9d2cb5bc44cb61ee380a27 SHA512 d4932d98cf92460774d9b9816bb66ce07f9dccbd10c4233a12d8a3f355e8f1e2c70dc6527073c588f5a9d64db4a9050ae344ac6df265b00e3d283ae2d4ed545a
 MISC metadata.xml 1522 BLAKE2B b67678f81739e2fb2866cc6ca49545368fce4a85b145ba3f8228b8a39ecb2d7f75b55500f13768838c9ed11a47f586ab7b05eb31e2dbf6fcd4d29c5d8896107f SHA512 091112e555a5a77c5643cbd4465046bfd9fe287e209b42f5410787a2f1a2e4d7ec640efad93c277f0f6581db2264fa104d5aba2e8cbc4126c2c14fe4d86afcee
diff --git a/sci-libs/gdal/gdal-2.2.3-r1.ebuild b/sci-libs/gdal/gdal-2.2.3-r1.ebuild
index 7084e66a8f50..b4bd9eb1ac6b 100644
--- a/sci-libs/gdal/gdal-2.2.3-r1.ebuild
+++ b/sci-libs/gdal/gdal-2.2.3-r1.ebuild
@@ -59,7 +59,6 @@ RDEPEND="${COMMON_DEPEND}
 	java? ( >=virtual/jre-1.7:* )"
 
 DEPEND="${COMMON_DEPEND}
-	app-shells/bash-completion
 	doc? ( app-doc/doxygen )
 	java? ( >=virtual/jdk-1.7:* )
 	perl? ( dev-lang/swig:0 )
diff --git a/sci-libs/gdal/gdal-2.2.3-r2.ebuild b/sci-libs/gdal/gdal-2.2.3-r2.ebuild
index 9db812294860..723e7ffd8c56 100644
--- a/sci-libs/gdal/gdal-2.2.3-r2.ebuild
+++ b/sci-libs/gdal/gdal-2.2.3-r2.ebuild
@@ -59,7 +59,6 @@ RDEPEND="${COMMON_DEPEND}
 	java? ( >=virtual/jre-1.7:* )"
 
 DEPEND="${COMMON_DEPEND}
-	app-shells/bash-completion
 	doc? ( app-doc/doxygen )
 	java? ( >=virtual/jdk-1.7:* )
 	perl? ( dev-lang/swig:0 )
diff --git a/sci-libs/gdal/gdal-2.3.0.ebuild b/sci-libs/gdal/gdal-2.3.0.ebuild
new file mode 100644
index 000000000000..24f395f1b094
--- /dev/null
+++ b/sci-libs/gdal/gdal-2.3.0.ebuild
@@ -0,0 +1,289 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+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="http://www.gdal.org/"
+SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
+
+SLOT="0/2.2"
+LICENSE="BSD Info-ZIP MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls"
+
+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= )
+	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.24.3:= )
+	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 )"
+
+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.2.3-goocast.patch" # bug 656252
+)
+
+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
+
+	tc-export AR RANLIB
+	local myopts=()
+
+	if use java; then
+		myopts+=(
+			--with-java=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-lib=dlopen
+			$(use_with mdb)
+		)
+	else
+		myopts+=( --without-java --without-mdb )
+	fi
+
+	if use sqlite; then
+		append-libs -lsqlite3
+	fi
+
+	# pcidsk is internal, because there is no such library yet released
+	#     also that thing is developed by the gdal people
+	# 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
+	ECONF_SOURCE="${S}" econf \
+		--includedir="${EPREFIX}/usr/include/${PN}" \
+		--disable-pdf-plugin \
+		--disable-static \
+		--enable-shared \
+		--with-expat \
+		--with-geotiff \
+		--with-grib \
+		--with-hide-internal-symbols \
+		--with-libjson-c="${EPREFIX}/usr/" \
+		--with-libtiff \
+		--with-libtool \
+		--with-libz="${EPREFIX}/usr/" \
+		--with-gnm \
+		--with-cryptopp=no \
+		--without-bsb \
+		--without-dods-root \
+		--without-ecw \
+		--without-epsilon \
+		--without-fme \
+		--without-grass \
+		--without-hdf4 \
+		--without-idb \
+		--without-ingres \
+		--without-jasper \
+		--without-jp2mrsid \
+		--without-kakadu \
+		--without-mrsid \
+		--without-msg \
+		--without-mrf \
+		--without-pcraster \
+		--without-pdfium \
+		--without-sde \
+		--without-sosi \
+		--without-mongocxx \
+		--without-podofo \
+		--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) \
+		$(use_with jpeg) \
+		$(use_with jpeg2k openjpeg) \
+		$(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 perl) \
+		$(use_with png) \
+		$(use_with pdf poppler) \
+		$(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) \
+		${myopts}
+
+	# 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
+		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*/*
+}
+
+pkg_postinst() {
+	elog "Check available image and data formats after building with"
+	elog "gdalinfo and ogrinfo (using the --formats switch)."
+}