Version bump. (Bug 468592) Call java-pkg-opt-2 functions. (Bug 471262; thanks to Tom Wijsman) Remove "=external". (Bug 470046; thanks to Ronan Dunklau.) Clean out old versions and patches, and update hdf to hdf5 in the local USE description.

(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key D1BBFDA0)
author: Aaron W. Swenson <titanofold@gentoo.org> 2013-06-24 11:09:35 +0000
committer: Aaron W. Swenson <titanofold@gentoo.org> 2013-06-24 11:09:35 +0000
commit: 6d71b6e138e176456ae16e31c6e07336921f6e20 (patch)
tree: b19f4acc10cd5fcde418088eb5fd09c1d7bdc6b6 /sci-libs
parent: Version bump. Removed old (diff)
download: gentoo-2-6d71b6e138e176456ae16e31c6e07336921f6e20.tar.gz
gentoo-2-6d71b6e138e176456ae16e31c6e07336921f6e20.tar.bz2
gentoo-2-6d71b6e138e176456ae16e31c6e07336921f6e20.zip
13 files changed, 64 insertions, 889 deletions
diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index b15a4e62e1c3..ab9e671b126a 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for sci-libs/gdal
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.138 2013/04/23 08:50:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.139 2013/06/24 11:09:35 titanofold Exp $
+
+*gdal-1.10.0 (24 Jun 2013)
+
+  24 Jun 2013; Aaron W. Swenson <titanofold@gentoo.org>
+  -files/1.7.2-ruby_cflags.patch, -files/gdal-1.4.2-datadir.patch,
+  -files/gdal-1.5.1-python-install.patch, -files/gdal-1.6.0-swig-fix.patch,
+  -files/gdal-1.6.1-ruby-make.patch, -gdal-1.6.3-r1.ebuild,
+  -files/gdal-1.6.3-libpng15.patch, -gdal-1.8.1-r1.ebuild, -gdal-1.9.1.ebuild,
+  -files/gdal-1.9.1-opencl.patch, -files/gdal-1.9.1-poppler-0.20.1.patch,
+  +gdal-1.10.0.ebuild, metadata.xml:
+  Version bump. (Bug 468592) Call java-pkg-opt-2 functions. (Bug 471262; thanks
+  to Tom Wijsman) Remove "=external". (Bug 470046; thanks to Ronan Dunklau.)
+  Clean out old versions and patches, and update hdf to hdf5 in the local USE
+  description.
 
   23 Apr 2013; Agostino Sarubbo <ago@gentoo.org> gdal-1.9.2.ebuild:
   Stable for ppc64, wrt bug #450682
@@ -105,9 +119,9 @@
   Convert from "useq" to "use".
 
   05 Jul 2011; Steve Arnold <nerdboy@gentoo.org> gdal-1.8.0-r1.ebuild:
-  This should fix the seemingly random (and unreproducible by me) install 
-  bug reported again here.  I still can't reproduce it on any of my test 
-  boxes but the build log attached to this bug shows an extra DESTDIR that 
+  This should fix the seemingly random (and unreproducible by me) install
+  bug reported again here.  I still can't reproduce it on any of my test
+  boxes but the build log attached to this bug shows an extra DESTDIR that
   shouldn't be there (and now it isn't).  Also removed a failing autoheader
   and added some additional python eclass helper functions.
 
@@ -203,7 +217,7 @@
   Version bump. Drop older. Grass support to be done.
 
   18 Jul 2010; Steve Arnold <nerdboy@gentoo.org> gdal-1.6.3-r1.ebuild:
-  Updated for a couple of minor/weird bugs (320237 and 325193). Suspect 
+  Updated for a couple of minor/weird bugs (320237 and 325193). Suspect
   random cosmic ray-induced bit-rot on the second one...
 
   11 Jul 2010; Raúl Porcel <armin76@gentoo.org> gdal-1.6.3-r1.ebuild:
@@ -252,7 +266,7 @@
 
   12 Apr 2010; Steve Arnold <nerdboy@gentoo.org> -gdal-1.7.1.ebuild,
   +gdal-1.7.1-r1.ebuild, +files/gdal-1.7.1-warp_fix.patch:
