version bump to close bug #103361

Package-Manager: portage-2.0.51.22-r2

4 files changed, 125 insertions, 2 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index e1cd9d0bdc5c..382e1ae85e8e 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,11 @@
 # 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.11 2005/09/11 04:14:51 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.12 2005/09/14 03:58:04 nerdboy Exp $
+
+*grass-6.0.1 (14 Sep 2005)
+
+  14 Sep 2005; Steve Arnold <nerdboy@gentoo.org> +grass-6.0.1.ebuild:
+  version bump to close bug #103361
 
   11 Sep 2005; Steve Arnold <nerdboy@gentoo.org> grass-5.4.0.ebuild,
   grass-6.0.0-r2.ebuild:
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index b1823b904b69..e9c61580af2f 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,9 +1,11 @@
-MD5 52b40a1eb923aae8c90069cfa7444aed ChangeLog 3710
+MD5 5bbfa6980f576c7c648f20db9ece7e7e ChangeLog 3845
 MD5 3bd6e46846f23339b4e13fb95dc58a71 grass-5.0.2.ebuild 2644
+MD5 74abd5523c680c9060c625a552517060 grass-6.0.1.ebuild 3197
 MD5 e3525ea07aea3bae2424110708012cd1 metadata.xml 480
 MD5 350d9696f5bd4a42c007d7e1358f5c9e grass-5.4.0.ebuild 2746
 MD5 efb3ea16e8e00ee5a72c5d46cd34c908 grass-6.0.0-r2.ebuild 3169
 MD5 f41ae1ddcca30e1eeea2a74100f36ba4 files/99grass-6 100
 MD5 bdf9112abfe51ff3b2cd0547318640df files/digest-grass-5.0.2 69
+MD5 1c66247c142863956c87662a927bf828 files/digest-grass-6.0.1 64
 MD5 10ebb9a11297c10411154dd687057f1d files/digest-grass-6.0.0-r2 64
 MD5 3856d089c392313ea91a67cb000a90a9 files/digest-grass-5.4.0 65
diff --git a/sci-geosciences/grass/files/digest-grass-6.0.1 b/sci-geosciences/grass/files/digest-grass-6.0.1
new file mode 100644
index 000000000000..893dc107212c
--- /dev/null
+++ b/sci-geosciences/grass/files/digest-grass-6.0.1
@@ -0,0 +1 @@
+MD5 5225e816895d5e6b28bca623f76acaad grass-6.0.1.tar.gz 8508427
diff --git a/sci-geosciences/grass/grass-6.0.1.ebuild b/sci-geosciences/grass/grass-6.0.1.ebuild
new file mode 100644
index 000000000000..8b239164ab4b
--- /dev/null
+++ b/sci-geosciences/grass/grass-6.0.1.ebuild
@@ -0,0 +1,115 @@
+# 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.1.ebuild,v 1.1 2005/09/14 03:58:04 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 ~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
+	>=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
+	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 )
+	nls? ( x11-terms/mlterm )
+	opengl? ( virtual/opengl )
+	virtual/x11"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch rpm/fedora/grass-readline.patch
+}
+
+src_compile() {
+
+	MYCONF=" --with-cxx --enable-shared --with-gdal=/usr/bin/gdal-config"
+
+	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/$(get_libdir)/mysql" \
+		|| MYCONF="${MYCONF} --without-mysql"
+
+	if use opengl; then
+	    MYCONF="${MYCONF} --with-opengl-libs=/usr/$(get_libdir)/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/$(get_libdir):${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` \
+		`use_with readline` \
+		${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
+}