Whitespace fixes. Depend only on swig-2.0 as it is only we mostly checked. punt overshadowed versions.

Package-Manager: portage-2.2.0_alpha39/cvs/Linux x86_64

5 files changed, 45 insertions, 548 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 86b84f288d1a..fe129bd0caf9 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/gdal
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.109 2011/04/05 05:35:00 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.110 2011/06/11 11:49:31 scarabeus Exp $
+
+  11 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> -gdal-1.7.3.ebuild,
+  -gdal-1.8.0.ebuild, gdal-1.8.0-r1.ebuild:
+  Whitespace fixes. Depend only on swig-2.0 as it is only we mostly checked.
+  punt overshadowed versions.
 
   05 Apr 2011; Ulrich Mueller <ulm@gentoo.org> gdal-1.6.3-r1.ebuild:
   Depend on dev-lang/python because virtual/python will go away, bug 358849.
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 67ac36733cdc..02fdff8e934d 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -10,28 +10,15 @@ AUX gdal-1.6.0-swig-fix.patch 535 RMD160 a3946ac3897d73d09be2d03f1f8a5facef7301b
 AUX gdal-1.6.1-ruby-make.patch 1150 RMD160 8e5b8397a86506d968cbf1a5a04616303df26fc8 SHA1 80c9844bfa4374879cc01af8ac90674c251e1034 SHA256 33d213226ad831ea43df8e7d78e56cd6704dc6089320ac63a4eb3d369b920dea
 AUX gdal-png-1.5.patch 1422 RMD160 5177f60d44189289fefc98ec8f59645b880b7362 SHA1 63c3290883f6f9f70fe6ec9cd2c3e37becaeee7b SHA256 c7a5c4584b60c653b0f2116d9898e5110fe0e29d175a2fc00d34d36487856418
 DIST gdal-1.6.3.tar.gz 7007613 RMD160 aab37ae4b7a98f9af6c10511e2ce5205505b9769 SHA1 b8fc53f562dd253c0c75e9ea4d4398f9548c1f1f SHA256 bf946aa229eef28f3d95c8bbf75913aa2d89dd93a03c5cc769cd7c8b98890c67
-DIST gdal-1.7.3.tar.gz 7757684 RMD160 ce84a12d48c85a58c56a17381aee1c4f2ba08b57 SHA1 58d4355fe792ad618bb74605dc1a084a0aeb7cb1 SHA256 fbdb89356abad4e27894ebfbc865afb8b89cdb796f3a19d9b0347f9dd6e4cf4a
 DIST gdal-1.8.0.tar.gz 8837824 RMD160 0e116f41b23ff5b44c692f56459facab332c6201 SHA1 e5a2802933054050c6fb0b0a0e1f46b5dd195b0a SHA256 515f0316cd17281a09a147914b47b28bbc4855cdb86d41d12cb8716d1721e435
 EBUILD gdal-1.6.3-r1.ebuild 6944 RMD160 6cc5139d6e9d67417867cc65b73a79c9b0e67342 SHA1 a64a3e9c00a208304076b7432b5f6699b1296f16 SHA256 8fee7711d458b29d1295ab9831d54a4659343f167e3cd0bee9c035b29912ae2c
