Updated to latest upstream "stable" release; tested with more data.

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

3 files changed, 298 insertions, 4 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index e3acfa34ca4a..de989b5ecf84 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,13 +1,19 @@
 # ChangeLog for sci-geosciences/grass
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.70 2009/09/05 02:09:59 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.71 2009/12/28 07:22:26 nerdboy Exp $
+
+*grass-6.4.0_rc5 (28 Dec 2009)
+
+  28 Dec 2009; Steve Arnold <nerdboy@gentoo.org> +grass-6.4.0_rc5.ebuild:
+  Updated to latest upstream "stable" release; tested with additional real 
+  data sets (fixes import issues with certain shape files).
 
   04 Sep 2009; Steve Arnold <nerdboy@gentoo.org> grass-6.3.0.ebuild:
-  Updated to use postgresql virtual and verified it bvilds correctly from 
+  Updated to use postgresql virtual and verified it builds correctly from 
   libpq-8.0 all the way through postgres-8.3.7 (which means it can go 
   stable now). Yee-haw!  Also tested importing a bunch of old vector data
   using both postgres and sqlite with no issues (since it now defaults to
-  requiring a dull SQL backend).
+  requiring a full SQL backend).
 
   02 Aug 2009; Steve Arnold <nerdboy@gentoo.org> grass-6.3.0.ebuild:
   Updated desktop file and description (set terminal=false).
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index ff710e847cfb..8eeed3efb7b3 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -13,9 +13,11 @@ DIST grass-5.4.0.tar.gz 20487737 RMD160 76821edeff55e72ffad0fa5db275dca2221660a5
 DIST grass-6.0.1.tar.gz 8508427 RMD160 35cc84ecb593ddc83f78d41985d1ffe9db060295 SHA1 7faa22d1ac3e2272c12a82e284d2e3a8819b31ca SHA256 53127007260bf2181e711fa0520636ff497bd0c3406c16a1002945b1c4415340
 DIST grass-6.2.1.tar.gz 12599109 RMD160 ff885023b926ece6545591666fdaa1189facc8bc SHA1 bbd179b9145d735873a13f40a25784b64762387b SHA256 fb7a1030a51222b586f1fd4cbd6ee2c99a0974dba72c70032d336a6a30b073f9
 DIST grass-6.3.0.tar.gz 17688547 RMD160 66db4223fc0d5172371903f71d68f1dd024ad2d2 SHA1 c4b0b1407655f8ed1e16e911df191323fe00eb9e SHA256 a84658a7065a3ece09d3d18a3b601515484d1e5dbb3a92b8fbac3c37e368acf4
+DIST grass-6.4.0RC5.tar.gz 21087594 RMD160 3fa11d2672a4717a7f348cec3810bcbe51700202 SHA1 6f1f069d3044555f578c62e0601965ff745462b8 SHA256 2a9b43f5ca4946c204a20b286ebb49fe08ef022ea1537595cb9b8d1009aa8e7a
 EBUILD grass-5.4.0.ebuild 3097 RMD160 885b7eabdad5fa912b7120b8a571d5b59c9f3971 SHA1 72b35ffc88f218afb14055e94eb8573713d67bb9 SHA256 d93cbad8dea7f99c74979abfc5a86292dffa76e8e3477c5cbc8a7cdf7cf33d21
 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 8586 RMD160 5eb3c1d85abe115c93bb2e1ff553ee2c084b5315 SHA1 70f1c9ee835b1006a93c36bf5f376478505fd042 SHA256 001756b4ae513b59e3e47304e76bd861a8ab7745619ae089f2e2f23f19f53524
-MISC ChangeLog 14957 RMD160 1084feab04f6131d20c9ccc960906821f1ae70d8 SHA1 da2b7700c9a00f60fbcc9d0ea27825443655d0a8 SHA256 2b38d1e9306ca40cce29a8d3375701a4a88408299f99bab9258d1cf82f789700
+EBUILD grass-6.4.0_rc5.ebuild 7828 RMD160 d99227da542bada18e6470ebc968b0ac4b7a5107 SHA1 63f683f1c4382e313ff3cb5a0a30f794726075aa SHA256 5078322cc121b9d641e9f33dcee68e42e999991511f3020944602931049b35b6
+MISC ChangeLog 15200 RMD160 db4c1ea97bfe32167ee61094b9bd1bce43b30080 SHA1 41405bcf71699f065772a1697d1e1f58eb2ea4ca SHA256 800e751d3a5d7276978d87cf2c1a9ba59ac95cc9e91c1e34a36701cf7e94722b
 MISC metadata.xml 783 RMD160 1b1fa970a119a29ee5502815e2dd8103be600526 SHA1 75c6aef32f661f74e29c550e84af8b637d70e98d SHA256 2cb454a8c266d344c7830cee33fffde971164a0d3456b6ff0c1f28a76f0034cd
