Slightly update grass ebuild. Synced with sci overlay + whitespace cleanup.

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

4 files changed, 110 insertions, 56 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index 9b0a9d8fd5a1..ec2024265c25 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,11 @@
 # 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.75 2010/02/03 20:56:55 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.76 2010/02/17 16:48:21 scarabeus Exp $
+
+  17 Feb 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  grass-6.4.0_rc5.ebuild, +files/grass-6.4.0-html-nonviz.patch:
+  Slightly update grass ebuild. Synced with sci overlay + whitespace
+  cleanup.
 
   03 Feb 2010; Markos Chandras <hwoarang@gentoo.org> grass-6.3.0.ebuild:
   Stable on amd64 wrt bug #250850
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index b6076164b290..ab09aa12278c 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 99grass-6 100 RMD160 e62ea08a12a22039fbe8fb396e011fd9b769ff2f SHA1 8ef4acdbb4330b64a51e7b8304f9c68fce17c438 SHA256 dce426f95d7be7f7deae328537ad8666d4ff140dc6de0bb65495f23ad1a5e8f8
 AUX 99grass-6.2 68 RMD160 08c932be282925ca1316664ba7ef9654a0543488 SHA1 ba73dcd993687fc0bfa95d97ff1ce30fb05bfa45 SHA256 bf7b1df4b9d9f71ffdd36cf924cb374032fd49ba0277a5cc7a4f77658cdc76e4
 AUX grass-6.2.0-html-nonviz.patch 1721 RMD160 ad57109c03792e8376ccbe2ed8ff459b850cdf20 SHA1 20122b510bc7e52dfbaac04fd8587281d99a08e6 SHA256 492475975bb08f5b24f6c043a8bdfce32a1b22b5432127223dfe36e1ba66057c
@@ -8,6 +11,7 @@ AUX grass-6.2.1-html-nviz-fix.patch 592 RMD160 7935449babc7dd6a07cffad66513c404a
 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_icon.png 4470 RMD160 b4a6deeb6ce859a57c6aba3c4095e2dd718f36e9 SHA1 6839c28ec1d01c486d45a245a159fced3c0d0810 SHA256 c6c873f24bb59b8ff98000b500ca3a047ca86af216b4b7b1593baef5f2fbe6a9
 DIST grass-5.4.0.tar.gz 20487737 RMD160 76821edeff55e72ffad0fa5db275dca2221660a5 SHA1 3324bf8af1861c63d9d171577ffa7fb7e87582f1 SHA256 ac4cc3f1408750d7f9d54ea2155b7e8960041337d4e4d3662bffb41cb9899537
 DIST grass-6.0.1.tar.gz 8508427 RMD160 35cc84ecb593ddc83f78d41985d1ffe9db060295 SHA1 7faa22d1ac3e2272c12a82e284d2e3a8819b31ca SHA256 53127007260bf2181e711fa0520636ff497bd0c3406c16a1002945b1c4415340
@@ -18,6 +22,13 @@ EBUILD grass-5.4.0.ebuild 3097 RMD160 885b7eabdad5fa912b7120b8a571d5b59c9f3971 S
 EBUILD grass-6.0.1.ebuild 3185 RMD160 9861427db9a4a846941eacd6d8f35cb057460d1b SHA1 79ef31f94dcb9bf8d7a3a89563867b291509173b SHA256 8ce6c6abd8359c2d736d491998d2d93720c89834a7e5f935c954b26af31781be
 EBUILD grass-6.2.1.ebuild 5898 RMD160 55aa97b65c844a9e436f403ea2f8e49aa16620c7 SHA1 57a97027573fb96ebafca2d820b8693b56aedc62 SHA256 fb54121425315410f9cc174b67819ba3d7eb84cc3e9d68ee1d52a2b703879ca1
 EBUILD grass-6.3.0.ebuild 8584 RMD160 1bca3fa24ec28bcf0fe1fed886887cb18870c199 SHA1 670624f4df9bb9599ea6e6b25e956d0dabc1ff77 SHA256 a58832dc2a9f23b8136a8c10277c8590ce4aed2240ce042fa77859d1288e2d74
-EBUILD grass-6.4.0_rc5.ebuild 7828 RMD160 d99227da542bada18e6470ebc968b0ac4b7a5107 SHA1 63f683f1c4382e313ff3cb5a0a30f794726075aa SHA256 5078322cc121b9d641e9f33dcee68e42e999991511f3020944602931049b35b6
-MISC ChangeLog 15591 RMD160 02e29cf1be535a2b02aa727ba120403cc8ff8b77 SHA1 c9b802fa7f8b440ab7024ceb81c937d92d3b1644 SHA256 f235d8c29b08a0255978db9ea09791571575bc35e683096261de53c427437e9f
+EBUILD grass-6.4.0_rc5.ebuild 7659 RMD160 eaca7a1d7ade7f259bdfdfdbd4bd7905667568a3 SHA1 1aea332d6ab2cf7fdfd2fdd6de1005dede18fed9 SHA256 ad1be0cdf195dc708bbbca82777adad31a4bf4b7fd94180c3ed85b01bbf3254b
+MISC ChangeLog 15792 RMD160 3e38ea0798846841ed12b7e22faad0c5188e2ca8 SHA1 bfb6ac73e04ac81c9deb1911b9a344e19bc3b3f3 SHA256 1c735a758f88acada67c9e7b65ca5c24a6ef86a3306793a4f0af9cf18e0fd7a9
 MISC metadata.xml 783 RMD160 1b1fa970a119a29ee5502815e2dd8103be600526 SHA1 75c6aef32f661f74e29c550e84af8b637d70e98d SHA256 2cb454a8c266d344c7830cee33fffde971164a0d3456b6ff0c1f28a76f0034cd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkt8HaAACgkQHB6c3gNBRYdW+wCfY8pzAtdiw1hcy3OBD7gM0WXA
