updated latest version with various fixes and desktop enhancements

Package-Manager: portage-2.1.4.4

8 files changed, 328 insertions, 52 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index 6156fe03fbd1..8e44e131f154 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sci-geosciences/grass
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.48 2008/03/06 18:01:07 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.49 2008/03/22 02:31:43 nerdboy Exp $
+
+*grass-6.2.1-r1 (22 Mar 2008)
+
+  22 Mar 2008; Steve Arnold <nerdboy@gentoo.org> +files/grass_icon.png,
+  +grass-6.2.1-r1.ebuild:
+  Updated ebuild with various fixes and enhancements, with enough changes to
+  warrant a revision bump.  Several QA fixes, streamlined the X-related USE
+  flags somewhat, added desktop files, and tested nviz 3D with terrain data
+  on amd64 w/radeon xorg driver (works nicely after minor system update,
+  with no more video artifacts).  Grass env file now provides GRASS_HOME
+  variable for gdal rebuild.
 
   06 Mar 2008; nixnut <nixnut@gentoo.org> grass-6.2.1.ebuild:
   Stable on ppc wrt bug 212033
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index dc301db0a88d..8a21c5508cfc 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -4,13 +4,15 @@ AUX grass-6.2.0-html-nonviz.patch 1721 RMD160 ad57109c03792e8376ccbe2ed8ff459b85
 AUX grass-6.2.1-ffmpeg-fix.patch 816 RMD160 eaefa978b965e1b66d0efec6d3ba8a07d4515307 SHA1 322b5ed2089f5b94f74ba38924cde7fe2611918c SHA256 2cbdfe11078783cf5bc95a5f4baaa05769c0921025737d8afdcf638321b4b501
 AUX grass-6.2.1-html-nonviz.patch 1742 RMD160 39103490f48abcc53f1fb8f3d9df48910866fab6 SHA1 a98486fb4b21f5ef42084d37ec0e6addc655fdc2 SHA256 73b7661832230f5ea1dadf983d6ce723b2f87bd3bafc4e939f36f7620d764270
 AUX grass-6.2.1-html-nviz-fix.patch 592 RMD160 7935449babc7dd6a07cffad66513c404a266848f SHA1 653a049d80fba93968620f7dc4e0ec2bbfb8edba SHA256 df2bfefc4aa6ddb030eb4a809a3cc885ade69e526a0ec99cd31fe1b751e05c41
+AUX grass_icon.png 4470 RMD160 b4a6deeb6ce859a57c6aba3c4095e2dd718f36e9 SHA1 6839c28ec1d01c486d45a245a159fced3c0d0810 SHA256 c6c873f24bb59b8ff98000b500ca3a047ca86af216b4b7b1593baef5f2fbe6a9
 DIST grass-5.4.0.tar.gz 20487737 RMD160 76821edeff55e72ffad0fa5db275dca2221660a5 SHA1 3324bf8af1861c63d9d171577ffa7fb7e87582f1 SHA256 ac4cc3f1408750d7f9d54ea2155b7e8960041337d4e4d3662bffb41cb9899537
 DIST grass-6.0.1.tar.gz 8508427 RMD160 35cc84ecb593ddc83f78d41985d1ffe9db060295 SHA1 7faa22d1ac3e2272c12a82e284d2e3a8819b31ca SHA256 53127007260bf2181e711fa0520636ff497bd0c3406c16a1002945b1c4415340
 DIST grass-6.2.0.tar.gz 12534549 RMD160 0173e1c7cd3a13af9fe0d9e77101e5e216df7dac SHA1 ace7ddcd3219550dd7068948865d96ce5f16d289 SHA256 2246008c1baadbb35398b35d8d069bee60c23c780e1573c22ae947e3f5a451a8
 DIST grass-6.2.1.tar.gz 12599109 RMD160 ff885023b926ece6545591666fdaa1189facc8bc SHA1 bbd179b9145d735873a13f40a25784b64762387b SHA256 fb7a1030a51222b586f1fd4cbd6ee2c99a0974dba72c70032d336a6a30b073f9
