[gentoo-commits] repo/gentoo:master commit in: sci-libs/gdal/, sci-libs/gdal/files/

[Andreas Sturmlechner]

commit:     936fdfe7d0cbbc1fa31f612cc3dbf21156f4bd83
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  2 20:24:38 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar  2 20:24:38 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=936fdfe7

sci-libs/gdal: Drop 2.3.0-r2

Does not build against poppler versions in tree.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-libs/gdal/Manifest                             |   1 -
 sci-libs/gdal/files/gdal-2.2.3-goocast.patch       |  11 -
 .../gdal/files/gdal-2.3.0-changeset_38658.patch    |  80 ------
 .../gdal/files/gdal-2.3.0-frmts-nitf38234.patch    |  12 -
 sci-libs/gdal/files/gdal-2.3.0-libtiff.patch       |  12 -
 sci-libs/gdal/gdal-2.3.0-r2.ebuild                 | 318 ---------------------
 6 files changed, 434 deletions(-)

diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 3d0114321d5..3e3fe719104 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,2 +1 @@
-DIST gdal-2.3.0.tar.gz 14423820 BLAKE2B 6c67c66b2f68699249ccd4df2cb1e3b7042e94003b730e64bd8b8eec726a32da9485cab29552bd34c23831686ec3e879edd1848a2339c8289580ce282a287992 SHA512 b37e433be0b7a587ea9f9e5e720295e4cd1406f6c8ca770f5fedcd7fdc797e01e576eb887034b38f93f04a4e76c0ce84792bc7d91a49fea4122231a37ace812f
 DIST gdal-2.3.1.tar.gz 14450452 BLAKE2B 226ddf80ff8b9e3d420ac717b245a09fe3daa0331931f4d371b62ab9fa9bb0735ca11e1e045398de92d61b68815aa1dc3e7b6568f4853964cf42d188e46e6eb7 SHA512 0c5bb515dd2a9ad3110421b39bd680ce7e9de68e969cf35a7e63118965dbe193d25a7720a525e53af153de3e78f76ccc6983f4dcdfa6ba429d732a7a47a35d57

diff --git a/sci-libs/gdal/files/gdal-2.2.3-goocast.patch b/sci-libs/gdal/files/gdal-2.2.3-goocast.patch
deleted file mode 100644
index a25a524c253..00000000000
--- a/sci-libs/gdal/files/gdal-2.2.3-goocast.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/frmts/pdf/pdfobject.cpp	2018-05-29 11:23:00.980957371 +0300
-+++ b/frmts/pdf/pdfobject.cpp	2018-05-29 11:23:44.378955265 +0300
-@@ -1055,7 +1055,7 @@
- {
-     if (GetType() == PDFObjectType_String)
-     {
--        GooString* gooString = m_po->getString();
-+        GooString* gooString =(GooString*) m_po->getString();
-         return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast<const GByte*>(gooString->getCString()),
-                                                       static_cast<int>(gooString->getLength())));
-     }

