Update grass-640_rc6 nonviz patch. Pastebin fail. Per bug #300504.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 28 insertions, 34 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/Manifest b/sci-geosciences/grass/Manifest
index ab94e9561986..4db730919c1a 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -5,7 +5,7 @@ AUX grass-6.3.0-gcc44.patch 387 RMD160 d104b2cbea3ee14d8f266da122d9e4aef63dc6b0
 AUX grass-6.3.0-html-nonviz.patch 763 RMD160 054b336fcc47d64e56a40d2dda955732047ceb08 SHA1 e8f10078f8cccc5a47d2f2c8bed1d9ace7ed2598 SHA256 e870d724170a9d629a5d0bb8897a2e2f5d1b25eed204a7450061f26d48192981
 AUX grass-6.3.0-o_creat.patch 1469 RMD160 dd2cec8103c07eabd906f3792544bf2225cb1287 SHA1 3bb27a3069abb47b3ac6a9480c508a036d1f3aba SHA256 b9bb9ea09414fbcb00b52520cd4e98147d3de199401efe9996eb6f911fd7ef05
 AUX grass-6.4.0-html-nonviz.patch 2043 RMD160 054a8510ba051656ea89652995a975473fc64dc7 SHA1 49f3f75a1090a3012d60df729aeadb1bafe24417 SHA256 f037db888e1ac33185615207240e98a836fd9efdb5021d0e2f166ea121c98112
-AUX grass-6.4.0_rc6-html-nonviz.patch 2956 RMD160 aeed166ab53875ee4754d87ff0036cf39c0d929a SHA1 2225ea3ecf77433fbcaebb71a5c2cff3121c2987 SHA256 3792dec948c3e1757b55c328fc72544b6aee179e2a267b7288980c22932f94ef
+AUX grass-6.4.0_rc6-html-nonviz.patch 1774 RMD160 95f278e851dc782fa89861a60e97f2c6c4da564b SHA1 d917690626b669a9e9455b12bcb1aa14db65c29d SHA256 6da939c90fa851c50895aeb26c54bd9a512e2e7ca14c3da3268e1daa672442ff
 AUX grass-pkgconf.patch 1322 RMD160 7b48d8e05a07090d8d36d2fb96b385f2d655e066 SHA1 cb33293f442ad0bdd5592f842bcafe13eb021b48 SHA256 2d80c1a3851cd82bdcd7401c537348ec43e488c8b475718727d65ac423a5640c
 AUX grass_icon.png 4470 RMD160 b4a6deeb6ce859a57c6aba3c4095e2dd718f36e9 SHA1 6839c28ec1d01c486d45a245a159fced3c0d0810 SHA256 c6c873f24bb59b8ff98000b500ca3a047ca86af216b4b7b1593baef5f2fbe6a9
 DIST grass-6.3.0.tar.gz 17688547 RMD160 66db4223fc0d5172371903f71d68f1dd024ad2d2 SHA1 c4b0b1407655f8ed1e16e911df191323fe00eb9e SHA256 a84658a7065a3ece09d3d18a3b601515484d1e5dbb3a92b8fbac3c37e368acf4
@@ -14,12 +14,12 @@ DIST grass-6.4.0RC6.tar.gz 22598465 RMD160 6c8a0cd56b72b11395cf97953bc7467293922
 EBUILD grass-6.3.0.ebuild 8471 RMD160 2e0c2edc7138860f3b09544017a782b54378d4de SHA1 e1fc7fcd1755da668581f5085c0e7eb9179c1eb4 SHA256 ce5fda50d68629dba66b0a5751eef930b93669a90faabf3e0a79bc3af3fa7c78
 EBUILD grass-6.4.0_rc5.ebuild 7571 RMD160 969b57c999f0054ddbe470889afab909135f0d38 SHA1 8719f2b829e4ec97e87f16dae69c6aa7a92378ac SHA256 3152882344086470164009b7d2dce0af4df40350732f5990a885b5ecd9a02db1
 EBUILD grass-6.4.0_rc6.ebuild 7843 RMD160 80646f26a01edd83228f11bd72c283f907a452af SHA1 888ecb472f09b16cced84d299e1b98b7cbf11fca SHA256 80cf3a2875553d484177030738776443ac2e73dbdcbd1ab4e9cae653e493987a