-EBUILD grass-5.4.0.ebuild 3080 RMD160 5b8d64ef0565ee74d9f284b74c0a3b04bc5a1c64 SHA1 a93bcca6e832a5f681a44814403f41d18ff966dd SHA256 970e831db408f3a5eee698ffe0d57e653b285b108be1829ffcbf1e9ca21c20eb
-EBUILD grass-6.0.1.ebuild 3333 RMD160 a0150947e08200de04ca6b364bea1efd52198280 SHA1 568f6fe81e96d6e099a4de6539ee616916eb0e71 SHA256 fea4bae58c21459c47f0ae31fc20feccfdbfdb041b49825285dfa32244a13b00
-EBUILD grass-6.2.0-r1.ebuild 5388 RMD160 98200b0147960ed3a68b40cd219e2faad764405a SHA1 d5ae582a115ca1369added1893695c4fdd3f7afb SHA256 7cc50275c96938774168091c93d5efd2d968cb92301698010496d60dd4ba5d7e
-EBUILD grass-6.2.1.ebuild 6364 RMD160 f19841a4251052e699dc21ee1543f55ca90c66b4 SHA1 b8ce3765b32858f8002b823e3863e185d544dafa SHA256 f3755a1e50a9f8aaa951697d347c969e5b8557f6a16b4a9b254d83765d146820
-MISC ChangeLog 9575 RMD160 a7f3afcf9e7ec2970650de8326e1ca27eb47efb7 SHA1 1f330daa5e9faddd2ecedd3b8b266a8bad2efa0c SHA256 3d7b86be829a2602634723a25c892ce147820c8cbd1b26cacfdb9ae1a9f425a1
+EBUILD grass-5.4.0.ebuild 3089 RMD160 0e18c66b2410d062a756df0c436535bad39f8e89 SHA1 7eedd6b18b41c288c761a89a621bc68a06bb02d5 SHA256 229a374a9dd9575008ae1507d2d57f89b838019c2b8cbf2ece035daabe436fe5
+EBUILD grass-6.0.1.ebuild 3177 RMD160 c1a168fd9008a3490a9ca040dd0c4fd752f7d635 SHA1 a9b6209a84d7a67011d903a8f86add1fa23ef1b9 SHA256 b613f5d646f83037ab2a08e151ec1d923a23eca634c0fc636e6bc57b87422434
+EBUILD grass-6.2.0-r1.ebuild 5413 RMD160 3db6698e2ae49bbc3c6dbf466edc9703c0ae1553 SHA1 67f3dca703f52ff948dcabfdc6037132c12521b0 SHA256 af65999cacb6d177b5acedd66b5e21f28cc593b6f2e24fce0a5ae36f310dca60
+EBUILD grass-6.2.1-r1.ebuild 7564 RMD160 0af82fb92c3c8e068c1c55103713912ce0204774 SHA1 f8c5578e13235c3b458a1a7b3b078c48cd34b4c1 SHA256 818de43dbaa587569fa6dc5b59c41c9049a8409b387b8b935f0c0522aaa4d485
+EBUILD grass-6.2.1.ebuild 6396 RMD160 afb5f82e82a0623a0e49e5ffc6914805631f58a4 SHA1 796d2bdee1fb50de7efb0d6d19042aedb7ef8565 SHA256 0922709646befaac7d8f7cb4e4efdc3b250bc4c9ab82f0ab1cc2d7bb63124d7a
+MISC ChangeLog 10110 RMD160 d31012ffff23f5c92dbcbdae02c1dd7ddf6c9c76 SHA1 65b7a96a20aa145e40579a68563bdd8ab8451dad SHA256 5878c77aacb11b11f2d5bf10980abe5df780b477133e1a2e92f79f813157d601
 MISC metadata.xml 492 RMD160 03cf12a529c5443dffc366017b997d183a2bcf3b SHA1 bd8657499f8b6cb3b232684afd63c3b5d915ba5e SHA256 976d5771ed6fbabbeba026b0394186b7735135deb79c86aa9388fc5134467e8e
