Added new version and updated for gcc 4.3 with contributed patches

Package-Manager: portage-2.1.5_rc6

5 files changed, 348 insertions, 2 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 92a3e8d362be..647c632af935 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-libs/gdal
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.41 2008/05/15 06:24:07 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.42 2008/05/20 00:37:33 nerdboy Exp $
+
+*gdal-1.5.1 (20 May 2008)
+
+  20 May 2008; Steve Arnold <nerdboy@gentoo.org>
+  +files/gdal-1.5.1-max-min.patch, +files/gdal-1.5.1-python-install.patch,
+  +gdal-1.5.1.ebuild:
+  Added new version and updated for gcc 4.3 with contributed patches
+  (thanks to Peter Alfredsen <peter.alfredsen@gmail.com>).
 
   15 May 2008; Steve Arnold <nerdboy@gentoo.org> gdal-1.5.0-r1.ebuild:
   updated depends for bugs 221687 and 221493
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index e97caabc5f19..d52a8ac8fdbb 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -7,14 +7,18 @@ AUX gdal-1.4.2-ruby-install.patch 934 RMD160 c63a79e091fee943526ec94182d75ca798b
 AUX gdal-1.5.0-makefile.patch 894 RMD160 955b2ac69f6d8477cc26ae1321ddc0d92e88fb90 SHA1 02ee0ac5351c2c83a848f7f9db646dcc19937123 SHA256 cd40c5f77c9f5d2a78a880a83d09656eacfe3437e8be7bfb13559a5e3fd9ee58
 AUX gdal-1.5.0-python-install.patch 481 RMD160 c618ad3238f6ed91740d148a87a068d00d7c4207 SHA1 66e594995f7670b3b209607b209c95c2982e4e1a SHA256 b7fd770ef84559ce2d5ba433534794b7a8f96d3d8ccf30268eb66a824b5dfb44
 AUX gdal-1.5.0-soname.patch 483 RMD160 4ed5e17c3b1e50a1d0bbb52a1d3a56f5bec52aa4 SHA1 8a98cc52bb1d74a1d45f72f8191cf322ee050682 SHA256 212f6f4cb1ef6051bdd1306cedd2236eada53a9ab650158c3b37577f7cd566e7
+AUX gdal-1.5.1-max-min.patch 4292 RMD160 299c1ff45e3586986d5177ced76c29f9c3f94b3a SHA1 b355c50408351af34ce51f3232bb3e577d7ce513 SHA256 b3238774b3bde6b7cfa289084313eea5b82e71f3ea08c68f9c70ed7af465a3df
+AUX gdal-1.5.1-python-install.patch 493 RMD160 f925c5b902a14f4a75a8c6a7816c3e500a59c24e SHA1 7c02ab132485d1486751d45663af21aa9a04ace1 SHA256 122555483fcb811df1f305b20c9c492c64575321b4e834c75a2805ca8e62f593
 AUX gdal-gcc4.patch 472 RMD160 7c12123cc5e61bf2f92e60acc7f7aafd24a9b413 SHA1 9cbba5ebf35e2ca90386e4ddcd53c47a748f4597 SHA256 25f4b1a67063373536407d23eb98bc98752b5341c1a4556e18906e2077d1d5ae
 DIST gdal-1.3.1.tar.gz 6856011 RMD160 5967608e6e1c9f0af8698fcffb58eab4dcdd518d SHA1 2783c4c0d2a83a34f4c5c6a8efe41e816ba396fb SHA256 4f8f3c462f9174e1dd99f7bfa2abe010aa129e04c08a242a3c63c1a9e5078753
 DIST gdal-1.3.2.tar.gz 7279872 RMD160 98c7f33bc3a57364e9ca15bf61d11d45f147b8ad SHA1 eda247dd96558ff79f843fb7b4393bf62cb01644 SHA256 00f2b73fea5eff79ae26338928187f956427421bc70ddab0ab63fe5a58112b87
 DIST gdal-1.4.2.tar.gz 7457778 RMD160 d4e2c09b4ec4ef3eb6a4da0e832168ef89878860 SHA1 42fc753f6fa70a66b9e619365575bcfb60a5003d SHA256 ee6e74cb80f47929fcfe8426fb024c2b195d237612be4d9a0795e9e353f588ee
 DIST gdal-1.5.0.tar.gz 6167411 RMD160 25326301edbc88739fce6f33b42dfb9499842896 SHA1 c049d29f530f1867e4edcf36b1a299c96a9327a1 SHA256 9ac75f8928aa649a70e2aa3ebda86e71e18acc295cd874c43d33a84ac11c1e91
