Bump, restrict swig dependency to avoid build failure

Package-Manager: portage-2.2.20/cvs/Linux x86_64

4 files changed, 359 insertions, 15 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 6597600b78c8..5f69b4ac35e2 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/gdal
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.166 2015/04/26 17:19:23 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.167 2015/07/08 05:36:17 patrick Exp $
+
+*gdal-1.11.2 (08 Jul 2015)
+
+  08 Jul 2015; Patrick Lauer <patrick@gentoo.org> +gdal-1.11.2.ebuild,
+  gdal-1.11.1-r3.ebuild:
+  Bump, restrict swig dependency to avoid build failure
 
   26 Apr 2015; Pacho Ramos <pacho@gentoo.org> gdal-1.11.1-r3.ebuild:
   ppc stable wrt bug #540132
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 0a637f119266..2fbd3947e47d 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX gdal-1.10.0-ruby-makefile.patch 1468 SHA256 a07a8df543bc65dbb6871689287ef1bc831399a1090064a97c2e0f71c9f27a88 SHA512 ae2bd2c051f851533efd16efafd4fbf41906cdb64401e327220a09dd879e124e6483122ef618bec4fd6e9f9c8a5b0d7dd8362938d0a5ea788d77887e9a54de7b WHIRLPOOL 563004ce1a9920965c2b59aeca036fc04ba2df3e61685e7427879481591387eb6780d7a50d0a4c631df149beb4751d807462c0802a86a998cebc7116a3275875
 AUX gdal-1.11.1-poppler-0.31.0-support.patch 4994 SHA256 a27a1f9f024d890b35a771ba4150468d488c0e39757ebe48d9e3903f29700d79 SHA512 ad0c685d1fbf34543966d097ef235db5b84b827d4e56e6910b788baacf11f0af1550e6214c402ed08abc5bef9b7c34f188869c2a6ccf1eb7c298b8918db34e54 WHIRLPOOL 7cb9ae09dac6bf0acc7c98d0263c7f22799060aa77213f20103d58dacc29f3d516f61e22cac1d1a84933097c032065448c3fc9f76cf4ced338e40e574c5b5a80
 AUX gdal-1.11.1-swig-3.0.3.patch 4345 SHA256 972fe3f5893243e37a7e7a2ffe679d8187ce11f42d0119d1863fbdf0a22feb57 SHA512 843f99b3c62a8cefd87d49d53933646a9039f80d4be907317c36bba79f8f411ecf87b0269a22b9c787d51f6b0d6c1fcba5fa29b075362946c39ea840f86060b0 WHIRLPOOL 914f88e789dafe1366c49de8032a0ca0a1663952f3805bdf748f848d1fb3f0a82b4786a6ffb1f32ec5ce3f2cac36945e412cfc5cd0c1fc915099c5554ab47ce4
