fixed for use with gdal, ogdi, proj, etc

Package-Manager: portage-2.0.51.22-r2

4 files changed, 32 insertions, 22 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index 4761c528120b..f9ba1563b143 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-geosciences/grass
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.6 2005/07/20 02:07:35 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.7 2005/07/23 06:42:03 nerdboy Exp $
+
+*grass-6.0.0-r1 (23 Jul 2005)
+
+  23 Jul 2005; Steve Arnold <nerdboy@gentoo.org> +grass-6.0.0-r1.ebuild:
+  fixed for use with gdal, ogdi, proj, etc (gdal is apparently no
+  longer optional)
 
   20 Jul 2005; Steve Arnold <nerdboy@gentoo.org> grass-6.0.0.ebuild:
   fixed up gdal use flag handling and added to use.local
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index bf416faf679e..be4a33a45da7 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,9 +1,9 @@
-MD5 0a3f5f5f518419dd7326a5a9abf0cabf ChangeLog 2848
+MD5 0040558cec11119faa2662d6d1245427 ChangeLog 3038
 MD5 3bd6e46846f23339b4e13fb95dc58a71 grass-5.0.2.ebuild 2644
 MD5 61bbfbc01bab6d1de078f9df119e8bad grass-5.0.3.ebuild 3257
 MD5 e3525ea07aea3bae2424110708012cd1 metadata.xml 480
-MD5 24ec31c9164e39f6437cf209f9bbc208 grass-6.0.0.ebuild 3031
+MD5 a155af405c21e8a6142ac59fc41b0210 grass-6.0.0-r1.ebuild 3171
 MD5 b61d36004b3bf19f8357e5b2f3a5c8dc files/99grass-6 109
 MD5 bdf9112abfe51ff3b2cd0547318640df files/digest-grass-5.0.2 69
 MD5 0595fca992dc9e3ab6f3ddf331323b79 files/digest-grass-5.0.3 209
-MD5 c0ab8e2beb1ed62c15e81642c2f99eba files/digest-grass-6.0.0 64
+MD5 c0ab8e2beb1ed62c15e81642c2f99eba files/digest-grass-6.0.0-r1 64
diff --git a/sci-geosciences/grass/files/digest-grass-6.0.0 b/sci-geosciences/grass/files/digest-grass-6.0.0-r1
index c616ace2c8f6..c616ace2c8f6 100644
--- a/sci-geosciences/grass/files/digest-grass-6.0.0
+++ b/sci-geosciences/grass/files/digest-grass-6.0.0-r1
diff --git a/sci-geosciences/grass/grass-6.0.0.ebuild b/sci-geosciences/grass/grass-6.0.0-r1.ebuild
index e714c821cd33..3857ed5bc283 100644
--- a/sci-geosciences/grass/grass-6.0.0.ebuild
+++ b/sci-geosciences/grass/grass-6.0.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-geosciences/grass/grass-6.0.0.ebuild,v 1.3 2005/07/20 02:07:35 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.0.0-r1.ebuild,v 1.1 2005/07/23 06:42:03 nerdboy Exp $
 
 inherit eutils
 
@@ -12,8 +12,11 @@ SRC_URI="http://grass.itc.it/grass60/source/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="6"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
-IUSE="X blas fftw gd gdal jpeg lapack motif mysql nls odbc opengl png postgres readline tcltk tiff truetype"
+KEYWORDS="~x86 ~amd64 ~ppc ~ppc64 ~sparc"
+
+# add gdal back to use flags once grass is fixed
+IUSE="blas fftw jpeg lapack motif mysql nls odbc opengl png postgres readline tcltk tiff truetype"
+
 RESTRICT="nostrip"
 
 DEPEND=">=sys-devel/make-3.80
@@ -27,15 +30,12 @@ DEPEND=">=sys-devel/make-3.80
 	>=sci-libs/proj-4.4.7
 	blas? ( virtual/blas )
 	fftw? ( =sci-libs/fftw-2* )
-	gdal? ( sci-libs/gdal )
-	gd? ( >=media-libs/gd-1.8.3 )
+	sci-libs/gdal
 	jpeg? ( media-libs/jpeg )
 	lapack? ( virtual/lapack )
 	motif? ( x11-libs/openmotif )
-	|| (
-	    postgres? ( >=dev-db/postgresql-7.3 )
-	    mysql? ( dev-db/mysql )
-	)
+	postgres? ( >=dev-db/postgresql-7.3 )
+	mysql? ( dev-db/mysql )
 	odbc? ( >=dev-db/unixODBC-2.0.6 )
 	png? ( >=media-libs/libpng-1.2.2 )
 	readline? ( sys-libs/readline )
@@ -43,10 +43,9 @@ DEPEND=">=sys-devel/make-3.80
 		>=dev-lang/tk-8.3.4 )
 	tiff? ( >=media-libs/tiff-3.5.7 )
 	truetype? ( >=media-libs/freetype-2.0 )
-	X? ( virtual/x11 )
-	nls? ( x11-terms/mlterm )"
-	# Mesa 3.5 is currenlty borked on x86
-	#nviz? ( >=media-libs/mesa-3.5 )"
+	nls? ( x11-terms/mlterm )
+	opengl? ( virtual/opengl )
+	virtual/x11"
 
 src_unpack() {
 	unpack ${A}
@@ -57,7 +56,7 @@ src_unpack() {
 
 src_compile() {
 
-	MYCONF=" --with-cxx --enable-shared"
+	MYCONF=" --with-cxx --enable-shared --with-gdal=/usr/bin/gdal-config"
 
 	if use truetype; then
 		MYCONF="${MYCONF} --with-freetype-includes=/usr/include/freetype2/ "
@@ -72,6 +71,14 @@ src_compile() {
 	    MYCONF="${MYCONF} --with-opengl-libs=/usr/lib/opengl/xorg-x11/lib/"
 	fi
 
+# apparently gdal isn't optional with this version
+# we'll temporarily make it a hard dep for now
+#	if use gdal; then
+#	    MYCONF="${MYCONF} --with-gdal=/usr/bin/gdal-config"
+#	else
+#	    MYCONF="${MYCONF} --without-gdal"
+#	fi
+
 	export LD_LIBRARY_PATH="/${WORKDIR}/image/usr/grass60/lib:${LD_LIBRARY_PATH}"
 	./configure \
 		`use_with tcltk` \
@@ -86,11 +93,8 @@ src_compile() {
 		`use_with tiff` \
 		`use_with odbc` \
 		`use_enable amd64 64bit` \
-		`use_with opengl opengl` \
-		`use_with gd` \
-		`use_with gdal` \
+		`use_with opengl` \
 		`use_with readline` \
-		`use_with X` \
 		${MYCONF} || die "Error: configure failed!"
 	emake -j1 || die "Error: emake failed!"
 }