update to current upstream release and consolidate environment settings

(Portage version: 2.1.2.6)

6 files changed, 206 insertions, 5 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index 46da643ccd4b..3bd0d4d51e20 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-geosciences/grass
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.36 2007/04/28 18:01:00 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.37 2007/05/19 22:13:14 nerdboy Exp $
+
+*grass-6.2.1 (19 May 2007)
+
+  19 May 2007; Steve Arnold <nerdboy@gentoo.org> -files/99grass-6.1.0,
+  +files/99grass-6.2, -files/99grass-6.2.0, grass-6.2.0-r1.ebuild,
+  +grass-6.2.1.ebuild:
+  Update to current upstream release and consolidate environment settings.
+  This closes bug #177070; also opened bug #179150 for stablizing 6.2.0.
 
   28 Apr 2007; Sven Wegener <swegener@gentoo.org> grass-6.0.1.ebuild:
   Fix *initd, *confd and *envd calls (#173884, #174266)
diff --git a/sci-geosciences/grass/files/99grass-6.1.0 b/sci-geosciences/grass/files/99grass-6.1.0
deleted file mode 100644
index 27f86c9a3073..000000000000
--- a/sci-geosciences/grass/files/99grass-6.1.0
+++ /dev/null
@@ -1,2 +0,0 @@
-GRASS_LD_LIBRARY_PATH="/usr/grass-6.1.0/lib"
-LDPATH="/usr/grass-6.1.0/lib"
diff --git a/sci-geosciences/grass/files/99grass-6.2.0 b/sci-geosciences/grass/files/99grass-6.2
index 464ccee6a426..1c706579148a 100644
--- a/sci-geosciences/grass/files/99grass-6.2.0
+++ b/sci-geosciences/grass/files/99grass-6.2
@@ -1,2 +1,3 @@
 GRASS_LD_LIBRARY_PATH="/usr/grass62/lib"
 LDPATH="/usr/grass62/lib"
+
diff --git a/sci-geosciences/grass/files/digest-grass-6.2.1 b/sci-geosciences/grass/files/digest-grass-6.2.1
new file mode 100644
index 000000000000..5c994f284134
--- /dev/null
+++ b/sci-geosciences/grass/files/digest-grass-6.2.1
@@ -0,0 +1,3 @@
+MD5 cbe14d34503a75e8102d2f56c7b527a7 grass-6.2.1.tar.gz 12599109
+RMD160 ff885023b926ece6545591666fdaa1189facc8bc grass-6.2.1.tar.gz 12599109
+SHA256 fb7a1030a51222b586f1fd4cbd6ee2c99a0974dba72c70032d336a6a30b073f9 grass-6.2.1.tar.gz 12599109
diff --git a/sci-geosciences/grass/grass-6.2.0-r1.ebuild b/sci-geosciences/grass/grass-6.2.0-r1.ebuild
index a620ef5fb821..f05bf37269f8 100644
--- a/sci-geosciences/grass/grass-6.2.0-r1.ebuild
+++ b/sci-geosciences/grass/grass-6.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.0-r1.ebuild,v 1.2 2007/03/13 00:32:26 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.0-r1.ebuild,v 1.3 2007/05/19 22:13:14 nerdboy Exp $
 
 inherit eutils autotools
 
@@ -187,5 +187,5 @@ src_install() {
 	mv ${D}usr/bin/gem ${D}usr/grass62/bin/
 
 	einfo "Adding env.d entry for Grass6"
-	newenvd ${FILESDIR}/99${P} 99grass
+	newenvd ${FILESDIR}/99grass-6.2 99grass-6
 }
diff --git a/sci-geosciences/grass/grass-6.2.1.ebuild b/sci-geosciences/grass/grass-6.2.1.ebuild
new file mode 100644
index 000000000000..d6e2a5433527
--- /dev/null
+++ b/sci-geosciences/grass/grass-6.2.1.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.1.ebuild,v 1.1 2007/05/19 22:13:14 nerdboy Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="An open-source GIS with raster and vector functionality"
+HOMEPAGE="http://grass.itc.it/"
+SRC_URI="http://grass.itc.it/grass62/source/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+# To-do: get ppc64 gdal deps fixed up
+
+IUSE="ffmpeg fftw glw gmath jpeg largefile motif mysql nls odbc opengl png
+postgres python readline sqlite tcl tk tiff truetype"
+
+RESTRICT="nostrip"
+
+RDEPEND=">=sys-devel/make-3.80
+	>=sys-libs/zlib-1.1.4
+	>=sys-devel/flex-2.5.4a
+	>=sys-devel/bison-1.35
+	>=sys-libs/ncurses-5.3
+	>=sys-libs/gdbm-1.8.0
+	>=sys-devel/gcc-3.2.2
+	|| (
+	    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 )
+	motif? ( x11-libs/openmotif )
+	mysql? ( dev-db/mysql )
+	odbc? ( >=dev-db/unixODBC-2.0.6 )
+	opengl? ( ( virtual/opengl )
+	    glw? ( media-libs/mesa ) )
+	png? ( >=media-libs/libpng-1.2.2 )
+	postgres? ( >=dev-db/postgresql-7.3 )
+	python? ( dev-lang/python )
+	readline? ( sys-libs/readline )
+	sqlite? ( dev-db/sqlite )
+	tcl? ( >=dev-lang/tcl-8.4 )
+	tk? ( >=dev-lang/tk-8.4 )
+	tiff? ( >=media-libs/tiff-3.5.7 )
+	truetype? ( >=media-libs/freetype-2.0 )
+	|| (
+	    ( 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 )
+	virtual/x11 )"
+
+DEPEND="${RDEPEND}
+	|| (
+	    ( x11-proto/xproto x11-proto/xextproto )
+	        virtual/x11 )"
+
+src_unpack() {
+	if use glw && ! use opengl; then
+		ewarn "You set USE='glw -opengl'. GLw support needs OpenGL."
+		ewarn "OpenGL support also requires Tcl and Tk support."
+		die "Set opengl, tcl, and tk useflags!"
+	fi
+	if use glw && ! built_with_use media-libs/mesa motif; then
+		ewarn "GRASS OpenGL support needs mesa with motif headers."
+		ewarn "Please rebuild mesa with motif support."
+		die "re-emerge mesa with motif"
+	fi
+
+	if use tcl && ! use tk; then
+		ewarn "You set USE='tcl -tk'. GRASS needs both tcl and tk."
+		die "Set 'tk' useflag!"
+	fi
+
+	if use tk && ! use tcl; then
+		ewarn "You set USE='-tcl tk'. GRASS needs both tcl and tk."
+		die "Set 'tcl' useflag!"
+	fi
+
+	if use tcl && built_with_use dev-lang/tcl threads; then
+		ewarn "GRASS nviz will not work with Tcl compiled with threads!"
+		ewarn "Please disable either opengl or tcl threads."
+		die "emerge TCL without threads"
+	fi
+	if use tk && built_with_use dev-lang/tk threads; then
+		ewarn "GRASS nviz will not work with Tk compiled with threads!"
+		ewarn "Please disable either opengl or tk threads."
+		die "emerge tk without threads"
+	fi
+	unpack ${A}
+	cd ${S}
+
+	epatch rpm/fedora/grass-readline.patch
+	elibtoolize
+}
+
+src_compile() {
+	local myconf
+	myconf="--prefix=/usr --with-cxx --enable-shared \
+		--with-gdal=$(type -P gdal-config) --with-curses --with-proj \
+		--with-proj-includes=/usr/include --with-proj-libs=/usr/lib \
+		--with-proj-share=/usr/share/proj"
+
+	if use tcl || use tk; then
+		myconf="${myconf} --with-tcltk \
+		    --with-tcltk-includes=/usr/include \
+		    --with-tcltk-libs=/usr/$(get_libdir)/tcl8.4 --with-x"
+	else
+		myconf="${myconf} --without-tcltk --without-x"
+	fi
+
+	if use ffmpeg; then
+		myconf="${myconf} --with-ffmpeg --with-ffmpeg-includes=/usr/include/ffmpeg --with-ffmpeg-libs=/usr/lib"
+	else
+		myconf="${myconf} --without-ffmpeg"
+	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 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
+	    epatch ${FILESDIR}/${P}-html-nonviz.patch
+	fi
+
+	if use sqlite; then
+		myconf="${myconf} --with-sqlite --with-sqlite-includes=/usr/include
+		--with-sqlite-libs=/usr/lib"
+	else
+		myconf="${myconf} --without-sqlite"
+	fi
+
+	export LD_LIBRARY_PATH="/${WORKDIR}/image/usr/${P}/$(get_libdir):${LD_LIBRARY_PATH}"
+	econf ${myconf} \
+		$(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 python) \
+		$(use_with readline) \
+		$(use_with tiff) \
+		$(use_with tcl tcltk) || die "Error: configure failed!"
+	# patch missing math functions
+	sed -i 's:EXTRA_LIBS=:EXTRA_LIBS=-lm :g' ${S}/lib/gmath/Makefile
+	sed -i 's:EXTRA_LIBS = :EXTRA_LIBS = -lm :g' ${S}/lib/gis/Makefile
+	emake -j1 || die "Error: emake failed!"
+}
+
+src_install() {
+	make install UNIX_BIN=${D}usr/bin BINDIR=${D}usr/bin \
+		PREFIX=${D}usr INST_DIR=${D}usr/grass62 \
+		|| die "Error: make install failed!"
+
+	sed -i "s:^GISBASE=.*$:GISBASE=/usr/grass62:" \
+		${D}usr/bin/grass62 || die "Error: sed failed!"
+
+	# Grass Extension Manager conflicts with ruby gems
+	mv ${D}usr/bin/gem ${D}usr/grass62/bin/
+
+	einfo "Adding env.d entry for Grass6"
+	newenvd ${FILESDIR}/99grass-6.2 99grass-6
+}