-EBUILD gdal-1.7.3.ebuild 6338 RMD160 72d01e85e43f008c4085bc473016d56051f62639 SHA1 53d933abd9415147cb3f971d63ede251ad6425e3 SHA256 5def9add2dba72c13766f556be5d9ef9d591740de886d9b6845642721d2ae67e
-EBUILD gdal-1.8.0-r1.ebuild 6372 RMD160 2953a8f3fb1435306474e9f47aad7068dde92dc4 SHA1 68d455e30e6baca62d0a1cbb2ec441205f4ce974 SHA256 b497b7e1a42b6a1a1354d93166950b68f380eb55147ead78d8795feecf2c3a75
-EBUILD gdal-1.8.0.ebuild 6271 RMD160 c3f1cba19fdc99b0831b8e8fa531658001aa7716 SHA1 3c5cee1c8e39dbe72de87cc437badb5cbc07d91f SHA256 732aac0859eced0daff235dfc0c4d42e90fadc3c1eefe99427f6dc7f476ee4fb
-MISC ChangeLog 20202 RMD160 16c11ab56a1c8994a93f389fa4ab6f80e69cd3d5 SHA1 b27fedb79a1705bc0c470a947a96456f0811a271 SHA256 bdf547eaf1829b815ec0010c0562899371d165794719915759411af8ba91f202
+EBUILD gdal-1.8.0-r1.ebuild 6255 RMD160 90eef6b6d766897defb0fc8ee6e64b5da1f44a3b SHA1 0a2ae167f6a89a03079defb86926625362d3921e SHA256 ccb1da90e42c1ac9e3bab781039bc1d54035bbfe42365f4388d990db99849be8
+MISC ChangeLog 20435 RMD160 5e2b5d34c846ac0cc158f1c311f3a382914b5925 SHA1 3ce87f318f8f5c409b6fdff16b0ca6b89aab0242 SHA256 5a3b6a21cc7b2e1c5d938d9361e99612a40b2f51aae0f2dce50017319a976285
 MISC metadata.xml 1177 RMD160 1711328052cf0a70e14142ea08d571d564288c68 SHA1 c791c4e490071c65aad3938cee40e54db4541de4 SHA256 2d9cf1dfaf4d13f428e1dc5b5e4f5dfea3997475d09f994ce858f90768329807
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNpI73AAoJENgZr6v6gHY0MRkP/0YGmvdbqLkVIiDiNO+ZmUE8
-xkZNbL/wO/sU1mz9F3HeihI6QPj4+FeismMlXjdVjsg/UMArDF9GQssp83gC8vXZ
-DWCFJcGBp6Oo2xR3b9UB7vIlUmxKWsb3wiK5+royecoQqtbhchRiftsogr35rNrr
-JHri0TfZ4RXG9wvQpVoUfKdkFifoY07oZcHN0ovWiCDYIrxHtEgXOWUuD3gLL9Jd
-Q1cLjVJZVK9YIjD0K7SuAzHeD2vKDNpDdkPtoPIe5x2hw7g65kjwFtA/aDBpx924
-z709AeS0onjyWINRSVyePuijNvfxbIeO6Uy2+B+EDuNqGwcr4MAtmaUpsIOE2OtS
-YxFz6uDHEGvLOAtGV5JclaLGtP66c9TDvRtpM7SGH2caDmrT0hpP7A+Nj7y9tXAH
-aOhgKLcZuIkz0a0jqQs5bf60C8ETCCcPtqQAKqeWzmwZYI40WX3XrWKqsaE2KWG9
-EARgwslhLXWHCD5DlmMi+domB9/AWBLU/3qJTSH7Z0/TL4ODeUfQcyN8nG6gNRhc
-x9/eAwJe7j0LnIQxYWV20fpnm1Bv02rWCc6qeHvl7mxLpP2tjOo+qMHkq03ETj4s
-V4a9RtWyhLAsuP7Id7fjTWIkHN06b4/3dCUAnx5MYXlg/4NZVAnQqX1vyDl600rN
-vYyLMad2u5fBl1Hs/tWX
-=oWpg
+iEYEARECAAYFAk3zVkMACgkQHB6c3gNBRYfa6ACfTj0ISJlv5mfRYUZGIgYAMcVV
+P+gAoLh54lwr4YSXln6fqjVFTnletob+
+=D7g2
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/gdal/gdal-1.7.3.ebuild b/sci-libs/gdal/gdal-1.7.3.ebuild
deleted file mode 100644
index 5b6bdfd1c85b..000000000000
--- a/sci-libs/gdal/gdal-1.7.3.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.7.3.ebuild,v 1.3 2011/02/26 22:19:38 signals Exp $
-
-EAPI="2"
-
-WANT_AUTOCONF="2.5"
-RUBY_OPTIONAL="yes"
-USE_RUBY="ruby18"
-PYTHON_DEPEND="python? 2"
-
-inherit autotools eutils perl-module python ruby-ng toolchain-funcs
-
-DESCRIPTION="GDAL is a 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 perl png postgres python ruby sqlite threads"
-
-RDEPEND="
-	dev-libs/expat
-	>=media-libs/tiff-4.0.0_beta6
-	sci-libs/libgeotiff
-	sys-libs/zlib
-	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 )
-	perl? ( dev-lang/perl )
-	png? ( media-libs/libpng )
-	postgres? (
-		|| (
-			>=dev-db/postgresql-base-8.4
-			>=dev-db/postgresql-server-8.4
-		)
-	)
-	python? ( dev-python/numpy )
-	ruby? ( $(ruby_implementation_depend ruby18) )
-	sqlite? ( >=dev-db/sqlite-3 )
-"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	perl? ( >=dev-lang/swig-1.3.32 )
-	python? ( >=dev-lang/swig-1.3.32 )
-	ruby? ( >=dev-lang/swig-1.3.32 )
-"
-
-AT_M4DIR="${S}/m4"
-MAKEOPTS+=" -j1"
-
-pkg_setup() {
-	# only py2 is supported
-	python_set_active_version 2
-}
-
-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
-
-	sed -i \
-		-e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
-		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
-
-	eautoreconf
-}
-
-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 \
-		--with-geotiff \
-		$(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 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
-
-	# parallel makes fail
-	emake || die "emake failed"
-
-	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
-	    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() {
-	echo
-	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.8.0-r1.ebuild b/sci-libs/gdal/gdal-1.8.0-r1.ebuild
index d61b74e10fb3..47c3137aa2be 100644
--- a/sci-libs/gdal/gdal-1.8.0-r1.ebuild
+++ b/sci-libs/gdal/gdal-1.8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.8.0-r1.ebuild,v 1.1 2011/03/03 07:21:12 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.8.0-r1.ebuild,v 1.2 2011/06/11 11:49:31 scarabeus Exp $
 
 EAPI="2"
 
@@ -42,21 +42,17 @@ RDEPEND="
 	pdf? ( app-text/poppler )
 	perl? ( dev-lang/perl )
 	png? ( media-libs/libpng )
-	postgres? (
-		|| (
-			>=dev-db/postgresql-base-8.4
-			>=dev-db/postgresql-server-8.4
-		)
-	)
+	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? ( >=dev-lang/swig-1.3.32 )
-	python? ( >=dev-lang/swig-1.3.32 )
-	ruby? ( >=dev-lang/swig-1.3.32 )"
+	perl? ( ${SWIG_DEP} )
+	python? ( ${SWIG_DEP} )
+	ruby? ( ${SWIG_DEP} )"
 
 AT_M4DIR="${S}/m4"
 MAKEOPTS+=" -j1"
@@ -158,19 +154,19 @@ src_configure() {
 	# 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"
+			-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 \
+		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:\$(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"
+			swig/python/setup.cfg || die "sed python setup.cfg failed"
 	fi
 }
 
@@ -188,23 +184,23 @@ src_compile() {
 	emake || die "emake failed"
 
 	if use perl ; then
-	    cd "${S}"/swig/perl
-	    perl-module_src_prep
-	    perl-module_src_compile
-	    cd "${S}"
+		pushd "${S}"/swig/perl > /dev/null
+		perl-module_src_prep
+		perl-module_src_compile
+		popd > /dev/null
 	fi
 
 	if use doc ; then
-	    make docs || die "make docs failed"
+		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 \
+		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
@@ -212,12 +208,12 @@ src_install() {
 	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
+		# 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
@@ -225,15 +221,15 @@ src_install() {
 	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"
+		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
+		newdoc swig/python/README.txt README-python.txt || die
+		insinto /usr/share/${PN}/samples
+		doins swig/python/samples/* || die
 	fi
 }
 
diff --git a/sci-libs/gdal/gdal-1.8.0.ebuild b/sci-libs/gdal/gdal-1.8.0.ebuild
deleted file mode 100644
index 5128fb88a133..000000000000
--- a/sci-libs/gdal/gdal-1.8.0.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.8.0.ebuild,v 1.4 2011/02/26 22:19:38 signals Exp $
-
-EAPI="2"
-
-WANT_AUTOCONF="2.5"
-RUBY_OPTIONAL="yes"
-USE_RUBY="ruby18"
-PYTHON_DEPEND="python? *:2.6"
-
-inherit autotools eutils perl-module python ruby-ng toolchain-funcs
-
-DESCRIPTION="GDAL is a 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 perl png postgres python ruby sqlite threads"
-
-RDEPEND="
-	dev-libs/expat
-	>=media-libs/tiff-4.0.0_beta6
-	sci-libs/libgeotiff
-	sys-libs/zlib
-	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 )
-	perl? ( dev-lang/perl )
-	png? ( media-libs/libpng )
-	postgres? (
-		|| (
-			>=dev-db/postgresql-base-8.4
-			>=dev-db/postgresql-server-8.4
-		)
-	)
-	python? ( dev-python/numpy )
-	ruby? ( $(ruby_implementation_depend ruby18) )
-	sqlite? ( >=dev-db/sqlite-3 )
-"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	perl? ( >=dev-lang/swig-1.3.32 )
-	python? ( >=dev-lang/swig-1.3.32 )
-	ruby? ( >=dev-lang/swig-1.3.32 )
-"
-
-AT_M4DIR="${S}/m4"
-MAKEOPTS+=" -j1"
-
-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
-
-	sed -i \
-		-e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
-		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
-
-	eautoreconf
-}
-
-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 \
-		--with-geotiff \
-		$(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 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
-
-	# parallel makes fail
-	emake || die "emake failed"
-
-	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
-	    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() {
-	echo
-	elog "Check available image and data formats after building with"
-	elog "gdalinfo and ogrinfo (using the --formats switch)."
-}