diff --git a/sci-libs/gdal/files/gdal-2.3.0-changeset_38658.patch b/sci-libs/gdal/files/gdal-2.3.0-changeset_38658.patch
deleted file mode 100644
index 3f681836989..00000000000
--- a/sci-libs/gdal/files/gdal-2.3.0-changeset_38658.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Index: /trunk/gdal/frmts/nitf/nitfrasterband.cpp
-===================================================================
---- a/frmts/nitf/nitfrasterband.cpp	(revision 38657)
-+++ b/frmts/nitf/nitfrasterband.cpp	(revision 38658)
-@@ -824,4 +826,20 @@
-         pUnpackData[i+7] = ((pDataSrc[k+2]) & 0x7);
-       }
-+      if( i < n )
-+      {
-+        pUnpackData[i+0] = ((pDataSrc[k+0] >> 5));
-+        if( i + 1 < n )
-+            pUnpackData[i+1] = ((pDataSrc[k+0] >> 2) & 0x07);
-+        if( i + 2 < n )
-+            pUnpackData[i+2] = ((pDataSrc[k+0] << 1) & 0x07) | (pDataSrc[k+1] >> 7);
-+        if( i + 3 < n )
-+            pUnpackData[i+3] = ((pDataSrc[k+1] >> 4) & 0x07);
-+        if( i + 4 < n )
-+            pUnpackData[i+4] = ((pDataSrc[k+1] >> 1) & 0x07);
-+        if( i + 5 < n )
-+            pUnpackData[i+5] = ((pDataSrc[k+1] << 2) & 0x07) | (pDataSrc[k+2] >> 6);
-+        if( i + 6 < n )
-+            pUnpackData[i+6] = ((pDataSrc[k+2] >> 3) & 0x07);
-+      }
- 
-       memcpy(pData, pUnpackData, n);
-@@ -842,4 +862,20 @@
-         pUnpackData[i+7] = ((pDataSrc[k+4]) & 0x1f);
-       }
-+      if( i < n )
-+      {
-+        pUnpackData[i+0] = ((pDataSrc[k+0] >> 3));
-+        if( i + 1 < n )
-+            pUnpackData[i+1] = ((pDataSrc[k+0] << 2) & 0x1f) | (pDataSrc[k+1] >> 6);
-+        if( i + 2 < n )
-+            pUnpackData[i+2] = ((pDataSrc[k+1] >> 1) & 0x1f);
-+        if( i + 3 < n )
-+            pUnpackData[i+3] = ((pDataSrc[k+1] << 4) & 0x1f) | (pDataSrc[k+2] >> 4);
-+        if( i + 4 < n )
-+            pUnpackData[i+4] = ((pDataSrc[k+2] << 1) & 0x1f) | (pDataSrc[k+3] >> 7);
-+        if( i + 5 < n )
-+            pUnpackData[i+5] = ((pDataSrc[k+3] >> 2) & 0x1f);
-+        if( i + 6 < n )
-+            pUnpackData[i+6] = ((pDataSrc[k+3] << 3) & 0x1f) | (pDataSrc[k+4] >> 5);
-+      }
- 
-       memcpy(pData, pUnpackData, n);
-@@ -856,4 +894,12 @@
-         pUnpackData[i+3] = ((pDataSrc[k+2]) & 0x3f);
-       }
-+      if( i < n )
-+      {
-+        pUnpackData[i+0] = ((pDataSrc[k+0] >> 2));
-+        if( i + 1 < n )
-+            pUnpackData[i+1] = ((pDataSrc[k+0] << 4) & 0x3f) | (pDataSrc[k+1] >> 4);
-+        if( i + 2 < n )
-+            pUnpackData[i+2] = ((pDataSrc[k+1] << 2) & 0x3f) | (pDataSrc[k+2] >> 6);
-+      }
- 
-       memcpy(pData, pUnpackData, n);
-@@ -873,4 +921,20 @@
-         pUnpackData[i+6] = ((pDataSrc[k+5] << 1) & 0x7f) | (pDataSrc[k+6] >> 7);
-         pUnpackData[i+7] = ((pDataSrc[k+6]) & 0x7f);
-+      }
-+      if( i < n )
-+      {
-+        pUnpackData[i+0] = ((pDataSrc[k+0] >> 1));
-+        if( i + 1 < n )
-+            pUnpackData[i+1] = ((pDataSrc[k+0] << 6) & 0x7f) | (pDataSrc[k+1] >> 2);
-+        if( i + 2 < n )
-+            pUnpackData[i+2] = ((pDataSrc[k+1] << 5) & 0x7f) | (pDataSrc[k+2] >> 3) ;
-+        if( i + 3 < n )
-+            pUnpackData[i+3] = ((pDataSrc[k+2] << 4) & 0x7f) | (pDataSrc[k+3] >> 4);
-+        if( i + 4 < n )
-+            pUnpackData[i+4] = ((pDataSrc[k+3] << 3) & 0x7f) | (pDataSrc[k+4] >> 5);
-+        if( i + 5 < n )
-+            pUnpackData[i+5] = ((pDataSrc[k+4] << 2) & 0x7f) | (pDataSrc[k+5] >> 6);
-+        if( i + 6 < n )
-+            pUnpackData[i+6] = ((pDataSrc[k+5] << 1) & 0x7f) | (pDataSrc[k+6] >> 7);
-       }
- 

diff --git a/sci-libs/gdal/files/gdal-2.3.0-frmts-nitf38234.patch b/sci-libs/gdal/files/gdal-2.3.0-frmts-nitf38234.patch
deleted file mode 100644
index 783752e0efa..00000000000
--- a/sci-libs/gdal/files/gdal-2.3.0-frmts-nitf38234.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: trunk/gdal/frmts/nitf/nitffile.c
-===================================================================
---- a/frmts/nitf/nitffile.c	(revision 38085)
-+++ b/frmts/nitf/nitffile.c	(revision 38234)
-@@ -350,5 +350,6 @@
-     if (nOffset != -1)
-         nOffset = NITFCollectSegmentInfo( psFile, nHeaderLen, nOffset, "RE", 4, 7, &nNextData);
--    else
-+
-+    if( nOffset < 0 )
-     {
-         NITFClose(psFile);

diff --git a/sci-libs/gdal/files/gdal-2.3.0-libtiff.patch b/sci-libs/gdal/files/gdal-2.3.0-libtiff.patch
deleted file mode 100644
index 5964165e3e6..00000000000
--- a/sci-libs/gdal/files/gdal-2.3.0-libtiff.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./frmts/gtiff/libtiff/tif_read.c.old	2018-08-11 09:12:42.378891934 +0100
-+++ ./frmts/gtiff/libtiff/tif_read.c	2018-08-11 09:15:37.330882891 +0100
-@@ -296,7 +296,8 @@
-         }
-         else
-         {
--                return 1;
-+		tif->tif_rawcc = tif->tif_rawdataloaded;
-+		return 1;
-         }
- }
- 

diff --git a/sci-libs/gdal/gdal-2.3.0-r2.ebuild b/sci-libs/gdal/gdal-2.3.0-r2.ebuild
deleted file mode 100644
index fe8e746f8d1..00000000000
--- a/sci-libs/gdal/gdal-2.3.0-r2.ebuild
+++ /dev/null
@@ -1,318 +0,0 @@
-# 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="https://www.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 ~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 lzma 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= )
-	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.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
-	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
-	# Security bugs
-	"${FILESDIR}/${P}-libtiff.patch" # bug 621712
-	"${FILESDIR}/${P}-frmts-nitf38234.patch" # bug 621720
-	"${FILESDIR}/${P}-changeset_38658.patch" # bug 623028
-)
-
-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=(
-		# 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-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-php
-		--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) )
-
-	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
-		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)."
-}