fixing lib silliness on non-x86 arches, and bumping stable (x86 and sparc)

Package-Manager: portage-2.0.51.19

4 files changed, 13 insertions, 108 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 00ee9fa45de7..d9e6452d5d66 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,15 @@
 # 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.2 2005/02/22 06:31:55 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.3 2005/07/10 20:45:40 nerdboy Exp $
+
+*gdal-1.2.5-r1 (10 Jul 2005)
+
+  10 Jul 2005; Steve Arnold <nerdboy@gentoo.org> -gdal-1.2.5.ebuild,
+  +gdal-1.2.5-r1.ebuild:
+  fixing lib silliness on non-x86 arches (informal bug report), a 
+  small but important change to fix the libgdal.so install (which
+  requires stablizing libgeotiff, proj, and ogdi).  Add sparc to
+  the list of heavily tested arches...
 
   21 Feb 2005; Steve Arnold <nerdboy@gentoo.org> gdal-1.2.5.ebuild:
   added debug flag at user request
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 5f9890ae3db3..1532c80b342e 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,4 +1,4 @@
 MD5 dc56f5d75556cdbcd7c4024288ef8fcb metadata.xml 481
-MD5 a2a9a598efda5c0881c4a8c56f23aaec gdal-1.2.5.ebuild 3137
-MD5 f410550b9efc21b4909661405d46bba8 ChangeLog 531
-MD5 82ada11f44c42ddedbfa5426ad7991d2 files/digest-gdal-1.2.5 63
+MD5 21fa6513c7119ae6586796b70e9d9294 ChangeLog 893
+MD5 51886357e5091d522669fe764754138f gdal-1.2.5-r1.ebuild 3200
+MD5 82ada11f44c42ddedbfa5426ad7991d2 files/digest-gdal-1.2.5-r1 63
diff --git a/sci-libs/gdal/files/digest-gdal-1.2.5 b/sci-libs/gdal/files/digest-gdal-1.2.5-r1
index 1a5ca2ddbd9d..1a5ca2ddbd9d 100644
--- a/sci-libs/gdal/files/digest-gdal-1.2.5
+++ b/sci-libs/gdal/files/digest-gdal-1.2.5-r1
diff --git a/sci-libs/gdal/gdal-1.2.5.ebuild b/sci-libs/gdal/gdal-1.2.5.ebuild
deleted file mode 100644
index 27662dd8b119..000000000000
--- a/sci-libs/gdal/gdal-1.2.5.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# 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.5.ebuild,v 1.2 2005/02/22 06:31:55 nerdboy Exp $
-
-inherit eutils libtool gnuconfig distutils
-
-# libgrass support is coming soon...
-#	grass? ( >=sci-geosciences/grass-5.0 )
-
-IUSE="jpeg png gif python postgres mysql ogdi fits debug"
-
-DESCRIPTION="GDAL is a translator library for raster geospatial data formats"
-HOMEPAGE="http://www.remotesensing.org/gdal/index.html"
-SRC_URI="http://dl.maptools.org/dl/gdal/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="x86 ~sparc ~hppa ~alpha ~amd64 ~ppc"
-
-DEPEND=">=sys-libs/zlib-1.1.4
-	>=media-libs/tiff-3.7.0
-	sci-libs/libgeotiff
-	jpeg? ( media-libs/jpeg )
-	gif? ( media-libs/libungif )
-	png? ( media-libs/libpng )
-	python? ( dev-lang/python )
-	fits? ( sci-libs/cfitsio )
-	ogdi? ( sci-libs/ogdi )
-	|| (
-		sci-libs/netcdf
-		sci-libs/hdf
-	)
-	|| (
-		postgres? ( dev-db/postgresql )
-		mysql? ( dev-db/mysql )
-	)"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	elibtoolize --patch-only
-	gnuconfig_update
-}
-
-src_compile() {
-	distutils_python_version
-	# This package uses old borked automake/autoconf and libtool, so
-	# it doesn't work without ${D} econf and einstall
-	pkg_conf="--datadir=${D}usr/share/gdal --includedir=${D}usr/include/gdal --without-libtool --enable-shared --with-gnu-ld --with-pic"
-	use_conf="$(use_with jpeg) $(use_with png) $(use_with mysql) $(use_with postgres pg) $(use_with fits cfitsio) $(use_with ogdi)"
-
-	myconf="${pkg_conf} ${use_conf}"
-
-	# These will need version checks:
-	#$(use_with grass) $(use_with libgrass)
-
-	if useq gif ; then
-		myconf="--with-gif=internal ${myconf}"
-	else
-		myconf="--with-gif=no ${myconf}"
-	fi
-
-	if useq debug ; then
-	        export CFG=debug
-	fi
-#	if useq grass ; then # no libgrass in 5.0.3 !!!
-#		myconf="--with-libgrass=/usr/grass5/lib ${myconf}"
-#	else
-		myconf="--with-libgrass=no ${myconf}"
-#	fi
-
-	if useq python ; then
-		myconf="--with-pymoddir=${D}usr/lib/python${PYVER}/site-packages ${myconf}"
-	else
-		myconf="--with-python=no ${myconf}"
-	fi
-
-	./configure --prefix=${D}usr --exec-prefix=${D}usr \
-	    --with-pymoddir=${D}usr/lib/python${PYVER}/site-packages \
-	    ${myconf}
-	# 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
-	make || die "make failed"
-}
-
-src_install() {
-	# einstall causes sandbox violations on /usr/lib/libgdal.so
-	#einstall || die "einstall failed"
-	make DESTDIR=${D} install
-	dosed "s:${D}usr:/usr:g" /usr/bin/gdal-config
-	dodoc Doxyfile.man Doxyfile HOWTO-RELEASE NEWS
-}
-
-pkg_postinst() {
-	einfo "GDAL is most useful with full graphics support enabled via"
-	einfo "USE flags: png, jpeg, and gif. Optional python fits, ogdi, and"
-	einfo "support for either netcdf or HDF4 is available, as well as"
-	einfo "either mysql or postgres."
-	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 (ver 4 only) prior to emerging"
-	einfo "gdal."
-}