updated grass dep for latest grass

Package-Manager: portage-2.0.51.22-r3

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 76b589fdf4ffd34c864c1142dcdda3572248b9bd..d798c69f59ecad6d8dcd7634ca12e8915078c0ad 100644 (file)
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,10 @@
 # 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.14 2005/10/08 21:43:02 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.15 2005/10/13 06:46:23 nerdboy Exp $
+
+  13 Oct 2005; Steve Arnold <nerdboy@gentoo.org> gdal-1.2.6-r4.ebuild,
+  gdal-1.3.0-r1.ebuild:
+  updated grass dep for latest grass (more or less fixes bug 106287)
 
 *gdal-1.3.0-r1 (08 Oct 2005)
 *gdal-1.2.6-r4 (08 Oct 2005)

diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index ff0bd17434c5311c9fd83622c068132d94191c40..81a61959c7db51a2b24e34d1cfe786ae52f8827c 100644 (file)
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,7 +1,7 @@
 MD5 dc56f5d75556cdbcd7c4024288ef8fcb metadata.xml 481
-MD5 045588e2e7300feb2d670d64a22c0e61 ChangeLog 2814
-MD5 36180d22cbae247c5b04a3c08f44a9ed gdal-1.2.6-r4.ebuild 4203
-MD5 46f76bba96da85aa857e7725c94e948a gdal-1.3.0-r1.ebuild 4256
+MD5 842b36ae8eb26d03a3e0e3b58bf12eab ChangeLog 2979
+MD5 f2994eb2cdb0db01674a20b59d7dc7ec gdal-1.2.6-r4.ebuild 4214
+MD5 8256e70a78e0f691ec31177b2fc55f25 gdal-1.3.0-r1.ebuild 4267
 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

diff --git a/sci-libs/gdal/gdal-1.2.6-r4.ebuild b/sci-libs/gdal/gdal-1.2.6-r4.ebuild
index a70d05efaf033998b9154128bfe1d0282b8f50cd..e10a6262f69ae28eb37a1b635ed7d604ad25d3e2 100644 (file)
--- a/sci-libs/gdal/gdal-1.2.6-r4.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-r4.ebuild,v 1.1 2005/10/08 21:43:02 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.2.6-r4.ebuild,v 1.2 2005/10/13 06:46:23 nerdboy Exp $
 
 inherit eutils libtool gnuconfig distutils
 
@@ -38,7 +38,7 @@ DEPEND=">=sys-libs/zlib-1.1.4
        jasper? ( media-libs/jasper )
        odbc?   ( dev-db/unixODBC )
        geos?   ( sci-libs/geos )
-       grass? ( ~sci-geosciences/grass-6.0.0 )
+       grass? ( >=sci-geosciences/grass-6.0.0 )
        sqlite? ( dev-db/sqlite )
        doc? ( app-doc/doxygen )"
 
@@ -73,7 +73,7 @@ src_compile() {
 
        # It can't find this
        if useq ogdi ; then
-           use_conf="--with-ogdi=/usr/lib ${use_conf}"
+           use_conf="--with-ogdi=/usr/${get_libdir} ${use_conf}"
        fi
 
        if useq gif ; then

diff --git a/sci-libs/gdal/gdal-1.3.0-r1.ebuild b/sci-libs/gdal/gdal-1.3.0-r1.ebuild
index 87e69288280d83b71805c1f778451e8f8b256a33..f7b2462404b8be5fecd006b603cc69d94f3556dc 100644 (file)
--- a/sci-libs/gdal/gdal-1.3.0-r1.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-r1.ebuild,v 1.1 2005/10/08 21:43:02 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.3.0-r1.ebuild,v 1.2 2005/10/13 06:46:23 nerdboy Exp $
 
 inherit eutils libtool gnuconfig distutils
 
@@ -39,7 +39,7 @@ DEPEND=">=sys-libs/zlib-1.1.4
        jasper? ( media-libs/jasper )
        odbc?   ( dev-db/unixODBC )
        geos?   ( sci-libs/geos )
-       grass? ( ~sci-geosciences/grass-6.0.0 )
+       grass? ( >=sci-geosciences/grass-6.0.0 )
        sqlite? ( dev-db/sqlite )
        doc? ( app-doc/doxygen )"
 
@@ -74,7 +74,7 @@ src_compile() {
 
        # It can't find this
        if useq ogdi ; then
-           use_conf="--with-ogdi=/usr/lib ${use_conf}"
+           use_conf="--with-ogdi=/usr/${get_libdir} ${use_conf}"
        fi
 
        if useq gif ; then