From 43793fab84041cfc5c60c0151d1591b8a69fb24a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Aug 2018 07:36:27 +0100 Subject: gentoo resync : 25.08.2018 --- sci-libs/gdal/Manifest | 10 +- .../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.2.3-r1.ebuild | 289 ------------------- sci-libs/gdal/gdal-2.2.3-r2.ebuild | 290 ------------------- sci-libs/gdal/gdal-2.3.0-r1.ebuild | 313 -------------------- sci-libs/gdal/gdal-2.3.0-r2.ebuild | 318 +++++++++++++++++++++ sci-libs/gdal/gdal-2.3.1.ebuild | 3 +- 9 files changed, 429 insertions(+), 898 deletions(-) create mode 100644 sci-libs/gdal/files/gdal-2.3.0-changeset_38658.patch create mode 100644 sci-libs/gdal/files/gdal-2.3.0-frmts-nitf38234.patch create mode 100644 sci-libs/gdal/files/gdal-2.3.0-libtiff.patch delete mode 100644 sci-libs/gdal/gdal-2.2.3-r1.ebuild delete mode 100644 sci-libs/gdal/gdal-2.2.3-r2.ebuild delete mode 100644 sci-libs/gdal/gdal-2.3.0-r1.ebuild create mode 100644 sci-libs/gdal/gdal-2.3.0-r2.ebuild (limited to 'sci-libs/gdal') diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest index 8c5930d89a11..3e155f1cba33 100644 --- a/sci-libs/gdal/Manifest +++ b/sci-libs/gdal/Manifest @@ -2,12 +2,12 @@ AUX gdal-2.2.3-bashcomp-path.patch 621 BLAKE2B 0f825aa27d68e35afdcbd7c5d3239b6b6 AUX gdal-2.2.3-goocast.patch 540 BLAKE2B 3e80e54dc29d90529a6c705e434b6bd0f99bcc326c9e0e7967bd81ab8b80f3a09657c16f4a95250e6753a3dd463acc0a45301a157279a6408b697c15868f86aa SHA512 2dce2e5f391645c4470d7b08a906a942b1821a0086a4042853ba6a38df96b710b29bb7c32f6a2ac9732d281f3afe9e42aeb6f51fdc2734f896402680aed95d27 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 +AUX gdal-2.3.0-changeset_38658.patch 3281 BLAKE2B 3939df03e8ceba4c3615a70003bfa6a599676cd29ba6f3b61d753d7eefe6f7de1082bb3bf7fd41a45bd40674f62b390c18fd7ccc4ade10fc72b4c91b0b9ce5e2 SHA512 9e176b5335bd035e38440317b1b4aced7e252d84f48c6e3b5a42f6041a4ab810da5ef45421326a071ebe7c7cdecf133df9ca0335557e8fbc2da48b3274f46dc8 AUX gdal-2.3.0-curl.patch 471 BLAKE2B 551c9fba5cd49afef45ae271f20b8440214b06f569893cf8dfba73bd5682a9494e8ff1d3c81c1784019e49149d56aa4a4f4ced77db2d1a29f12eaec3f4fbce72 SHA512 a23a7df486ed2fe0c000a87405ad56ed48107a957ce29bd6692df26ef93e493b2221b856720721cafeba9646c4c959e154549c87e1012a8a65389343d267dbe6 -DIST gdal-2.2.3.tar.gz 13754766 BLAKE2B d9482e7ee40bb5558fbbb43b750dfb95344abe45142c19e1f767535d3fc127fa9d6ed4496d730a25cb4132980efbffb4685e8663798fa05515b8548edb689e42 SHA512 841e5ba3c1a442b678dcaabac719ea7707b817f3dc717a34430dc7ba1f2c27fa88e27b7a8645075fae6e16373b36e6c50f674bdd6b70d10059e6bc4be7a72046 +AUX gdal-2.3.0-frmts-nitf38234.patch 421 BLAKE2B d32592e440b459a57a25de39658224db5a871a82955620140a209bab0f84872dd5c67414df16d64cf24d7ad7a180eeaff7eed7e4aef8e6a70f550575538d93ec SHA512 ffcd68e4fc277f37540a81cf200a597da0f3ee42284107724a3b6bdb44ca54459dceefd52e9d946c8b3d8fd9c5153bcdcc30dacf3ebef46180a9d22280e62c2d +AUX gdal-2.3.0-libtiff.patch 306 BLAKE2B 8f2b39c812ceeee94b95102638885d0ff25086dec8196eaf9ae50378abe88809414da370d9b626b05d2daecfd762bf56938e35fd566952fddc18f1c614dfb4c4 SHA512 b793b1f2631a5944a79be58eab530f3cd248b25858f810515875adc71abb8e4abb1c9f9cf87ec45282bf9eca2e3932706110099a330664aadba3724954ca7297 DIST gdal-2.3.0.tar.gz 14423820 BLAKE2B 6c67c66b2f68699249ccd4df2cb1e3b7042e94003b730e64bd8b8eec726a32da9485cab29552bd34c23831686ec3e879edd1848a2339c8289580ce282a287992 SHA512 b37e433be0b7a587ea9f9e5e720295e4cd1406f6c8ca770f5fedcd7fdc797e01e576eb887034b38f93f04a4e76c0ce84792bc7d91a49fea4122231a37ace812f DIST gdal-2.3.1.tar.gz 14450452 BLAKE2B 226ddf80ff8b9e3d420ac717b245a09fe3daa0331931f4d371b62ab9fa9bb0735ca11e1e045398de92d61b68815aa1dc3e7b6568f4853964cf42d188e46e6eb7 SHA512 0c5bb515dd2a9ad3110421b39bd680ce7e9de68e969cf35a7e63118965dbe193d25a7720a525e53af153de3e78f76ccc6983f4dcdfa6ba429d732a7a47a35d57 -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-r1.ebuild 7926 BLAKE2B 6781fc33a7d287814d267d95c7b9fa5ff6eab0ad970072f79f55476481560753155121add92bbd4d8d18d7b3f8fe22ccc1fab1aa3c69907eb8993ac50970e421 SHA512 0da72b67c0ee5acb3ef0a4306877e942574873672156a61ceffeea4043170e88df46b4b675f85f0b42326b088b7a8f76dedd70699b8282a4857ff5133d9e103a -EBUILD gdal-2.3.1.ebuild 7987 BLAKE2B d550f6c8a05cefef45f62de1a11845d80ee14f257cbedb373ac317632e0abe814098c455253912f1cc111ea5eadeb50c8d83987566338941edf127c17b1e2922 SHA512 fc7344da710ca0464229ea8ef2f5192ad6bd13b7e9ca533d8369d8bd18c79241e9d40019a0b27d110e4b50189702e548423914f6390cfbe78b8ae2d39e81ae31 +EBUILD gdal-2.3.0-r2.ebuild 8138 BLAKE2B f11f4a5110a63b6eacac015ce16d05c235776a365d8328ce2046494ec560f6653f9dee26b8c99b536c6452d25e0fb600bfaed4b849b5dea87dea2bf5c0d5752b SHA512 a2cbe076456ad3b151c554b7f72da5fdf52637278b2e06816aede1e5150ee6c8aaf6441fd1be10a90b3bba380d99262c33430df10dfc7a524ea6001feca7bcab +EBUILD gdal-2.3.1.ebuild 7988 BLAKE2B 62f4a17522a39a3fb054be6e4d516d3795a3f63481f13bb4a43dbf2fb1c7e62de4f5e9297ffa5bd37eec977acf01c4794c298c342f7544f3fb589c76eee9d0f7 SHA512 674bee0f3e1b2094186ec76255dd252c045642ad9a30619a346dc4fc4f2d65ba9586a02d806a39537dfabff6eb8a96f1ea01139f716b333682e161bd807c52cb MISC metadata.xml 1616 BLAKE2B 7167165623c93e069ce77ef80e68e6339fc38354c0db343564ce8ecf3566e0d61b8b5aeb4e6b69e66bf1e8932d18de54b528bf1a2148767efe3b5cf985a31748 SHA512 dca0cb7a8c94a5313aed09f8c28ae35a55de4b0ff8198469b7f9adc8220b29cbd8c3f92db121b944b03c169b302ac8aa95f4342b76510590aff63a5f122c74c1 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 new file mode 100644 index 000000000000..3f681836989f --- /dev/null +++ b/sci-libs/gdal/files/gdal-2.3.0-changeset_38658.patch @@ -0,0 +1,80 @@ +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 new file mode 100644 index 000000000000..783752e0efa6 --- /dev/null +++ b/sci-libs/gdal/files/gdal-2.3.0-frmts-nitf38234.patch @@ -0,0 +1,12 @@ +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 new file mode 100644 index 000000000000..5964165e3e6f --- /dev/null +++ b/sci-libs/gdal/files/gdal-2.3.0-libtiff.patch @@ -0,0 +1,12 @@ +--- ./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.2.3-r1.ebuild b/sci-libs/gdal/gdal-2.2.3-r1.ebuild deleted file mode 100644 index b4bd9eb1ac6b..000000000000 --- a/sci-libs/gdal/gdal-2.2.3-r1.ebuild +++ /dev/null @@ -1,289 +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="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}/${P}-soname.patch" - "${FILESDIR}/${P}-json-c-0.13.patch" # bug 641658 - "${FILESDIR}/${P}-bashcomp-path.patch" # bug 641866 -) - -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)." -} diff --git a/sci-libs/gdal/gdal-2.2.3-r2.ebuild b/sci-libs/gdal/gdal-2.2.3-r2.ebuild deleted file mode 100644 index 723e7ffd8c56..000000000000 --- a/sci-libs/gdal/gdal-2.2.3-r2.ebuild +++ /dev/null @@ -1,290 +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="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}/${P}-soname.patch" - "${FILESDIR}/${P}-json-c-0.13.patch" # bug 641658 - "${FILESDIR}/${P}-bashcomp-path.patch" # bug 641866 - "${FILESDIR}/${P}-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)." -} diff --git a/sci-libs/gdal/gdal-2.3.0-r1.ebuild b/sci-libs/gdal/gdal-2.3.0-r1.ebuild deleted file mode 100644 index 436c68a468d8..000000000000 --- a/sci-libs/gdal/gdal-2.3.0-r1.ebuild +++ /dev/null @@ -1,313 +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 -) - -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*/* -} - -pkg_postinst() { - elog "Check available image and data formats after building with" - elog "gdalinfo and ogrinfo (using the --formats switch)." -} diff --git a/sci-libs/gdal/gdal-2.3.0-r2.ebuild b/sci-libs/gdal/gdal-2.3.0-r2.ebuild new file mode 100644 index 000000000000..fe8e746f8d17 --- /dev/null +++ b/sci-libs/gdal/gdal-2.3.0-r2.ebuild @@ -0,0 +1,318 @@ +# 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)." +} diff --git a/sci-libs/gdal/gdal-2.3.1.ebuild b/sci-libs/gdal/gdal-2.3.1.ebuild index 38736368a997..e1f97f524f2e 100644 --- a/sci-libs/gdal/gdal-2.3.1.ebuild +++ b/sci-libs/gdal/gdal-2.3.1.ebuild @@ -210,8 +210,9 @@ src_configure() { $(use_with sqlite sqlite3 "${EPREFIX}"/usr) $(use_with threads) $(use_with webp) - $(use_with xls freexl) ) + $(use_with xls freexl) $(use_with zstd) + ) tc-export AR RANLIB -- cgit v1.2.3