Updated to official 6.4.0 release and removed old rc releases/patches.

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

5 files changed, 42 insertions, 343 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index 572bac04f6ce..87628bd64d33 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.88 2010/06/17 21:03:51 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.89 2010/09/04 02:29:11 nerdboy Exp $
+
+*grass-6.4.0 (04 Sep 2010)
+
+  04 Sep 2010; Steve Arnold <nerdboy@gentoo.org> -grass-6.4.0_rc5.ebuild,
+  -grass-6.4.0_rc6.ebuild, +grass-6.4.0.ebuild,
+  files/grass-6.4.0-html-nonviz.patch,
+  -files/grass-6.4.0_rc6-html-nonviz.patch:
+  Updated to official 6.4.0 release and removed old rc releases/patches. 
+  Both GUIs tested (with actual data) on amd64.
 
   17 Jun 2010; Patrick Lauer <patrick@gentoo.org> grass-6.3.0.ebuild,
   grass-6.4.0_rc5.ebuild, grass-6.4.0_rc6.ebuild:
diff --git a/sci-geosciences/grass/files/grass-6.4.0-html-nonviz.patch b/sci-geosciences/grass/files/grass-6.4.0-html-nonviz.patch
index a879ad22356b..a5afd0dfafb6 100644
--- a/sci-geosciences/grass/files/grass-6.4.0-html-nonviz.patch
+++ b/sci-geosciences/grass/files/grass-6.4.0-html-nonviz.patch
@@ -1,14 +1,14 @@
---- tools/build_html_index.sh	2009-05-05 21:04:00.000000000 +0200
-+++ tools/build_html_index.sh.new	2010-01-27 10:33:02.000000000 +0100
-@@ -139,7 +139,6 @@
-        <li><a href=\"displaydrivers.html\">Display drivers</a></li>
-         <li><a href=\"gis.m.html\">gis.m</a> and <a href=d.m.html>d.m</a> GIS managers</li>
-         <li><a href=\"wxGUI.html\">wxGUI</a> wxPython-based GUI frontend</li>
--        <li><a href=\"nviz.html\">nviz</a> visualization and animation tool</li>
+--- tools/build_html_index.sh.old	2010-06-16 23:07:37.000000000 +0200
++++ tools/build_html_index.sh	2010-06-16 23:10:00.000000000 +0200
+@@ -135,7 +135,6 @@
+        </ul>
+ 
+        <ul>
+-        <li><a href=\"nviz.html\">nviz</a> 3D visualization and animation tool</li>
          <li><a href=\"xganim.html\">xganim</a> tool  for animating a raster map series</li>
-         <li><a href=\"display.html\">Display commands manual</a></li>
         </ul></td>
-@@ -235,11 +234,11 @@
+     </tr>
+@@ -245,11 +244,11 @@
  #copy over CSS:
  cp -f grassdocs.css $HTMLDIR/
  mkdir -p $HTMLDIR/nviz/
@@ -22,7 +22,7 @@
  chmod a+r $HTMLDIR/grass_logo.png $HTMLDIR/nviz/grass_logo.png
  if [ "$MACOSX" ] ; then
    cp -f grass_icon.png $HTMLDIR/
-@@ -292,7 +291,7 @@
+@@ -302,7 +301,7 @@
  echo "<tr><td>&nbsp;&nbsp;<a href=\"full_index.html#r3\">r3.*</a> </td><td>raster3D commands</td></tr>" >> "$FULLINDEX"
  echo "<tr><td>&nbsp;&nbsp;<a href=\"full_index.html#v\">v.*</a> </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"
