diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2010-06-14 11:10:46 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2010-06-14 11:10:46 +0000 |
| commit | 5bb016047c49d064b73ccea0c3153e9ff35af505 (patch) | |
| tree | c9ce1a37a19920a8e66bc9d68c03bc521d3d13a7 /sci-geosciences/grass | |
| parent | remove old, drop creole dep (diff) | |
| download | gentoo-2-5bb016047c49d064b73ccea0c3153e9ff35af505.tar.gz gentoo-2-5bb016047c49d064b73ccea0c3153e9ff35af505.tar.bz2 gentoo-2-5bb016047c49d064b73ccea0c3153e9ff35af505.zip | |
Fix -opengl nonviz patch to work with latest. Fix -nls build.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sci-geosciences/grass')
| -rw-r--r-- | sci-geosciences/grass/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-geosciences/grass/files/grass-6.4.0_rc6-html-nonviz.patch | 43 | ||||
| -rw-r--r-- | sci-geosciences/grass/grass-6.4.0_rc6.ebuild | 16 |
3 files changed, 57 insertions, 8 deletions
diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog index d0420145f2c0..c6dab66836cf 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.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/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 index 000000000000..09cbadd83309 --- /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 @@ + </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"</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 54de95389685..e8e23e794a68 100644 --- 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 |