@@ -11,19 +8,14 @@ AUX gdal-1.9.1-ruby-makefile.patch 1384 SHA256 0588d23d027a716b6a75364abba7222bc
 DIST gdal-1.10.0.tar.gz 10232486 SHA256 1a9ca12bcc3a55f66bcd6654d5ff12eeddb3a26b622dd7c8872febb4f5a97487 SHA512 908639218e4a4fea1c239d5dbd6d22bff30b8b3644183295f19ba11ca11828db9736a63204a629cc8619b8a44f58e8fc2d9eea2125918cf7c214ace5c8de7fb6 WHIRLPOOL a5c91975614fbdf1b35d9587080beafd09badca97604d618209f6cb12b6d99416331d5bb982be3407e6db6ffa3ac22a129a8cb4d207ded7af34be5c279fd62ac
 DIST gdal-1.10.1.tar.gz 10241357 SHA256 9984f0314c0bd831eb59fb646c2bc5e13cf1378be4f51499045166cbe62be6ea SHA512 214cdb2ad8d01b615b53a53584afcf38be7180174a358963b32af2027201b1e7030cb36be416b271675499e76e42baf8bc09e3646f3d12b0d778b4d1f1a11820 WHIRLPOOL 96a451442dfeec44f12e44a621908afa783c1b0379233b877495c0c2f0f02f2e81a7fedd72e7273e3a7de76415b5c54b80c48ed82723178805b839f36561ad8d
 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-1.9.2.tar.gz 9495381 SHA256 9f3b9ae968eaa8d06ee5448e5b65e7bfa940e2e345282a29d95275421f36c688 SHA512 d93cd5fb16a3728a1f545bc6ceeb61bf41e011619b9290ed51eb5fc2d99e3c0f5733bfc6b3444ad2991e462c87c1088247e3fbb92d880701d48790125647b423 WHIRLPOOL 87f31c12ac5c4e18b4a7b9c416144b32c6d862ddba7688d5317582c797f8a637e37192cbb74406b6a71a672a4c53d3c71505ba024405911008e7b863881c9b8c
 EBUILD gdal-1.10.0-r1.ebuild 7467 SHA256 dd4b9569597b485b64dfd498454f600c3623003895c87c1ab6c9f9e940deb81d SHA512 faaed69e870c4b64fe5b0778e430c86bf74dfc202bbffb56b52bb27121dd8d8a7e7a2ac376db53d166c136a129a1c376fd3e604b1d558335b1cbbbd90f34eccd WHIRLPOOL 469bec9b5f566aeda04f9e2487abbfa3e4d71d3bfec7b06ec494026ec5c326bb190af5310452841a6be149d492c4abd4ab013644ac4a83200c19074894eceae1
 EBUILD gdal-1.10.1.ebuild 8593 SHA256 f5ffe4362ebd76a528f1e8054bc34e7218f513b81abfef36ae0025cd6414e55d SHA512 207906acf000cb735ca67ba7b8543b97863f895d2335efa6cc50d269d8613c583e979e814a5d869034bd5223dc8ea5044d1a52a491053853c2c16eda5b49985a WHIRLPOOL e7d385eb06d5c0706d1cdaf4e0e21bd5e440b1ca8bbe419788a36b9654ad70f51c8fe5e5228425bedfeb74b8a0854a898aa97016c3f9cb7f5a74341133dc2903
 EBUILD gdal-1.11.1-r1.ebuild 8766 SHA256 40347a4e0bf5ce9cc044d176c49358a57b6cbb7dc7ca0736d8742d1c40428919 SHA512 181bd5f50d327f9f863d3cab9351a5f6707fa7f938e2e7ef71a2cdf23be0f6ddaf9ce8eba70c23e6ef6bff45a5c2833716fe048b1748cccdb646b99dca3fc5b1 WHIRLPOOL b5b3017082723bee7ec890df1075a707ca318753822aabc5dcd6dcc7a290179778bd0fef5fa01a3a6f9811185e6a13cf3d1ebbede0ae5d7357727d35e39de74a
 EBUILD gdal-1.11.1-r2.ebuild 8844 SHA256 25bc7664bca05cc4c094be83f5d8a509218d6be0d1d22b5d6f3646dc31129755 SHA512 ca6a883b766ac2f5d8150af9dc41da04ff20928617dff17947ba49758ec855f09c30f73a6749b606460b01749ece7d8580fa05479d271af79274fbb53a79f84a WHIRLPOOL f718bbc17ed2dda4cd479faad4f4077b460785fe1943ff4a33cfb92e1ab7950d38c6bc20dc0d857930f16fd72ff7226cdff5cc8acc4aedc2804cc40a02a23866
-EBUILD gdal-1.11.1-r3.ebuild 8885 SHA256 574bd9716d5e3ae4acde2464ed21c06f77211b55cc2a2f919e8b60fa13e54807 SHA512 0757c5bc719cd5123fba9116fdd5def7766271f1607954fec7191b33e90b5c1ec7b16cfb4c5afec854be8b2fd282db41db02e3830db489d4ec84b7ec624b9466 WHIRLPOOL 16eacf3bb4580c3b81dac4cd6876b10aa93d5a25f791a5bdc8bff6e4416092d3caef150adcf9b4133eb963559eba02ec5eea8c00afae7d7ec8dbe2c3c9e637ff
+EBUILD gdal-1.11.1-r3.ebuild 8909 SHA256 ad13921c2c7c3c2d68682753c28c08669ce5e5519b21b9b0d4502273ec87f038 SHA512 cce6429290ace0e754f34d2d06dad2aa530ba2e7f42769b2e9bfcccfa449b6d78f12c74c779b7a8533e34f4cfacb54d13c355164b47965cb50e12d29ed6f9482 WHIRLPOOL 026da0fe151861f0f8970e21a4489dc3cf66b6397e352dc56ef94d80bdbfa4feaf9ab46ab3e6e284421d5a7db919c7ff90ffa46beed22383a462355608599275
+EBUILD gdal-1.11.2.ebuild 8817 SHA256 1add0df584b2ddbe53e8504f1d0beb066d6d6e2e9730972f2f649b4ec9aba429 SHA512 6394c5412efc79828b64e9ccb575817f8cf5d6eecf91ee51bd5d8321e37257deb1634bb765440eb535b7a05dff5c33fb821855e2f915db80b2475e97382ef1a4 WHIRLPOOL 5d76aa4d01bb2deb94d5c434cb590c8f2ae1b0250c7b98fd1f02d68b0c8e863dfe0e51cc771660ba95c7e384c5b53947c1f6bf043c7190e9464968e6a6e795c0
 EBUILD gdal-1.9.2.ebuild 7451 SHA256 70cb598d751ab607bcb624614b328edb0c50f76ecc8edd13dd237a43939bf32a SHA512 dc3e4d87a3e7a0245bb0b3eb2215268f837395817f7469fa81222b449abc47a71bed239a6a8f4ec49853422e23dc8ee3bd9ccdc36de39ed78ec329b7412eb884 WHIRLPOOL d1ae57dfc6170314fa1820b1256279c6e82606e453411d58a54b01b2b6ec3569ecbd3f2a3d91ce177e78f556b1783433f2099c0ca9de5de440259a959362b94b
