revision bump for glsa and cleanup of old ebuilds

(Portage version: 2.0.51.22-r2)

8 files changed, 18 insertions, 116 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 6c422f73ea2e..76b589fdf4ff 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,12 +1,21 @@
 # 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.13 2005/10/06 07:11:16 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.14 2005/10/08 21:43:02 nerdboy Exp $
+
+*gdal-1.3.0-r1 (08 Oct 2005)
+*gdal-1.2.6-r4 (08 Oct 2005)
+
+  08 Oct 2005; Steve Arnold <nerdboy@gentoo.org> -gdal-1.2.5-r1.ebuild,
+  -gdal-1.2.6-r3.ebuild, +gdal-1.2.6-r4.ebuild, -gdal-1.3.0.ebuild,
+  +gdal-1.3.0-r1.ebuild:
+  revision bump for glsa and cleanup of old ebuilds
 
   06 Oct 2005; Steve Arnold <nerdboy@gentoo.org>
   +files/gdal-1.2.6-installpathfix.patch,
   +files/gdal-1.3.0-installpathfix.patch, gdal-1.2.6-r3.ebuild,
   gdal-1.3.0.ebuild:
-  Added fix for bug #105760
+  Added fix for bug #105760 (patch courtesy of dragonheart and his sed
+  foo).
 
   21 Sep 2005; Steve Arnold <nerdboy@gentoo.org> gdal-1.2.6-r3.ebuild,
   gdal-1.3.0.ebuild:
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 354baed2be7b..6ae0612c388a 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,10 +1,8 @@
 MD5 dc56f5d75556cdbcd7c4024288ef8fcb metadata.xml 481
-MD5 96efdf9eb82a8f04e9a3617249058d3c gdal-1.3.0.ebuild 4253
 MD5 4e1c6935b1e8e1af36a400a2d70d4653 ChangeLog 2486
-MD5 05fad9d06c351a459c7e9cc8d738b12c gdal-1.2.5-r1.ebuild 3173
-MD5 016b5f695ec43d69a29939367cb9cafa gdal-1.2.6-r3.ebuild 4202
-MD5 82ada11f44c42ddedbfa5426ad7991d2 files/digest-gdal-1.2.5-r1 63
-MD5 4d15ffbcc89c38a4e5a7bbbe698207a1 files/digest-gdal-1.2.6-r3 63
-MD5 d4bd0e3f81da140c24f49c6e6513b9f6 files/digest-gdal-1.3.0 63
+MD5 5879eca369954cdbfba112a26b6a8436 gdal-1.2.6-r4.ebuild 4203
+MD5 96efdf9eb82a8f04e9a3617249058d3c gdal-1.3.0-r1.ebuild 4253
+MD5 4d15ffbcc89c38a4e5a7bbbe698207a1 files/digest-gdal-1.2.6-r4 63
+MD5 d4bd0e3f81da140c24f49c6e6513b9f6 files/digest-gdal-1.3.0-r1 63
 MD5 8069b0c62dde416a0c74d1bf73543c9d files/gdal-1.2.6-installpathfix.patch 7786
 MD5 3f4304111ffcc48b1784cc03ef64844b files/gdal-1.3.0-installpathfix.patch 7764
diff --git a/sci-libs/gdal/files/digest-gdal-1.2.5-r1 b/sci-libs/gdal/files/digest-gdal-1.2.5-r1
deleted file mode 100644
index 1a5ca2ddbd9d..000000000000
--- a/sci-libs/gdal/files/digest-gdal-1.2.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2e3e651be6b4f42486e99ef39c17ffb1 gdal-1.2.5.tar.gz 4165783
diff --git a/sci-libs/gdal/files/digest-gdal-1.2.6-r3 b/sci-libs/gdal/files/digest-gdal-1.2.6-r4
index 9cfc52edf488..9cfc52edf488 100644
--- a/sci-libs/gdal/files/digest-gdal-1.2.6-r3
+++ b/sci-libs/gdal/files/digest-gdal-1.2.6-r4
diff --git a/sci-libs/gdal/files/digest-gdal-1.3.0 b/sci-libs/gdal/files/digest-gdal-1.3.0-r1
index 952482fd1a38..952482fd1a38 100644
--- a/sci-libs/gdal/files/digest-gdal-1.3.0
+++ b/sci-libs/gdal/files/digest-gdal-1.3.0-r1
diff --git a/sci-libs/gdal/gdal-1.2.5-r1.ebuild b/sci-libs/gdal/gdal-1.2.5-r1.ebuild
deleted file mode 100644
index 998232724ad1..000000000000
--- a/sci-libs/gdal/gdal-1.2.5-r1.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-r1.ebuild,v 1.6 2005/09/21 06:19:14 nerdboy Exp $
-
-inherit eutils libtool gnuconfig distutils multilib
-
-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="~alpha ~amd64 ~hppa ppc ~ppc64 sparc x86"
-
-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} (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"
-	[ "${ARCH}" = "x86" ] && pkg_conf="${pkg_conf} --without-libtool"
-	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,"
-	einfo "and support for either netcdf or HDF4 is available, as well"
-	einfo "as 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."
-}
diff --git a/sci-libs/gdal/gdal-1.2.6-r3.ebuild b/sci-libs/gdal/gdal-1.2.6-r4.ebuild
index 085120ff9901..a70d05efaf03 100644
--- a/sci-libs/gdal/gdal-1.2.6-r3.ebuild
+++ b/sci-libs/gdal/gdal-1.2.6-r4.ebuild
@@ -1,6 +1,6 @@
 # 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-r3.ebuild,v 1.6 2005/10/06 07:11:16 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.2.6-r4.ebuild,v 1.1 2005/10/08 21:43:02 nerdboy Exp $
 
 inherit eutils libtool gnuconfig distutils
 
@@ -13,7 +13,7 @@ SRC_URI="http://dl.maptools.org/dl/gdal/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ppc sparc x86"
+KEYWORDS="~amd64 ~ppc sparc x86"
 # need to get these arches updated on several libs first
 #KEYWORDS="~alpha ~hppa ~ppc64"
 
diff --git a/sci-libs/gdal/gdal-1.3.0.ebuild b/sci-libs/gdal/gdal-1.3.0-r1.ebuild
index 920582185080..87e69288280d 100644
--- a/sci-libs/gdal/gdal-1.3.0.ebuild
+++ b/sci-libs/gdal/gdal-1.3.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.3.0.ebuild,v 1.3 2005/10/06 07:11:16 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.3.0-r1.ebuild,v 1.1 2005/10/08 21:43:02 nerdboy Exp $
 
 inherit eutils libtool gnuconfig distutils