Added latest version and updated Ruby build patch (again) for 1.6x.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

4 files changed, 240 insertions, 8 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index b7423c3ce19a..9899083e73e8 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-libs/gdal
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.61 2009/08/01 16:56:11 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.62 2009/08/03 03:49:06 nerdboy Exp $
+
+*gdal-1.6.1 (03 Aug 2009)
+
+  03 Aug 2009; Steve Arnold <nerdboy@gentoo.org> gdal-1.6.0-r1.ebuild,
+  -files/gdal-1.6.0-ruby-make.patch, +gdal-1.6.1.ebuild,
+  +files/gdal-1.6.1-ruby-make.patch:
+  Added latest version and updated Ruby build patch (again) for 1.6x.
+  Could use some actual testing of the ruby interface...
 
   01 Aug 2009; Steve Arnold <nerdboy@gentoo.org> gdal-1.6.0-r1.ebuild,
   +files/gdal-1.6.0-mysql_ogr_header.patch:
diff --git a/sci-libs/gdal/files/gdal-1.6.0-ruby-make.patch b/sci-libs/gdal/files/gdal-1.6.1-ruby-make.patch
index f71db69b7067..0216f38bd581 100644
--- a/sci-libs/gdal/files/gdal-1.6.0-ruby-make.patch
+++ b/sci-libs/gdal/files/gdal-1.6.1-ruby-make.patch
@@ -1,5 +1,5 @@
---- swig/ruby/RubyMakefile.mk.orig	2009-04-20 18:43:31.107342741 -0700
-+++ swig/ruby/RubyMakefile.mk	2009-04-20 18:45:51.396591741 -0700
+--- 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
  
@@ -16,8 +16,9 @@
  	mkdir -p $(DESTDIR)$(INSTALL_DIR)
  
 -install: $(INSTALL_DIR)
+-	$(INSTALL) $(RUBY_MODULES) $(DESTDIR)$(INSTALL_DIR) 
 +install: $(INSTALL_DIR) $(RUBY_MODULES)
- 	$(INSTALL) $(RUBY_MODULES) $(DESTDIR)$(INSTALL_DIR) 
++	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 $@
diff --git a/sci-libs/gdal/gdal-1.6.0-r1.ebuild b/sci-libs/gdal/gdal-1.6.0-r1.ebuild
index 6eadd978e130..d9868a6572d2 100644
--- a/sci-libs/gdal/gdal-1.6.0-r1.ebuild
+++ b/sci-libs/gdal/gdal-1.6.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.0-r1.ebuild,v 1.2 2009/08/01 16:56:11 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.0-r1.ebuild,v 1.3 2009/08/03 03:49:06 nerdboy Exp $
 
 WANT_AUTOCONF="2.5"
-inherit autotools distutils eutils perl-module toolchain-funcs
+inherit autotools distutils eutils perl-module ruby toolchain-funcs
 
 DESCRIPTION="GDAL is a translator library for raster geospatial data formats (includes OGR support)"
 HOMEPAGE="http://www.gdal.org/"
@@ -54,6 +54,8 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
 AT_M4DIR="${S}/m4"
