Fix -opengl nonviz patch to work with latest. Fix -nls build.

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

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index d0420145f2c053ec9709fb70dfaf8d33ec9ef602..c6dab66836cfe4d040d67a914cb05116692eea42 100644 (file)
--- 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.82 2010/06/13 09:14:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.83 2010/06/14 11:10:46 scarabeus Exp $
+
+  14 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  grass-6.4.0_rc6.ebuild, +files/grass-6.4.0_rc6-html-nonviz.patch:
+  Fix -opengl nonviz patch to work with latest. Fix -nls build.
 
   13 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
   files/grass-pkgconf.patch:

diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 7e75d34ccc70717ecbd716f72fd30efce1c56c6c..f1fcfb5810da7ba3b445c1f593ef7aa0d2fc5e42 100644 (file)
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,7 +1,11 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX grass-6.3.0-gcc44.patch 387 RMD160 d104b2cbea3ee14d8f266da122d9e4aef63dc6b0 SHA1 1ce70dbb99f64419361816a75e6948d8960d4f4f SHA256 210e7f7f34ec04caf41bd312f5c90c7be206656766e98725f27185e0c8759f80
 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-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
@@ -9,6 +13,13 @@ DIST grass-6.4.0RC5.tar.gz 21087594 RMD160 3fa11d2672a4717a7f348cec3810bcbe51700
 DIST grass-6.4.0RC6.tar.gz 22598465 RMD160 6c8a0cd56b72b11395cf97953bc74672939225f3 SHA1 4e82d7211ac85dbefa15ff27397d896d1955db64 SHA256 5f550abf05e65ac91ef38aa249d6de62774bfda1fae02a7ac0a4652284ea6c10
 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 7733 RMD160 84d575f4224a7261011409482f4704e712503c0e SHA1 7e62515ba457de32c8a70d70afeb70c43c29f645 SHA256 f805e2e9e1d75ed0575e8c7d738772345b787ba5c16f649a3ad1a2b58a62fd1f
-MISC ChangeLog 16942 RMD160 91dcfc47342f01dc06f3b1b1e66ce78590bee88b SHA1 35a48716c294d54fdf28eaa6182a189f2f815ab6 SHA256 7665bcd552787e55d78982d23c9eb5fd70d04802b75d6ddbb9e3fa850a820c51
+EBUILD grass-6.4.0_rc6.ebuild 7753 RMD160 0176fe16f74125c65af84fe57927758a5b23fe70 SHA1 68a38992004136e07e1137c15ee89346a2a568be SHA256 1b1b4bdc59621a6e709aabdde36866900f672118658564624bf705883328f74c
+MISC ChangeLog 17130 RMD160 52e223175d2e791dcbe275f22f34cbcbfccb7fdc SHA1 d9fe99165c2d64ac52b81c407cd1a95d01d5555a SHA256 d9c7c1328e9a0116adf9585a1ae4f1585e385f51ad91c82d994d590ca85a2d13
 MISC metadata.xml 689 RMD160 e86713ba2244d319bd1d76241c6e23d9bbb1ed35 SHA1 e6ef423536dc2e57b8f699fe24fe6af865f747df SHA256 e47a71f5bbefcdbce341e5445a88d1f7954762370a7f15628c56e7a31243f70e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwWDi0ACgkQHB6c3gNBRYcRlgCgyzIpLey7Mh7+dJax9AOIThDP
+WhEAn2OTvZyahzb5KODzfai/rUJHWdh6
+=vBTQ
+-----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
new file mode 100644 (file)
index 0000000..09cbadd
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-6.4.0_rc6-html-nonviz.patch
@@ -0,0 +1,43 @@
+<!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
+@@ -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;
+@@ -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 [ &quot;$MACOSX&quot; ] ; 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

diff --git a/sci-geosciences/grass/grass-6.4.0_rc6.ebuild b/sci-geosciences/grass/grass-6.4.0_rc6.ebuild
index 54de95389685b5b8a5c342ac204c386b1570d084..e8e23e794a6838d97b815601b450e645cecce76f 100644 (file)
--- a/sci-geosciences/grass/grass-6.4.0_rc6.ebuild
+++ b/sci-geosciences/grass/grass-6.4.0_rc6.ebuild
@@ -1,6 +1,6 @@
 # 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.5 2010/05/04 10:53:41 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.0_rc6.ebuild,v 1.6 2010/06/14 11:10:46 scarabeus Exp $
 
 EAPI="3"
 
@@ -127,7 +127,7 @@ pkg_setup() {
 
 src_prepare() {
        if ! use opengl; then
-               epatch "${FILESDIR}"/${PN}-6.4.0-html-nonviz.patch
+               epatch "${FILESDIR}"/${P}-html-nonviz.patch
        fi
 
        base_src_prepare
@@ -237,11 +237,13 @@ src_install() {
        rm -rf man/ || die
 
        # translations
-       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
+       if use nls; then
+               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
+       fi
 
        popd &> /dev/null