Version bump.

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

4 files changed, 265 insertions, 18 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 8179a01845fe..f57cbd304952 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/gdal
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.103 2010/12/01 08:09:44 tomka Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.104 2011/01/25 18:34:08 scarabeus Exp $
+
+*gdal-1.8.0 (25 Jan 2011)
+*gdal-1.7.3 (25 Jan 2011)
+
+  25 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org> -gdal-1.7.2-r2.ebuild,
+  +gdal-1.7.3.ebuild, +gdal-1.8.0.ebuild:
+  Version bump
 
   01 Dec 2010; Thomas Kahle <tomka@gentoo.org> gdal-1.6.3-r1.ebuild:
   Reverted ruby->ruby-ng as per bug 347249
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 3a42b1440f62..860cb8e50c4c 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.7.2-ruby_cflags.patch 1161 RMD160 5635b016c18a54a45e4f9410028f0a4596b52e5b SHA1 42389f01f14ba57a6337a9a1cdbe889c9fc34d61 SHA256 8a943b69b200e8b926e2ed9ad1861a152731bb829459f402a8024e1137eed754
 AUX gdal-1.4.2-datadir.patch 353 RMD160 a5dec6a5bbe091b6e877ced363507798d0ed47d5 SHA1 eddb7f332ff361cbfb8771cc7496d2428a290d71 SHA256 761e5dc10bb8a0d6a270af62aa67e7ec1259f072db958969ce14812f85004c4e
 AUX gdal-1.5.0-install_name.patch 1731 RMD160 9e6d9d2a8a14bf01de242d889140369d083fd7c4 SHA1 4c46ebb1bb7d5f5ca2f1079e6ad1a1230ef698ef SHA256 da631282e7ee42b3f9c46a4ce76d7b4905caa4a056c8109fce0f661b9aa58abd
@@ -9,15 +6,10 @@ AUX gdal-1.5.1-python-install.patch 493 RMD160 f925c5b902a14f4a75a8c6a7816c3e500
 AUX gdal-1.6.0-swig-fix.patch 535 RMD160 a3946ac3897d73d09be2d03f1f8a5facef7301ba SHA1 9b3214e7ffe6aa821d716caf3e984841f6e208fd SHA256 83f4de0287893efbc4528a0e4ecc97e0f174d5a44406a8ab5e94e66e51286db1
 AUX gdal-1.6.1-ruby-make.patch 1150 RMD160 8e5b8397a86506d968cbf1a5a04616303df26fc8 SHA1 80c9844bfa4374879cc01af8ac90674c251e1034 SHA256 33d213226ad831ea43df8e7d78e56cd6704dc6089320ac63a4eb3d369b920dea
 DIST gdal-1.6.3.tar.gz 7007613 RMD160 aab37ae4b7a98f9af6c10511e2ce5205505b9769 SHA1 b8fc53f562dd253c0c75e9ea4d4398f9548c1f1f SHA256 bf946aa229eef28f3d95c8bbf75913aa2d89dd93a03c5cc769cd7c8b98890c67
-DIST gdal-1.7.2.tar.gz 7755378 RMD160 a3f7950798448d8179f899dc095a83e23dcc269b SHA1 a03127530708e3924aec7b505cc2ca4f8153f13c SHA256 0834909a93e955a45cf050714b018fed89f8dbe74e0381e91d16a8084ca08837
+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 6949 RMD160 ded997205e4d47a07b32b693faf3f9558b236c73 SHA1 72fc47f2bcdaeace9e7eb6f831127e6922cd90e1 SHA256 54ce35e65cf6cf4c8b8c36afd6369e9755ed0dbb79688058623c3b1076e81fb8
-EBUILD gdal-1.7.2-r2.ebuild 6351 RMD160 a3d34af03756fc0295058116fade62cb12df4322 SHA1 f29ae4dbf32cf638de64cadbd48654a55ef6207d SHA256 6caab03992e51e898f320a631699536dc272f354851d07f9ea014ea1a1c49d9a
-MISC ChangeLog 19218 RMD160 57ff24cdd8cda739e551ae286291187ea0fd537e SHA1 d68302688841a441670d91b83fd50b91e32d7736 SHA256 1ca5d0a0797879d1b4624671a97a3332c216adcd76caeb36fef407368a1783c0
+EBUILD gdal-1.7.3.ebuild 6350 RMD160 5223cf1deeb01c8ecb72397b6c8208d62e85c162 SHA1 33b42e4cfe3be535a6de8094ca6ada288635688d SHA256 58cda271d4efa77e18d0e3c21f21f8730f59a79baba710b2e7311903c8424f33
+EBUILD gdal-1.8.0.ebuild 6350 RMD160 bb1bcdc2becd810f342764c0b7db61032721f7bf SHA1 189155ba371889ca818e09da1ef13dcda8e9861e SHA256 7cc42bb3641b0ca4458ba368d9a8799b47fc0b7a99e97f9c28334bcff22ce292
+MISC ChangeLog 19411 RMD160 8b17b703ef3be6b6922d5e7943d4e137ac9ce3e3 SHA1 6db7f38f46838a2a8cdf3099b6d939c5d8311896 SHA256 7a16e4fcf05a7d77d64588069e980dafb4a7ebe23dd874e898c4b9288ca7cb19
 MISC metadata.xml 1177 RMD160 1711328052cf0a70e14142ea08d571d564288c68 SHA1 c791c4e490071c65aad3938cee40e54db4541de4 SHA256 2d9cf1dfaf4d13f428e1dc5b5e4f5dfea3997475d09f994ce858f90768329807
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkz2As8ACgkQnZsgo/h8kNYvBwCgnguJcDcBkMer+hnk6leoXug1
-t64An3z3/dLdYQpOS0LTJoXlpYRGMb+Z
-=VbiM
------END PGP SIGNATURE-----
diff --git a/sci-libs/gdal/gdal-1.7.2-r2.ebuild b/sci-libs/gdal/gdal-1.7.3.ebuild
index 8d42edabf9a5..e72fd74d2fb0 100644
--- a/sci-libs/gdal/gdal-1.7.2-r2.ebuild
+++ b/sci-libs/gdal/gdal-1.7.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.2-r2.ebuild,v 1.1 2010/11/30 03:04:15 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.7.3.ebuild,v 1.1 2011/01/25 18:34:08 scarabeus Exp $
 
 EAPI="2"
 
@@ -83,7 +83,7 @@ src_prepare() {
 		-e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
 		swig/python/GNUmakefile || die
 
-	epatch "${FILESDIR}"/${PV}-ruby_cflags.patch
+	epatch "${FILESDIR}"/1.7.2-ruby_cflags.patch
 
 	# -soname is only accepted by GNU ld/ELF
 	[[ ${CHOST} == *-darwin* ]] \
diff --git a/sci-libs/gdal/gdal-1.8.0.ebuild b/sci-libs/gdal/gdal-1.8.0.ebuild
new file mode 100644
index 000000000000..87cd5b823148
--- /dev/null
+++ b/sci-libs/gdal/gdal-1.8.0.ebuild
@@ -0,0 +1,248 @@
+# 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.1 2011/01/25 18:34:08 scarabeus 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 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x86-linux ~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? ( media-libs/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)."
+}