Updated deps and use flags for current version (including postgres).

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26.5 x86_64

4 files changed, 28 insertions, 44 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index 2336b6f1314b..aceffae9e190 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-geosciences/grass
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.64 2008/10/04 15:33:26 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.65 2008/11/08 22:19:39 nerdboy Exp $
+
+  08 Nov 2008; Steve Arnold <nerdboy@gentoo.org> metadata.xml,
+  grass-6.3.0.ebuild:
+  Updated deps and use flags for current version (including postgres).
+  Note that parallel makes are supposed to work now, both with and without
+  distcc (tested on multiple dual-core amd64 boxes).  Closes bugs #241244
+  and #242190.
 
   04 Oct 2008; Petteri Räty <betelgeuse@gentoo.org> -grass-6.2.0-r1.ebuild:
   Delete old version. Fixes bug #204785.
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 8c725aa2696d..a88aa143fd7d 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,6 +1,3 @@
------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
@@ -20,13 +17,6 @@ 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 6507 RMD160 4f383e98f43b50e6cc3ca594e33c1b80cafcfaed SHA1 fc78c4076f8d15f53ff568e5f031ac565f7705b4 SHA256 cbf66c333e16f85979aaaba47614fe8798aa6f30948083968ef30b83bd1a231a
 EBUILD grass-6.2.3.ebuild 7022 RMD160 5aaf43cbcf3cd3878e2439b24e8a0b5e9bcbcb26 SHA1 4080ab8f4bde1d41fb832d8a83f0119276d42d7f SHA256 3055f55ade77a246c9574c486d8e0273fed40e7283555f501ebcb3c3b6f9b843
-EBUILD grass-6.3.0.ebuild 8623 RMD160 2e63643ed183d68bbfad2b825c926c825d37f126 SHA1 a04ba50043d9a316786f44a7a14eb13d9f95d867 SHA256 113d484f1d713876f0620cfcbf97277353a57c674f229e58837e4a73050cf00c
-MISC ChangeLog 13195 RMD160 1442d43cdaa474f5102a2579e7b02aea1323526e SHA1 e730a9e6903d55437f5d589c3963590b33b5cdfe SHA256 841926f9bc20717d2dfe8a2405e888bf633a13794223195d8f6daad5ac74b8da
-MISC metadata.xml 874 RMD160 af77ae02605e55ba00b9b9214f675184920ca3f4 SHA1 28750209e745c85d4b1b1b5cd34b2db337f2882d SHA256 7793471ab20fc541e0c7fb7ec42593450a32efdee19da114ac656c57a118c781
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjnjM0ACgkQcxLzpIGCsLS3wACfbtkQXuKkVR5TVM1Sb4T4XEjZ
-NqoAoJoxkBiBLE7q3gDUf/pQECkIkHR+
-=5sJ+
------END PGP SIGNATURE-----
+EBUILD grass-6.3.0.ebuild 8234 RMD160 90bc30c53da6906a69b80c09065b6a75fae8bdfd SHA1 4eb2a2324bd39cb9015f25a8edd590813285b583 SHA256 28a8b8cd1a7a1947615a8f52d3462da429e96ab2e0267043573e2fe92680467a
+MISC ChangeLog 13513 RMD160 9b6196352c92a34a579e4e08cee76c6466aba400 SHA1 dff3f01f14939d4ff4036404499fc352c52f3ffa SHA256 6d0fce9775da95ff63563f105629dac353c7dc064bc643c441aa4d99ce9e03fb
+MISC metadata.xml 874 RMD160 d131172bff1e4b072dce2b0015df6afb31a51d2b SHA1 5c59aeba3ea221ab9c195d36cb8ce6dad3cb5bd1 SHA256 a036bd075d95c2326841a62e3146c7fe9f38654d611585962aa904bed0907aaa
diff --git a/sci-geosciences/grass/grass-6.3.0.ebuild b/sci-geosciences/grass/grass-6.3.0.ebuild
index d71f29d52ea1..339d37ed024b 100644
--- a/sci-geosciences/grass/grass-6.3.0.ebuild
+++ b/sci-geosciences/grass/grass-6.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.3.0.ebuild,v 1.4 2008/09/21 21:23:39 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.3.0.ebuild,v 1.5 2008/11/08 22:19:39 nerdboy Exp $
 
 inherit eutils distutils fdo-mime versionator wxwidgets
 
@@ -9,14 +9,14 @@ MY_PVM=$(delete_all_version_separators ${MY_PV})
 MY_PM=${PN}${MY_PVM}
 
 DESCRIPTION="An open-source GIS with raster and vector functionality, as well as 3D vizualization."
