commit: 9c20aad4922fb94a82abaf786056b8ac3d2add93
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 19 18:35:14 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 19 18:53:49 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c20aad4
sci-libs/gdal: Drop 1.11 versions
Package-Manager: Portage-2.3.6, Repoman-2.3.1
sci-libs/gdal/Manifest | 2 -
.../gdal/files/gdal-1.10.0-ruby-makefile.patch | 47 ---
sci-libs/gdal/files/gdal-1.11-swig-3.0.6.patch | 22 --
.../files/gdal-1.11.1-poppler-0.31.0-support.patch | 119 -------
sci-libs/gdal/files/gdal-1.11.1-swig-3.0.3.patch | 161 ----------
sci-libs/gdal/gdal-1.11.1-r4.ebuild | 352 ---------------------
sci-libs/gdal/gdal-1.11.2-r1.ebuild | 349 --------------------
7 files changed, 1052 deletions(-)
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 109dfbf2dcb..d601fb10b32 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,4 +1,2 @@
-DIST gdal-1.11.1.tar.gz 10731242 SHA256
f46b5944a8cabc8516673f231f466131cdfd2cdc6677dbee5d96ec7fc58a3340 SHA512
17214ae17a5199d73477d17cf8680396aee8a28d4333cf55818bdd869548dc6a4d7535d7e05949696db31a7be4a511c5ca73199af3dda48d9a40d5640618e9c3
WHIRLPOOL
1f07ee4acccf58552ddef6b5a306b9dbe832014f6890d353f195ab0d47dfc4e81164b7c8b9cefc9915035d113d2f28818f05e89918728eadb0e80e43e7220b5b
-DIST gdal-1.11.2.tar.gz 10746847 SHA256
66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845 SHA512
f1f025de5a618cc2458b6d1f066647341ad4ded1cc2a08e4b78756d96d38715ddd8ba34b7c263369bde66cb20c7919195e13b60a1ecadee25ef80db79f3eb7da
WHIRLPOOL
77274f6f9b9bb29fc21c6f274512bccebc7748420c31e3e626d26087194f69b9606354603b393b77903451b073d034f2508403193fdf738f5b099d7808771653
DIST gdal-2.0.2.tar.gz 11643726 SHA256
db7722caf8d9dd798ec18012b9cacf40a518918466126a88b9fd277bd7d40cc4 SHA512
b3fedc8d1d0522d2a6fd22fbc722c551ebf2e4326f64b76c9c43cd3848f7c97a0636c691ee383b3f3c872dc79cd0e216527d3985c6aac3103395fde657db1266
WHIRLPOOL
889b35d0c2d972681d30eb33b731498b58951ed64a37d0152b15f8d9c3e414703158498cc6eb1bc75a3cd598a567738e4e937fffa6a55cdff2b6cf87338e25e6
DIST gdal-2.0.3.tar.gz 11589011 SHA256
af661066a0bcac733521d66a73375dbe70b0e87d234a99af9f8f1d034c127914 SHA512
3ed2a084fa146fab8d5f5e039480ab935edaefebe9e55f85bf637a4487a3f56951c93055395850e7bf35d5a6d6e901f741ae01ad64be87597aabfad52f1c5e90
WHIRLPOOL
15bc985dc9a8543e3cc7caaca36e41bb9891558adaea2c3883af3d58d5059d01eacda9e8e79b6051c230dd84d08b93b9a8c778758b8fab14d146d42bfba22659
diff --git a/sci-libs/gdal/files/gdal-1.10.0-ruby-makefile.patch
b/sci-libs/gdal/files/gdal-1.10.0-ruby-makefile.patch
deleted file mode 100644
index cc89200c526..00000000000
--- a/sci-libs/gdal/files/gdal-1.10.0-ruby-makefile.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -Naurw gdal-1.10.0.orig/swig/ruby/RubyMakefile.mk
gdal-1.10.0/swig/ruby/RubyMakefile.mk
---- gdal-1.10.0.orig/swig/ruby/RubyMakefile.mk 2013-04-24 18:55:26.000000000
+0000
-+++ gdal-1.10.0/swig/ruby/RubyMakefile.mk 2013-06-25 23:58:06.464518830
+0000
-@@ -37,13 +37,13 @@
-
- ifeq ("$(shell uname -s)", "Darwin")
- RUBY_MODULES=$(RUBY_MODULES_MAC)
--LDFLAGS += -Xcompiler -bundle -L$(RUBY_LIB_DIR)
--RUBY_LIB := -l$(RUBY_SO_NAME)
- else
- RUBY_MODULES=$(RUBY_MODULES_LIN)
--LDFLAGS += -Xcompiler -shared -L$(RUBY_LIB_DIR)
--RUBY_LIB := -l$(RUBY_SO_NAME)
- endif
-+LDFLAGS += -fPIC -DPIC -shared -L$(RUBY_LIB_DIR)
-+CFLAGS += -fPIC -DPIC
-+CXXFLAGS += -fPIC -DPIC
-+RUBY_LIB := -l$(RUBY_SO_NAME)
-
- build: $(RUBY_MODULES)
-
-@@ -56,10 +56,10 @@
- veryclean: clean
- rm -f *_wrap.cpp
-
--$(INSTALL_DIR):
-+$(DESTDIR)$(INSTALL_DIR):
- mkdir -p $(DESTDIR)$(INSTALL_DIR)
-
--install: $(INSTALL_DIR)
-+install: $(DESTDIR)$(INSTALL_DIR) $(RUBY_MODULES)
- for i in $(RUBY_MODULES) ; do $(INSTALL) $$i $(DESTDIR)$(INSTALL_DIR) ;
done
-
- $(RUBY_MODULES_MAC): %.bundle: %_wrap.o
-@@ -69,10 +69,10 @@
- $(LD) $(LDFLAGS) $(LIBS) $(GDAL_SLIB_LINK) $(RUBY_LIB) $< -o $@
-
- %.o: %.cpp
-- $(CXX) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $<
-+ $(CXX) $(CXXFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $<
-
- %.o: %.cxx
-- $(CXX) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $<
-+ $(CXX) $(CXXFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $<
-
- %.o: %.c
- $(CC) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $<
diff --git a/sci-libs/gdal/files/gdal-1.11-swig-3.0.6.patch
b/sci-libs/gdal/files/gdal-1.11-swig-3.0.6.patch
deleted file mode 100644
index 4f4e80b84f9..00000000000
--- a/sci-libs/gdal/files/gdal-1.11-swig-3.0.6.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- gdal/swig/include/python/ogr_python.i
-+++ gdal/swig/include/python/ogr_python.i
-@@ -67,7 +67,7 @@
- def __getitem__(self, value):
- """Support dictionary, list, and slice -like access to the datasource.
--ds[0] would return the first layer on the datasource.
--ds['aname'] would return the layer named "aname".
--ds[0:4] would return a list of the first four layers."""
-+ ds[0] would return the first layer on the datasource.
-+ ds['aname'] would return the layer named "aname".
-+ ds[0:4] would return a list of the first four layers."""
- if isinstance(value, slice):
- output = []
-@@ -135,6 +135,6 @@
- def __getitem__(self, value):
- """Support list and slice -like access to the layer.
--layer[0] would return the first feature on the layer.
--layer[0:4] would return a list of the first four features."""
-+ layer[0] would return the first feature on the layer.
-+ layer[0:4] would return a list of the first four features."""
- if isinstance(value, slice):
- import sys
diff --git a/sci-libs/gdal/files/gdal-1.11.1-poppler-0.31.0-support.patch
b/sci-libs/gdal/files/gdal-1.11.1-poppler-0.31.0-support.patch
deleted file mode 100644
index 7700c246387..00000000000
--- a/sci-libs/gdal/files/gdal-1.11.1-poppler-0.31.0-support.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-diff -urpN gdal-1.11.1.orig/frmts/pdf/pdfdataset.cpp
gdal-1.11.1/frmts/pdf/pdfdataset.cpp
---- gdal-1.11.1.orig/frmts/pdf/pdfdataset.cpp 2014-09-24 06:47:43.000000000
-0700
-+++ gdal-1.11.1/frmts/pdf/pdfdataset.cpp 2015-02-19 13:55:58.714589328
-0800
-@@ -108,12 +108,9 @@ class GDALPDFOutputDev : public SplashOu
-
- public:
- GDALPDFOutputDev(SplashColorMode colorModeA, int bitmapRowPadA,
-- GBool reverseVideoA, SplashColorPtr paperColorA,
-- GBool bitmapTopDownA = gTrue,
-- GBool allowAntialiasA = gTrue) :
-+ GBool reverseVideoA, SplashColorPtr paperColorA) :
- SplashOutputDev(colorModeA, bitmapRowPadA,
-- reverseVideoA, paperColorA,
-- bitmapTopDownA, allowAntialiasA),
-+ reverseVideoA, paperColorA),
- bEnableVector(TRUE),
- bEnableText(TRUE),
- bEnableBitmap(TRUE) {}
-diff -urpN gdal-1.11.1.orig/frmts/pdf/pdfio.cpp gdal-1.11.1/frmts/pdf/pdfio.cpp
---- gdal-1.11.1.orig/frmts/pdf/pdfio.cpp 2014-09-24 06:47:43.000000000
-0700
-+++ gdal-1.11.1/frmts/pdf/pdfio.cpp 2015-02-19 13:55:58.715589318 -0800
-@@ -39,13 +39,25 @@
-
- CPL_CVSID("$Id$");
-
-+
-+#ifdef POPPLER_BASE_STREAM_HAS_TWO_ARGS
-+/* Poppler 0.31.0 is the first one that needs to know the file size */
-+static vsi_l_offset VSIPDFFileStreamGetSize(VSILFILE* f)
-+{
-+ VSIFSeekL(f, 0, SEEK_END);
-+ vsi_l_offset nSize = VSIFTellL(f);
-+ VSIFSeekL(f, 0, SEEK_SET);
-+ return nSize;
-+}
-+#endif
-+
- /************************************************************************/
- /* VSIPDFFileStream() */
- /************************************************************************/
-
- VSIPDFFileStream::VSIPDFFileStream(VSILFILE* f, const char* pszFilename,
Object *dictA):
- #ifdef POPPLER_BASE_STREAM_HAS_TWO_ARGS
-- BaseStream(dictA, 0)
-+ BaseStream(dictA,
(setPos_offset_type)VSIPDFFileStreamGetSize(f))
- #else
- BaseStream(dictA)
- #endif
-@@ -195,7 +207,7 @@ int VSIPDFFileStream::FillBuffer()
- /* getChar() */
- /************************************************************************/
-
--/* The unoptimized version performs a bit well since we must go through */
-+/* The unoptimized version performs a bit less since we must go through */
- /* the whole virtual I/O chain for each character reading. We save a few */
- /* percent with this extra internal caching */
-
-@@ -326,4 +338,47 @@ void VSIPDFFileStream::moveStart(moveSta
- nPosInBuffer = nBufferLength = -1;
- }
-
-+/************************************************************************/
-+/* hasGetChars() */
-+/************************************************************************/
-+
-+GBool VSIPDFFileStream::hasGetChars()
-+{
-+ return true;
-+}
-+
-+/************************************************************************/
-+/* getChars() */
-+/************************************************************************/
-+
-+int VSIPDFFileStream::getChars(int nChars, Guchar *buffer)
-+{
-+ int nRead = 0;
-+ while (nRead < nChars)
-+ {
-+ int nToRead = nChars - nRead;
-+ if (nPosInBuffer == nBufferLength)
-+ {
-+ if (!bLimited && nToRead > BUFFER_SIZE)
-+ {
-+ int nJustRead = (int) VSIFReadL(buffer + nRead, 1, nToRead,
f);
-+ nPosInBuffer = nBufferLength = -1;
-+ nCurrentPos += nJustRead;
-+ nRead += nJustRead;
-+ break;
-+ }
-+ else if (!FillBuffer() || nPosInBuffer >= nBufferLength)
-+ break;
-+ }
-+ if( nToRead > nBufferLength - nPosInBuffer )
-+ nToRead = nBufferLength - nPosInBuffer;
-+
-+ memcpy( buffer + nRead, abyBuffer + nPosInBuffer, nToRead );
-+ nPosInBuffer += nToRead;
-+ nCurrentPos += nToRead;
-+ nRead += nToRead;
-+ }
-+ return nRead;
-+}
-+
- #endif
-diff -urpN gdal-1.11.1.orig/frmts/pdf/pdfio.h gdal-1.11.1/frmts/pdf/pdfio.h
---- gdal-1.11.1.orig/frmts/pdf/pdfio.h 2014-09-24 06:47:43.000000000 -0700
-+++ gdal-1.11.1/frmts/pdf/pdfio.h 2015-02-19 13:55:58.715589318 -0800
-@@ -93,6 +93,10 @@ class VSIPDFFileStream: public BaseStrea
- virtual void close();
-
- private:
-+ /* Added in poppler 0.15.0 */
-+ virtual GBool hasGetChars();
-+ virtual int getChars(int nChars, Guchar *buffer);
-+
- VSIPDFFileStream *poParent;
- GooString *poFilename;
- VSILFILE *f;
diff --git a/sci-libs/gdal/files/gdal-1.11.1-swig-3.0.3.patch
b/sci-libs/gdal/files/gdal-1.11.1-swig-3.0.3.patch
deleted file mode 100644
index c6b8240b8eb..00000000000
--- a/sci-libs/gdal/files/gdal-1.11.1-swig-3.0.3.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-svn diff -c 28298 https://svn.osgeo.org/gdal/branches/1.11
-r28298 | rouault | 2015-01-06 10:03:37 +0100 (Di, 06 Jan 2015) | 1 line
-Python bindings: fix processing error of ogr_python.i with SWIG 3 (#5795)
-http://trac.osgeo.org/gdal/ticket/5795#comment:3
-https://bugs.gentoo.org/534168
-
-Index: gdal/swig/python/osgeo/ogr.py
-===================================================================
---- gdal/swig/python/osgeo/ogr.py (revision 28297)
-+++ gdal/swig/python/osgeo/ogr.py (revision 28298)
-@@ -2025,12 +2025,12 @@
- """Returns the number of features in the layer"""
- return self.GetFeatureCount()
-
--
--
-+ # To avoid __len__ being called when testing boolean value
-+ # which can have side effects (#4758)
- def __nonzero__(self):
- return True
-
--
-+ # For Python 3 compat
- __bool__ = __nonzero__
-
- def __getitem__(self, value):
-@@ -2041,9 +2041,9 @@
- import sys
- output = []
- if value.stop == sys.maxint:
--
--
--
-+ #for an unending slice, sys.maxint is used
-+ #We need to stop before that or GDAL will write an
-+ ##error to stdout
- stop = len(self) - 1
- else:
- stop = value.stop
-@@ -2944,8 +2944,8 @@
- def __copy__(self):
- return self.Clone()
-
--
--
-+ # This makes it possible to fetch fields in the form "feature.area".
-+ # This has some risk of name collisions.
- def __getattr__(self, key):
- """Returns the values of fields by the given name"""
- if key == 'this':
-@@ -2961,8 +2961,8 @@
- else:
- return self.GetField(idx)
-
--
--
-+ # This makes it possible to set fields in the form "feature.area".
-+ # This has some risk of name collisions.
- def __setattr__(self, key, value):
- """Set the values of fields by the given name"""
- if key == 'this' or key == 'thisown':
-@@ -2978,7 +2978,7 @@
- else:
- self.__dict__[key] = value
-
--
-+ # This makes it possible to fetch fields in the form "feature['area']".
- def __getitem__(self, key):
- """Returns the values of fields by the given name / field_index"""
- if isinstance(key, str):
-@@ -2993,7 +2993,7 @@
- else:
- return self.GetField(fld_index)
-
--
-+ # This makes it possible to set fields in the form "feature['area'] =
123".
- def __setitem__(self, key, value):
- """Returns the value of a field by field name / index"""
- if isinstance(key, str):
-@@ -3026,9 +3026,9 @@
- return self.GetFieldAsIntegerList(fld_index)
- if fld_type == OFTRealList:
- return self.GetFieldAsDoubleList(fld_index)
--
--
--
-+ ## if fld_type == OFTDateTime or fld_type == OFTDate or fld_type ==
OFTTime:
-+ # return self.GetFieldAsDate(fld_index)
-+ # default to returning as a string. Should we add more types?
- return self.GetFieldAsString(fld_index)
-
- def SetField2(self, fld_index, value):
-Index: gdal/swig/include/python/ogr_python.i
-===================================================================
---- gdal/swig/include/python/ogr_python.i (revision 28297)
-+++ gdal/swig/include/python/ogr_python.i (revision 28298)
-@@ -111,7 +111,7 @@
- }
-
- %extend OGRLayerShadow {
-- %pythoncode {
-+ %pythoncode %{
- def Reference(self):
- "For backwards compatibility only."
- pass
-@@ -183,12 +183,12 @@
- return output
- schema = property(schema)
-
-- }
-+ %}
-
- }
-
- %extend OGRFeatureShadow {
-- %pythoncode {
-+ %pythoncode %{
- def Reference(self):
- pass
-
-@@ -383,12 +383,12 @@
- return output
-
-
--}
-+%}
-
- }
-
- %extend OGRGeometryShadow {
--%pythoncode {
-+%pythoncode %{
- def Destroy(self):
- self.__swig_destroy__(self)
- self.__del__()
-@@ -416,8 +416,8 @@
- return subgeom
- else:
- raise StopIteration
-+%}
- }
--}
-
-
- %extend OGRFieldDefnShadow {
-@@ -449,13 +449,13 @@
- }
-
- %extend OGRFieldDefnShadow {
--%pythoncode {
-+%pythoncode %{
- def Destroy(self):
- "Once called, self has effectively been destroyed. Do not access. For
backwards compatiblity only"
- _ogr.delete_FieldDefn( self )
- self.thisown = 0
-+%}
- }
--}
-
- %import typemaps_python.i
-
diff --git a/sci-libs/gdal/gdal-1.11.1-r4.ebuild
b/sci-libs/gdal/gdal-1.11.1-r4.ebuild
deleted file mode 100644
index 9ef1f0a3dab..00000000000
--- a/sci-libs/gdal/gdal-1.11.1-r4.ebuild
+++ /dev/null
@@ -1,352 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WANT_AUTOCONF="2.5"
-
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python2_7 python3_4 )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools eutils libtool perl-module distutils-r1 python-r1
toolchain-funcs 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"
-LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="amd64 ~arm 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 mdb mysql netcdf odbc ogdi opencl pdf perl png postgres python ruby
spatialite sqlite threads xls"
-
-RDEPEND="
- 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 )
- hdf5? ( >=sci-libs/hdf5-1.6.4[szip] )
- java? ( >=virtual/jre-1.6:* )
- jpeg? ( virtual/jpeg:0= )
- jpeg2k? ( media-libs/jasper:= )
- mysql? ( virtual/mysql )
- netcdf? ( sci-libs/netcdf )
- odbc? ( dev-db/unixODBC )
- ogdi? ( sci-libs/ogdi )
- opencl? ( virtual/opencl )
- 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/setuptools[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- )
- ruby? ( dev-lang/ruby:1.9 )
- sqlite? ( dev-db/sqlite:3 )
- spatialite? ( dev-db/spatialite )
- xls? ( dev-libs/freexl )
-"
-
-SWIG_DEP=">=dev-lang/swig-2.0.2"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
- java? ( >=virtual/jdk-1.6 )
- perl? ( ${SWIG_DEP} )
- python? ( ${SWIG_DEP} )
- ruby? ( ${SWIG_DEP} )"
-
-AT_M4DIR="${S}/m4"
-MAKEOPTS+=" -j1"
-
-REQUIRED_USE="
- spatialite? ( sqlite )
- mdb? ( java )
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- java-pkg-opt-2_src_prepare
-
- # fix datadir and docdir placement
- sed -i \
- -e "s:@datadir@:@datadir@/gdal:" \
- -e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
- "${S}"/GDALmake.opt.in || die
-
- # the second sed expression should fix bug 371075
- sed -i \
- -e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
- -e "s:--prefix=\$(DESTDIR):--prefix=:" \
- "${S}"/swig/python/GNUmakefile || die
-
- epatch "${FILESDIR}"/${PN}-1.10.0-ruby-makefile.patch
-
- # -soname is only accepted by GNU ld/ELF
- [[ ${CHOST} == *-darwin* ]] \
- && epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \
- || epatch "${FILESDIR}"/${PN}-1.5.0-soname.patch
-
- # Fix spatialite/sqlite include issue
- sed -i \
- -e 's:spatialite/sqlite3.h:sqlite3.h:g' \
- ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die
-
- # Fix freexl configure check
- sed -i \
- -e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
- configure.in || die
-
- sed \
- -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
- -i configure.in || die
-
- sed \
- -e 's:^ar:$(AR):g' \
- -i ogr/ogrsf_frmts/sdts/install-libs.sh || die
-
- # Fix swig-3.0.3 problem (bug #534168)
- epatch "${FILESDIR}"/${PN}-1.11.1-swig-3.0.3.patch
-
- # Fix swig-3.0.6 problem, https://trac.osgeo.org/gdal/ticket/6045
- epatch "${FILESDIR}"/${PN}-1.11-swig-3.0.6.patch
-
- # bug 540132
- epatch "${FILESDIR}"/${PN}-1.11.1-poppler-0.31.0-support.patch
-
- tc-export AR RANLIB
-
- eautoreconf
-
- prepare_python() {
- mkdir -p "${BUILD_DIR}" || die
- find "${S}" -type d -maxdepth 1 -exec ln -s {} "${BUILD_DIR}"/
\; ||die
- find "${S}" -type f -maxdepth 1 -exec cp
--target="${BUILD_DIR}"/ {} + ||die
-# mkdir -p "${BUILD_DIR}"/swig/python || die
-# mkdir -p "${BUILD_DIR}"/apps || die
-# cp -dpR --target="${BUILD_DIR}"/swig/ \
-# "${S}"/swig/{python,SWIGmake.base,GNUmakefile} || die
-# ln -s "${S}"/swig/include "${BUILD_DIR}"/swig/ || die
-# ln -s "${S}"/apps/gdal-config "${BUILD_DIR}"/apps/ || die
-# ln -s "${S}"/port "${BUILD_DIR}"/ || die
- }
- if use python; then
- python_foreach_impl prepare_python
- fi
-}
-
-gdal_src_configure() {
- local myopts=""
-
- if use ruby; then
- RUBY_MOD_DIR="$(ruby19 -r rbconfig -e 'print
RbConfig::CONFIG["sitearchdir"]')"
- echo "Ruby module dir is: $RUBY_MOD_DIR"
- fi
-
- if use java; then
- myopts+="
- --with-java=$(java-config --jdk-home 2>/dev/null)
- $(use_with mdb)"
- else
- myopts+=" --without-java --without-mdb"
- use mdb && ewarn "mdb requires java use enabled. disabling"
- fi
-
- if use sqlite; then
- myopts+=" 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
- # oracle - disabled, i dont have and can't test
- # ingres - same story as oracle oci
- # 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-static \
- --enable-shared \
- --with-expat \
- --with-geotiff \
- --with-grib \
- --with-libtiff \
- --with-libz="${EPREFIX}/usr/" \
- --with-ogr \
- --without-bsb \
- --without-dods-root \
- --without-dwgdirect \
- --without-epsilon \
- --without-fme \
- --without-grass \
- --without-hdf4 \
- --without-idb \
- --without-ingres \
- --without-jp2mrsid \
- --without-kakadu \
- --without-libtool \
- --without-mrsid \
- --without-msg \
- --without-oci \
- --without-pcraster \
- --without-podofo \
- --without-sde \
- $(use_enable debug) \
- $(use_with armadillo) \
- $(use_with aux_xml pam) \
- $(use_with curl) \
- --without-ecw \
- $(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 jasper) \
- $(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config) \
- $(use_with netcdf) \
- $(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 ruby) \
- $(use_with spatialite) \
- $(use_with sqlite sqlite3 "${EPREFIX}"/usr) \
- $(use_with threads) \
- $(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 -i \
- -e "s: -rdynamic : :" \
- GDALmake.opt || die "sed LIBS failed"
- fi
-
- if [[ -n $use_python ]]; then
- # updated for newer swig (must specify the path to input files)
- sed -i \
- -e "s: gdal_array.i: ../include/gdal_array.i:" \
- -e
"s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
- swig/python/GNUmakefile || die "sed python makefile
failed"
- sed -i \
- -e "s:library_dirs = :library_dirs =
/usr/$(get_libdir):g" \
- swig/python/setup.cfg || die "sed python setup.cfg
failed"
-# -e
"s:gdal_config=.*$:gdal_config=../../../apps/gdal-config:g" \
- fi
-}
-
-src_configure() {
- local use_python=""
-
- gdal_src_configure
-
- if use python; then
- use_python="yes"
- python_foreach_impl run_in_build_dir gdal_src_configure
- fi
-}
-
-src_compile() {
- local i
- for i in perl ruby; do
- if use $i; then
- rm "${S}"/swig/$i/*_wrap.cpp
- emake -C "${S}"/swig/$i generate
- fi
- done
-
- default
-
- if use perl ; then
- pushd "${S}"/swig/perl > /dev/null
- perl-module_src_configure
- perl-module_src_compile
- popd > /dev/null
- fi
-
- use doc && emake docs
-
- compile_python() {
- rm -f swig/python/*_wrap.cpp
- emake -C swig/python generate
- emake -C swig/python build
- }
- if use python; then
- python_foreach_impl run_in_build_dir compile_python
- fi
-}
-
-src_install() {
- if use perl ; then
- pushd "${S}"/swig/perl > /dev/null
- perl-module_src_install
- popd > /dev/null
- sed -i \
- -e "s:BINDINGS = python ruby perl:BINDINGS
= python ruby:g" \
- GDALmake.opt || die
- fi
-
- default
-
- if use ruby ; then
- # weird reinstall collision; needs manual intervention...
- pushd "${S}"/swig/ruby > /dev/null
- rm -rf "${D}"${RUBY_MOD_DIR}/gdal
- exeinto ${RUBY_MOD_DIR}/gdal
- doexe *.so || die "doins ruby modules failed"
- popd > /dev/null
- fi
-
- use perl && perl_delete_localpod
-
- dodoc Doxyfile HOWTO-RELEASE NEWS
-
- if use doc ; then
- dohtml html/*
- docinto ogr
- dohtml ogr/html/*
- fi
-
- install_python() {
- emake -C swig/python DESTDIR="${D}" install
- }
- if use python; then
- python_foreach_impl run_in_build_dir install_python
- newdoc swig/python/README.txt README-python.txt
- insinto /usr/share/${PN}/samples
- doins swig/python/samples/*
- python_replicate_script "${ED}"/usr/bin/*py
- fi
-
- pushd man/man1 > /dev/null
- for i in * ; do
- newman ${i} ${i}
- done
- popd > /dev/null
-}
-
-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-1.11.2-r1.ebuild
b/sci-libs/gdal/gdal-1.11.2-r1.ebuild
deleted file mode 100644
index 8cea1f6257c..00000000000
--- a/sci-libs/gdal/gdal-1.11.2-r1.ebuild
+++ /dev/null
@@ -1,349 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WANT_AUTOCONF="2.5"
-
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python2_7 python3_4 )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools eutils libtool perl-module distutils-r1 python-r1
toolchain-funcs 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"
-LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="~amd64 ~arm ~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 mdb mysql netcdf odbc ogdi opencl pdf perl png postgres python ruby
spatialite sqlite threads xls"
-
-RDEPEND="
- 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 )
- hdf5? ( >=sci-libs/hdf5-1.6.4[szip] )
- java? ( >=virtual/jre-1.6:* )
- jpeg? ( virtual/jpeg:0= )
- jpeg2k? ( media-libs/jasper:= )
- mysql? ( virtual/mysql )
- netcdf? ( sci-libs/netcdf )
- odbc? ( dev-db/unixODBC )
- ogdi? ( sci-libs/ogdi )
- opencl? ( virtual/opencl )
- 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/setuptools[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- )
- ruby? ( dev-lang/ruby:1.9 )
- sqlite? ( dev-db/sqlite:3 )
- spatialite? ( dev-db/spatialite )
- xls? ( dev-libs/freexl )
-"
-
-SWIG_DEP=">=dev-lang/swig-2.0.2"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
- java? ( >=virtual/jdk-1.6 )
- perl? ( ${SWIG_DEP} )
- python? ( ${SWIG_DEP} )
- ruby? ( ${SWIG_DEP} )"
-
-AT_M4DIR="${S}/m4"
-MAKEOPTS+=" -j1"
-
-REQUIRED_USE="
- spatialite? ( sqlite )
- mdb? ( java )
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- java-pkg-opt-2_src_prepare
-
- # fix datadir and docdir placement
- sed -i \
- -e "s:@datadir@:@datadir@/gdal:" \
- -e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
- "${S}"/GDALmake.opt.in || die
-
- # the second sed expression should fix bug 371075
- sed -i \
- -e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
- -e "s:--prefix=\$(DESTDIR):--prefix=:" \
- "${S}"/swig/python/GNUmakefile || die
-
- epatch "${FILESDIR}"/${PN}-1.10.0-ruby-makefile.patch
-
- # -soname is only accepted by GNU ld/ELF
- [[ ${CHOST} == *-darwin* ]] \
- && epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \
- || epatch "${FILESDIR}"/${PN}-1.5.0-soname.patch
-
- # Fix spatialite/sqlite include issue
- sed -i \
- -e 's:spatialite/sqlite3.h:sqlite3.h:g' \
- ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die
-
- # Fix freexl configure check
- sed -i \
- -e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
- configure.in || die
-
- sed \
- -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
- -i configure.in || die
-
- sed \
- -e 's:^ar:$(AR):g' \
- -i ogr/ogrsf_frmts/sdts/install-libs.sh || die
-
- # bug 540132
- epatch "${FILESDIR}"/${PN}-1.11.1-poppler-0.31.0-support.patch
-
- # Fix swig-3.0.6 problem, https://trac.osgeo.org/gdal/ticket/6045
- epatch "${FILESDIR}"/${PN}-1.11-swig-3.0.6.patch
-
- tc-export AR RANLIB
-
- eautoreconf
-
- prepare_python() {
- mkdir -p "${BUILD_DIR}" || die
- find "${S}" -type d -maxdepth 1 -exec ln -s {} "${BUILD_DIR}"/
\; ||die
- find "${S}" -type f -maxdepth 1 -exec cp
--target="${BUILD_DIR}"/ {} + ||die
-# mkdir -p "${BUILD_DIR}"/swig/python || die
-# mkdir -p "${BUILD_DIR}"/apps || die
-# cp -dpR --target="${BUILD_DIR}"/swig/ \
-# "${S}"/swig/{python,SWIGmake.base,GNUmakefile} || die
-# ln -s "${S}"/swig/include "${BUILD_DIR}"/swig/ || die
-# ln -s "${S}"/apps/gdal-config "${BUILD_DIR}"/apps/ || die
-# ln -s "${S}"/port "${BUILD_DIR}"/ || die
- }
- if use python; then
- python_foreach_impl prepare_python
- fi
-}
-
-gdal_src_configure() {
- local myopts=""
-
- if use ruby; then
- RUBY_MOD_DIR="$(ruby19 -r rbconfig -e 'print
RbConfig::CONFIG["sitearchdir"]')"
- echo "Ruby module dir is: $RUBY_MOD_DIR"
- fi
-
- if use java; then
- myopts+="
- --with-java=$(java-config --jdk-home 2>/dev/null)
- $(use_with mdb)"
- else
- myopts+=" --without-java --without-mdb"
- use mdb && ewarn "mdb requires java use enabled. disabling"
- fi
-
- if use sqlite; then
- myopts+=" 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
- # oracle - disabled, i dont have and can't test
- # ingres - same story as oracle oci
- # 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-static \
- --enable-shared \
- --with-expat \
- --with-geotiff \
- --with-grib \
- --with-libtiff \
- --with-libz="${EPREFIX}/usr/" \
- --with-ogr \
- --without-bsb \
- --without-dods-root \
- --without-dwgdirect \
- --without-epsilon \
- --without-fme \
- --without-grass \
- --without-hdf4 \
- --without-idb \
- --without-ingres \
- --without-jp2mrsid \
- --without-kakadu \
- --without-libtool \
- --without-mrsid \
- --without-msg \
- --without-oci \
- --without-pcraster \
- --without-podofo \
- --without-sde \
- $(use_enable debug) \
- $(use_with armadillo) \
- $(use_with aux_xml pam) \
- $(use_with curl) \
- --without-ecw \
- $(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 jasper) \
- $(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config) \
- $(use_with netcdf) \
- $(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 ruby) \
- $(use_with spatialite) \
- $(use_with sqlite sqlite3 "${EPREFIX}"/usr) \
- $(use_with threads) \
- $(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 -i \
- -e "s: -rdynamic : :" \
- GDALmake.opt || die "sed LIBS failed"
- fi
-
- if [[ -n $use_python ]]; then
- # updated for newer swig (must specify the path to input files)
- sed -i \
- -e "s: gdal_array.i: ../include/gdal_array.i:" \
- -e
"s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
- swig/python/GNUmakefile || die "sed python makefile
failed"
- sed -i \
- -e "s:library_dirs = :library_dirs =
/usr/$(get_libdir):g" \
- swig/python/setup.cfg || die "sed python setup.cfg
failed"
-# -e
"s:gdal_config=.*$:gdal_config=../../../apps/gdal-config:g" \
- fi
-}
-
-src_configure() {
- local use_python=""
-
- gdal_src_configure
-
- if use python; then
- use_python="yes"
- python_foreach_impl run_in_build_dir gdal_src_configure
- fi
-}
-
-src_compile() {
- local i
- for i in perl ruby; do
- if use $i; then
- rm "${S}"/swig/$i/*_wrap.cpp
- emake -C "${S}"/swig/$i generate
- fi
- done
-
- default
-
- if use perl ; then
- pushd "${S}"/swig/perl > /dev/null
- perl-module_src_configure
- perl-module_src_compile
- popd > /dev/null
- fi
-
- use doc && emake docs
-
- compile_python() {
- rm -f swig/python/*_wrap.cpp
- emake -C swig/python generate
- emake -C swig/python build
- }
- if use python; then
- python_foreach_impl run_in_build_dir compile_python
- fi
-}
-
-src_install() {
- if use perl ; then
- pushd "${S}"/swig/perl > /dev/null
- perl-module_src_install
- popd > /dev/null
- sed -i \
- -e "s:BINDINGS = python ruby perl:BINDINGS
= python ruby:g" \
- GDALmake.opt || die
- fi
-
- default
-
- if use ruby ; then
- # weird reinstall collision; needs manual intervention...
- pushd "${S}"/swig/ruby > /dev/null
- rm -rf "${D}"${RUBY_MOD_DIR}/gdal
- exeinto ${RUBY_MOD_DIR}/gdal
- doexe *.so || die "doins ruby modules failed"
- popd > /dev/null
- fi
-
- use perl && perl_delete_localpod
-
- dodoc Doxyfile HOWTO-RELEASE NEWS
-
- if use doc ; then
- dohtml html/*
- docinto ogr
- dohtml ogr/html/*
- fi
-
- install_python() {
- emake -C swig/python DESTDIR="${D}" install
- }
- if use python; then
- python_foreach_impl run_in_build_dir install_python
- newdoc swig/python/README.txt README-python.txt
- insinto /usr/share/${PN}/samples
- doins swig/python/samples/*
- python_replicate_script "${ED}"/usr/bin/*py
- fi
-
- pushd man/man1 > /dev/null
- for i in * ; do
- newman ${i} ${i}
- done
- popd > /dev/null
-}
-
-pkg_postinst() {
- elog "Check available image and data formats after building with"
- elog "gdalinfo and ogrinfo (using the --formats switch)."
-}