+DIST gdal-1.5.1.tar.gz 6176140 RMD160 4f0557edaf99e89cbaa540bfdbf8fa8b352204c6 SHA1 e188b82f0c4f12c6925afecfde742e3eab627d49 SHA256 407794d5846d18673df71ece278707ddb209d505a100335e21d6489a09f290fe
 EBUILD gdal-1.3.1.ebuild 4424 RMD160 92cfb77b8b2348aab5847efb6783b8f6ba77ba91 SHA1 5cf1570aa03cf618b24e3c961490946dfd629d2e SHA256 1c912465c93dc6515a48a6824f4e43e442f341eac9729566cd9e6ecb34fe001c
 EBUILD gdal-1.3.2.ebuild 4710 RMD160 6c5f327b0c69a19078b5d87931826abef174c364 SHA1 ea273c09db5ab2a26bd4ee91d3ea70cdaa70d9ce SHA256 2db23bb124b9a6fb019da6e6c3494f406c6bea8ec72871af1e0a32b8018e834f
 EBUILD gdal-1.4.2.ebuild 4581 RMD160 c47c1fba5b94bc3a4c57c8abfa2b19444962a4f7 SHA1 f6b426fd97c71e486cd4017d8f2139318079a3f4 SHA256 90946f8420887ecf15a6d054906a7937359fc809324f20df9b3913be5cda162f
 EBUILD gdal-1.5.0-r1.ebuild 6003 RMD160 eee6b79de5d97b9c4e963364a44321c78c526e81 SHA1 9c0b71fab1339cc5f29f08572912912ef64e4349 SHA256 a840839f9ca207bf024a7037b300d90188bd10c9b351ffd8fc05dacde3aa891c
-MISC ChangeLog 8017 RMD160 986bdbb14e2096d4afae96bc09dd1096396b71cf SHA1 331fa02fe710a634a0eb3e557c30c6ff10dc5856 SHA256 e32e3282df3cfb57c9eb00537936034ea5660ab1310ed914fef78493a4a1f124
+EBUILD gdal-1.5.1.ebuild 6172 RMD160 874c16de2fca5726a88c0802e3be97f12072cadd SHA1 9ca356222e85cc77cfba5d078a34443ba4885910 SHA256 0ac4872482e7cfb0ddaee186bc473ae8bad28a45462c5db705b36488c5ffac6c
+MISC ChangeLog 8319 RMD160 a5f84fd77b0dfdbc25207dd1842506d28f30b8bd SHA1 16d104f10a78eb4a523696e99adc3467bd6bb5f7 SHA256 c5d50531f1b45764ed197287cc11404d2dd8e1184b2fca93dad56d8bd4916e2f
 MISC metadata.xml 493 RMD160 8ad930d21e928734d6c22796abc6da27f420eb4d SHA1 d97adc27fa58d040e92e93d17fce2f666090ad36 SHA256 1f6fdd4665a2c5e8f6f53e3d7d1b05ab2696eb23af60d7f430e20b2b3022b958
