Update install approach. Install .pc file. Drop old.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

13 files changed, 100 insertions, 591 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index 05ca2ba96e00..13313a529268 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-geosciences/grass
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.78 2010/04/30 08:54:30 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.79 2010/05/04 10:52:10 scarabeus Exp $
+
+  04 May 2010; Tomáš Chvátal <scarabeus@gentoo.org> -grass-5.4.0.ebuild,
+  -files/99grass-6, -grass-6.0.1.ebuild, -files/99grass-6.2,
+  -files/grass-6.2.0-html-nonviz.patch, -grass-6.2.1.ebuild,
+  -files/grass-6.2.1-ffmpeg-fix.patch, -files/grass-6.2.1-gcc43.patch,
+  -files/grass-6.2.1-html-nonviz.patch,
+  -files/grass-6.2.1-html-nviz-fix.patch, grass-6.4.0_rc6.ebuild,
+  +files/grass-pkgconf.patch:
+  Update install approach. Install .pc file. Drop old.
 
   30 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org>
   grass-6.4.0_rc6.ebuild:
diff --git a/sci-geosciences/grass/files/99grass-6 b/sci-geosciences/grass/files/99grass-6
deleted file mode 100644
index 320734474f54..000000000000
--- a/sci-geosciences/grass/files/99grass-6
+++ /dev/null
@@ -1,3 +0,0 @@
-GRASS_LD_LIBRARY_PATH="/usr/grass60/lib"
-LDPATH="/usr/grass60/lib"
-CONFIG_PROTECT="/usr/grass60/etc"
\ No newline at end of file
diff --git a/sci-geosciences/grass/files/99grass-6.2 b/sci-geosciences/grass/files/99grass-6.2
deleted file mode 100644
index 1c706579148a..000000000000
--- a/sci-geosciences/grass/files/99grass-6.2
+++ /dev/null
@@ -1,3 +0,0 @@
-GRASS_LD_LIBRARY_PATH="/usr/grass62/lib"
-LDPATH="/usr/grass62/lib"
-
diff --git a/sci-geosciences/grass/files/grass-6.2.0-html-nonviz.patch b/sci-geosciences/grass/files/grass-6.2.0-html-nonviz.patch
deleted file mode 100644
index 5ddb4d6f6282..000000000000
--- a/sci-geosciences/grass/files/grass-6.2.0-html-nonviz.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- tools/build_html_index.sh.orig	2006-12-29 11:55:46.000000000 -0800
-+++ tools/build_html_index.sh	2006-12-29 11:58:10.000000000 -0800
-@@ -129,10 +129,12 @@
- 
- #copy over CSS:
- cp -f grassdocs.css $HTMLDIR/
--cp -f grassdocs.css $HTMLDIR/nviz/
-+# patch for no opengl 
-+#cp -f grassdocs.css $HTMLDIR/nviz/
- #copy over GRASS logo:
- cp -f grass.smlogo.gif $HTMLDIR/
--cp -f grass.smlogo.gif $HTMLDIR/nviz/
-+# patch for no opengl
-+#cp -f grass.smlogo.gif $HTMLDIR/nviz/
- #copy over GEM docs:
- mkdir -p $HTMLDIR/gem
- cp -f $GEMDIR/docs/GEM-Manual/*.html $HTMLDIR/gem/
-@@ -161,7 +163,8 @@
- echo "<tr><td>&nbsp;&nbsp;r.*  </td><td>raster commands</td></tr>" >> $FULLINDEX
- echo "<tr><td>&nbsp;&nbsp;r3.* </td><td>raster3D commands</td></tr>" >> $FULLINDEX
- echo "<tr><td>&nbsp;&nbsp;v.*  </td><td>vector commands</td></tr>" >> $FULLINDEX
--echo "<tr><td>&nbsp;&nbsp;nviz </td><td>visualization command</td></tr>" >> $FULLINDEX
-+# patch for no opengl
-+#echo "<tr><td>&nbsp;&nbsp;nviz </td><td>visualization command</td></tr>" >> $FULLINDEX
- echo "</table>" >> $FULLINDEX
- echo "<p>" >> $FULLINDEX
- 
-@@ -240,9 +243,10 @@
-   echo "<li><a href=\"$MODCLASS.html\">$MODCLASS commands</a></li>" >> $FILENAME
- done
- 
-+# patch for no opengl (no nviz)
- #extra stuff for 'nviz' and 'xganim' and GUIs:
- echo "<li><a href=\"gis.m.html\">gis.m</a> and <a href=\"d.m.html\">d.m</a> GIS managers</li>" >> $FILENAME
--echo "<li><a href=\"nviz.html\">nviz</a> visualization and animation tool</li>" >> $FILENAME
-+#echo "<li><a href=\"nviz.html\">nviz</a> visualization and animation tool</li>" >> $FILENAME
- echo "<li><a href=\"xganim.html\">xganim</a> tool  for animating a raster map series</li>" >> $FILENAME
- 	      
- echo "</ul>" >> $FILENAME
diff --git a/sci-geosciences/grass/files/grass-6.2.1-ffmpeg-fix.patch b/sci-geosciences/grass/files/grass-6.2.1-ffmpeg-fix.patch
deleted file mode 100644
index 3e52df7a5055..000000000000
--- a/sci-geosciences/grass/files/grass-6.2.1-ffmpeg-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- lib/ogsf/gsd_img_ppm.c.orig	2007-08-22 19:07:35.000000000 -0700
-+++ lib/ogsf/gsd_img_ppm.c	2007-08-22 19:10:58.000000000 -0700
-@@ -119,10 +119,9 @@
- 
-         avcodec_init();
- 
--        register_avcodec(&mpeg1video_encoder); /* just mpeg1 */
--	/* -- use with othe formats ...
-+        /* register_avcodec(&mpeg1video_encoder);  just mpeg1 */
-+	/* -- use with all formats ... */
- 	avcodec_register_all();
--	*/
- 
-         /* find the mpeg1 video encoder */
-         codec = avcodec_find_encoder(CODEC_ID_MPEG1VIDEO);
-@@ -144,7 +143,7 @@
- 	For Xvid the canvas size must be a multiple of (4?). Best try 16, 
- 	 720x720. (File->Set Canval Size) Otherwise the codec won't open.
- 	*/
--	register_avcodec(&xvid_encoder);
-+	avcodec_register_all();
- 	codec = avcodec_find_encoder(CODEC_ID_XVID);
- 	bitrate=2000000;
- #endif
diff --git a/sci-geosciences/grass/files/grass-6.2.1-gcc43.patch b/sci-geosciences/grass/files/grass-6.2.1-gcc43.patch
deleted file mode 100644
index 556ac73168fe..000000000000
--- a/sci-geosciences/grass/files/grass-6.2.1-gcc43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -aur grass-6.2.3.orig/raster/r.terraflow/IOStream/include/ami_stream.h grass-6.2.3/raster/r.terraflow/IOStream/include/ami_stream.h
---- grass-6.2.3.orig/raster/r.terraflow/IOStream/include/ami_stream.h	2004-11-09 14:29:58.000000000 +0100
-+++ grass-6.2.3/raster/r.terraflow/IOStream/include/ami_stream.h	2008-03-21 01:03:36.000000000 +0100
-@@ -51,6 +51,7 @@
- #include <fcntl.h>
- #include <errno.h>
- #include <unistd.h>
-+#include <cstring>
- 
- #include <iostream>
- using namespace std;
diff --git a/sci-geosciences/grass/files/grass-6.2.1-html-nonviz.patch b/sci-geosciences/grass/files/grass-6.2.1-html-nonviz.patch
deleted file mode 100644
index 194673562a7a..000000000000
--- a/sci-geosciences/grass/files/grass-6.2.1-html-nonviz.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- tools/build_html_index.sh.orig	2007-07-01 09:47:50.000000000 -0700
-+++ tools/build_html_index.sh	2007-07-01 09:52:47.000000000 -0700
-@@ -129,10 +129,10 @@
- 
- #copy over CSS:
- cp -f grassdocs.css $HTMLDIR/
--cp -f grassdocs.css $HTMLDIR/nviz/
-+#cp -f grassdocs.css $HTMLDIR/nviz/
- #copy over GRASS logo:
- cp -f grass.smlogo.gif $HTMLDIR/
--cp -f grass.smlogo.gif $HTMLDIR/nviz/
-+#cp -f grass.smlogo.gif $HTMLDIR/nviz/
- #copy over GEM docs:
- mkdir -p $HTMLDIR/gem
- cp -f $GEMDIR/docs/GEM-Manual/*.html $HTMLDIR/gem/
-@@ -163,7 +163,7 @@
- echo "<tr><td>&nbsp;&nbsp;r3.* </td><td>raster3D commands</td></tr>" >> $FULLINDEX
- echo "<tr><td>&nbsp;&nbsp;v.*  </td><td>vector commands</td></tr>" >> $FULLINDEX
- echo "<tr><td>&nbsp;&nbsp;<a href=\"gis.m.html\">gis.m</a> </td><td>GUI frontend to GIS menus and display</td></tr>" >> $FULLINDEX
--echo "<tr><td>&nbsp;&nbsp;<a href=\"nviz.html\">nviz</a> </td><td>visualization suite</td></tr>" >> $FULLINDEX
-+#echo "<tr><td>&nbsp;&nbsp;<a href=\"nviz.html\">nviz</a> </td><td>visualization suite</td></tr>" >> $FULLINDEX
- echo "<tr><td>&nbsp;&nbsp;<a href=\"xganim.html\">xganim</a> </td><td>raster map slideshow</td></tr>" >> $FULLINDEX
- echo "</table>" >> $FULLINDEX
- echo "<p>" >> $FULLINDEX
-@@ -245,7 +245,7 @@
- 
- #extra stuff for 'nviz' and 'xganim' and GUIs:
- echo "<li><a href=\"gis.m.html\">gis.m</a> and <a href=\"d.m.html\">d.m</a> GIS managers</li>" >> $FILENAME
--echo "<li><a href=\"nviz.html\">nviz</a> visualization and animation tool</li>" >> $FILENAME
-+#echo "<li><a href=\"nviz.html\">nviz</a> visualization and animation tool</li>" >> $FILENAME
- echo "<li><a href=\"xganim.html\">xganim</a> tool  for animating a raster map series</li>" >> $FILENAME
- 	      
- echo "</ul>" >> $FILENAME
diff --git a/sci-geosciences/grass/files/grass-6.2.1-html-nviz-fix.patch b/sci-geosciences/grass/files/grass-6.2.1-html-nviz-fix.patch
deleted file mode 100644
index 75997702abd2..000000000000
--- a/sci-geosciences/grass/files/grass-6.2.1-html-nviz-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- tools/build_html_index.sh.orig	2006-11-20 08:02:23.000000000 -0800
-+++ tools/build_html_index.sh	2007-08-22 17:49:12.000000000 -0700
-@@ -127,12 +127,16 @@
- 
- ################
- 
--#copy over CSS:
-+#copy over CSS and GRASS logo:
- cp -f grassdocs.css $HTMLDIR/
--cp -f grassdocs.css $HTMLDIR/nviz/
--#copy over GRASS logo:
- cp -f grass.smlogo.gif $HTMLDIR/
-+if ! test -d $HTMLDIR/nviz
-+then
-+    mkdir $HTMLDIR/nviz
-+fi
-+cp -f grassdocs.css $HTMLDIR/nviz/
- cp -f grass.smlogo.gif $HTMLDIR/nviz/
-+
- #copy over GEM docs:
- mkdir -p $HTMLDIR/gem
- cp -f $GEMDIR/docs/GEM-Manual/*.html $HTMLDIR/gem/
diff --git a/sci-geosciences/grass/files/grass-pkgconf.patch b/sci-geosciences/grass/files/grass-pkgconf.patch
new file mode 100644
index 000000000000..025217dd13e3
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-pkgconf.patch
@@ -0,0 +1,21 @@
+--- grass.pc.in.old	2010-05-04 11:38:58.000000000 +0200
++++ grass.pc.in	2010-05-04 11:40:11.000000000 +0200
+@@ -1,12 +1,12 @@
+ # Package Information for pkg-config
+ 
+-prefix=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@
+-exec_prefix=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@
+-libdir=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/lib
+-includedir=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/include
++prefix=@prefix@
++exec_prefix=@prefix@
++libdir=@libdir@
++includedir=@includedir@
+ 
+ Name: GRASS
+ Description: GRASS GIS
+ Version: @GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@
+-Libs: -L@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/lib -lgrass_I -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_gproj -lgrass_vect -lgrass_dbmibase -lgrass_dbmiclient
+-Cflags: -I@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/include
++Libs: -L${libdir} -lgrass_I -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_gproj -lgrass_vect -lgrass_dbmibase -lgrass_dbmiclient
++Cflags: -I${includedir}/grass
diff --git a/sci-geosciences/grass/grass-5.4.0.ebuild b/sci-geosciences/grass/grass-5.4.0.ebuild
deleted file mode 100644
index fcba86174e20..000000000000
--- a/sci-geosciences/grass/grass-5.4.0.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# 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.15 2008/06/24 07:45:51 nerdboy Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="An open-source GIS with raster and vector functionality"
-HOMEPAGE="http://grass.itc.it/"
-SRC_URI="http://grass.itc.it/grass54/source/${P}.tar.gz
-	http://grass.meteo.uni.wroc.pl/grass54/source/${P}.tar.gz
-	http://grass.ibiblio.org/grass54/source/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 sparc x86"
-IUSE="tk png jpeg tiff postgres odbc motif gdal mysql blas lapack X fftw truetype nls opengl"
-
-RDEPEND=">=sys-libs/zlib-1.1.4
-	>=sys-libs/ncurses-5.3
-	>=sys-libs/gdbm-1.8.0
-	virtual/man
-	>=sci-libs/proj-4.4.7
-	blas? ( virtual/blas )
-	lapack? ( virtual/lapack )
-	fftw? ( =sci-libs/fftw-2* )
-	gdal? ( >=sci-libs/gdal-1.2.6 )
-	jpeg? ( media-libs/jpeg )
-	tiff? ( media-libs/tiff )
-	png? ( >=media-libs/libpng-1.2.2 )
-	mysql? ( virtual/mysql )
-	odbc? ( >=dev-db/unixODBC-2.0.6 )
-	postgres? ( >=virtual/postgresql-server-7.3 )
-	nls? ( x11-terms/mlterm )
-	tk? ( >=dev-lang/tk-8.3.4 )
-	truetype? ( >=media-libs/freetype-2.0.0 )
-	motif? ( x11-libs/openmotif )
-	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
-	)"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.80
-	>=sys-devel/flex-2.5.4a
-	>=sys-devel/bison-1.35
-	>=sys-devel/gcc-3.2.2
-	X? (
-		x11-proto/xproto
-		x11-proto/xextproto
-	)"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	einfo "Patching configure..."
-	sed -i -e "s:relid':relid:g" configure || die "sed blew chunks"
-}
-
-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"
-
-	use truetype \
-		&& MYCONF="${MYCONF} --with-freetype \
-		--with-freetype-includes=/usr/include/freetype2 \
-		--with-freetype-libs=/usr/lib" \
-		|| MYCONF="${MYCONF} --without-freetype"
-
-	use gdal \
-		&& MYCONF="${MYCONF} --with-gdal=/usr/bin/gdal-config" \
-		|| MYCONF="${MYCONF} --without-gdal"
-
-	use mysql \
-		&& MYCONF="${MYCONF} --with-mysql --with-mysql-includes=/usr/include/mysql \
-		 --with-mysql-libs=/usr/lib/mysql" \
-		|| MYCONF="${MYCONF} --without-mysql"
-
-	mkdir ./grass-build
-	cd ./grass-build
-
-	../configure ${MYCONF} \
-		`use_with X` \
-		`use_with readline` \
-		`use_with tk tcltk` \
-		`use_with postgres` \
-		`use_with motif` \
-		`use_with blas` \
-		`use_with lapack` \
-		`use_with fftw` \
-		`use_with jpeg` \
-		`use_with png` \
-		`use_with tiff` \
-		`use_with odbc` \
-		`use_with nls` \
-		`use_enable amd64 64bit` \
-		`use_with opengl` || die "Error: configure failed!"
-	emake -j1 || die "Error: emake failed!"
-}
-
-src_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
-	# Install grass always in one directory
-	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
deleted file mode 100644
index 0807f7b2dc28..000000000000
--- a/sci-geosciences/grass/grass-6.0.1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# 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.18 2008/06/24 07:45:51 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="amd64 ppc sparc x86"
-# To-do: get ppc64 gdal deps fixed up
-
-# add gdal back to use flags once grass is fixed
-IUSE="fftw jpeg motif mysql nls odbc opengl png postgres readline tk tiff truetype"
-
-RESTRICT="strip"
-
-RDEPEND=">=sys-libs/zlib-1.1.4
-	>=sys-libs/ncurses-5.3
-	>=sys-libs/gdbm-1.8.0
-	virtual/man
-	>=sci-libs/proj-4.4.7
-	sci-libs/gdal
-	fftw? ( =sci-libs/fftw-2* )
-	jpeg? ( media-libs/jpeg )
-	postgres? ( >=virtual/postgresql-server-7.3 )
-	mysql? ( virtual/mysql )
-	odbc? ( >=dev-db/unixODBC-2.0.6 )
-	png? ( >=media-libs/libpng-1.2.2 )
-	readline? ( sys-libs/readline )
-	tiff? ( >=media-libs/tiff-3.5.7 )
-	truetype? ( >=media-libs/freetype-2.0 )
-	nls? ( x11-terms/mlterm )
-	opengl? ( virtual/opengl )
-	tk? ( >=dev-lang/tk-8.3.4 )
-	motif? ( x11-libs/openmotif )
-	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"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.80
-	>=sys-devel/flex-2.5.4a
-	>=sys-devel/bison-1.35
-	>=sys-devel/gcc-3.2.2
-	x11-proto/xproto
-	x11-proto/xextproto"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch rpm/fedora/grass-readline.patch
-	sed -i -e "s/relid'/relid/" "${S}"/configure || die "sed blew chunks"
-}
-
-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
-
-	export LD_LIBRARY_PATH="/${WORKDIR}/image/usr/grass60/$(get_libdir):${LD_LIBRARY_PATH}"
-	./configure \
-		`use_with postgres` \
-		`use_with motif` \
-		`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` \
-		$(use_with tk tcltk) \
-		${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"
-	newenvd "${FILESDIR}"/99grass-6 99grass
-}
diff --git a/sci-geosciences/grass/grass-6.2.1.ebuild b/sci-geosciences/grass/grass-6.2.1.ebuild
deleted file mode 100644
index 0099085239f5..000000000000
--- a/sci-geosciences/grass/grass-6.2.1.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# 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.15 2008/12/19 05:57:29 nerdboy Exp $
-
-inherit eutils libtool
-
-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/grass62/source/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="6"
-KEYWORDS="amd64 ppc sparc x86"
-# To-do: get ppc64 gdal deps fixed up
-
-IUSE="ffmpeg fftw gmath jpeg largefile motif mysql nls odbc opengl png \
-postgres python readline sqlite tiff truetype X"
-
-RESTRICT="strip"
-
-RDEPEND=">=sys-libs/zlib-1.1.4
-	>=sys-libs/ncurses-5.3
-	>=sys-libs/gdbm-1.8.0
-	|| (
-	    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 )
-	motif? ( x11-libs/openmotif )
-	mysql? ( dev-db/mysql )
-	odbc? ( >=dev-db/unixODBC-2.0.6 )
-	opengl? ( virtual/opengl )
-	png? ( >=media-libs/libpng-1.2.2 )
-	postgres? ( >=virtual/postgresql-base-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}
-	>=sys-devel/flex-2.5.4a
-	>=sys-devel/bison-1.35
-	X? (
-		x11-proto/xproto
-		x11-proto/xextproto
-	)"
-
-pkg_setup() {
-	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 opengl && ! use X; then
-		ewarn "GRASS OpenGL support needs X (will also pull in Tcl/Tk)."
-		die "Please set the X useflag."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	use ffmpeg && epatch "${FILESDIR}"/${P}-ffmpeg-fix.patch
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-	epatch rpm/fedora/grass-readline.patch
-
-	elibtoolize
-
-	# patch missing math functions (yes, this is still needed)
-	sed -i -e "s:\$(EXTRA_LIBS):\$(EXTRA_LIBS) \$(MATHLIB):g" include/Make/Shlib.make
-	echo "MATHLIB=-lm" >> include/Make/Rules.make
-}
-
-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 \
-		--without-glw --without-wxwidgets"
-	if use X; then
-	    if has_version ">=dev-lang/tcl-8.5"; then
-		TCL_LIBDIR="/usr/$(get_libdir)/tcl8.5"
-	    else
-		TCL_LIBDIR="/usr/$(get_libdir)/tcl8.4"
-	    fi
-	    myconf="${myconf} --with-tcltk --with-x \
-	        --with-tcltk-includes=/usr/include \
-		--with-tcltk-libs=${TCL_LIBDIR}"
-	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"
-	else
-	    epatch "${FILESDIR}"/${P}-html-nonviz.patch
-	    myconf="${myconf} --without-opengl --without-glw"
-	fi
-
-	# Should handle either older or latest without intervention;
-	# this won't work forever, but it should be okay for a while...
-	if use ffmpeg; then
-	    myconf="${myconf} --with-ffmpeg \
-	        --with-ffmpeg-libs=/usr/$(get_libdir)"
-	    if has_version ">=media-video/ffmpeg-0.4.9_p20080326" ; then
-		# must pass multiple include dirs now; if anyone has a better
-		# way to do this, please speak up and file a bug :)
-	        myconf="${myconf} --with-ffmpeg-includes=/usr/include/libav*"
-	    else
-		myconf="${myconf} --with-ffmpeg-includes=/usr/include/ffmpeg"
-	    fi
-	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/lib"
-	else
-		myconf="${myconf} --without-sqlite"
-	fi
-
-	#export LD_LIBRARY_PATH="/${WORKDIR}/image/usr/${P}/$(get_libdir):${LD_LIBRARY_PATH}"
-	econf ${myconf} --with-libs=/usr/$(get_libdir) \
-		$(use_enable amd64 64bit) \
-		$(use_with fftw) \
-		$(use_with jpeg) \
-		$(use_enable largefile) \
-		$(use_with 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!"
-
-	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 \
-		|| die "make install 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/
-
-	einfo "Adding env.d entry for Grass6"
-	newenvd "${FILESDIR}"/99grass-6.2 99grass-6
-}
diff --git a/sci-geosciences/grass/grass-6.4.0_rc6.ebuild b/sci-geosciences/grass/grass-6.4.0_rc6.ebuild
index 5f501243df78..cb84f45ed93c 100644
--- a/sci-geosciences/grass/grass-6.4.0_rc6.ebuild
+++ b/sci-geosciences/grass/grass-6.4.0_rc6.ebuild
@@ -1,18 +1,19 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.0_rc6.ebuild,v 1.3 2010/04/30 18:43:55 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.0_rc6.ebuild,v 1.4 2010/05/04 10:52:10 scarabeus Exp $
 
 EAPI="3"
 
 PYTHON_DEPEND="python? 2"
-inherit eutils python gnome2 versionator wxwidgets base
+inherit eutils python gnome2 multilib versionator wxwidgets base
 
 MY_PM=${PN}$(get_version_component_range 1-2 ${PV})
+MY_PM=${MY_PM/.}
 MY_P=${P/_rc/RC}
 
 DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization."
 HOMEPAGE="http://grass.osgeo.org//"
-SRC_URI="http://grass.osgeo.org/${MY_PM/.}/source/${MY_P}.tar.gz"
+SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="6"
@@ -39,7 +40,6 @@ RDEPEND="
 		virtual/lapack
 	)
 	jpeg? ( media-libs/jpeg )
-	motif? ( x11-libs/openmotif )
 	mysql? ( dev-db/mysql )
 	odbc? ( dev-db/unixODBC )
 	png? ( media-libs/libpng )
@@ -63,6 +63,10 @@ RDEPEND="
 		x11-libs/libXp
 		x11-libs/libXpm
 		x11-libs/libXt
+		motif? (
+			x11-libs/openmotif
+			opengl? ( media-libs/mesa[motif] )
+		)
 		opengl? (
 			virtual/opengl
 			${TCL_DEPS}
@@ -74,7 +78,9 @@ RDEPEND="
 "
 
 DEPEND="${RDEPEND}
+	dev-util/pkgconfig
 	sys-devel/flex
+	sys-devel/gettext
 	sys-devel/bison
 	X? (
 		x11-proto/xextproto
@@ -82,7 +88,11 @@ DEPEND="${RDEPEND}
 		python? ( wxwidgets? ( dev-lang/swig ) )
 	)"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+  "${FILESDIR}/${PN}-pkgconf.patch"
+)
 
 pkg_setup() {
 	local myblas
@@ -106,6 +116,7 @@ pkg_setup() {
 	fi
 
 	# check useflag nesting.
+	use motif && ! use X && ewarn "For motif support X useflag must be enabled"
 	use opengl && ! use X && ewarn "For opengl support X useflag must be enabled"
 	use wxwidgets && ! use X && ewarn "For wxwidgets support X useflag must be enabled"
 	use wxwidgets && ! use python && ewarn "For wxwidgets support python useflag must be enabled"
@@ -116,7 +127,7 @@ pkg_setup() {
 
 src_prepare() {
 	if ! use opengl; then
-	    epatch "${FILESDIR}"/${PN}-6.4.0-html-nonviz.patch
+		epatch "${FILESDIR}"/${PN}-6.4.0-html-nonviz.patch
 	fi
 
 	base_src_prepare
@@ -129,10 +140,10 @@ src_configure() {
 		TCL_LIBDIR="/usr/$(get_libdir)/tcl8.5"
 		myconf+="
 			--with-tcltk-libs=${TCL_LIBDIR}
+			$(use_with motif)
 			$(use_with opengl)
 			--with-x
 		"
-		use opengl && myconf+=" --with-tcltk"
 
 		if use python && use wxwidgets; then
 			WX_BUILD=yes
@@ -151,9 +162,14 @@ src_configure() {
 				--without-wxwidgets
 			"
 		fi
+
+		use opengl && myconf+=" --with-tcltk"
+		use motif && use opengl && myconf+=" --with-glw"
+		use motif || myconf+=" --without-glw"
 	else
 		myconf+="
 			--without-opengl
+			--without-glw
 			--without-tcltk
 			--without-wxwidgets
 			--without-x
@@ -168,6 +184,7 @@ src_configure() {
 		--without-glw \
 		--enable-shared \
 		$(use_enable amd64 64bit) \
+		$(use_enable ppc64 64bit) \
 		$(use_with cairo) \
 		$(use_with cxx) \
 		$(use_with fftw) \
@@ -180,7 +197,6 @@ src_configure() {
 		$(use_with gmath lapack) \
 		$(use_with jpeg) \
 		$(use_enable largefile) \
-		$(use_with motif) \
 		$(use_with mysql) \
 		$(use_with nls) \
 		$(use_with odbc) \
@@ -202,12 +218,13 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" \
-		INST_DIR="${D}"/usr/share/${PN}/$(get_version_component_range 1-2 ${PV})/ \
-		PREFIX="${D}"/usr/share/${PN}/$(get_version_component_range 1-2 ${PV})/ \
-		BINDIR="${D}"/usr/bin \
+		INST_DIR="${D}"/usr/${MY_PM} \
+		prefix="${D}"/usr BINDIR="${D}"/usr/bin \
+		PREFIX="${D}"/usr/ \
 		install || die
 
-	cd "${D}"/usr/share/${PN}/$(get_version_component_range 1-2 ${PV})/
+	pushd "${D}"/usr/${MY_PM} &> /dev/null
+
 	# fix docs
 	dodoc AUTHORS CHANGES || die
 	dohtml -r docs/html/* || die
@@ -223,18 +240,51 @@ src_install() {
 	dodir /usr/share/locale/ || die
 	mv locale/* "${D}"/usr/share/locale/ || die
 	rm -rf locale/ || die
+	# pt_BR is broken
+	mv "${D}"/usr/share/locale/pt_br "${D}"/usr/share/locale/pt_BR || die
+
+	popd &> /dev/null
 
-	# get rid of DESTDIR in script path
-	sed -i -e "s:${D}:/:" "${D}"usr/bin/${MY_PM/.} || die
+	# place libraries where they belong
+	mv "${D}"/usr/${MY_PM}/lib/ "${D}"/usr/$(get_libdir)/ || die
+
+	# place header files where they belong
+	mv "${D}"/usr/${MY_PM}/include/ "${D}"/usr/include/ || die
+	# make rules are not required on installed system
+	rm -rf "${D}"/usr/include/Make || die
+
+	# mv remaining gisbase stuff to libdir
+	mv "${D}"/usr/${MY_PM} "${D}"/usr/$(get_libdir) || die
+
+	# set proper default window renderer
+	if [[ ${WX_BUILD} == yes ]]; then
+		sed -i \
+			-e "1,\$s:^DEFAULT_GUI.*:DEFAULT_GUI=\"wxpython\":" \
+			"${D}"/usr/$(get_libdir)/${MY_PM}/etc/Init.sh || die
+	fi
+
+	# get proper folder for grass path in script
+	sed -i \
+		-e "1,\$s:^GISBASE.*:GISBASE=/usr/$(get_libdir)/${MY_PM}:" \
+		"${D}"usr/bin/${MY_PM} || die
+
+	# get proper fonts path for fontcap
+	sed -i \
+		-e "s|${D}/usr/${MY_PM}|/usr/$(get_libdir)/${MY_PM}|" \
+		"${D}"/usr/$(get_libdir)/${MY_PM}/etc/fontcap || die
 
-	cd ${S}
 	if use X; then
 		generate_files
 		doicon gui/icons/${PN}-48x48.png || die
-		domenu ${MY_PM/.}-grass.desktop || die
+		domenu ${MY_PM}-grass.desktop || die
 	fi
 
-	# FIXME: install .pc file so other apps know where to look for grass
+	# install .pc file so other apps know where to look for grass
+	insinto /usr/$(get_libdir)/pkgconfig/
+	doins grass.pc || die
+
+	# fix weird +x on tcl scripts
+	find "${D}" -name "*.tcl" -exec chmod +r-x '{}' \;
 }
 
 pkg_postinst() {
@@ -255,14 +305,14 @@ generate_files() {
 	local GUI="-gui"
 	[[ ${WX_BUILD} == yes ]] && GUI="-wxpython"
 
-	cat <<-EOF > ${MY_PM/.}-grass.desktop
+	cat <<-EOF > ${MY_PM}-grass.desktop
 	[Desktop Entry]
 	Encoding=UTF-8
 	Version=1.0
 	Name=Grass ${PV}
 	Type=Application
 	Comment=GRASS (Geographic Resources Analysis Support System), the original GIS.
-	Exec=${TERM} -T Grass -e /usr/bin/${MY_PM/.} ${GUI}
+	Exec=${TERM} -T Grass -e /usr/bin/${MY_PM} ${GUI}
 	Path=
 	Icon=${PN}-48x48.png
 	Categories=Science;Education;