+iqUAnj1w8KFEKSceHlNOEKJQOAr+v2ee
+=4PGe
+-----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..a879ad22356b
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-6.4.0-html-nonviz.patch
@@ -0,0 +1,33 @@
+--- 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>
+         <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 @@
+ #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/
+@@ -292,7 +291,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_rc5.ebuild b/sci-geosciences/grass/grass-6.4.0_rc5.ebuild
index 91baa5dbda28..a9be56251109 100644
--- a/sci-geosciences/grass/grass-6.4.0_rc5.ebuild
+++ b/sci-geosciences/grass/grass-6.4.0_rc5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.1 2009/12/28 07:22:26 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.0_rc5.ebuild,v 1.2 2010/02/17 16:48:21 scarabeus Exp $
 
 EAPI="2"
 
@@ -19,8 +19,8 @@ LICENSE="GPL-2"
 SLOT="6"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="ffmpeg fftw gmath jpeg largefile motif mysql nls odbc opengl png \
-postgres python readline sqlite tiff truetype wxwindows X"
+IUSE="X ffmpeg fftw gmath jpeg largefile motif mysql nls odbc opengl png
+	postgres python readline sqlite tiff truetype wxwindows"
 
 RESTRICT="strip"
 
@@ -28,23 +28,28 @@ 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 )
+		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 )
+	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? ( || (
-		>=virtual/postgresql-base-8.0
-		>=virtual/postgresql-server-8.0 )
+	postgres? (
+		|| (
+			>=virtual/postgresql-base-8.0
+			>=virtual/postgresql-server-8.0
+		)
 	)
 	python? ( dev-lang/python )
 	readline? ( sys-libs/readline )
@@ -118,7 +123,7 @@ src_prepare() {
 	    || die "sed failed"
 
 	if ! use opengl; then
-	    epatch "${FILESDIR}"/${P}-html-nonviz.patch
+	    epatch "${FILESDIR}"/${PN}-6.4.0-html-nonviz.patch
 	fi
 
 	# patch missing math functions (yes, this is still needed)
@@ -141,49 +146,49 @@ src_configure() {
 		--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="${myconf} --with-tcltk --with-x \
-	        --with-tcltk-includes=/usr/include \
+		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="${myconf} --with-python --with-wxwidgets=${WX_CONFIG}"
+			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="${myconf} $(use_with python) --without-wxwidgets"
+			# USE=python must be enabled above if wxwindows is enabled
+			myconf+=" $(use_with python) --without-wxwidgets"
 	    fi
 	else
-		myconf="${myconf} --without-tcltk --without-x"
+		myconf+=" --without-tcltk --without-x"
 	fi
 
 	if use opengl; then
-	    myconf="${myconf} --with-opengl --with-opengl-libs=/usr/$(get_libdir)/opengl/xorg-x11/lib"
+		myconf+=" --with-opengl --with-opengl-libs=/usr/$(get_libdir)/opengl/xorg-x11/lib"
 	else
-	    myconf="${myconf} --without-opengl"
+		myconf+=" --without-opengl"
 	fi
 
 	if use truetype; then
-		myconf="${myconf} --with-freetype \
-		    --with-freetype-includes=/usr/include/freetype2"
+		myconf+=" --with-freetype
+			--with-freetype-includes=/usr/include/freetype2"
 	fi
 
 	if use mysql; then
-		myconf="${myconf} --with-mysql --with-mysql-includes=/usr/include/mysql \
-		    --with-mysql-libs=/usr/$(get_libdir)/mysql"
+		myconf+=" --with-mysql --with-mysql-includes=/usr/include/mysql
+			--with-mysql-libs=/usr/$(get_libdir)/mysql"
 	else
-		myconf="${myconf} --without-mysql"
+		myconf+=" --without-mysql"
 	fi
 
 	if use sqlite; then
-		myconf="${myconf} --with-sqlite --with-sqlite-includes=/usr/include \
-		    --with-sqlite-libs=/usr/$(get_libdir)"
+		myconf+=" --with-sqlite --with-sqlite-includes=/usr/include
+			--with-sqlite-libs=/usr/$(get_libdir)"
 	else
-		myconf="${myconf} --without-sqlite"
+		myconf+=" --without-sqlite"
 	fi
 
 	# Old ffmpeg is gone, but new is a pita with all those include dirs,
@@ -191,22 +196,22 @@ src_configure() {
 	if use ffmpeg; then
 	    ffmlib_conf="--with-ffmpeg --with-ffmpeg-libs=/usr/$(get_libdir)"
 	else
-		myconf="${myconf} --without-ffmpeg"
+		myconf+=" --without-ffmpeg"
 	fi
 
-	myconf="${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) \
+	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
@@ -239,12 +244,12 @@ src_install() {
 	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
+	generate_files
+	doenvd 99grass-6
+	if use X; then
 		doicon "${FILESDIR}"/grass_icon.png
 		domenu ${MY_PM}-grass.desktop
-	    fi
+	fi
 	eend ${?}
 }