modified version of user-submitted ebuild (bug 72353 and 84862)

(Portage version: 2.0.51.19)

6 files changed, 137 insertions, 4 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index 2f7613b02c88..c8dd5289eb17 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,13 @@
 # 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.4 2005/06/02 15:41:24 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.5 2005/06/15 08:22:01 nerdboy Exp $
+
+*grass-6.0.0 (15 Jun 2005)
+
+  15 Jun 2005; Steve Arnold <nerdboy@gentoo.org> +files/99grass-6,
+  metadata.xml, +grass-6.0.0.ebuild:
+  modified version of user-submitted ebuild (bug 72353 and 84862).
+  The former bug is not being closed just yet...
 
   02 Jun 2005; Olivier Fisette <ribosome@gentoo.org> grass-5.0.2.ebuild,
   grass-5.0.3.ebuild:
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 38ac9b3d3280..cf081b5a56a9 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,6 +1,9 @@
-MD5 61bbfbc01bab6d1de078f9df119e8bad grass-5.0.3.ebuild 3257
+MD5 247ee372efa927cc7ed36ff81dc75684 ChangeLog 2722
 MD5 3bd6e46846f23339b4e13fb95dc58a71 grass-5.0.2.ebuild 2644
-MD5 ae9680102fc7de2183677263d10e3b72 ChangeLog 2473
-MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
+MD5 61bbfbc01bab6d1de078f9df119e8bad grass-5.0.3.ebuild 3257
+MD5 e3525ea07aea3bae2424110708012cd1 metadata.xml 480
+MD5 d4463d1d49180616a61517004dabed21 grass-6.0.0.ebuild 2925
+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
diff --git a/sci-geosciences/grass/files/99grass-6 b/sci-geosciences/grass/files/99grass-6
new file mode 100644
index 000000000000..e89d58b93259
--- /dev/null
+++ b/sci-geosciences/grass/files/99grass-6
@@ -0,0 +1,3 @@
+GRASS_LD_LIBRARY_PATH="/usr/grass60/lib"
+LD_LIBRARY_PATH="/usr/grass60/lib"
+CONFIG_PROTECT="/usr/grass60/etc"
\ No newline at end of file
diff --git a/sci-geosciences/grass/files/digest-grass-6.0.0 b/sci-geosciences/grass/files/digest-grass-6.0.0
new file mode 100644
index 000000000000..c616ace2c8f6
--- /dev/null
+++ b/sci-geosciences/grass/files/digest-grass-6.0.0
@@ -0,0 +1 @@
+MD5 acfa05ada219cd15c9db1a5d5320e008 grass-6.0.0.tar.gz 7791409
diff --git a/sci-geosciences/grass/grass-6.0.0.ebuild b/sci-geosciences/grass/grass-6.0.0.ebuild
new file mode 100644
index 000000000000..b77332fdc77b
--- /dev/null
+++ b/sci-geosciences/grass/grass-6.0.0.ebuild
@@ -0,0 +1,112 @@
+# 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.1 2005/06/15 08:22:01 nerdboy Exp $
+
+inherit eutils
+
+DESCRIPTION="An open-source GIS with raster and vector functionality"
+HOMEPAGE="http://grass.itc.it/"
+SRC_URI="http://grass.itc.it/grass60/source/${P}.tar.gz
+	http://grass.meteo.uni.wroc.pl/grass60/source/${P}.tar.gz
+	http://grass.ibiblio.org/grass60/source/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="6"
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
+IUSE="tcltk png jpeg tiff postgres odbc motif gd X
+	mysql blas lapack fftw truetype readline opengl"
+RESTRICT="nostrip"
+
+DEPEND=">=sys-devel/make-3.80
+	>=sys-libs/zlib-1.1.4
+	>=sys-devel/flex-2.5.4a
+	>=sys-devel/bison-1.35
+	>=sys-libs/ncurses-5.3
+	>=sys-libs/gdbm-1.8.0
+	>=sys-devel/gcc-3.2.2
+	sys-apps/man
+	>=sci-libs/proj-4.4.7
+	blas? ( virtual/blas )
+	fftw? ( =sci-libs/fftw-2* )
+	sci-libs/gdal
+	gd? ( >=media-libs/gd-1.8.3 )
+	jpeg? ( media-libs/jpeg )
+	lapack? ( virtual/lapack )
+	motif? ( x11-libs/openmotif )
+	|| (
+	    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 )
+	tcltk? ( >=dev-lang/tcl-8.3.4
+		>=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 )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch rpm/fedora/grass-readline.patch
+}
+
+src_compile() {
+
+	MYCONF=" --with-cxx --enable-shared"
+
+	if use truetype; then
+		MYCONF="${MYCONF} --with-freetype-includes=/usr/include/freetype2/ "
+	fi
+
+	use mysql && MYCONF="${MYCONF} --with-mysql \
+		--with-mysql-includes=/usr/include/mysql \
+		--with-mysql-libs=/usr/lib/mysql" \
+		|| MYCONF="${MYCONF} --without-mysql"
+
+	if use opengl; then
+	    MYCONF="${MYCONF} --with-opengl-libs=/usr/lib/opengl/xorg-x11/lib/"
+	fi
+
+	export LD_LIBRARY_PATH="/${WORKDIR}/image/usr/grass60/lib:${LD_LIBRARY_PATH}"
+	./configure \
+		`use_with tcltk` \
+		`use_with postgres` \
+		`use_with motif` \
+		`use_with blas` \
+		`use_with lapack` \
+		`use_with fftw` \
+		`use_with truetype freetype` \
+		`use_with jpeg` \
+		`use_with png` \
+		`use_with tiff` \
+		`use_with odbc` \
+		`use_enable amd64 64bit` \
+		`use_with opengl opengl` \
+		`use_with gd` \
+		`use_with gdal` \
+		`use_with readline` \
+		`use_with X` \
+		${MYCONF} || die "Error: configure failed!"
+	emake -j1 || die "Error: emake failed!"
+}
+
+src_install() {
+	make install \
+		prefix=${D}/usr UNIX_BIN=${D}/usr/bin BINDIR=${D}/usr/bin PREFIX=${D}/usr \
+		    || die "Error: make install failed!"
+	sed -i "s:^GISBASE=.*$:GISBASE=/usr/grass60:" \
+		${D}/usr/bin/grass60
+
+	# This is required for GRASS dependent ebuilds (ie. QGIS)
+	mv ${D}/usr/${P} ${D}/usr/grass60
+
+	einfo "Adding env.d entry for Grass6"
+	insinto /etc/env.d
+	newins ${FILESDIR}/99grass-6 99grass
+}
diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml
index b229aec85b8f..8b51e00bc37a 100644
--- a/sci-geosciences/grass/metadata.xml
+++ b/sci-geosciences/grass/metadata.xml
@@ -2,4 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci</herd>
+<maintainer>
+  <email>nerdboy@gentoo.org</email>
+  <name>Steve Arnold</name>
+</maintainer>
+<longdescription>The original GIS, yes the first one, developed by the US Army Corp of Engineers, now an active open source GIS. 
+See the GRASS Documentation Project for more info http://grass.itc.it/gdp/index.php
+</longdescription>
 </pkgmetadata>