-  Applied back-ported upstream patch for warping operations; (closes bug 
+  Applied back-ported upstream patch for warping operations; (closes bug
   #314717).
 
 *gdal-1.7.1 (05 Apr 2010)
@@ -273,8 +287,8 @@
 
   23 Feb 2010; Steve Arnold <nerdboy@gentoo.org> gdal-1.6.1.ebuild,
   gdal-1.6.2.ebuild, gdal-1.6.3.ebuild:
-  Updated swig depends and added work-around for new perl with swig cruft 
-  (fixes bug #305395).  Seems like there ought to be an EAPI2 way to do 
+  Updated swig depends and added work-around for new perl with swig cruft
+  (fixes bug #305395).  Seems like there ought to be an EAPI2 way to do
   the swig deps in a nicer way, but I couldn't find one...
 
 *gdal-1.6.3 (15 Feb 2010)
@@ -356,9 +370,9 @@
 
   11 Apr 2009; Steve Arnold <nerdboy@gentoo.org> +gdal-1.6.0.ebuild,
   gdal-1.5.3.ebuild:
-  Updated to latest upstream version (fixes bug #253363) but had to revert 
-  to -j1 again to address reported build failures.  Also updated swig dep 
-  for the three supported bindings (perl, python, ruby).  Feel free to 
+  Updated to latest upstream version (fixes bug #253363) but had to revert
+  to -j1 again to address reported build failures.  Also updated swig dep
+  for the three supported bindings (perl, python, ruby).  Feel free to
   test the experimental java bindings and report success/failure.
 
   02 Mar 2009; Brent Baude <ranger@gentoo.org> gdal-1.5.2.ebuild:
@@ -394,7 +408,7 @@
 
   18 Oct 2008; Steve Arnold <nerdboy@gentoo.org> metadata.xml,
   gdal-1.5.2.ebuild, +gdal-1.5.3.ebuild:
-  Updated with latest release and fixes for the perllocal.pod thing and 
+  Updated with latest release and fixes for the perllocal.pod thing and
   USE flag support for libecwj2 (subject to blocking bug #230802).  The
   latter support is only in 1.5.3 so 1.5.2 should be fine (ie, with the
   existing jasper support).  Also fixed some minor QA issues in older
@@ -405,7 +419,7 @@
 
   12 Oct 2008; Steve Arnold <nerdboy@gentoo.org> gdal-1.3.1.ebuild,
   gdal-1.3.2.ebuild, gdal-1.4.2.ebuild, gdal-1.5.0-r1.ebuild:
-  Added die to sed invocations (although what this hs to do with perl I'm 
+  Added die to sed invocations (although what this hs to do with perl I'm
   not quite sure...
 
   07 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
@@ -441,7 +455,7 @@
 
   22 Mar 2008; Steve Arnold <nerdboy@gentoo.org> -gdal-1.5.0.ebuild,
   +gdal-1.5.0-r1.ebuild:
-  Updated for optional libgrass rebuild support (avoids circular 
+  Updated for optional libgrass rebuild support (avoids circular
   dependency issue).
 
   09 Feb 2008; Steve Arnold <nerdboy@gentoo.org> ChangeLog:
@@ -498,7 +512,7 @@
 
   09 Jun 2006; Steve Arnold <nerdboy@gentoo.org>
   +files/gdal-1.3.2-gcc4-stl.patch, gdal-1.3.2.ebuild, gdal-1.3.1.ebuild:
-  Added upstream CVS patch for bug 134498; thanks to Matteo Spreafico 
+  Added upstream CVS patch for bug 134498; thanks to Matteo Spreafico
   <matteo _at_ fsfe.org> for posting the patch. Stable bump for amd64
   and ppc (1.3.1).
 
@@ -623,7 +637,7 @@
 
   10 Jul 2005; Steve Arnold <nerdboy@gentoo.org> -gdal-1.2.5.ebuild,
   +gdal-1.2.5-r1.ebuild:
-  fixing lib silliness on non-x86 arches (informal bug report), a 
+  fixing lib silliness on non-x86 arches (informal bug report), a
   small but important change to fix the libgdal.so install (which
   requires stablizing libgeotiff, proj, and ogdi).  Add sparc to
   the list of heavily tested arches...
diff --git a/sci-libs/gdal/files/1.7.2-ruby_cflags.patch b/sci-libs/gdal/files/1.7.2-ruby_cflags.patch
deleted file mode 100644
index 1371c0535457..000000000000
--- a/sci-libs/gdal/files/1.7.2-ruby_cflags.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- swig/ruby/RubyMakefile.mk.orig	2010-07-27 16:55:52.061254647 +0200
-+++ swig/ruby/RubyMakefile.mk	2010-07-27 16:57:06.837255416 +0200
-@@ -25,7 +25,9 @@
- INSTALL_DIR := $(RUBY_EXTENSIONS_DIR)/gdal
- 
- RUBY_INCLUDE = -I$(RUBY_INCLUDE_DIR)
--LDFLAGS += -Xcompiler -shared -L$(RUBY_LIB_DIR)
-+LDFLAGS += -fPIC -DPIC -Xcompiler -shared -L$(RUBY_LIB_DIR)
-+CFLAGS += -fPIC -DPIC
-+CXXFLAGS += -fPIC -DPIC
- RUBY_LIB := -l$(RUBY_SO_NAME)
- 
- build: $(RUBY_MODULES)
-@@ -40,17 +42,17 @@
- $(INSTALL_DIR):
- 	mkdir -p $(DESTDIR)$(INSTALL_DIR)
- 
--install: $(INSTALL_DIR)
--	$(INSTALL) $(RUBY_MODULES) $(DESTDIR)$(INSTALL_DIR) 
-+install: $(INSTALL_DIR) $(RUBY_MODULES)
-+	for f in $(RUBY_MODULES) ; do $(INSTALL) $$f $(DESTDIR)$(INSTALL_DIR) ; done
- 
- $(RUBY_MODULES): %.so: %_wrap.o
- 	$(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.4.2-datadir.patch b/sci-libs/gdal/files/gdal-1.4.2-datadir.patch
deleted file mode 100644
index 95cd058256a1..000000000000
--- a/sci-libs/gdal/files/gdal-1.4.2-datadir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- GDALmake.opt.in.orig	2006-05-21 14:59:21.000000000 -0700
-+++ GDALmake.opt.in	2006-05-21 15:13:22.000000000 -0700
-@@ -54,7 +54,7 @@
- exec_prefix	=	@exec_prefix@
- INST_PREFIX	=	@exec_prefix@
- INST_INCLUDE	=	@includedir@
--INST_DATA 	=	@datadir@
-+INST_DATA 	=	@datadir@/gdal
- INST_LIB	=	@libdir@
- INST_BIN	=	@bindir@
- INST_PYMOD      =       @pymoddir@
diff --git a/sci-libs/gdal/files/gdal-1.5.1-python-install.patch b/sci-libs/gdal/files/gdal-1.5.1-python-install.patch
deleted file mode 100644
index fd1b7e488cdc..000000000000
--- a/sci-libs/gdal/files/gdal-1.5.1-python-install.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- swig/python/GNUmakefile.orig	2008-02-02 17:00:52.000000000 -0800
-+++ swig/python/GNUmakefile	2008-02-02 17:02:03.000000000 -0800
-@@ -51,9 +51,9 @@
- install:
- 
- ifeq ($(PY_HAVE_SETUPTOOLS),1)
--	$(PYTHON) setup.py install 
-+	$(PYTHON) setup.py install --root=$(DESTDIR) 
- else
--	$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
-+	$(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix)
- endif
- 
- 	for f in $(SCRIPTS) ; do $(INSTALL) ./scripts/$$f $(DESTDIR)$(INST_BIN) ; done
diff --git a/sci-libs/gdal/files/gdal-1.6.0-swig-fix.patch b/sci-libs/gdal/files/gdal-1.6.0-swig-fix.patch
deleted file mode 100644
index 38c94da52f76..000000000000
--- a/sci-libs/gdal/files/gdal-1.6.0-swig-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- swig/include/gdal.i.orig	2009-04-24 21:55:06.315863023 -0700
-+++ swig/include/gdal.i	2009-04-24 22:10:28.806611326 -0700
-@@ -176,6 +176,17 @@
- %include "gdal_typemaps.i"
- #endif
- 
-+/* Default memberin typemaps required to support SWIG 1.3.39 and above */
-+%typemap(memberin) char *Info %{
-+/* char* Info memberin typemap */
-+$1;
-+%}
-+
-+%typemap(memberin) char *Id %{
-+/* char* Info memberin typemap */
-+$1;
-+%}
-+
- //************************************************************************
- //
- // Define the exposed CPL functions.
diff --git a/sci-libs/gdal/files/gdal-1.6.1-ruby-make.patch b/sci-libs/gdal/files/gdal-1.6.1-ruby-make.patch
deleted file mode 100644
index 0216f38bd581..000000000000
--- a/sci-libs/gdal/files/gdal-1.6.1-ruby-make.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- swig/ruby/RubyMakefile.mk.orig	2009-08-01 18:54:22.260573234 -0700
-+++ swig/ruby/RubyMakefile.mk	2009-08-01 18:59:11.208571244 -0700
-@@ -25,7 +25,9 @@
- INSTALL_DIR := $(RUBY_EXTENSIONS_DIR)/gdal
- 
- RUBY_INCLUDE = -I$(RUBY_INCLUDE_DIR)
--LDFLAGS += -shared -L$(RUBY_LIB_DIR)
-+LDFLAGS += -fPIC -DPIC -Xcompiler -shared -L$(RUBY_LIB_DIR)
-+CFLAGS += -fPIC -DPIC
-+CXXFLAGS += -fPIC -DPIC
- RUBY_LIB := -l$(RUBY_SO_NAME)
- 
- build: $(RUBY_MODULES)
-@@ -41,17 +43,17 @@
- $(INSTALL_DIR):
- 	mkdir -p $(DESTDIR)$(INSTALL_DIR)
- 
--install: $(INSTALL_DIR)
--	$(INSTALL) $(RUBY_MODULES) $(DESTDIR)$(INSTALL_DIR) 
-+install: $(INSTALL_DIR) $(RUBY_MODULES)
-+	for f in $(RUBY_MODULES) ; do $(INSTALL) $$f $(DESTDIR)$(INSTALL_DIR) ; done
- 
- $(RUBY_MODULES): %.so: %_wrap.o
- 	$(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.6.3-libpng15.patch b/sci-libs/gdal/files/gdal-1.6.3-libpng15.patch
deleted file mode 100644
index e0411a3ea696..000000000000
--- a/sci-libs/gdal/files/gdal-1.6.3-libpng15.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://bugs.gentoo.org/386009
-
---- frmts/png/pngdataset.cpp
-+++ frmts/png/pngdataset.cpp
-@@ -1288,7 +1288,7 @@
-     * instead of an int, which is what fread() actually returns.
-     */
-    check = (png_size_t)VSIFReadL(data, (png_size_t)1, length,
--                                 (png_FILE_p)png_ptr->io_ptr);
-+                                 (png_FILE_p)png_get_io_ptr(png_ptr));
- 
-    if (check != length)
-       png_error(png_ptr, "Read Error");
-@@ -1303,7 +1303,7 @@
- {
-    png_uint_32 check;
- 
--   check = VSIFWriteL(data, 1, length, (png_FILE_p)(png_ptr->io_ptr));
-+   check = VSIFWriteL(data, 1, length, (png_FILE_p)(png_get_io_ptr(png_ptr)));
- 
-    if (check != length)
-       png_error(png_ptr, "Write Error");
-@@ -1314,7 +1314,7 @@
- /************************************************************************/
- static void png_vsi_flush(png_structp png_ptr)
- {
--    VSIFFlushL( (png_FILE_p)(png_ptr->io_ptr) );
-+    VSIFFlushL( (png_FILE_p)(png_get_io_ptr(png_ptr)) );
- }
- 
- /************************************************************************/
-@@ -1330,7 +1330,7 @@
-     // libpng is generally not built as C++ and so won't honour unwind
-     // semantics.  Ugg. 
- 
--    jmp_buf* psSetJmpContext = (jmp_buf*) png_ptr->error_ptr;
-+    jmp_buf* psSetJmpContext = (jmp_buf*) png_get_error_ptr(png_ptr);
-     if (psSetJmpContext)
-     {
-         longjmp( *psSetJmpContext, 1 );
diff --git a/sci-libs/gdal/files/gdal-1.9.1-opencl.patch b/sci-libs/gdal/files/gdal-1.9.1-opencl.patch
deleted file mode 100644
index f5377844683e..000000000000
--- a/sci-libs/gdal/files/gdal-1.9.1-opencl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ur gdal-1.9.0b1_orig/alg/gdalwarpkernel_opencl.c gdal-1.9.0b1/alg/gdalwarpkernel_opencl.c
---- gdal-1.9.0b1_orig/alg/gdalwarpkernel_opencl.c	2011-12-20 02:18:27.000000000 +0100
-+++ gdal-1.9.0b1/alg/gdalwarpkernel_opencl.c	2011-12-26 19:28:04.564576034 +0100
-@@ -1409,20 +1409,9 @@
-         handleErr(err);
-     } else {
-         //Make a fake image so we don't have a NULL pointer
--        if (warper->bIsATI)
--        {
--            /* The code in the else clause generates a CL_INVALID_IMAGE_SIZE with ATI SDK 2.2 */
--            /* while theoretically correct and working on other SDKs. The following is a */
--            /* workaround */
--            char dummyImageData[16];
--            (*srcImag) = clCreateImage2D(warper->context, CL_MEM_READ_ONLY | CL_MEM_COPY_HOST_PTR, &imgFmt,
--                                        1, 1, sz, dummyImageData, &err);
--        }
--        else
--        {
--            (*srcImag) = clCreateImage2D(warper->context, CL_MEM_READ_ONLY, &imgFmt,
--                                         1, 1, sz, NULL, &err);
--        }
-+	char dummyImageData[16];
-+	(*srcImag) = clCreateImage2D(warper->context, CL_MEM_READ_ONLY | CL_MEM_COPY_HOST_PTR, &imgFmt,
-+				    1, 1, sz, dummyImageData, &err);
-         handleErr(err);
-     }
- 
diff --git a/sci-libs/gdal/files/gdal-1.9.1-poppler-0.20.1.patch b/sci-libs/gdal/files/gdal-1.9.1-poppler-0.20.1.patch
deleted file mode 100644
index 3e7f0355a6d8..000000000000
--- a/sci-libs/gdal/files/gdal-1.9.1-poppler-0.20.1.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-Index: /branches/1.9/gdal/nmake.opt
-===================================================================
---- /branches/1.9/gdal/nmake.opt	(revision 23610)
-+++ /branches/1.9/gdal/nmake.opt	(revision 24437)
-@@ -469,8 +469,10 @@
- # Uncomment for PDF support
- # Uncomment POPPLER_BASE_STREAM_HAS_TWO_ARGS = YES for Poppler >= 0.16.0
-+# Uncomment POPPLER_0_20_OR_LATER = YES for Poppler >= 0.20.0
- #POPPLER_ENABLED = YES
- #POPPLER_CFLAGS = -Ie:/kde/include -Ie:/kde/include/poppler
- #POPPLER_HAS_OPTCONTENT = YES
- #POPPLER_BASE_STREAM_HAS_TWO_ARGS = YES
-+#POPPLER_0_20_OR_LATER = YES
- #POPPLER_LIBS = e:/kde/lib/poppler.lib e:/kde/lib/freetype.lib e:/kde/lib/liblcms-1.lib advapi32.lib gdi32.lib
- 
-Index: /branches/1.9/gdal/configure.in
-===================================================================
---- /branches/1.9/gdal/configure.in	(revision 24333)
-+++ /branches/1.9/gdal/configure.in	(revision 24437)
-@@ -2941,4 +2941,5 @@
- POPPLER_HAS_OPTCONTENT=no
- POPPLER_BASE_STREAM_HAS_TWO_ARGS=no
-+POPPLER_0_20_OR_LATER=no
- 
- AC_MSG_CHECKING([for poppler])
-@@ -3000,4 +3001,17 @@
-             POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes
-             AC_MSG_RESULT([yes])
-+
-+            # And now we check if we have Poppler >= 0.20.0
-+            AC_MSG_CHECKING([if we have Poppler >= 0.20.0])
-+            rm -f testpoppler.*
-+            echo '#include <poppler/Error.h>' > testpoppler.cpp
-+            echo 'int main(int argc, char** argv) { setErrorCallback(0,0); return 0; }' >> testpoppler.cpp
-+            if test -z "`${CXX} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then
-+                POPPLER_0_20_OR_LATER=yes
-+                AC_MSG_RESULT([yes])
-+            else
-+                AC_MSG_RESULT([no])
-+            fi
-+
-         else
-             AC_MSG_RESULT([no])
-@@ -3015,4 +3029,5 @@
- AC_SUBST(POPPLER_HAS_OPTCONTENT, $POPPLER_HAS_OPTCONTENT)
- AC_SUBST(POPPLER_BASE_STREAM_HAS_TWO_ARGS, $POPPLER_BASE_STREAM_HAS_TWO_ARGS)
-+AC_SUBST(POPPLER_0_20_OR_LATER, $POPPLER_0_20_OR_LATER)
- AC_SUBST(POPPLER_INC, $POPPLER_INC)
- 
-Index: /branches/1.9/gdal/frmts/pdf/pdfdataset.cpp
-===================================================================
---- /branches/1.9/gdal/frmts/pdf/pdfdataset.cpp	(revision 23986)
-+++ /branches/1.9/gdal/frmts/pdf/pdfdataset.cpp	(revision 24437)
-@@ -327,5 +327,9 @@
-         poSplashOut = new SplashOutputDev(splashModeRGB8, 4, gFalse, sColor);
-         PDFDoc* poDoc = poGDS->poDoc;
-+#ifdef POPPLER_0_20_OR_LATER
-+        poSplashOut->startDoc(poDoc);
-+#else
-         poSplashOut->startDoc(poDoc->getXRef());
-+#endif
-         double dfDPI = poGDS->dfDPI;
- 
-@@ -518,4 +522,19 @@
- 
- #ifdef USE_POPPLER
-+#ifdef POPPLER_0_20_OR_LATER
-+static void PDFDatasetErrorFunction(void* userData, ErrorCategory eErrCatagory, int nPos, char *pszMsg)
-+{
-+    CPLString osError;
-+
-+    if (nPos >= 0)
-+        osError.Printf("Pos = %d, ", nPos);
-+    osError += pszMsg;
-+
-+    if (strcmp(osError.c_str(), "Incorrect password") == 0)
-+        return;
-+
-+    CPLError(CE_Failure, CPLE_AppDefined, "%s", osError.c_str());
-+}
-+#else
- static void PDFDatasetErrorFunction(int nPos, char *pszMsg, va_list args)
- {
-@@ -531,4 +550,5 @@
-     CPLError(CE_Failure, CPLE_AppDefined, "%s", osError.c_str());
- }
-+#endif
- #endif
- 
-@@ -567,5 +587,9 @@
- 
-     /* Set custom error handler for poppler errors */
-+#ifdef POPPLER_0_20_OR_LATER
-+    setErrorCallback(PDFDatasetErrorFunction, NULL);
-+#else
-     setErrorFunction(PDFDatasetErrorFunction);
-+#endif
- 
-     /* poppler global variable */
-Index: /branches/1.9/gdal/frmts/pdf/makefile.vc
-===================================================================
---- /branches/1.9/gdal/frmts/pdf/makefile.vc	(revision 22493)
-+++ /branches/1.9/gdal/frmts/pdf/makefile.vc	(revision 24437)
-@@ -7,5 +7,5 @@
- 
- !IFDEF POPPLER_ENABLED
--EXTRAFLAGS = $(POPPLER_CFLAGS) $(POPPLER_HAS_OPTCONTENT_FLAGS) $(POPPLER_BASE_STREAM_HAS_TWO_ARGS_FLAGS) -DUSE_POPPLER
-+EXTRAFLAGS = $(POPPLER_CFLAGS) $(POPPLER_HAS_OPTCONTENT_FLAGS) $(POPPLER_BASE_STREAM_HAS_TWO_ARGS_FLAGS) $(POPPLER_0_20_OR_LATER_FLAGS) -DUSE_POPPLER
- 
- !IFDEF POPPLER_HAS_OPTCONTENT
-@@ -15,4 +15,8 @@
- !IFDEF POPPLER_BASE_STREAM_HAS_TWO_ARGS
- POPPLER_BASE_STREAM_HAS_TWO_ARGS_FLAGS = -DPOPPLER_BASE_STREAM_HAS_TWO_ARGS
-+!ENDIF
-+
-+!IFDEF POPPLER_0_20_OR_LATER
-+POPPLER_0_20_OR_LATER_FLAGS = -DPOPPLER_0_20_OR_LATER
- !ENDIF
- 
-Index: /branches/1.9/gdal/frmts/pdf/GNUmakefile
-===================================================================
---- /branches/1.9/gdal/frmts/pdf/GNUmakefile	(revision 22491)
-+++ /branches/1.9/gdal/frmts/pdf/GNUmakefile	(revision 24437)
-@@ -16,4 +16,9 @@
- endif
- 
-+ifeq ($(POPPLER_0_20_OR_LATER),yes)
-+CPPFLAGS +=  -DPOPPLER_0_20_OR_LATER
-+endif
-+
-+
- CPPFLAGS	:=	$(GDAL_INCLUDE) $(CPPFLAGS) $(POPPLER_INC) $(PODOFO_INC)
- 
-Index: /branches/1.9/gdal/GDALmake.opt.in
-===================================================================
---- /branches/1.9/gdal/GDALmake.opt.in	(revision 24419)
-+++ /branches/1.9/gdal/GDALmake.opt.in	(revision 24437)
-@@ -386,4 +386,5 @@
- POPPLER_HAS_OPTCONTENT = @POPPLER_HAS_OPTCONTENT@
- POPPLER_BASE_STREAM_HAS_TWO_ARGS = @POPPLER_BASE_STREAM_HAS_TWO_ARGS@
-+POPPLER_0_20_OR_LATER = @POPPLER_0_20_OR_LATER@
- POPPLER_INC = @POPPLER_INC@
- 
diff --git a/sci-libs/gdal/gdal-1.9.1.ebuild b/sci-libs/gdal/gdal-1.10.0.ebuild
index b76371749572..dd5bb2336188 100644
--- a/sci-libs/gdal/gdal-1.9.1.ebuild
+++ b/sci-libs/gdal/gdal-1.10.0.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.9.1.ebuild,v 1.6 2012/12/04 09:44:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.10.0.ebuild,v 1.1 2013/06/24 11:09:35 titanofold Exp $
 
-EAPI=4
+EAPI=5
 
 WANT_AUTOCONF="2.5"
 
-PYTHON_DEPEND="python? 2:2.6"
+PYTHON_DEPEND="python? *"
 
 inherit autotools eutils libtool perl-module python 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/gdal/${P}.tar.gz"
+SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
@@ -23,7 +23,7 @@ RDEPEND="
 	dev-libs/expat
 	media-libs/tiff
 	sci-libs/libgeotiff
-	( || ( <sys-libs/zlib-1.2.5.1-r1 >=sys-libs/zlib-1.2.5.1-r2[minizip] ) )
+	|| ( <sys-libs/zlib-1.2.5.1-r1 >=sys-libs/zlib-1.2.5.1-r2[minizip] )
 	armadillo? ( sci-libs/armadillo[lapack] )
 	curl? ( net-misc/curl )
 	ecwj2k? ( sci-libs/libecwj2 )
@@ -40,19 +40,14 @@ RDEPEND="
 	odbc?   ( dev-db/unixODBC )
 	ogdi? ( sci-libs/ogdi )
 	opencl? ( virtual/opencl )
-	pdf? (
-		app-text/podofo
-		app-text/poppler
-	)
+	pdf? ( app-text/poppler )
 	perl? ( dev-lang/perl )
 	png? ( media-libs/libpng )
 	postgres? ( >=dev-db/postgresql-base-8.4 )
 	python? ( dev-python/numpy )
 	ruby? ( dev-lang/ruby:1.9 )
 	sqlite? ( dev-db/sqlite:3 )
-	spatialite? (
-		dev-db/spatialite
-	)
+	spatialite? ( dev-db/spatialite )
 	xls? ( dev-libs/freexl )
 "
 
@@ -73,10 +68,8 @@ REQUIRED_USE="
 "
 
 pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
+	use python && python_pkg_setup
+	java-pkg-opt-2_pkg_setup
 }
 
 src_unpack() {
@@ -85,6 +78,8 @@ src_unpack() {
 }
 
 src_prepare() {
+	java-pkg-opt-2_src_prepare
+
 	# fix datadir and docdir placement
 	sed -i \
 		-e "s:@datadir@:@datadir@/gdal:" \
@@ -99,9 +94,6 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/${PN}-1.9.1-ruby-makefile.patch
 
-	# Opencl seems broken with nvidia without this
-	epatch "${FILESDIR}"/${PN}-1.9.1-opencl.patch
-
 	# -soname is only accepted by GNU ld/ELF
 	[[ ${CHOST} == *-darwin* ]] \
 		&& epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \
@@ -120,14 +112,16 @@ src_prepare() {
 		-e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
 		configure.in || die
 
-	epatch "${FILESDIR}"/${P}-poppler-0.20.1.patch
+	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
+
+	tc-export AR RANLIB
 
-	# autoheader fail
-#	eaclocal
-#	eautoconf
-#	eautomake
-#	elibtoolize
-	# Seems to work here.
 	eautoreconf
 }
 
@@ -148,8 +142,7 @@ src_configure() {
 	if use java; then
 		myopts+="
 			--with-java=$(java-config --jdk-home 2>/dev/null)
-			$(use_with mdb)
-		"
+			$(use_with mdb)"
 	else
 		myopts+=" --without-java --without-mdb"
 		use mdb && ewarn "mdb requires java use enabled. disabling"
@@ -189,8 +182,8 @@ src_configure() {
 		--with-ogr \
 		--with-grib \
 		--with-vfk \
-		--with-libtiff=external \
-		--with-geotiff=external \
+		--with-libtiff \
+		--with-geotiff \
 		$(use_enable debug) \
 		$(use_with armadillo) \
 		$(use_with postgres pg) \
@@ -245,12 +238,11 @@ src_compile() {
 	for i in perl ruby python; do
 		if use $i; then
 			rm "${S}"/swig/$i/*_wrap.cpp
-			emake -C "${S}"/swig/$i generate || \
-				die "make generate failed for swig/$i"
+			emake -C "${S}"/swig/$i generate
 		fi
 	done
 
-	emake || die "emake failed"
+	default
 
 	if use perl ; then
 		pushd "${S}"/swig/perl > /dev/null
@@ -259,9 +251,7 @@ src_compile() {
 		popd > /dev/null
 	fi
 
-	if use doc ; then
-		emake docs || die "make docs failed"
-	fi
+	use doc && emake docs
 }
 
 src_install() {
@@ -274,7 +264,7 @@ src_install() {
 			GDALmake.opt || die
 	fi
 
-	emake DESTDIR="${D}" install || die "make install failed"
+	default
 
 	if use ruby ; then
 		# weird reinstall collision; needs manual intervention...
@@ -287,18 +277,18 @@ src_install() {
 
 	use perl && fixlocalpod
 
-	dodoc Doxyfile HOWTO-RELEASE NEWS || die
+	dodoc Doxyfile HOWTO-RELEASE NEWS
 
 	if use doc ; then
-		dohtml html/* || die "install html failed"
+		dohtml html/*
 		docinto ogr
-		dohtml ogr/html/* || die "install ogr html failed"
+		dohtml ogr/html/*
 	fi
 
 	if use python; then
-		newdoc swig/python/README.txt README-python.txt || die
+		newdoc swig/python/README.txt README-python.txt
 		insinto /usr/share/${PN}/samples
-		doins swig/python/samples/* || die
+		doins swig/python/samples/*
 	fi
 }
 
diff --git a/sci-libs/gdal/gdal-1.6.3-r1.ebuild b/sci-libs/gdal/gdal-1.6.3-r1.ebuild
deleted file mode 100644
index 9ca58e357ea4..000000000000
--- a/sci-libs/gdal/gdal-1.6.3-r1.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.3-r1.ebuild,v 1.24 2012/05/19 20:01:03 ssuominen Exp $
-
-EAPI=3
-
-WANT_AUTOCONF="2.5"
-
-RUBY_OPTIONAL="yes"
-USE_RUBY="ruby18"
-
-PYTHON_DEPEND="python? 2"
-
-inherit autotools eutils perl-module python ruby toolchain-funcs
-
-DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="http://www.gdal.org/"
-SRC_URI="http://download.osgeo.org/gdal/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="curl debug doc ecwj2k fits geos gif gml hdf hdf5 jpeg jpeg2k mysql netcdf odbc png ogdi perl postgres python ruby sqlite threads"
-
-RDEPEND="
-	dev-libs/expat
-	media-libs/tiff:0
-	sci-libs/libgeotiff
-	sys-libs/zlib
-	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg )
-	gif? ( media-libs/giflib )
-	png? ( media-libs/libpng )
-	perl? ( dev-lang/perl )
-	python? ( dev-python/numpy )
-	ruby? ( >=dev-lang/ruby-1.8.4.20060226 )
-	fits? ( sci-libs/cfitsio )
-	ogdi? ( sci-libs/ogdi )
-	gml? ( >=dev-libs/xerces-c-3 )
-	hdf5? ( >=sci-libs/hdf5-1.6.4 )
-	postgres? ( dev-db/postgresql-base )
-	|| (
-		netcdf? ( sci-libs/netcdf )
-		hdf? ( sci-libs/hdf )
-	)
-	|| (
-		jpeg2k? ( media-libs/jasper )
-		ecwj2k? ( sci-libs/libecwj2 )
-	)
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/unixODBC )
-	geos? ( >=sci-libs/geos-2.2.1 )
-	sqlite? ( >=dev-db/sqlite-3 )"
-
-DEPEND="${RDEPEND}
-	perl? ( >=dev-lang/swig-1.3.32 )
-	python? ( >=dev-lang/swig-1.3.32 )
-	ruby? ( >=dev-lang/swig-1.3.32 )
-	doc? ( app-doc/doxygen )"
-
-AT_M4DIR="${S}/m4"
-
-pkg_setup() {
-	if [ -n "${GDAL_CONFIGURE_OPTS}" ]; then
-		elog "User-specified configure options are ${GDAL_CONFIGURE_OPTS}."
-	else
-		elog "User-specified configure options are not set."
-		elog "If needed, set GDAL_CONFIGURE_OPTS to enable grass support."
-	fi
-	python_set_active_version 2
-}
-
-src_prepare() {
-	eaclocal
-	eautoconf
-
-	epatch \
-		"${FILESDIR}"/${PN}-1.4.2-datadir.patch \
-		"${FILESDIR}"/${PN}-1.5.1-python-install.patch \
-		"${FILESDIR}"/${PN}-1.6.0-swig-fix.patch \
-		"${FILESDIR}"/${PN}-1.6.1-ruby-make.patch \
-		"${FILESDIR}"/${PN}-1.6.3-libpng15.patch
-
-	[[ ${CHOST} == *-darwin* ]] \
-		&& epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \
-		|| epatch "${FILESDIR}"/${PN}-1.5.0-soname.patch
-
-	has_version '>=sys-libs/zlib-1.2.5.1-r1' && \
-		sed -i -e '1i#define OF(x) x' port/cpl_minizip_ioapi.h
-}
-
-src_configure() {
-	local pkg_conf="${GDAL_CONFIGURE_OPTS}"
-	local use_conf=""
-
-	pkg_conf="${pkg_conf} --enable-shared=yes --with-pic \
-		--with-libgrass=no --without-libtool --with-expat=${EPREFIX}/usr"
-
-	if use hdf && use netcdf; then
-		ewarn "Netcdf and HDF4 are incompatible due to certain tools in"
-		ewarn "common; HDF5 is now the preferred choice for HDF data."
-		ewarn "Disabling hdf4 in favor of NetCDF..."
-		use_conf="--with-netcdf --with-hdf4=no"
-	elif use hdf && ! use netcdf; then
-		use_conf="--with-netcdf=no --with-hdf4"
-	else
-		use_conf="$(use_with netcdf)"
-	fi
-
-	use_conf="$(use_with jpeg) $(use_with png) $(use_with mysql) \
-	 $(use_with gml xerces) $(use_with hdf5) $(use_with curl) \
-	 $(use_with postgres pg) $(use_with python) $(use_with ruby) \
-	 $(use_with threads) $(use_with fits cfitsio) $(use_with perl) \
-	 $(use_with sqlite sqlite3 ="${EPREFIX}"/usr) $(use_with geos) \
-	 $(use_with jpeg2k jasper) $(use_with odbc) $(use_enable debug)"
-
-	# It can't find this
-	if use ogdi ; then
-		use_conf="--with-ogdi=${EPREFIX}/usr ${use_conf}"
-	fi
-
-	if use mysql ; then
-		use_conf="--with-mysql=${EPREFIX}/usr/bin/mysql_config ${use_conf}"
-	fi
-
-	if use gif ; then
-		use_conf="--with-gif=internal ${use_conf}"
-	else
-		use_conf="--with-gif=no ${use_conf}"
-	fi
-
-	if use python ; then
-		use_conf="--with-pymoddir=${EPREFIX}/$(python_get_sitedir) \
-		${use_conf}"
-	fi
-
-	# Fix doc path just in case
-	sed \
-		-e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
-		-i GDALmake.opt.in || die "sed gdalmake.opt failed"
-
-	econf ${pkg_conf} ${use_conf}
-
-	# mysql-config puts this in (and boy is it a PITA to get it out)
-	sed \
-	 -i -r -e '/^LDFLAGS/ s/(-(Wl|O1),|,-(Wl|O1))//g' \
-	 -i -e '/^MYSQL_LIB/ s:-Wl,-O1 -rdynamic::' \
-	 GDALmake.opt || die "sed LIBS failed"
-}
-
-src_compile() {
-	local i
-	for i in perl ruby python; do
-		if use $i; then
-			rm "${S}"/swig/$i/*_wrap.cpp
-			emake -C "${S}"/swig/$i generate || \
-				die "make generate failed for swig/$i"
-		fi
-	done
-
-	# parallel makes fail on the ogr stuff (C++, what can I say?)
-	# also failing with gcc4 in libcsf
-	emake -j1 || die "emake failed"
-
-	if use python; then
-	 sed -i -e "s#library_dirs = #library_dirs = ${EPREFIX}/usr/$(get_libdir):#g" \
-		swig/python/setup.cfg || die "sed python setup.cfg failed"
-	 sed -i -e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
-		swig/python/GNUmakefile || die "sed python makefile failed"
-	fi
-
-	if use perl ; then
-		cd "${S}"/swig/perl
-		perl-module_src_prep
-		perl-module_src_compile
-		cd "${S}"
-	fi
-
-	if use doc ; then
-		make docs || die "make docs failed"
-	fi
-}
-
-src_install() {
-	if use perl ; then
-		cd "${S}"/swig/perl
-		perl-module_src_install
-		sed -i -e "s:BINDINGS = python ruby perl:BINDINGS = python ruby:g" \
-		GDALmake.opt
-		cd "${S}"
-	fi
-
-	# einstall causes sandbox violations on /usr/lib/libgdal.so
-	emake DESTDIR="${D}" install \
-	 || die "make install failed"
-
-	dodoc Doxyfile HOWTO-RELEASE NEWS
-
-	if use doc ; then
-		dohtml html/* || die "install html failed"
-		docinto ogr
-		dohtml ogr/html/* || die "install ogr html failed"
-	fi
-
-	if use python; then
-	 newdoc swig/python/README.txt README-python.txt
-	 dodir /usr/share/${PN}/samples
-	 insinto /usr/share/${PN}/samples
-	 doins swig/python/samples/*
-	fi
-
-	use perl && fixlocalpod
-}
-
-pkg_postinst() {
-	echo
-	elog "If you need libgrass support, then you must rebuild gdal, after"
-	elog "installing the latest Grass, and set the following option:"
-	echo
-	elog "GDAL_CONFIGURE_OPTS=--with-grass=\$GRASS_HOME emerge gdal"
-	echo
-	elog "GDAL is most useful with full graphics support enabled via various"
-	elog "USE flags: png, jpeg, gif, jpeg2k, etc. Also python, fits, ogdi,"
-	elog "geos, and support for either netcdf or HDF4 is available, as well as"
-	elog "grass, and mysql, sqlite, or postgres (grass support requires grass 6"
-	elog "and rebuilding gdal). HDF5 support is now included."
-	echo
-	elog "Note: tiff and geotiff are now hard depends, so no USE flags."
-	elog "Also, this package will check for netcdf before hdf, so if you"
-	elog "prefer hdf, please emerge hdf with USE=szip prior to emerging"
-	elog "gdal. Detailed API docs require doxygen (man pages are free)."
-	echo
-	elog "Check available image and data formats after building with"
-	elog "gdalinfo and ogrinfo (using the --formats switch)."
-	echo
-}
diff --git a/sci-libs/gdal/gdal-1.8.1-r1.ebuild b/sci-libs/gdal/gdal-1.8.1-r1.ebuild
deleted file mode 100644
index ba1c982570f7..000000000000
--- a/sci-libs/gdal/gdal-1.8.1-r1.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.8.1-r1.ebuild,v 1.5 2012/06/05 21:08:15 ranger Exp $
-
-EAPI=3
-
-WANT_AUTOCONF="2.5"
-
-RUBY_OPTIONAL="yes"
-USE_RUBY="ruby18"
-
-PYTHON_DEPEND="python? 2:2.6"
-
-inherit autotools eutils libtool perl-module python ruby-ng toolchain-funcs
-
-DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="http://www.gdal.org/"
-SRC_URI="http://download.osgeo.org/gdal/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+aux_xml curl debug doc ecwj2k fits geos gif gml hdf5 jpeg jpeg2k mysql netcdf odbc ogdi pdf perl png postgres python ruby sqlite threads"
-
-RDEPEND="
-	dev-libs/expat
-	media-libs/tiff
-	sci-libs/libgeotiff
-	( || ( <sys-libs/zlib-1.2.5.1-r1 >=sys-libs/zlib-1.2.5.1-r2[minizip] ) )
-	curl? ( net-misc/curl )
-	ecwj2k? ( sci-libs/libecwj2 )
-	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] )
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/jasper )
-	mysql? ( virtual/mysql )
-	netcdf? ( sci-libs/netcdf )
-	odbc?   ( dev-db/unixODBC )
-	ogdi? ( sci-libs/ogdi )
-	pdf? ( app-text/poppler )
-	perl? ( dev-lang/perl )
-	png? ( media-libs/libpng )
-	postgres? ( >=dev-db/postgresql-base-8.4 )
-	python? ( dev-python/numpy )
-	ruby? ( $(ruby_implementation_depend ruby18) )
-	sqlite? ( >=dev-db/sqlite-3 )"
-
-SWIG_DEP=">=dev-lang/swig-2.0.2"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	perl? ( ${SWIG_DEP} )
-	python? ( ${SWIG_DEP} )
-	ruby? ( ${SWIG_DEP} )"
-
-AT_M4DIR="${S}/m4"
-MAKEOPTS+=" -j1"
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_unpack() {
-	# prevent ruby-ng.eclass from messing with the src path
-	default
-}
-
-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" \
-		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=:" \
-		swig/python/GNUmakefile || die
-
-	epatch "${FILESDIR}"/1.7.2-ruby_cflags.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
-
-	# Update for zlib header changes (see bug #383569)
-	epatch "${FILESDIR}"/${P}-zlib_header_fix.patch
-
-	# Fix ldflags when building with ruby
-	sed -e '/^LDFLAGS/s/-Xcompiler//' -i swig/ruby/RubyMakefile.mk || die
-
-	# autoheader fail
-	eaclocal
-	eautoconf
-	eautomake
-	elibtoolize
-}
-
-src_configure() {
-	if use ruby; then
-		RUBY_MOD_DIR="$(ruby18 -r rbconfig -e 'print Config::CONFIG["sitearchdir"]')"
-		echo "Ruby module dir is: $RUBY_MOD_DIR"
-	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
-	# tiff is a hard dep
-	econf \
-		--enable-shared \
-		--disable-static \
-		--with-expat \
-		--without-grass \
-		--without-hdf4 \
-		--without-fme \
-		--without-pcraster \
-		--without-kakadu \
-		--without-mrsid \
-		--without-jp2mrsid \
-		--without-msg \
-		--without-bsb \
-		--without-dods-root \
-		--without-oci \
-		--without-ingres \
-		--without-spatialite \
-		--without-dwgdirect \
-		--without-epsilon \
-		--without-idb \
-		--without-sde \
-		--without-libtool \
-		--with-libz="${EPREFIX}/usr/" \
-		--with-ogr \
-		--with-grib \
-		--with-vfk \
-		--with-libtiff=external \
-		--with-geotiff=external \
-		$(use_enable debug) \
-		$(use_with postgres pg) \
-		$(use_with fits cfitsio) \
-		$(use_with netcdf) \
-		$(use_with png) \
-		$(use_with jpeg) \
-		$(use_with jpeg pcidsk) \
-		$(use_with gif) \
-		$(use_with ogdi ogdi "${EPREFIX}"/usr) \
-		$(use_with hdf5) \
-		$(use_with jpeg2k jasper) \
-		$(use_with ecwj2k ecw) \
-		$(use_with gml xerces) \
-		$(use_with odbc) \
-		$(use_with curl) \
-		$(use_with sqlite sqlite3 "${EPREFIX}"/usr) \
-		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config) \
-		$(use_with geos) \
-		$(use_with aux_xml pam) \
-		$(use_with pdf poppler) \
-		$(use_with perl) \
-		$(use_with ruby) \
-		$(use_with python) \
-		$(use_with threads) \
-		--with-pymoddir="${EPREFIX}"/$(python_get_sitedir)
-
-	# 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
-
-	# updated for newer swig (must specify the path to input files)
-	if use python; then
-		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"
-	fi
-}
-
-src_compile() {
-	local i
-	for i in perl ruby python; do
-		if use $i; then
-			rm "${S}"/swig/$i/*_wrap.cpp
-			emake -C "${S}"/swig/$i generate || \
-				die "make generate failed for swig/$i"
-		fi
-	done
-
-	emake || die "emake failed"
-
-	if use perl ; then
-		pushd "${S}"/swig/perl > /dev/null
-		perl-module_src_prep
-		perl-module_src_compile
-		popd > /dev/null
-	fi
-
-	if use doc ; then
-		emake docs || die "make docs failed"
-	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
-
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	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 && fixlocalpod
-
-	dodoc Doxyfile HOWTO-RELEASE NEWS || die
-
-	if use doc ; then
-		dohtml html/* || die "install html failed"
-		docinto ogr
-		dohtml ogr/html/* || die "install ogr html failed"
-	fi
-
-	if use python; then
-		newdoc swig/python/README.txt README-python.txt || die
-		insinto /usr/share/${PN}/samples
-		doins swig/python/samples/* || die
-	fi
-}
-
-pkg_postinst() {
-	if use python; then
-		python_need_rebuild
-		python_mod_optimize osgeo
-	fi
-	echo
-	elog "Check available image and data formats after building with"
-	elog "gdalinfo and ogrinfo (using the --formats switch)."
-}
-
-pkg_postrm() {
-	if use python; then
-		python_mod_cleanup osgeo
-	fi
-}
diff --git a/sci-libs/gdal/metadata.xml b/sci-libs/gdal/metadata.xml
index 0488d98544ac..8e988cf84477 100644
--- a/sci-libs/gdal/metadata.xml
+++ b/sci-libs/gdal/metadata.xml
@@ -14,7 +14,7 @@ vector data).
     <flag name="fits">Enable support for NASA's <pkg>sci-libs/cfitsio</pkg> library</flag>
     <flag name="geos">Add support for geometry engine (<pkg>sci-libs/geos</pkg>)</flag>
     <flag name="gml">Enable support for <pkg>dev-libs/xerces-c</pkg> C++ API</flag>
-    <flag name="hdf">Add support for the Hierarchical Data Format v. 4 (<pkg>sci-libs/hdf</pkg>)</flag>
+    <flag name="hdf5">Add support for the Hierarchical Data Format v5 (<pkg>sci-libs/hdf5</pkg>)</flag>
     <flag name="mdb">Enable support for Microsoft Access database</flag>
     <flag name="spatialite">Enable Spatial DBMS over sqlite <pkg>dev-db/spatialite</pkg></flag>
     <flag name="opencl">Enable OpenCL support</flag>
author	Aaron W. Swenson <titanofold@gentoo.org>	2013-06-24 11:09:35 +0000
committer	Aaron W. Swenson <titanofold@gentoo.org>	2013-06-24 11:09:35 +0000
commit	6d71b6e138e176456ae16e31c6e07336921f6e20 (patch)
tree	b19f4acc10cd5fcde418088eb5fd09c1d7bdc6b6 /sci-libs
parent	Version bump. Removed old (diff)
download	gentoo-2-6d71b6e138e176456ae16e31c6e07336921f6e20.tar.gz gentoo-2-6d71b6e138e176456ae16e31c6e07336921f6e20.tar.bz2 gentoo-2-6d71b6e138e176456ae16e31c6e07336921f6e20.zip