diff --git a/sci-geosciences/grass/files/grass_icon.png b/sci-geosciences/grass/files/grass_icon.png
new file mode 100644
index 000000000000..f1a0ca3754bb
--- /dev/null
+++ b/sci-geosciences/grass/files/grass_icon.png
diff --git a/sci-geosciences/grass/grass-5.4.0.ebuild b/sci-geosciences/grass/grass-5.4.0.ebuild
index 599ab7d80d0f..ccc09a12a439 100644
--- a/sci-geosciences/grass/grass-5.4.0.ebuild
+++ b/sci-geosciences/grass/grass-5.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-5.4.0.ebuild,v 1.12 2007/07/22 07:13:53 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-5.4.0.ebuild,v 1.13 2008/03/22 02:31:43 nerdboy Exp $
 
 inherit eutils toolchain-funcs
 
@@ -59,7 +59,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
+	cd "${S}"
 	einfo "Patching configure..."
 	sed -i -e "s:relid':relid:g" configure || die "sed blew chunks"
 }
@@ -67,7 +67,7 @@ src_unpack() {
 src_compile() {
 	MYCONF="--prefix=${D}usr --host=${CHOST} --infodir=${D}usr/share/info \
 		--libdir=${D}usr/$(get_libdir) --mandir=${D}usr/share/man \
-		--enable-shared --with-cxx "
+		--enable-shared --with-cxx"
 
 	use truetype \
 		&& MYCONF="${MYCONF} --with-freetype \
@@ -107,11 +107,11 @@ src_compile() {
 }
 
 src_install() {
-	cd ${WORKDIR}/${P}/grass-build
-	make DESTDIR=${D} install \
+	cd "${WORKDIR}"/${P}/grass-build
+	make DESTDIR="${D}" install \
 		|| die "Error: make install failed!"
 	sed -i "s:^GISBASE=.*$:GISBASE=/usr/grass54:" \
-		${D}usr/bin/grass54
+		"${D}"usr/bin/grass54
 	# Install grass always in one directory
-	mv ${D}usr/${P} ${D}usr/grass54
+	mv "${D}"usr/${P} "${D}"usr/grass54
 }
diff --git a/sci-geosciences/grass/grass-6.0.1.ebuild b/sci-geosciences/grass/grass-6.0.1.ebuild
index 4de8854cd48a..77225bd636e5 100644
--- a/sci-geosciences/grass/grass-6.0.1.ebuild
+++ b/sci-geosciences/grass/grass-6.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.15 2007/07/22 07:13:53 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.0.1.ebuild,v 1.16 2008/03/22 02:31:43 nerdboy Exp $
 
 inherit eutils
 
@@ -60,7 +60,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
+	cd "${S}"
 	epatch rpm/fedora/grass-readline.patch
 	sed -i -e "s/relid'/relid/" "${S}"/configure || die "sed blew chunks"
 }
