[patch] Diff with proposed updates

grass-6.3.0.ebuild.diff (text/plain), 1.56 KB, created by MarisN on 2008-10-11 09:46:07 UTC

12,13c12,13
< 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"
19c19
< IUSE="ffmpeg fftw glw gmath jpeg largefile mysql nls odbc opengl png \
---
> IUSE="ffmpeg fftw gmath jpeg largefile motif mysql nls odbc opengl png \
39,41c39,40
< 	opengl? ( ( virtual/opengl )
< 	    ( x11-libs/openmotif )
< 	    glw? ( media-libs/mesa ) )
---
> 	opengl? ( virtual/opengl )
> 	motif?  ( x11-libs/openmotif )
101,112d99
< 	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
< 
144c131,132
< 		--with-proj-share=/usr/share/proj"
---
> 		--with-proj-share=/usr/share/proj \
> 		--without-glw"
173,175d160
< 	    if use glw; then
< 		myconf="${myconf} --with-glw"
< 	    fi
177c162
< 	    myconf="${myconf} --without-opengl --without-glw"
---
> 	    myconf="${myconf} --without-opengl"
222c207
< 		$(use_with opengl motif) \
---
> 		$(use_with motif) \
231c216
< 	    emake -j1
---
> 	    emake
235c220
< 	    make default -j1 || die "make vdigit failed!"
---
> 	    make default || die "make vdigit failed!"
237c222
< 	    emake -j1 || die "make failed!"
---
> 	    emake || die "make failed!"