diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2010-06-17 07:28:03 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2010-06-17 07:28:03 +0000 |
commit | 4f422c601aab6e27f799155d2473aa5fc4a906e6 (patch) | |
tree | 4f59e5f9255745f3cca61ef1a8a5963c7bc702a0 /sci-geosciences | |
parent | Bump ghc requirement to 6.8 in version 2.1.0-r1 and 2.2.1, they have a ghc th... (diff) | |
download | gentoo-2-4f422c601aab6e27f799155d2473aa5fc4a906e6.tar.gz gentoo-2-4f422c601aab6e27f799155d2473aa5fc4a906e6.tar.bz2 gentoo-2-4f422c601aab6e27f799155d2473aa5fc4a906e6.zip |
Update grass-640_rc6 nonviz patch. Pastebin fail. Per bug #300504.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sci-geosciences')
-rw-r--r-- | sci-geosciences/grass/ChangeLog | 6 | ||||
-rw-r--r-- | sci-geosciences/grass/files/grass-6.4.0_rc6-html-nonviz.patch | 46 |
2 files changed, 23 insertions, 29 deletions
diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog index a282f96a1bd8..a626a8af8c26 100644 --- a/sci-geosciences/grass/ChangeLog +++ b/sci-geosciences/grass/ChangeLog @@ -1,6 +1,10 @@ # 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.84 2010/06/15 12:20:14 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.85 2010/06/17 07:28:03 scarabeus Exp $ + + 17 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> + files/grass-6.4.0_rc6-html-nonviz.patch: + Update grass-640_rc6 nonviz patch. Pastebin fail. Per bug #300504. 15 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> grass-6.4.0_rc6.ebuild: 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 index 09cbadd83309..a5afd0dfafb6 100644 --- 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 @@ -1,21 +1,13 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - <html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> - <title>RAW OUTPUT 3d3Kyh1D</title> - <meta name="robots" content="noindex, nofollow" /> - </head> - <body> - <pre>--- tools/build_html_index.sh.old 2010-06-14 12:44:05.000000000 +0200 -+++ tools/build_html_index.sh 2010-06-14 12:46:01.000000000 +0200 +--- 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> + </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/ @@ -28,16 +20,14 @@ -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 + 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"</pre> - </body> - </html>
\ No newline at end of file + echo "<tr><td> <a href=\"full_index.html#r3\">r3.*</a> </td><td>raster3D commands</td></tr>" >> "$FULLINDEX" + echo "<tr><td> <a href=\"full_index.html#v\">v.*</a> </td><td>vector commands</td></tr>" >> "$FULLINDEX" + echo "<tr><td> <a href=\"gis.m.html\">gis.m</a> </td><td>GUI frontend to GIS menus and display</td></tr>" >> "$FULLINDEX" +-echo "<tr><td> <a href=\"nviz.html\">nviz</a> </td><td>visualization suite</td></tr>" >> "$FULLINDEX" ++#echo "<tr><td> <a href=\"nviz.html\">nviz</a> </td><td>visualization suite</td></tr>" >> "$FULLINDEX" + echo "<tr><td> <a href=\"wxGUI.html\">wxGUI</a> </td><td>wxPython-based GUI frontend</td></tr>" >> "$FULLINDEX" + echo "<tr><td> <a href=\"xganim.html\">xganim</a> </td><td>raster map slideshow</td></tr>" >> "$FULLINDEX" + echo "</table>" >> "$FULLINDEX" |