-MISC ChangeLog 30677 SHA256 d26d50a590324d118fad9d0aa6bddbe9040d6557f0acc1881cf2068b482df2fc SHA512 79b12dc05604b85331e74ef08f9ef17329491472461b5eb6d96194db74c34e715fd23ed3a8a682f8f39387905636542afcd2763019ca5dab47212e8743d88d10 WHIRLPOOL 55ca03ad1ba98fe9eb428d5d167d8891968995dfd3e99be5405b84b74728a139a12ab9fe2cbfd1092144863c542b687432d01f3041306e05346211e97f15b70c
+MISC ChangeLog 30860 SHA256 0c3ecc5738f755f7be58e7dfe1e34fadc6731957b2cffe216cbea738a785f953 SHA512 b0a2b977d92555c5f945c48e808817234706a0c922e88db44475088df817a3c098b3e136bf304d74784c9cb4d1694d5752a376f472bac4e8c4f89f024324eaac WHIRLPOOL f5b3445f31ed29fd086ea3a0ae282d635191172da22d5f2ec79b1c8ebf1053beebbe156729af989e4d59467cf2743179bcc394f0905c2dcebb24f22d49707f81
 MISC metadata.xml 1358 SHA256 25a3063ee14c6c99706a045b00ca2c93ab49b2f595759be6d85c0eb5ee20bc53 SHA512 82f014319806fa20e404244780bedf0fdcb5bf8c070d3758095c23d62a1fbb0bb712222cbaaea1101940b06c8ea6b1a588dc3a9815f5f8e2d7342fa08243a9cc WHIRLPOOL 5e964a8c85ab7ce5820a35043d13e7c6535f5cd13d16c95d635fc7c735a9366994ce9b843f72db801777b689562e94183227c57504ddc33d0afc6e182e15ec96
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlU9HhwACgkQCaWpQKGI+9SRsgCfUWnYHgv6s6K7/03XyyLwxEJ4
-RfIAnRuu3SGAzgX2tCq5OhQKiiSLKiBr
-=CJvM
------END PGP SIGNATURE-----
diff --git a/sci-libs/gdal/gdal-1.11.1-r3.ebuild b/sci-libs/gdal/gdal-1.11.1-r3.ebuild
index 113c5119f8f7..b048be7be900 100644
--- a/sci-libs/gdal/gdal-1.11.1-r3.ebuild
+++ b/sci-libs/gdal/gdal-1.11.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.11.1-r3.ebuild,v 1.6 2015/04/26 17:19:23 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.11.1-r3.ebuild,v 1.7 2015/07/08 05:36:17 patrick Exp $
 
 EAPI=5
 
@@ -59,7 +59,7 @@ RDEPEND="
 	xls? ( dev-libs/freexl )
 "
 
-SWIG_DEP=">=dev-lang/swig-2.0.2"
+SWIG_DEP=">=dev-lang/swig-2.0.2 <=dev-lang/swig-3.0.4"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	java? ( >=virtual/jdk-1.6 )
diff --git a/sci-libs/gdal/gdal-1.11.2.ebuild b/sci-libs/gdal/gdal-1.11.2.ebuild
new file mode 100644
index 000000000000..36861e45415f
--- /dev/null
+++ b/sci-libs/gdal/gdal-1.11.2.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.11.2.ebuild,v 1.1 2015/07/08 05:36:17 patrick Exp $
+
+EAPI=5
+
+WANT_AUTOCONF="2.5"
+
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_COMPAT=( python2_7 python3_{3,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="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 <=dev-lang/swig-3.0.4"
+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 )
+"
+
+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
+
+	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)."
+}