diff --git a/sci-geosciences/grass/files/grass-6.4.0_rc6-html-nonviz.patch b/sci-geosciences/grass/files/grass-6.4.0_rc6-html-nonviz.patch
deleted file mode 100644
index a5afd0dfafb6..000000000000
--- a/sci-geosciences/grass/files/grass-6.4.0_rc6-html-nonviz.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- tools/build_html_index.sh.old	2010-06-16 23:07:37.000000000 +0200
-+++ tools/build_html_index.sh	2010-06-16 23:10:00.000000000 +0200
-@@ -135,7 +135,6 @@
-        </ul>
- 
-        <ul>
--        <li><a href=\"nviz.html\">nviz</a> 3D visualization and animation tool</li>
-         <li><a href=\"xganim.html\">xganim</a> tool  for animating a raster map series</li>
-        </ul></td>
-     </tr>
-@@ -245,11 +244,11 @@
- #copy over CSS:
- cp -f grassdocs.css $HTMLDIR/
- mkdir -p $HTMLDIR/nviz/
--cp -f grassdocs.css $HTMLDIR/nviz/
-+#cp -f grassdocs.css $HTMLDIR/nviz/
- chmod a+r $HTMLDIR/grassdocs.css $HTMLDIR/nviz/grassdocs.css
- #copy over GRASS logo:
- cp -f grass_logo.png $HTMLDIR/
--cp -f grass_logo.png $HTMLDIR/nviz/
-+#cp -f grass_logo.png $HTMLDIR/nviz/
- chmod a+r $HTMLDIR/grass_logo.png $HTMLDIR/nviz/grass_logo.png
- if [ "$MACOSX" ] ; then
-   cp -f grass_icon.png $HTMLDIR/
-@@ -302,7 +301,7 @@
- echo "<tr><td>&nbsp;&nbsp;<a href=\"full_index.html#r3\">r3.*</a> </td><td>raster3D commands</td></tr>" >> "$FULLINDEX"
- echo "<tr><td>&nbsp;&nbsp;<a href=\"full_index.html#v\">v.*</a> </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=\"wxGUI.html\">wxGUI</a> </td><td>wxPython-based GUI frontend</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"
diff --git a/sci-geosciences/grass/grass-6.4.0_rc6.ebuild b/sci-geosciences/grass/grass-6.4.0.ebuild
index cf5026109dd5..db69ed10d16f 100644
--- a/sci-geosciences/grass/grass-6.4.0_rc6.ebuild
+++ b/sci-geosciences/grass/grass-6.4.0.ebuild
@@ -1,11 +1,11 @@
 # 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.10 2010/06/17 21:03:51 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.0.ebuild,v 1.1 2010/09/04 02:29:11 nerdboy Exp $
 
 EAPI="3"
 
 PYTHON_DEPEND="python? 2"
-inherit eutils python gnome2 multilib versionator wxwidgets base
+inherit eutils gnome2 multilib python versionator wxwidgets base
 
 MY_PM=${PN}$(get_version_component_range 1-2 ${PV})
 MY_PM=${MY_PM/.}
@@ -23,10 +23,10 @@ IUSE="X cairo cxx ffmpeg fftw gmath jpeg largefile motif mysql nls odbc opengl p
 
 TCL_DEPS="
 	>=dev-lang/tcl-8.5
-	>=dev-lang/tk-8.5
-"
+	>=dev-lang/tk-8.5"
 
 RDEPEND="
+	>=app-admin/eselect-1.2
 	sci-libs/gdal
 	sci-libs/proj
 	sys-libs/gdbm
@@ -51,7 +51,9 @@ RDEPEND="
 	)
 	readline? ( sys-libs/readline )
 	sqlite? ( dev-db/sqlite:3 )
-	tiff? ( media-libs/tiff )
+	tiff? ( media-libs/tiff
+		largefile? ( >=media-libs/tiff-4 )
+	)
 	truetype? ( media-libs/freetype:2 )
 	X? (
 		x11-libs/libICE
@@ -71,11 +73,10 @@ RDEPEND="
 			virtual/opengl
 			${TCL_DEPS}
 		)
-		python? ( wxwidgets? ( >=dev-python/wxpython-2.8.10.1 ) )
+		python? ( wxwidgets? ( >=dev-python/wxpython-2.8.10.1[cairo,opengl?] ) )
 		!python? ( ${TCL_DEPS} )
 		!wxwidgets? ( ${TCL_DEPS} )
