fix for bug 100103, giflib, and general cleanup

Package-Manager: portage-2.0.51.22-r2

4 files changed, 15 insertions, 7 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index c08101c71179..28cfa862c4c2 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.5 2005/07/11 19:12:15 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.6 2005/07/25 01:47:20 nerdboy Exp $
+
+*gdal-1.2.6-r1 (25 Jul 2005)
+
+  25 Jul 2005; Steve Arnold <nerdboy@gentoo.org> -gdal-1.2.6.ebuild,
+  +gdal-1.2.6-r1.ebuild:
+  fix for bug 100103, giflib, and general cleanup
 
   11 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
   gdal-1.2.5-r1.ebuild:
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 7e448abf2966..f4d312c020dd 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,6 +1,6 @@
 MD5 dc56f5d75556cdbcd7c4024288ef8fcb metadata.xml 481
-MD5 1b71003597dccee29175008870a9d5a3 gdal-1.2.6.ebuild 3930
-MD5 4823bed30b1b47098e3b92f5a76415d7 ChangeLog 1098
+MD5 65341708a35446e9b1a48aad4c78ed02 ChangeLog 1270
 MD5 cffffd06d2205813df3407b5a2fdc341 gdal-1.2.5-r1.ebuild 3209
+MD5 03f756733b653593ad30d6813d99992c gdal-1.2.6-r1.ebuild 4015
 MD5 82ada11f44c42ddedbfa5426ad7991d2 files/digest-gdal-1.2.5-r1 63
-MD5 4d15ffbcc89c38a4e5a7bbbe698207a1 files/digest-gdal-1.2.6 63
+MD5 4d15ffbcc89c38a4e5a7bbbe698207a1 files/digest-gdal-1.2.6-r1 63
diff --git a/sci-libs/gdal/files/digest-gdal-1.2.6 b/sci-libs/gdal/files/digest-gdal-1.2.6-r1
index 9cfc52edf488..9cfc52edf488 100644
--- a/sci-libs/gdal/files/digest-gdal-1.2.6
+++ b/sci-libs/gdal/files/digest-gdal-1.2.6-r1
diff --git a/sci-libs/gdal/gdal-1.2.6.ebuild b/sci-libs/gdal/gdal-1.2.6-r1.ebuild
index ff7db466478d..66d60fd0f8c0 100644
--- a/sci-libs/gdal/gdal-1.2.6.ebuild
+++ b/sci-libs/gdal/gdal-1.2.6-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.2.6.ebuild,v 1.1 2005/07/23 06:33:02 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.2.6-r1.ebuild,v 1.1 2005/07/25 01:47:20 nerdboy Exp $
 
 inherit eutils libtool gnuconfig distutils
 
@@ -20,7 +20,7 @@ DEPEND=">=sys-libs/zlib-1.1.4
 	>=media-libs/tiff-3.7.0
 	sci-libs/libgeotiff
 	jpeg? ( media-libs/jpeg )
-	gif? ( media-libs/libungif )
+	gif? ( media-libs/giflib )
 	png? ( media-libs/libpng )
 	python? ( dev-lang/python )
 	fits? ( sci-libs/cfitsio )
@@ -46,7 +46,7 @@ src_unpack() {
 	gnuconfig_update
 	if useq netcdf && useq hdf; then
 		einfo	"Checking is HDF4 compiled with szip..."
-		if grep -c szip /var/db/pkg/sci-libs/hdf-4*/USE; then
+		if built_with_use hdf szip ; then
 			einfo	"Found HDF4 compiled with szip. Nice."
 		else
 			ewarn 	"HDF4 must be compiled with szip USE flag!"
@@ -104,6 +104,8 @@ src_compile() {
 
 	# 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
 	make || die "make failed"
 }