diff --git a/sci-libs/gdal/files/gdal-1.5.1-max-min.patch b/sci-libs/gdal/files/gdal-1.5.1-max-min.patch
new file mode 100644
index 000000000000..e2775b301802
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-1.5.1-max-min.patch
@@ -0,0 +1,114 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## max.dpatch by Francesco Paolo Lovergine <frankie@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad gdal-1.5.1~/ogr/ogrsf_frmts/geojson/jsonc/arraylist.c gdal-1.5.1/ogr/ogrsf_frmts/geojson/jsonc/arraylist.c
+--- gdal-1.5.1~/ogr/ogrsf_frmts/geojson/jsonc/arraylist.c	2007-11-07 05:00:48.000000000 +0100
++++ gdal-1.5.1/ogr/ogrsf_frmts/geojson/jsonc/arraylist.c	2008-04-07 13:26:42.000000000 +0200
+@@ -23,6 +23,8 @@
+ #include "bits.h"
+ #include "arraylist.h"
+ 
++#include <cpl_port.h> /* MIN and MAX macros */ 
++
+ struct array_list*
+ array_list_new(array_list_free_fn *free_fn)
+ {
+@@ -62,7 +64,7 @@
+   int new_size;
+ 
+   if(max < this->size) return 0;
+-  new_size = max(this->size << 1, max);
++  new_size = MAX(this->size << 1, max);
+   if(!(t = realloc(this->array, new_size*sizeof(void*)))) return -1;
+   this->array = t;
+   (void)memset(this->array + this->size, 0, (new_size-this->size)*sizeof(void*));
+diff -urNad gdal-1.5.1~/ogr/ogrsf_frmts/geojson/jsonc/bits.h gdal-1.5.1/ogr/ogrsf_frmts/geojson/jsonc/bits.h
+--- gdal-1.5.1~/ogr/ogrsf_frmts/geojson/jsonc/bits.h	2007-11-07 05:00:48.000000000 +0100
++++ gdal-1.5.1/ogr/ogrsf_frmts/geojson/jsonc/bits.h	2008-04-07 13:25:45.000000000 +0200
+@@ -12,14 +12,6 @@
+ #ifndef _bits_h_
+ #define _bits_h_
+ 
+-#ifndef min
+-#define min(a,b) ((a) < (b) ? (a) : (b))
+-#endif
+-
+-#ifndef max
+-#define max(a,b) ((a) > (b) ? (a) : (b))
+-#endif
+-
+ #define hexdigit(x) (((x) <= '9') ? (x) - '0' : ((x) & 7) + 9)
+ #define error_ptr(error) ((void*)error)
+ #define is_error(ptr) ((unsigned long)ptr > (unsigned long)-4000L)
+diff -urNad gdal-1.5.1~/ogr/ogrsf_frmts/geojson/jsonc/json_tokener.c gdal-1.5.1/ogr/ogrsf_frmts/geojson/jsonc/json_tokener.c
+--- gdal-1.5.1~/ogr/ogrsf_frmts/geojson/jsonc/json_tokener.c	2007-11-07 12:51:17.000000000 +0100
++++ gdal-1.5.1/ogr/ogrsf_frmts/geojson/jsonc/json_tokener.c	2008-04-07 13:30:21.000000000 +0200
+@@ -23,6 +23,7 @@
+ #include "json_object.h"
+ #include "json_tokener.h"
+ 
++#include <cpl_port.h> /* MIN and MAX macros */ 
+ 
+ #if !HAVE_STRNCASECMP && defined(_MSC_VER)
+   /* MSC has the version as _strnicmp */
+@@ -106,7 +107,7 @@
+ {
+   if(str) {
+     size_t len = strlen(str);
+-    size_t nn = min(len,n);
++    size_t nn = MIN(len,n);
+     char* s = (char*)malloc(sizeof(char) * (nn + 1));
+ 
+     if(s) {
+@@ -230,7 +231,7 @@
+     case json_tokener_state_null:
+       printbuf_memappend(tok->pb, &c, 1);
+       if(strncasecmp(json_null_str, tok->pb->buf,
+-		     min(tok->st_pos+1, strlen(json_null_str))) == 0) {
++		     MIN(tok->st_pos+1, strlen(json_null_str))) == 0) {
+ 	if(tok->st_pos == strlen(json_null_str)) {
+ 	  current = NULL;
+ 	  saved_state = json_tokener_state_finish;
+@@ -351,7 +352,7 @@
+     case json_tokener_state_boolean:
+       printbuf_memappend(tok->pb, &c, 1);
+       if(strncasecmp(json_true_str, tok->pb->buf,
+-		     min(tok->st_pos+1, strlen(json_true_str))) == 0) {
++		     MIN(tok->st_pos+1, strlen(json_true_str))) == 0) {
+ 	if(tok->st_pos == strlen(json_true_str)) {
+ 	  current = json_object_new_boolean(1);
+ 	  saved_state = json_tokener_state_finish;
+@@ -359,7 +360,7 @@
+ 	  goto redo_char;
+ 	}
+       } else if(strncasecmp(json_false_str, tok->pb->buf,
+-			    min(tok->st_pos+1, strlen(json_false_str))) == 0) {
++			    MIN(tok->st_pos+1, strlen(json_false_str))) == 0) {
+ 	if(tok->st_pos == strlen(json_false_str)) {
+ 	  current = json_object_new_boolean(0);
+ 	  saved_state = json_tokener_state_finish;
+diff -urNad gdal-1.5.1~/ogr/ogrsf_frmts/geojson/jsonc/printbuf.c gdal-1.5.1/ogr/ogrsf_frmts/geojson/jsonc/printbuf.c
+--- gdal-1.5.1~/ogr/ogrsf_frmts/geojson/jsonc/printbuf.c	2007-12-02 19:32:25.000000000 +0100
++++ gdal-1.5.1/ogr/ogrsf_frmts/geojson/jsonc/printbuf.c	2008-04-07 13:27:06.000000000 +0200
+@@ -28,6 +28,8 @@
+ 
+ #include "cpl_string.h"
+ 
++#include <cpl_port.h> /* MIN and MAX macros */ 
++
+ struct printbuf* printbuf_new()
+ {
+   struct printbuf *p;
+@@ -47,7 +49,7 @@
+ {
+   char *t;
+   if(p->size - p->bpos <= size) {
+-    int new_size = max(p->size * 2, p->bpos + size + 8);
++    int new_size = MAX(p->size * 2, p->bpos + size + 8);
+ #ifdef PRINTBUF_DEBUG
+     mc_debug("printbuf_memappend: realloc "
+ 	     "bpos=%d wrsize=%d old_size=%d new_size=%d\n",
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
new file mode 100644
index 000000000000..fd1b7e488cdc
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-1.5.1-python-install.patch
@@ -0,0 +1,14 @@
+--- 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/gdal-1.5.1.ebuild b/sci-libs/gdal/gdal-1.5.1.ebuild
new file mode 100644
index 000000000000..3f36ca06e94b
--- /dev/null
+++ b/sci-libs/gdal/gdal-1.5.1.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.5.1.ebuild,v 1.1 2008/05/20 00:37:33 nerdboy Exp $
+
+WANT_AUTOCONF="2.5"
+inherit autotools distutils eutils perl-module toolchain-funcs
+
+IUSE="curl debug doc fits geos gif gml hdf hdf5 jpeg jpeg2k mysql netcdf \
+odbc png ogdi perl postgres python ruby sqlite threads"
+
+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"
+
+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-2.8.0 )
+	hdf5? ( >=sci-libs/hdf5-1.6.4 )
+	postgres? ( dev-db/postgresql )
+	|| (
+	    netcdf? ( sci-libs/netcdf )
+	    hdf? ( sci-libs/hdf )
+	)
+	jpeg2k? ( media-libs/jasper )
+	mysql? ( virtual/mysql )
+	odbc?   ( dev-db/unixODBC )
+	geos?   ( >=sci-libs/geos-2.2.1 )
+	sqlite? ( >=dev-db/sqlite-3 )"
+
+DEPEND="${RDEPEND}
+	ruby? ( >=dev-lang/swig-1.3.28 )
+	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
+}
+
+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.0-makefile.patch \
+	    "${FILESDIR}"/${P}-python-install.patch \
+	    "${FILESDIR}"/${P}-max-min.patch
+
+	if useq netcdf && 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
+	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:/usr/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
+}
+
+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
+}