-	)
-"
+	)"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -125,6 +126,18 @@ pkg_setup() {
 		# only py2 is supported
 		python_set_active_version 2
 	fi
+
+	if use wxwidgets; then
+		# only 2.8 is supported or the wx-gui barfs at runtime...
+		local success=0
+		ewarn "Attempting to select a compatible wxwidgets"
+		eselect wxwidgets set gtk2-unicode-release-2.8
+		success=1
+	fi
+	if [ $success != 1 ]; then
+		 eerror "Unable to select a compatible wxwidgets!"
+		 die "Please set wxwidgets to at least 2.8 (see \`eselect wxwidgets --help\`)."
+	fi
 }
 
 src_prepare() {
@@ -145,7 +158,7 @@ src_configure() {
 			$(use_with motif)
 			$(use_with opengl)
 			--with-x
-		"
+			"
 
 		if use python && use wxwidgets; then
 			WX_BUILD=yes
@@ -158,7 +171,6 @@ src_configure() {
 		else
 			WX_BUILD=no
 			# use tcl gui if wxwidgets are disabled
-
 			myconf+="
 				--with-tcltk
 				--without-wxwidgets
diff --git a/sci-geosciences/grass/grass-6.4.0_rc5.ebuild b/sci-geosciences/grass/grass-6.4.0_rc5.ebuild
deleted file mode 100644
index c02f96c0e76a..000000000000
--- a/sci-geosciences/grass/grass-6.4.0_rc5.ebuild
+++ /dev/null
@@ -1,289 +0,0 @@
-# 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_rc5.ebuild,v 1.4 2010/06/17 21:03:51 patrick Exp $
-
-EAPI="2"
-
-inherit eutils distutils fdo-mime versionator wxwidgets
-
-MY_PV=$(get_version_component_range 1-2 ${PV})
-MY_PVM=$(delete_all_version_separators ${MY_PV})
-MY_PM=${PN}${MY_PVM}
-MY_P=${PN}-$(get_version_component_range 1-3 ${PV})RC5
-
-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"
-
-LICENSE="GPL-2"
-SLOT="6"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="X ffmpeg fftw gmath jpeg largefile motif mysql nls odbc opengl png
-	postgres python readline sqlite tiff truetype wxwindows"
-
-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 )
-	mysql? ( dev-db/mysql )
-	odbc? ( >=dev-db/unixODBC-2.0.6 )
-	opengl? ( virtual/opengl )
-	motif? ( x11-libs/openmotif )
-	png? ( >=media-libs/libpng-1.2.2 )
-	postgres? (
-		|| (
-			>=dev-db/postgresql-base-8.0
-			>=dev-db/postgresql-server-8.0
-		)
-	)
-	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 )
-	wxwindows? (
-		>=dev-python/wxpython-2.8.1.1
-		>=dev-lang/python-2.4
-	)
-	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
-	wxwindows? ( >=dev-lang/swig-1.3.31 )
-	X? (
-		x11-proto/xproto
-		x11-proto/xextproto
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	local myblas
-	elog ""
-	elog "This version enables the experimental wxpython interface, which"
-	elog "you may want to try.  If the legacy GUI seems a little wonky in"
-	elog "this version, just enable the wxwindows USE flag and rebuild"
-	elog "grass to use it."
-	elog ""
-	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_prepare() {
-	epatch rpm/fedora/grass-readline.patch
-
-	sed -i -e "s:buff\[12:buff\[16:g" general/g.parser/main.c \
-	    || die "sed failed"
-
-	if ! use opengl; then
-	    epatch "${FILESDIR}"/${PN}-6.4.0-html-nonviz.patch
-	fi
-
-	# 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_configure() {
-	local myconf
-	addpredict /var/cache/fontconfig
-
-	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"
-
-	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+=" --with-tcltk --with-x \
-			--with-tcltk-includes=/usr/include \
-		--with-tcltk-libs=${TCL_LIBDIR}"
-	    if use wxwindows; then
-			WX_GTK_VER=2.8
-			need-wxwidgets unicode
-			myconf+=" --with-python --with-wxwidgets=${WX_CONFIG}"
-	    else
-			# USE=python must be enabled above if wxwindows is enabled
-			myconf+=" $(use_with python) --without-wxwidgets"
-	    fi
-	else
-		myconf+=" --without-tcltk --without-x"
-	fi
-
-	if use opengl; then
-		myconf+=" --with-opengl --with-opengl-libs=/usr/$(get_libdir)/opengl/xorg-x11/lib"
-	else
-		myconf+=" --without-opengl"
-	fi
-
-	if use truetype; then
-		myconf+=" --with-freetype
-			--with-freetype-includes=/usr/include/freetype2"
-	fi
-
-	if use mysql; then
-		myconf+=" --with-mysql --with-mysql-includes=/usr/include/mysql
-			--with-mysql-libs=/usr/$(get_libdir)/mysql"
-	else
-		myconf+=" --without-mysql"
-	fi
-
-	if use sqlite; then
-		myconf+=" --with-sqlite --with-sqlite-includes=/usr/include
-			--with-sqlite-libs=/usr/$(get_libdir)"
-	else
-		myconf+=" --without-sqlite"
-	fi
-
-	# Old ffmpeg is gone, but new is a pita with all those include dirs,
-	# thus, a rather funky configure...
-	if use ffmpeg; then
-	    ffmlib_conf="--with-ffmpeg --with-ffmpeg-libs=/usr/$(get_libdir)"
-	else
-		myconf+=" --without-ffmpeg"
-	fi
-
-	myconf+=" --with-libs=/usr/$(get_libdir)
-		$(use_enable amd64 64bit)
-		$(use_with fftw)
-		$(use_with gmath blas)
-		$(use_with gmath lapack)
-		$(use_with jpeg)
-		$(use_enable largefile)
-		$(use_with motif)
-		$(use_with nls)
-		$(use_with odbc)
-		$(use_with png)
-		$(use_with postgres)
-		$(use_with readline)
-		$(use_with tiff)"
-
-	if use ffmpeg; then
-		"${S}"/configure ${myconf} ${ffmlib_conf} \
-			--with-ffmpeg-includes="/usr/include/libavcodec \
-			/usr/include/libavdevice /usr/include/libavfilter \
-			/usr/include/libavformat /usr/include/libavutil \
-			/usr/include/libpostproc /usr/include/libswscale" \
-			|| die "ffmpeg configure failed!"
-	else
-		"${S}"/configure ${myconf} || die "configure failed!"
-	fi
-}
-
-src_compile() {
-	# looks like we no longer need the vdigit symlink build hack
-	emake -j1 || die "make failed!"
-}
-
-src_install() {
-	elog "Grass Home is ${MY_PM}"
-	make install UNIX_BIN="${D}"usr/bin BINDIR="${D}"usr/bin \
-	    PREFIX="${D}"usr INST_DIR="${D}"usr/${MY_PM} \
-	    || die "make install failed!"
-
-	# get rid of DESTDIR in script path
-	sed -i -e "s@${D}@/@" "${D}"usr/bin/${MY_PM}
-
-	# 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
-	if use X; then
-		doicon "${FILESDIR}"/grass_icon.png
-		domenu ${MY_PM}-grass.desktop
-	fi
-	eend ${?}
-}
-
-pkg_postinst() {
-	use X && fdo-mime_desktop_database_update
-
-	elog "Note this version re-enables support for threads in Tcl and Tk."
-	elog "Enable the threads USE flag and rebuild to try it."
-}
-
-pkg_postrm() {
-	use X && fdo-mime_desktop_database_update
-}
-
-generate_files() {
-	local GUI="-gui"
-	use wxwindows && GUI="-wxpython"
-
-	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 > ${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}
-	Path=
-	Icon=grass_icon.png
-	Categories=Science;Education;
-	Terminal=false
-	EOF
-}