-HOMEPAGE="http://grass.itc.it/"
-SRC_URI="http://grass.itc.it/${MY_PM}/source/${P}.tar.gz"
+HOMEPAGE="http://grass.osgeo.org//"
+SRC_URI="http://download.osgeo.org/grass/${MY_PM}/source/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="6"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="ffmpeg fftw glw gmath jpeg largefile mysql nls odbc opengl png \
+IUSE="ffmpeg fftw gmath jpeg largefile motif mysql nls odbc opengl png \
 postgres python readline sqlite tiff truetype wxwindows X"
 
 RESTRICT="strip"
@@ -36,11 +36,10 @@ RDEPEND=">=sys-libs/zlib-1.1.4
 	jpeg? ( media-libs/jpeg )
 	mysql? ( dev-db/mysql )
 	odbc? ( >=dev-db/unixODBC-2.0.6 )
-	opengl? ( ( virtual/opengl )
-	    ( x11-libs/openmotif )
-	    glw? ( media-libs/mesa ) )
+	opengl? ( virtual/opengl )
+	motif? ( x11-libs/openmotif )
 	png? ( >=media-libs/libpng-1.2.2 )
-	postgres? ( >=dev-db/postgresql-7.3 )
+	postgres? ( >=dev-db/postgresql-base-8.3 )
 	python? ( dev-lang/python )
 	readline? ( sys-libs/readline )
 	sqlite? ( dev-db/sqlite )
@@ -98,18 +97,6 @@ pkg_setup() {
 		fi
 	fi
 
-	if use glw && ! use opengl; then
-		ewarn "You set USE='glw -opengl'. GLw support needs OpenGL."
-		ewarn "OpenGL support also requires X."
-		die "Set opengl and X useflags."
-	fi
-
-	if use glw && ! built_with_use media-libs/mesa motif; then
-		ewarn "GRASS GLw/OpenGL support needs mesa with motif headers."
-		ewarn "Please rebuild mesa with motif support."
-		die "Re-emerge mesa with motif."
-	fi
-
 	if use opengl && ! use X; then
 		ewarn "GRASS OpenGL support needs X (will also pull in Tcl/Tk)."
 		die "Please set the X useflag."
@@ -122,7 +109,7 @@ src_unpack() {
 
 	epatch rpm/fedora/grass-readline.patch
 
-	if use opengl; then
+	if ! use opengl; then
 	    epatch "${FILESDIR}"/${P}-html-nonviz.patch
 	fi
 
@@ -141,7 +128,8 @@ src_compile() {
 		--with-includes=/usr/include --with-libs=/usr/$(get_libdir) \
 		--with-proj-includes=/usr/include \
 		--with-proj-libs=/usr/$(get_libdir) \
-		--with-proj-share=/usr/share/proj"
+		--with-proj-share=/usr/share/proj \
+		--without-glw"
 
 	if use X; then
 	    if has_version ">=dev-lang/tcl-8.5"; then
@@ -170,11 +158,8 @@ src_compile() {
 
 	if use opengl; then
 	    myconf="${myconf} --with-opengl --with-opengl-libs=/usr/$(get_libdir)/opengl/xorg-x11/lib"
-	    if use glw; then
-		myconf="${myconf} --with-glw"
-	    fi
 	else
-	    myconf="${myconf} --without-opengl --without-glw"
+	    myconf="${myconf} --without-opengl"
 	fi
 
 	# Should handle either older or latest without intervention;
@@ -219,7 +204,7 @@ src_compile() {
 		$(use_with gmath lapack) \
 		$(use_with jpeg) \
 		$(use_enable largefile) \
-		$(use_with opengl motif) \
+		$(use_with motif) \
 		$(use_with nls) \
 		$(use_with odbc) \
 		$(use_with png) \
@@ -228,13 +213,15 @@ src_compile() {
 		$(use_with tiff) || die "configure failed!"
 
 	if use wxwindows; then
-	    emake -j1
+	    # can't use die here since we need to hack the vdigit build
+	    emake
 	    ln -sf "${LIBGDI}" dist.${CHOST}/lib/libgdi.so \
 		|| die "making libgdi link failed"
 	    cd gui/wxpython/vdigit
+	    # now we're OK
 	    make default -j1 || die "make vdigit failed!"
 	else
-	    emake -j1 || die "make failed!"
+	    emake || die "make failed!"
 	fi
 }
 
diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml
index 2b9f813a8708..2303a98ff74f 100644
--- a/sci-geosciences/grass/metadata.xml
+++ b/sci-geosciences/grass/metadata.xml
@@ -11,7 +11,7 @@ See the GRASS Documentation Project for more info http://grass.itc.it/gdp/index.
 </longdescription>
 <use>
   <flag name='gdal'>Enable support for <pkg>sci-libs/gdal</pkg>
-    (Grass 6 only)</flag>
+    (Grass 5 only)</flag>
   <flag name='glw'>Enable libGLw support (requires <pkg>media-libs/mesa</pkg>)
     </flag>
   <flag name='gmath'>Enable gmath wrapper for BLAS/Lapack