@@ -82,13 +82,7 @@ src_compile() {
 		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
+	# apparently gdal isn't optional with this version
 
 	export LD_LIBRARY_PATH="/${WORKDIR}/image/usr/grass60/$(get_libdir):${LD_LIBRARY_PATH}"
 	./configure \
@@ -110,14 +104,14 @@ src_compile() {
 
 src_install() {
 	make install \
-		prefix=${D}/usr UNIX_BIN=${D}/usr/bin BINDIR=${D}/usr/bin PREFIX=${D}/usr \
+		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
+		"${D}"/usr/bin/grass60
 
 	# This is required for GRASS dependent ebuilds (ie. QGIS)
-	mv ${D}/usr/${P} ${D}/usr/grass60
+	mv "${D}"/usr/${P} "${D}"/usr/grass60
 
 	einfo "Adding env.d entry for Grass6"
-	newenvd ${FILESDIR}/99grass-6 99grass
+	newenvd "${FILESDIR}"/99grass-6 99grass
 }
diff --git a/sci-geosciences/grass/grass-6.2.0-r1.ebuild b/sci-geosciences/grass/grass-6.2.0-r1.ebuild
index 108ddb7b80fd..c1408c1ae794 100644
--- a/sci-geosciences/grass/grass-6.2.0-r1.ebuild
+++ b/sci-geosciences/grass/grass-6.2.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.0-r1.ebuild,v 1.9 2007/09/02 11:03:33 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.0-r1.ebuild,v 1.10 2008/03/22 02:31:43 nerdboy Exp $
 
 inherit eutils autotools
 
@@ -96,7 +96,7 @@ src_unpack() {
 		die "emerge tk without threads"
 	fi
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	epatch rpm/fedora/grass-readline.patch
 	elibtoolize
@@ -139,7 +139,7 @@ src_compile() {
 		myconf="${myconf} --with-glw"
 	    fi
 	else
-	    epatch ${FILESDIR}/${P}-html-nonviz.patch
+	    epatch "${FILESDIR}"/${P}-html-nonviz.patch
 	fi
 
 	if use sqlite; then
@@ -167,22 +167,22 @@ src_compile() {
 		$(use_with tiff) \
 		$(use_with tcl tcltk) || die "Error: configure failed!"
 	# patch missing math functions
-	sed -i 's:EXTRA_LIBS=:EXTRA_LIBS=-lm :g' ${S}/lib/gmath/Makefile
-	sed -i 's:EXTRA_LIBS = :EXTRA_LIBS = -lm :g' ${S}/lib/gis/Makefile
+	sed -i 's:EXTRA_LIBS=:EXTRA_LIBS=-lm :g' "${S}"/lib/gmath/Makefile
+	sed -i 's:EXTRA_LIBS = :EXTRA_LIBS = -lm :g' "${S}"/lib/gis/Makefile
 	emake -j1 || die "Error: emake failed!"
 }
 
 src_install() {
-	make install UNIX_BIN=${D}usr/bin BINDIR=${D}usr/bin \
-		PREFIX=${D}usr INST_DIR=${D}usr/grass62 \
+	make install UNIX_BIN="${D}"usr/bin BINDIR="${D}"usr/bin \
+		PREFIX="${D}"usr INST_DIR="${D}"usr/grass62 \
 		|| die "Error: make install failed!"
 
 	sed -i "s:^GISBASE=.*$:GISBASE=/usr/grass62:" \
-		${D}usr/bin/grass62 || die "Error: sed failed!"
+		"${D}"usr/bin/grass62 || die "Error: sed failed!"
 
 	# Grass Extension Manager conflicts with ruby gems
-	mv ${D}usr/bin/gem ${D}usr/grass62/bin/
+	mv "${D}"usr/bin/gem "${D}"usr/grass62/bin/
 
 	einfo "Adding env.d entry for Grass6"
-	newenvd ${FILESDIR}/99grass-6.2 99grass-6
+	newenvd "${FILESDIR}"/99grass-6.2 99grass-6
 }
diff --git a/sci-geosciences/grass/grass-6.2.1-r1.ebuild b/sci-geosciences/grass/grass-6.2.1-r1.ebuild
new file mode 100644
index 000000000000..4efd315a341a
--- /dev/null
+++ b/sci-geosciences/grass/grass-6.2.1-r1.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.1-r1.ebuild,v 1.1 2008/03/22 02:31:43 nerdboy Exp $
+
+inherit eutils autotools fdo-mime versionator
+
+MY_PV=$(get_version_component_range 1-2 ${PV})
+MY_PVM=$(delete_all_version_separators ${MY_PV})
+MY_PM=${PN}${MY_PVM}
+
+DESCRIPTION="An open-source GIS with raster and vector functionality, as well as 3D vizualization."
+HOMEPAGE="http://grass.itc.it/"
+SRC_URI="http://grass.itc.it/${MY_PM}/source/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+# To-do: get ppc64 gdal deps fixed up
+
+IUSE="ffmpeg fftw glw gmath jpeg largefile mysql nls odbc opengl png \
+postgres python readline sqlite tiff truetype X"
+
+RESTRICT="strip"
+
+RDEPEND=">=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
+	    sys-apps/man-db )
+	sci-libs/gdal
+	>=sci-libs/proj-4.4.7
+	ffmpeg? ( media-video/ffmpeg )
+	fftw? ( sci-libs/fftw )
+	gmath? ( virtual/blas
+	    virtual/lapack )
+	jpeg? ( media-libs/jpeg )
+	mysql? ( dev-db/mysql )
+	odbc? ( >=dev-db/unixODBC-2.0.6 )
+	opengl? ( ( virtual/opengl )
+	    ( x11-libs/openmotif )
+	    glw? ( media-libs/mesa ) )
+	png? ( >=media-libs/libpng-1.2.2 )
+	postgres? ( >=dev-db/postgresql-7.3 )
+	python? ( dev-lang/python )
+	readline? ( sys-libs/readline )
+	sqlite? ( dev-db/sqlite )
+	tiff? ( >=media-libs/tiff-3.5.7 )
+	truetype? ( >=media-libs/freetype-2.0 )
+	X? (
+		x11-libs/libXmu
+		x11-libs/libXext
+		x11-libs/libXp
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libSM
+		x11-libs/libICE
+		x11-libs/libXpm
+		x11-libs/libXaw
+		>=dev-lang/tcl-8.4
+		>=dev-lang/tk-8.4
+	)"
+
+DEPEND="${RDEPEND}
+	X? (
+		x11-proto/xproto
+		x11-proto/xextproto
+	)"
+
+src_unpack() {
+	local myblas
+	if use gmath; then
+		for d in $(eselect lapack show); do myblas=${d}; done
+		if [[ -z "${myblas/reference/}" ]] && [[ -z "${myblas/atlas/}" ]]; then
+			ewarn "You need to set lapack to atlas or reference. Do:"
+			ewarn "   eselect lapack set <impl>"
+			ewarn "where <impl> is atlas, threaded-atlas or reference"
+			die "setup failed"
+		fi
+		for d in $(eselect blas show); do myblas=${d}; done
+		if [[ -z "${myblas/reference/}" ]] && [[ -z "${myblas/atlas/}" ]]; then
+			ewarn "You need to set blas to atlas or reference. Do:"
+			ewarn "   eselect blas set <impl>"
+			ewarn "where <impl> is atlas, threaded-atlas or reference"
+			die "setup failed"
+		fi
+	fi
+
+	if use glw && ! use opengl; then
+		ewarn "You set USE='glw -opengl'. GLw support needs OpenGL."
+		ewarn "OpenGL support also requires X."
+		die "Set opengl and X useflags."
+	fi
+
+	if use glw && ! built_with_use media-libs/mesa motif; then
+		ewarn "GRASS GLw/OpenGL support needs mesa with motif headers."
+		ewarn "Please rebuild mesa with motif support."
+		die "Re-emerge mesa with motif."
+	fi
+
+	if use opengl && ! use X; then
+		ewarn "GRASS OpenGL support needs X (will also pull in Tcl/Tk)."
+		die "Please set the X useflag."
+	fi
+
+	if use X && built_with_use dev-lang/tcl threads; then
+		ewarn "GRASS nviz will not work with Tcl compiled with threads!"
+		ewarn "Please disable either opengl or tcl threads."
+		die "Emerge TCL without threads."
+	fi
+
+	if use X && built_with_use dev-lang/tk threads; then
+		ewarn "GRASS nviz will not work with Tk compiled with threads!"
+		ewarn "Please disable either opengl or tk threads."
+		die "Emerge tk without threads."
+	fi
+
+	unpack ${A}
+	cd "${S}"
+	use ffmpeg && epatch "${FILESDIR}"/${P}-ffmpeg-fix.patch
+	epatch rpm/fedora/grass-readline.patch
+	elibtoolize
+	elog "Grass Home is ${MY_PM}"
+}
+
+src_compile() {
+	local myconf
+	myconf="--prefix=/usr --with-cxx --enable-shared \
+		--with-gdal=$(type -P gdal-config) --with-curses --with-proj \
+		--with-includes=/usr/include --with-libs=/usr/$(get_libdir) \
+		--with-proj-includes=/usr/include \
+		--with-proj-libs=/usr/$(get_libdir) \
+		--with-proj-share=/usr/share/proj"
+
+	if use X; then
+		myconf="${myconf} --with-tcltk --with-x \
+		    --with-tcltk-includes=/usr/include \
+		    --with-tcltk-libs=/usr/$(get_libdir)/tcl8.4"
+	else
+		myconf="${myconf} --without-tcltk --without-x"
+	fi
+
+	if use opengl; then
+	    epatch "${FILESDIR}"/${P}-html-nviz-fix.patch
+	    myconf="${myconf} --with-opengl --with-opengl-libs=/usr/$(get_libdir)/opengl/xorg-x11/lib"
+	    if use glw; then
+		myconf="${myconf} --with-glw"
+	    fi
+	else
+	    epatch "${FILESDIR}"/${P}-html-nonviz.patch
+	    myconf="${myconf} --without-opengl --without-glw"
+	fi
+
+	if use ffmpeg; then
+		myconf="${myconf} --with-ffmpeg --with-ffmpeg-includes=/usr/include/ffmpeg \
+		    --with-ffmpeg-libs=/usr/$(get_libdir)"
+	else
+		myconf="${myconf} --without-ffmpeg"
+	fi
+
+	if use truetype; then
+		myconf="${myconf} --with-freetype \
+		    --with-freetype-includes=/usr/include/freetype2"
+	fi
+
+	if use mysql; then
+		myconf="${myconf} --with-mysql --with-mysql-includes=/usr/include/mysql \
+		    --with-mysql-libs=/usr/$(get_libdir)/mysql"
+	else
+		myconf="${myconf} --without-mysql"
+	fi
+
+	if use sqlite; then
+		myconf="${myconf} --with-sqlite --with-sqlite-includes=/usr/include
+		--with-sqlite-libs=/usr/$(get_libdir)"
+	else
+		myconf="${myconf} --without-sqlite"
+	fi
+
+	econf ${myconf} --with-libs=/usr/$(get_libdir) \
+		$(use_enable amd64 64bit) \
+		$(use_with fftw) \
+		$(use_with jpeg) \
+		$(use_enable largefile) \
+		$(use_with opengl motif) \
+		$(use_with nls) \
+		$(use_with odbc) \
+		$(use_with png) \
+		$(use_with postgres) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with tiff) || die "configure failed!"
+	# patch missing math functions
+	sed -i -e "s:EXTRA_LIBS=:EXTRA_LIBS=-lm :g" "${S}"/lib/gmath/Makefile
+	sed -i -e "s:EXTRA_LIBS = :EXTRA_LIBS = -lm :g" "${S}"/lib/gis/Makefile
+
+	emake -j1 || die "emake failed!"
+}
+
+src_install() {
+	make install UNIX_BIN="${D}"usr/bin BINDIR="${D}"usr/bin \
+		PREFIX="${D}"usr INST_DIR="${D}"usr/${MY_PM} \
+		|| die "make install failed!"
+
+	# This is now generated in the function below
+	rm "${D}"usr/bin/grass62
+
+	# Grass Extension Manager conflicts with ruby gems
+	mv "${D}"usr/bin/gem "${D}"usr/${MY_PM}/bin/
+
+	ebegin "Adding env.d and desktop entry for Grass6..."
+	    generate_files
+	    doenvd 99grass-6
+	    dobin ${MY_PM}.sh
+	    doicon "${FILESDIR}"/grass_icon.png
+	    domenu ${MY_PM}-grass.desktop
+	eend ${?}
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
+
+generate_files() {
+	cat <<-EOF > 99grass-6
+	GRASS_LD_LIBRARY_PATH="/usr/${MY_PM}/lib"
+	LDPATH="/usr/${MY_PM}/lib"
+	MANPATH="/usr/${MY_PM}/man"
+	GRASS_HOME="/usr/${MY_PM}"
+	EOF
+
+	cat <<-EOF > grass62.sh
+	######################################################################
+	# MODULE:       GRASS Initialization
+	# AUTHOR(S):    Justin Hickey - Thailand - jhickey@hpcc.nectec.or.th
+	# COPYRIGHT:    (C) 2000-2005 by the GRASS Development Team
+	# This program is free software under the GNU General Public License 
+	# (>=v2)
+	#
+	trap "echo 'User break!' ; exit" 2 3 9 15
+	#
+	# Set the GISBASE variable; all arguments are passed to Init.sh
+	GISBASE=/usr/${MY_PM}
+	export GISBASE
+	exec "\$GISBASE/etc/Init.sh" "\$@"
+	EOF
+
+	cat <<-EOF > ${MY_PM}-grass.desktop
+	[Desktop Entry]
+	Encoding=UTF-8
+	Version=1.0
+	Name=Grass ${PV}
+	Type=Application
+	Comment=GRASS Open Source GIS, derived from the original US Army Corps of Engineers project.
+	Exec=${TERM} -T Grass -e /usr/bin/${MY_PM}.sh -gui
+	Path=
+	Icon=grass_icon.png
+	Categories=Science;Education;
+	Terminal=true
+	EOF
+}
diff --git a/sci-geosciences/grass/grass-6.2.1.ebuild b/sci-geosciences/grass/grass-6.2.1.ebuild
index 0154d41317c7..59306fd5b1d4 100644
--- a/sci-geosciences/grass/grass-6.2.1.ebuild
+++ b/sci-geosciences/grass/grass-6.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.1.ebuild,v 1.8 2008/03/06 18:01:07 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.1.ebuild,v 1.9 2008/03/22 02:31:43 nerdboy Exp $
 
 inherit eutils autotools
 
@@ -124,8 +124,8 @@ src_unpack() {
 		die "Emerge tk without threads."
 	fi
 	unpack ${A}
-	cd ${S}
-	use ffmpeg && epatch ${FILESDIR}/${P}-ffmpeg-fix.patch
+	cd "${S}"
+	use ffmpeg && epatch "${FILESDIR}"/${P}-ffmpeg-fix.patch
 	epatch rpm/fedora/grass-readline.patch
 	elibtoolize
 }
@@ -146,13 +146,13 @@ src_compile() {
 	fi
 
 	if use opengl; then
-	    epatch ${FILESDIR}/${P}-html-nviz-fix.patch
+	    epatch "${FILESDIR}"/${P}-html-nviz-fix.patch
 	    myconf="${myconf} --with-opengl --with-opengl-libs=/usr/$(get_libdir)/opengl/xorg-x11/lib"
 	    if use glw; then
 		myconf="${myconf} --with-glw"
 	    fi
 	else
-	    epatch ${FILESDIR}/${P}-html-nonviz.patch
+	    epatch "${FILESDIR}"/${P}-html-nonviz.patch
 	    myconf="${myconf} --without-opengl --without-glw"
 	fi
 
@@ -195,23 +195,23 @@ src_compile() {
 		$(use_with tiff) \
 		$(use_with tcl tcltk) || die "configure failed!"
 	# patch missing math functions
-	sed -i 's:EXTRA_LIBS=:EXTRA_LIBS=-lm :g' ${S}/lib/gmath/Makefile
-	sed -i 's:EXTRA_LIBS = :EXTRA_LIBS = -lm :g' ${S}/lib/gis/Makefile
+	sed -i 's:EXTRA_LIBS=:EXTRA_LIBS=-lm :g' "${S}"/lib/gmath/Makefile
+	sed -i 's:EXTRA_LIBS = :EXTRA_LIBS = -lm :g' "${S}"/lib/gis/Makefile
 
 	emake -j1 || die "emake failed!"
 }
 
 src_install() {
-	make install UNIX_BIN=${D}usr/bin BINDIR=${D}usr/bin \
-		PREFIX=${D}usr INST_DIR=${D}usr/grass62 \
+	make install UNIX_BIN="${D}"usr/bin BINDIR="${D}"usr/bin \
+		PREFIX="${D}"usr INST_DIR="${D}"usr/grass62 \
 		|| die "make install failed!"
 
-	sed -i "s:^GISBASE=.*$:GISBASE=/usr/grass62:" \
-		${D}usr/bin/grass62 || die "sed failed!"
+	sed -i -e "s:^GISBASE=.*$:GISBASE=/usr/grass62:" \
+		"${D}"usr/bin/grass62 || die "sed failed!"
 
 	# Grass Extension Manager conflicts with ruby gems
-	mv ${D}usr/bin/gem ${D}usr/grass62/bin/
+	mv "${D}"usr/bin/gem "${D}"usr/grass62/bin/
 
 	einfo "Adding env.d entry for Grass6"
-	newenvd ${FILESDIR}/99grass-6.2 99grass-6
+	newenvd "${FILESDIR}"/99grass-6.2 99grass-6
 }