heavily reworked to accommodate arch-neutral install and doc flag

Package-Manager: portage-2.0.51.22-r2

4 files changed, 50 insertions, 36 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 34ac28f8e2fb..95282df0a86a 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/gdal
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.8 2005/08/02 23:51:30 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.9 2005/08/04 00:05:50 nerdboy Exp $
+
+*gdal-1.2.6-r3 (04 Aug 2005)
+
+  04 Aug 2005; Steve Arnold <nerdboy@gentoo.org> -gdal-1.2.6-r2.ebuild,
+  +gdal-1.2.6-r3.ebuild:
+  heavily reworked to accomodate arch-neutral install and doc flag
 
   02 Aug 2005; Herbie Hopkins <herbs@gentoo.org> gdal-1.2.5-r1.ebuild,
   gdal-1.2.6-r2.ebuild:
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 581b9e069272..fb89136f492c 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 dbde47da00f85ec5ab00fe894a9bbb8b gdal-1.2.5-r1.ebuild 3244
-MD5 2a16cc058bfd73f8177582258fcc12cb gdal-1.2.6-r2.ebuild 3999
-MD5 b537ffc8f13e570567ab66e11f7f71a9 ChangeLog 1577
 MD5 dc56f5d75556cdbcd7c4024288ef8fcb metadata.xml 481
+MD5 e63b03bdb2be6bd2004eed250b2dcbb0 ChangeLog 1774
+MD5 dbde47da00f85ec5ab00fe894a9bbb8b gdal-1.2.5-r1.ebuild 3244
+MD5 849cbbec6b00eb99b4fc03c242ebae3a gdal-1.2.6-r3.ebuild 4827
 MD5 82ada11f44c42ddedbfa5426ad7991d2 files/digest-gdal-1.2.5-r1 63
-MD5 4d15ffbcc89c38a4e5a7bbbe698207a1 files/digest-gdal-1.2.6-r2 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC8AcP2G5bA0cA/ScRAmViAKDaob6znMXi5JRz3gPR4+vvsPf5vgCg59Ud
-49ksoi8lkM6JP2/h7fH73ZI=
-=+Q2D
------END PGP SIGNATURE-----
+MD5 4d15ffbcc89c38a4e5a7bbbe698207a1 files/digest-gdal-1.2.6-r3 63
diff --git a/sci-libs/gdal/files/digest-gdal-1.2.6-r2 b/sci-libs/gdal/files/digest-gdal-1.2.6-r3
index 9cfc52edf488..9cfc52edf488 100644
--- a/sci-libs/gdal/files/digest-gdal-1.2.6-r2
+++ b/sci-libs/gdal/files/digest-gdal-1.2.6-r3
diff --git a/sci-libs/gdal/gdal-1.2.6-r2.ebuild b/sci-libs/gdal/gdal-1.2.6-r3.ebuild
index f0d5eeb45e30..383b187dfc61 100644
--- a/sci-libs/gdal/gdal-1.2.6-r2.ebuild
+++ b/sci-libs/gdal/gdal-1.2.6-r3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.2.6-r2.ebuild,v 1.2 2005/08/02 23:51:30 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.2.6-r3.ebuild,v 1.1 2005/08/04 00:05:50 nerdboy Exp $
 
-inherit eutils libtool gnuconfig distutils multilib
+inherit eutils libtool gnuconfig distutils
 
-IUSE="jpeg png geos gif grass jasper netcdf hdf python postgres mysql odbc sqlite ogdi fits debug"
+IUSE="jpeg png geos gif grass jasper netcdf hdf python postgres mysql odbc sqlite ogdi fits doc debug"
 
-DESCRIPTION="GDAL is a translator library for raster geospatial data formats"
+DESCRIPTION="GDAL is a translator library for raster geospatial data formats (includes OGR support)"
 HOMEPAGE="http://www.remotesensing.org/gdal/index.html"
 SRC_URI="http://dl.maptools.org/dl/gdal/${P}.tar.gz"
 
@@ -37,7 +37,8 @@ DEPEND=">=sys-libs/zlib-1.1.4
 	odbc?   ( dev-db/unixODBC )
 	geos?   ( sci-libs/geos )
 	grass? ( ~sci-geosciences/grass-6.0.0 )