+USE_RUBY="ruby18"
+RUBY_OPTIONAL="yes"
 
 pkg_setup() {
 	if [ -n "${GDAL_CONFIGURE_OPTS}" ]; then
@@ -74,7 +76,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-1.4.2-datadir.patch \
 	    "${FILESDIR}"/${PN}-1.5.0-soname.patch \
 	    "${FILESDIR}"/${PN}-1.5.1-python-install.patch \
-	    "${FILESDIR}"/${P}-ruby-make.patch \
+	    "${FILESDIR}"/${PN}-1.6.1-ruby-make.patch \
 	    "${FILESDIR}"/${P}-swig-fix.patch \
 	    "${FILESDIR}"/${P}-mysql_ogr_header.patch \
 	    || die "sed failed"
@@ -136,7 +138,7 @@ src_compile() {
 	fi
 
 	# Fix doc path just in case
-	sed -i -e "s:@exec_prefix@/doc:/usr/share/doc/${PF}/html:g" \
+	sed -i -e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
 	    GDALmake.opt.in || die "sed gdalmake.opt failed"
 
 	econf ${pkg_conf} ${use_conf} || die "econf failed"
diff --git a/sci-libs/gdal/gdal-1.6.1.ebuild b/sci-libs/gdal/gdal-1.6.1.ebuild
new file mode 100644
index 000000000000..9cf14807c770
--- /dev/null
+++ b/sci-libs/gdal/gdal-1.6.1.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.1.ebuild,v 1.1 2009/08/03 03:49:06 nerdboy Exp $
+
+WANT_AUTOCONF="2.5"
+inherit autotools distutils eutils perl-module ruby 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"
+# need to get these arches updated on several libs first
+#KEYWORDS="~alpha ~hppa"
+
+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=">=sys-libs/zlib-1.1.4
+	>=media-libs/tiff-3.7.0
+	sci-libs/libgeotiff
+	dev-libs/expat
+	curl? ( net-misc/curl )
+	jpeg? ( media-libs/jpeg )
+	gif? ( media-libs/giflib )
+	png? ( media-libs/libpng )
+	perl? ( dev-lang/perl )
+	python? ( virtual/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? ( virtual/postgresql-server )
+	|| (
+	    netcdf? ( sci-libs/netcdf )
+	    hdf? ( sci-libs/hdf )
+	)
+	|| (
+	    jpeg2k? ( media-libs/jasper )
+	    ecwj2k? ( !media-libs/lcms
+		    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? ( python? ( ruby? ( >=dev-lang/swig-1.3.28 ) ) )
+	doc? ( app-doc/doxygen )"
+
+AT_M4DIR="${S}/m4"
+USE_RUBY="ruby18"
+RUBY_OPTIONAL="yes"
+
+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
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	eaclocal
+	eautoconf
+
+	epatch "${FILESDIR}"/${PN}-1.4.2-datadir.patch \
+	    "${FILESDIR}"/${PN}-1.5.0-soname.patch \
+	    "${FILESDIR}"/${PN}-1.5.1-python-install.patch \
+	    "${FILESDIR}"/${PN}-1.6.0-swig-fix.patch \
+	    "${FILESDIR}"/${PN}-1.6.0-mysql_ogr_header.patch \
+	    "${FILESDIR}"/${P}-ruby-make.patch
+
+	if useq hdf; then
+	    einfo	"Checking if HDF4 is compiled with szip..."
+	    if built_with_use sci-libs/hdf szip ; then
+		einfo	"Found HDF4 compiled with szip. Nice."
+	    else
+		ewarn 	"HDF4 (sci-libs/hdf) must be compiled with the szip USE flag!"
+		einfo 	"Please emerge hdf with szip USE flag and then emerge GDAL."
+		die 	"HDF4 not merged with szip use flag"
+	    fi
+
+	    if useq netcdf; then
+		ewarn "Netcdf and HDF4 are incompatible due to certain tools in"
+		ewarn "common; HDF5 is now the preferred choice for HDF data."
+		die "Please disable either the hdf or netcdf use flag."
+	    fi
+	fi
+}
+
+src_compile() {
+
+	distutils_python_version
+
+	local pkg_conf="${GDAL_CONFIGURE_OPTS}"
+	local use_conf=""
+
+	pkg_conf="${pkg_conf} --enable-shared=yes --with-pic \
+		--with-libgrass=no --without-libtool"
+
+	use_conf="$(use_with jpeg) $(use_with png) $(use_with mysql) \
+	    $(use_with postgres pg) $(use_with python) $(use_with ruby) \
+	    $(use_with threads) $(use_with fits cfitsio) $(use_with perl) \
+	    $(use_with netcdf) $(use_with hdf hdf4) $(use_with geos) \
+	    $(use_with sqlite sqlite3) $(use_with jpeg2k jasper) $(use_with odbc) \
+	    $(use_with gml xerces) $(use_with hdf5) $(use_with curl) \
+	    $(use_enable debug)"
+
+	# It can't find this
+	if useq ogdi ; then
+	    use_conf="--with-ogdi=/usr/$(get_libdir) ${use_conf}"
+	fi
+
+	if useq mysql ; then
+	    use_conf="--with-mysql=/usr/bin/mysql_config ${use_conf}"
+	fi
+
+	if useq gif ; then
+	    use_conf="--with-gif=internal ${use_conf}"
+	else
+	    use_conf="--with-gif=no ${use_conf}"
+	fi
+
+	if useq python ; then
+	    use_conf="--with-pymoddir=/usr/$(get_libdir)/python${PYVER}/site-packages \
+		${use_conf}"
+	fi
+
+	# Fix doc path just in case
+	sed -i -e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
+	    GDALmake.opt.in || die "sed gdalmake.opt failed"
+
+	econf ${pkg_conf} ${use_conf} || die "econf failed"
+
+	# parallel makes fail on the ogr stuff (C++, what can I say?)
+	# also failing with gcc4 in libcsf
+	emake -j1 || die "emake failed"
+
+	if useq python; then
+	    sed -i -e "s#library_dirs = #library_dirs = /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 useq perl ; then
+	    cd "${S}"/swig/perl
+	    perl-module_src_prep
+	    perl-module_src_compile
+	    cd "${S}"
+	fi
+
+	if useq doc ; then
+	    make docs || die "make docs failed"
+	fi
+}
+
+src_install() {
+
+	if useq 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
+	make DESTDIR="${D}" install \
+	    || die "make install failed"
+
+	dodoc Doxyfile HOWTO-RELEASE NEWS
+
+	if useq doc ; then
+	    dohtml html/* || die "install html failed"
+	    docinto ogr
+	    dohtml ogr/html/* || die "install ogr html failed"
+	fi
+
+	if useq 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() {
+	elog
+	elog "If you need libgrass support, then you must rebuild gdal, after"
+	elog "installing the latest Grass, and set the following option:"
+	elog
+	elog "GDAL_CONFIGURE_OPTS=--with-grass=\$GRASS_HOME emerge gdal"
+	elog
+	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."
+	elog
+	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)."
+	elog
+	elog "Check available image and data formats after building with"
+	elog "gdalinfo and ogrinfo (using the --formats switch)."
+	elog
+}