-MISC ChangeLog 17256 RMD160 90e582953e7055d37920237f7ea81cff21237692 SHA1 ec332a06f519e76d3178b18ed256498be7789844 SHA256 c385264192e476403ae81a48d029fa1be10ebd0afd32dffd2edd491b2e523a00
+MISC ChangeLog 17424 RMD160 235c9e117d8eab00e4c8b6fd8fae0ba70f036c34 SHA1 e6cecf967779e32efbfd7038d80ecc46fea87365 SHA256 f7c32ef89b80b06ca78b38d9efde1d284f35c16e9c7acc5fae0e4a6f5997bbeb
 MISC metadata.xml 689 RMD160 e86713ba2244d319bd1d76241c6e23d9bbb1ed35 SHA1 e6ef423536dc2e57b8f699fe24fe6af865f747df SHA256 e47a71f5bbefcdbce341e5445a88d1f7954762370a7f15628c56e7a31243f70e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwXYdQACgkQHB6c3gNBRYf4ngCcCwaZ5nu6U1hxaLsA5LiVhveT
-L/gAoK5GlvhfEO6t3/XKtdwynhe7KBzI
-=fI+1
+iEYEARECAAYFAkwZzpIACgkQHB6c3gNBRYfgYACfZW9N06LcTOwbDltRvPZw0fgx
+TlgAn2L77U0G60qNhsSyPbcRVQ8NNG2q
+=61Fx
 -----END PGP SIGNATURE-----
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 @@
-        &lt;/ul&gt;
-
-        &lt;ul&gt;
--        &lt;li&gt;&lt;a href=\&quot;nviz.html\&quot;&gt;nviz&lt;/a&gt; 3D visualization and animation tool&lt;/li&gt;
-         &lt;li&gt;&lt;a href=\&quot;xganim.html\&quot;&gt;xganim&lt;/a&gt; tool  for animating a raster map series&lt;/li&gt;
-        &lt;/ul&gt;&lt;/td&gt;
-     &lt;/tr&gt;
+        </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 [ &quot;$MACOSX&quot; ] ; then
+ if [ "$MACOSX" ] ; then
    cp -f grass_icon.png $HTMLDIR/
 @@ -302,7 +301,7 @@
- echo &quot;&lt;tr&gt;&lt;td&gt;&amp;nbsp;&amp;nbsp;&lt;a href=\&quot;full_index.html#r3\&quot;&gt;r3.*&lt;/a&gt; &lt;/td&gt;&lt;td&gt;raster3D commands&lt;/td&gt;&lt;/tr&gt;&quot; &gt;&gt; &quot;$FULLINDEX&quot;
- echo &quot;&lt;tr&gt;&lt;td&gt;&amp;nbsp;&amp;nbsp;&lt;a href=\&quot;full_index.html#v\&quot;&gt;v.*&lt;/a&gt; &lt;/td&gt;&lt;td&gt;vector commands&lt;/td&gt;&lt;/tr&gt;&quot; &gt;&gt; &quot;$FULLINDEX&quot;
- echo &quot;&lt;tr&gt;&lt;td&gt;&amp;nbsp;&amp;nbsp;&lt;a href=\&quot;gis.m.html\&quot;&gt;gis.m&lt;/a&gt; &lt;/td&gt;&lt;td&gt;GUI frontend to GIS menus and display&lt;/td&gt;&lt;/tr&gt;&quot; &gt;&gt; &quot;$FULLINDEX&quot;
--echo &quot;&lt;tr&gt;&lt;td&gt;&amp;nbsp;&amp;nbsp;&lt;a href=\&quot;nviz.html\&quot;&gt;nviz&lt;/a&gt; &lt;/td&gt;&lt;td&gt;visualization suite&lt;/td&gt;&lt;/tr&gt;&quot; &gt;&gt; &quot;$FULLINDEX&quot;
-+#echo &quot;&lt;tr&gt;&lt;td&gt;&amp;nbsp;&amp;nbsp;&lt;a href=\&quot;nviz.html\&quot;&gt;nviz&lt;/a&gt; &lt;/td&gt;&lt;td&gt;visualization suite&lt;/td&gt;&lt;/tr&gt;&quot; &gt;&gt; &quot;$FULLINDEX&quot;
- echo &quot;&lt;tr&gt;&lt;td&gt;&amp;nbsp;&amp;nbsp;&lt;a href=\&quot;wxGUI.html\&quot;&gt;wxGUI&lt;/a&gt; &lt;/td&gt;&lt;td&gt;wxPython-based GUI frontend&lt;/td&gt;&lt;/tr&gt;&quot; &gt;&gt; &quot;$FULLINDEX&quot;
- echo &quot;&lt;tr&gt;&lt;td&gt;&amp;nbsp;&amp;nbsp;&lt;a href=\&quot;xganim.html\&quot;&gt;xganim&lt;/a&gt; &lt;/td&gt;&lt;td&gt;raster map slideshow&lt;/td&gt;&lt;/tr&gt;&quot; &gt;&gt; &quot;$FULLINDEX&quot;
- echo &quot;&lt;/table&gt;&quot; &gt;&gt; &quot;$FULLINDEX&quot;</pre>
-		</body>
-	</html>
\ No newline at end of file
+ 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"