--- grass-6.2.1-r1.ebuild	2008-03-22 06:07:07.000000000 +0100
+++ grass-6.3.0_rc6.ebuild	2008-04-16 10:56:18.000000000 +0200
@@ -8,11 +8,11 @@
 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"
+SRC_URI="http://grass.itc.it/${MY_PM}/source/${P/_rc/RC}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
@@ -68,10 +68,12 @@
 	X? (
 		x11-proto/xproto
 		x11-proto/xextproto
 	)"
 
+S="${WORKDIR}/${P/_rc/RC}"
+
 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
@@ -118,11 +120,10 @@
 		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}"
 }
 
@@ -142,11 +143,10 @@
 	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
@@ -204,14 +204,11 @@
 	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/
+	rm "${D}"usr/bin/${MY_PM}
 
 	ebegin "Adding env.d and desktop entry for Grass6..."
 	    generate_files
 	    doenvd 99grass-6
 	    dobin ${MY_PM}.sh
@@ -236,11 +233,11 @@
 	LDPATH="/usr/${MY_PM}/lib"
 	MANPATH="/usr/${MY_PM}/man"
 	GRASS_HOME="/usr/${MY_PM}"
 	EOF
 
-	cat <<-EOF > grass62.sh
+	cat <<-EOF > ${MY_PM}.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