-	sqlite? ( dev-db/sqlite )"
+	sqlite? ( dev-db/sqlite )
+	doc? ( app-doc/doxygen )"
 
 src_unpack() {
 	unpack ${A}
@@ -60,8 +61,14 @@ src_compile() {
 	distutils_python_version
 	# This package uses old borked automake/autoconf and libtool, so
 	# it doesn't work without ${D} (or with econf and einstall).
-	pkg_conf="--datadir=${D}usr/share/gdal --includedir=${D}usr/include/gdal \
-		--libdir=${D}usr/$(get_libdir) --enable-shared --with-gnu-ld --with-pic"
+
+	pkg_conf="--prefix=${D}usr --exec-prefix=${D}usr --bindir=${D}usr/bin \
+		--datadir=${D}usr/share/gdal --includedir=${D}usr/include/gdal \
+		--libdir=${D}usr/$(get_libdir) --mandir=${D}usr/share/man
+		--with-pymoddir=${D}usr/lib/python${PYVER}/site-packages \
+		--enable-static=no --enable-shared=yes --with-gnu-ld"
+
+	# the above should make libtool behave for the most part
 
 	use_conf="$(use_with jpeg) $(use_with png) $(use_with mysql) \
 		$(use_with postgres pg) $(use_with fits cfitsio) \
@@ -70,7 +77,7 @@ src_compile() {
 
 	# It can't find this
 	if useq ogdi ; then
-		use_conf="--with-ogdi=/usr/$(get_libdir) ${use_conf}"
+		use_conf="--with-ogdi=/usr/lib ${use_conf}"
 	fi
 
 	if useq gif ; then
@@ -83,7 +90,7 @@ src_compile() {
 	        export CFG=debug
 	fi
 
-	#enable newer Grass support only
+	# Enable newer Grass support only
 	if useq grass ; then
 		use_conf="--with-grass=/usr/grass60 ${use_conf}"
 		use_conf="--with-libgrass=no ${use_conf}"
@@ -96,35 +103,46 @@ src_compile() {
 		use_conf="--with-python=no ${use_conf}"
 	fi
 
-	myconf="${pkg_conf} ${use_conf}"
+	# Fix doc path just in case
+	sed -i -e "s:@exec_prefix@/doc:${D}usr/share/doc/${PF}/html:g" GDALmake.opt.in
 
-	./configure --prefix=${D}usr --exec-prefix=${D}usr \
-	    --with-pymoddir=${D}usr/lib/python${PYVER}/site-packages \
-	    ${myconf}
+	./configure --with-pymoddir=${D}usr/lib/python${PYVER}/site-packages \
+	    ${pkg_conf} ${use_conf}
 
 	# Patch libtool here since it's not created until after configure runs
 	sed -i -e "s:hardcode_into_libs=yes:hardcode_into_libs=no:g" libtool
 	echo '#undef GDAL_PREFIX' >> port/cpl_config.h
 	echo '#define GDAL_PREFIX "/usr"' >> port/cpl_config.h
-	emake || die "emake failed"
+	emake  || die "emake failed"
+	if useq doc ; then
+	    emake docs || die "emake docs failed"
+	fi
 }
 
 src_install() {
 	# einstall causes sandbox violations on /usr/lib/libgdal.so
-	#einstall || die "einstall failed"
-	make DESTDIR=${D} install
+	make DESTDIR=${D} install || die "make install failed"
 	dosed "s:${D}usr:/usr:g" /usr/bin/gdal-config
+	dosed "s:/usr/local/bin/perl:/usr/bin/perl:g" ${S}/Doxyfile.man
+	dosed "s:$(INST_DOCS)/gdal:$(INST_DOCS)/html:g" GNUmakefile
 	dodoc Doxyfile.man Doxyfile HOWTO-RELEASE NEWS
+	if useq doc ; then
+	    dohtml html/*.* || die "install html failed"
+	fi
 }
 
 pkg_postinst() {
-	einfo "GDAL is most useful with full graphics support enabled via"
-	einfo "USE flags: png, jpeg, and gif. Optional python, fits, ogdi,"
-	einfo "and support for either netcdf or HDF4 is available, as well"
-	einfo "as either mysql or postgres."
+	einfo "GDAL is most useful with full graphics support enabled via various"
+	einfo "USE flags: png, jpeg, gif, jasper, etc. Also python, fits, ogdi,"
+	einfo "geos, and support for either netcdf or HDF4 is available, as well as"
+	einfo "grass, and mysql, sqlite, or postgres (grass support requires grass 6)."
 	ewarn
 	einfo "Note: tiff and geotiff are now hard depends, so no USE flags."
 	einfo "Also, this package will check for netcdf before hdf, so if you"
 	einfo "prefer hdf, please emerge hdf with USE=szip prior to emerging"
-	einfo "gdal."
+	einfo "gdal.  Detailed API docs require doxygen (man pages are free)."
+	einfo ""
+	einfo "Check available image and data formats after building with"
+	einfo "gdalinfo and ogrinfo (using the --formats switch)."
 }
+