diff --git a/sci-geosciences/grass/grass-6.4.0_rc5.ebuild b/sci-geosciences/grass/grass-6.4.0_rc5.ebuild
new file mode 100644
index 000000000000..91baa5dbda28
--- /dev/null
+++ b/sci-geosciences/grass/grass-6.4.0_rc5.ebuild
@@ -0,0 +1,286 @@
+# Copyright 1999-2009 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 $
+
+EAPI="2"
+
+inherit eutils distutils fdo-mime versionator wxwidgets
+
+MY_PV=$(get_version_component_range 1-2 ${PV})
+MY_PVM=$(delete_all_version_separators ${MY_PV})
+MY_PM=${PN}${MY_PVM}
+MY_P=${PN}-$(get_version_component_range 1-3 ${PV})RC5
+
+DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization."
+HOMEPAGE="http://grass.osgeo.org//"
+SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
+
+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"
+
+RESTRICT="strip"
+
+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 )
+	sci-libs/gdal
+	>=sci-libs/proj-4.4.7
+	ffmpeg? ( media-video/ffmpeg )
+	fftw? ( sci-libs/fftw )
+	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 )
+	)
+	python? ( dev-lang/python )
+	readline? ( sys-libs/readline )
+	sqlite? ( dev-db/sqlite )
+	tiff? ( >=media-libs/tiff-3.5.7 )
+	truetype? ( >=media-libs/freetype-2.0 )
+	wxwindows? (
+		>=dev-python/wxpython-2.8.1.1
+		>=dev-lang/python-2.4
+	)
+	X? (
+		x11-libs/libXmu
+		x11-libs/libXext
+		x11-libs/libXp
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libSM
+		x11-libs/libICE
+		x11-libs/libXpm
+		x11-libs/libXaw
+		>=dev-lang/tcl-8.4
+		>=dev-lang/tk-8.4
+	)"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/flex-2.5.4a
+	>=sys-devel/bison-1.35
+	wxwindows? ( >=dev-lang/swig-1.3.31 )
+	X? (
+		x11-proto/xproto
+		x11-proto/xextproto
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	local myblas
+	elog ""
+	elog "This version enables the experimental wxpython interface, which"
+	elog "you may want to try.  If the legacy GUI seems a little wonky in"
+	elog "this version, just enable the wxwindows USE flag and rebuild"
+	elog "grass to use it."
+	elog ""
+	if use gmath; then
+		for d in $(eselect lapack show); do myblas=${d}; done
+		if [[ -z "${myblas/reference/}" ]] && [[ -z "${myblas/atlas/}" ]]; then
+			ewarn "You need to set lapack to atlas or reference. Do:"
+			ewarn "   eselect lapack set <impl>"
+			ewarn "where <impl> is atlas, threaded-atlas or reference"
+			die "setup failed"
+		fi
+		for d in $(eselect blas show); do myblas=${d}; done
+		if [[ -z "${myblas/reference/}" ]] && [[ -z "${myblas/atlas/}" ]]; then
+			ewarn "You need to set blas to atlas or reference. Do:"
+			ewarn "   eselect blas set <impl>"
+			ewarn "where <impl> is atlas, threaded-atlas or reference"
+			die "setup failed"
+		fi
+	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."
+	fi
+}
+
+src_prepare() {
+	epatch rpm/fedora/grass-readline.patch
+
+	sed -i -e "s:buff\[12:buff\[16:g" general/g.parser/main.c \
+	    || die "sed failed"
+
+	if ! use opengl; then
+	    epatch "${FILESDIR}"/${P}-html-nonviz.patch
+	fi
+
+	# patch missing math functions (yes, this is still needed)
+	sed -i -e "s:\$(EXTRA_LIBS):\$(EXTRA_LIBS) \$(MATHLIB):g" include/Make/Shlib.make
+	echo "MATHLIB=-lm" >> include/Make/Rules.make
+}
+
+src_configure() {
+	local myconf
+	addpredict /var/cache/fontconfig
+	# wxwindows needs python (see bug #237495)
+	use wxwindows && distutils_python_version
+
+	myconf="--prefix=/usr --with-cxx --enable-shared \
+		--with-gdal=$(type -P gdal-config) --with-curses --with-proj \
+		--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 \
+		--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 \
+		--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}"
+	    else
+		# USE=python must be enabled above if wxwindows is enabled
+		myconf="${myconf} $(use_with python) --without-wxwidgets"
+	    fi
+	else
+		myconf="${myconf} --without-tcltk --without-x"
+	fi
+
+	if use opengl; then
+	    myconf="${myconf} --with-opengl --with-opengl-libs=/usr/$(get_libdir)/opengl/xorg-x11/lib"
+	else
+	    myconf="${myconf} --without-opengl"
+	fi
+
+	if use truetype; then
+		myconf="${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"
+	else
+		myconf="${myconf} --without-mysql"
+	fi
+
+	if use sqlite; then
+		myconf="${myconf} --with-sqlite --with-sqlite-includes=/usr/include \
+		    --with-sqlite-libs=/usr/$(get_libdir)"
+	else
+		myconf="${myconf} --without-sqlite"
+	fi
+
+	# Old ffmpeg is gone, but new is a pita with all those include dirs,
+	# thus, a rather funky configure...
+	if use ffmpeg; then
+	    ffmlib_conf="--with-ffmpeg --with-ffmpeg-libs=/usr/$(get_libdir)"
+	else
+		myconf="${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) \
+		$(use_with tiff)"
+
+	if use ffmpeg; then
+		"${S}"/configure ${myconf} ${ffmlib_conf} \
+			--with-ffmpeg-includes="/usr/include/libavcodec \
+			/usr/include/libavdevice /usr/include/libavfilter \
+			/usr/include/libavformat /usr/include/libavutil \
+			/usr/include/libpostproc /usr/include/libswscale" \
+			|| die "ffmpeg configure failed!"
+	else
+		"${S}"/configure ${myconf} || die "configure failed!"
+	fi
+}
+
+src_compile() {
+	# looks like we no longer need the vdigit symlink build hack
+	emake -j1 || die "make failed!"
+}
+
+src_install() {
+	elog "Grass Home is ${MY_PM}"
+	make install UNIX_BIN="${D}"usr/bin BINDIR="${D}"usr/bin \
+	    PREFIX="${D}"usr INST_DIR="${D}"usr/${MY_PM} \
+	    || die "make install failed!"
+
+	# get rid of DESTDIR in script path
+	sed -i -e "s@${D}@/@" "${D}"usr/bin/${MY_PM}
+
+	# Grass Extension Manager conflicts with ruby gems
+	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
+		doicon "${FILESDIR}"/grass_icon.png
+		domenu ${MY_PM}-grass.desktop
+	    fi
+	eend ${?}
+}
+
+pkg_postinst() {
+	use X && fdo-mime_desktop_database_update
+
+	elog "Note this version re-enables support for threads in Tcl and Tk."
+	elog "Enable the threads USE flag and rebuild to try it."
+}
+
+pkg_postrm() {
+	use X && fdo-mime_desktop_database_update
+}
+
+generate_files() {
+	local GUI="-gui"
+	use wxwindows && GUI="-wxpython"
+
+	cat <<-EOF > 99grass-6
+	GRASS_LD_LIBRARY_PATH="/usr/${MY_PM}/lib"
+	LDPATH="/usr/${MY_PM}/lib"
+	MANPATH="/usr/${MY_PM}/man"
+	GRASS_HOME="/usr/${MY_PM}"
+	EOF
+
+	cat <<-EOF > ${MY_PM}-grass.desktop
+	[Desktop Entry]
+	Encoding=UTF-8
+	Version=1.0
+	Name=Grass ${PV}
+	Type=Application
+	Comment=GRASS (Geographic Resources Analysis Support System), the original GIS.
+	Exec=${TERM} -T Grass -e /usr/bin/${MY_PM} ${GUI}
+	Path=
+	Icon=grass_icon.png
+	Categories=Science;Education;
+	Terminal=false
+	EOF
+}