version bump for latest Grass update

Package-Manager: portage-2.1.2_pre3-r6

5 files changed, 200 insertions, 15 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index 327f18ace1fe..18bd6bbb462b 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-geosciences/grass
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.20 2006/09/06 05:24:42 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.21 2006/10/23 16:18:10 nerdboy Exp $
+
+*grass-6.1.0 (23 Oct 2006)
+
+  23 Oct 2006; Steve Arnold <nerdboy@gentoo.org> +files/99grass-6.1.0,
+  +grass-6.1.0.ebuild:
+  version bump for updated Grass (still has a minor math lib issue if built
+  without Blas/Lapack support).
 
   06 Sep 2006; Steve Arnold <nerdboy@gentoo.org> -grass-5.0.2.ebuild:
   removing old version due to dep cleanup issues (requested by dberkholz)
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index d33c10b0f9bd..5d14c522aca7 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,13 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 99grass-6 100 RMD160 e62ea08a12a22039fbe8fb396e011fd9b769ff2f SHA1 8ef4acdbb4330b64a51e7b8304f9c68fce17c438 SHA256 dce426f95d7be7f7deae328537ad8666d4ff140dc6de0bb65495f23ad1a5e8f8
 MD5 f41ae1ddcca30e1eeea2a74100f36ba4 files/99grass-6 100
 RMD160 e62ea08a12a22039fbe8fb396e011fd9b769ff2f files/99grass-6 100
 SHA256 dce426f95d7be7f7deae328537ad8666d4ff140dc6de0bb65495f23ad1a5e8f8 files/99grass-6 100
+AUX 99grass-6.1.0 75 RMD160 2223006ec70c67dceb4e9395b497a0e22bd4ee3b SHA1 dfccf8926a4973e3c624f5941654921561d7b308 SHA256 fde4b8be94db0d1f4f7d871397e4a74b8bbf41643adc10f26630a1f5a0eada25
+MD5 bcf80c80f08a6847fca6220fc7cf0f49 files/99grass-6.1.0 75
+RMD160 2223006ec70c67dceb4e9395b497a0e22bd4ee3b files/99grass-6.1.0 75
+SHA256 fde4b8be94db0d1f4f7d871397e4a74b8bbf41643adc10f26630a1f5a0eada25 files/99grass-6.1.0 75
 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
 DIST grass-6.0.2.tar.gz 8640862 RMD160 64a251c9fe9ae0920e86c0fba7e3081eb0b83fc3 SHA1 cc04474026b39d80cde6143c30de3c3adea262f9 SHA256 dabe7315be1147b40f148a93add29dd405725aca39f366f31826b17230f8437b
+DIST grass-6.1.0.tar.gz 12152023 RMD160 e621051c4444219fb42cfddd884518225496fc97 SHA1 ea26163f42805a2571a0a35ac58457bffdbcfc1e SHA256 c772baf08cea32bb228463f2d696ecc56d1e55768ec7c4a39651cf6edaf8adb2
 EBUILD grass-5.4.0.ebuild 3190 RMD160 6bdd32b46a520d06e0753bbe8b9080faaf12b435 SHA1 1798d6bdb1657ad2d149dbbeb220d8c19a257bc9 SHA256 e9a9fb11375e18c3124c044522ed0d430f9483db45ac8c966f686211b47ebbc9
 MD5 4fdd08124ca5fb63eafb340fc621b24f grass-5.4.0.ebuild 3190
 RMD160 6bdd32b46a520d06e0753bbe8b9080faaf12b435 grass-5.4.0.ebuild 3190
@@ -20,10 +22,14 @@ EBUILD grass-6.0.2.ebuild 3418 RMD160 9723da040f880f77326c739673c8003e534ce2ec S
 MD5 81bdd8bd4e63c08f73805ed58317330a grass-6.0.2.ebuild 3418
 RMD160 9723da040f880f77326c739673c8003e534ce2ec grass-6.0.2.ebuild 3418
 SHA256 5db851ccb97d2c0dff261f7617fd39d51753bb74b24ae2c88254288538baee77 grass-6.0.2.ebuild 3418
-MISC ChangeLog 5083 RMD160 86543fd00a3c3b271c6eadd97d104904be8843e2 SHA1 28f7c34fc72b808615c0b267bc353b0b85622dd6 SHA256 39ff4f0a6db6b9559aff2d0e05e9c7097d9d04ee4c52551eddb91200abfbaa48
-MD5 8813b491f156e4e3358dc4ee59b272f7 ChangeLog 5083
-RMD160 86543fd00a3c3b271c6eadd97d104904be8843e2 ChangeLog 5083
-SHA256 39ff4f0a6db6b9559aff2d0e05e9c7097d9d04ee4c52551eddb91200abfbaa48 ChangeLog 5083
+EBUILD grass-6.1.0.ebuild 4733 RMD160 c8d3ae71dee763c14c622d6f992dcba11665c453 SHA1 65f7b8fcef8646d151620b427992e9767d3cdf1f SHA256 12cd5faad698c48842a7c4fb8bc3af764b869ca85f120dd3a25ba8d0ce07e9d6
+MD5 665495b1f589c17335b8a01b8a01cd48 grass-6.1.0.ebuild 4733
+RMD160 c8d3ae71dee763c14c622d6f992dcba11665c453 grass-6.1.0.ebuild 4733
+SHA256 12cd5faad698c48842a7c4fb8bc3af764b869ca85f120dd3a25ba8d0ce07e9d6 grass-6.1.0.ebuild 4733
+MISC ChangeLog 5314 RMD160 46eeb1c188e65929099b4f3d6c62720c102e090a SHA1 a4def218ce759fbc30ce18e22449c9608d698e82 SHA256 6efc62a626023df9902e3cf1ef768f4ef10f3535dca4c7b81b715c15136a9d48
+MD5 266620ec631e69bf61c827bf0319480e ChangeLog 5314
+RMD160 46eeb1c188e65929099b4f3d6c62720c102e090a ChangeLog 5314
+SHA256 6efc62a626023df9902e3cf1ef768f4ef10f3535dca4c7b81b715c15136a9d48 ChangeLog 5314
 MISC metadata.xml 492 RMD160 03cf12a529c5443dffc366017b997d183a2bcf3b SHA1 bd8657499f8b6cb3b232684afd63c3b5d915ba5e SHA256 976d5771ed6fbabbeba026b0394186b7735135deb79c86aa9388fc5134467e8e
 MD5 efddef8657f71e6240e2d838ebf178d1 metadata.xml 492
 RMD160 03cf12a529c5443dffc366017b997d183a2bcf3b metadata.xml 492
@@ -37,10 +43,6 @@ SHA256 50f9fc1916ee615d2490f1a84ed0321970f39c3664820724950a718becf63fa4 files/di
 MD5 e66c229df06d3688329f85a424c1e1ff files/digest-grass-6.0.2 238
 RMD160 bf3ba19f561ae1797a385f9aac5f729f833e2fb0 files/digest-grass-6.0.2 238
 SHA256 9ca2a9fab8f3a80cbcb6bd4fa6fe6b8dfc22ea9e0270303bacf0fddc3d3babec files/digest-grass-6.0.2 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFFLQVPGG5LT2KRH24RAnFCAJ0THkSAOV1fHbqHhDxhAVAuYOvyTACdH7Ua
-TcmgCNva6A+rJlvpV845IUY=
-=BITB
------END PGP SIGNATURE-----
+MD5 a385d4f5beed4699c4aa54ee8fa779de files/digest-grass-6.1.0 241
+RMD160 b66cf190b37212830c7a780fb7039e76f8c51683 files/digest-grass-6.1.0 241
+SHA256 3f0a49492fbca31da17a0230b6e16ac3fdd0ac14462d19be205cb5ccc16d1b47 files/digest-grass-6.1.0 241
diff --git a/sci-geosciences/grass/files/99grass-6.1.0 b/sci-geosciences/grass/files/99grass-6.1.0
new file mode 100644
index 000000000000..27f86c9a3073
--- /dev/null
+++ b/sci-geosciences/grass/files/99grass-6.1.0
@@ -0,0 +1,2 @@
+GRASS_LD_LIBRARY_PATH="/usr/grass-6.1.0/lib"
+LDPATH="/usr/grass-6.1.0/lib"
diff --git a/sci-geosciences/grass/files/digest-grass-6.1.0 b/sci-geosciences/grass/files/digest-grass-6.1.0
new file mode 100644
index 000000000000..ebfb46f07e94
--- /dev/null
+++ b/sci-geosciences/grass/files/digest-grass-6.1.0
@@ -0,0 +1,3 @@
+MD5 87746be5fa3f2caa01ac746dbdddfe44 grass-6.1.0.tar.gz 12152023
+RMD160 e621051c4444219fb42cfddd884518225496fc97 grass-6.1.0.tar.gz 12152023
+SHA256 c772baf08cea32bb228463f2d696ecc56d1e55768ec7c4a39651cf6edaf8adb2 grass-6.1.0.tar.gz 12152023
diff --git a/sci-geosciences/grass/grass-6.1.0.ebuild b/sci-geosciences/grass/grass-6.1.0.ebuild
new file mode 100644
index 000000000000..d22bc6dc16e2
--- /dev/null
+++ b/sci-geosciences/grass/grass-6.1.0.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.1.0.ebuild,v 1.1 2006/10/23 16:18:10 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/grass61/source/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+# To-do: get ppc64 gdal deps fixed up
+
+IUSE="ncurses ffmpeg fftw truetype glw gmath jpeg largefile motif mysql nls odbc opengl png postgres proj readline sqlite tcl tk tiff X"
+
+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
+	>=sci-libs/proj-4.4.7
+	sci-libs/gdal
+	ffmpeg? ( media-video/ffmpeg )
+	fftw? ( =sci-libs/fftw-2* )
+	gmath? ( virtual/blas
+	    virtual/lapack )
+	freetype? ( >=media-libs/freetype-2.0 )
+	jpeg? ( media-libs/jpeg )
+	motif? ( x11-libs/openmotif )
+	mysql? ( dev-db/mysql )
+	nls? ( x11-terms/mlterm )
+	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 )
+	proj? ( sci-libs/proj )
+	readline? ( sys-libs/readline )
+	sqlite? ( dev-db/sqlite )
+	tcl? >=dev-lang/tcl-8.3
+	tk? >=dev-lang/tk-8.3
+	tiff? ( >=media-libs/tiff-3.5.7 )
+	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 )
+	virtual/x11 )
+	)"
+
+DEPEND="${RDEPEND}
+	X? ( || (
+	    ( x11-proto/xproto x11-proto/xextproto )
+	        virtual/x11 )
+	)"
+
+src_unpack() {
+	if use opengl && 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 opengl && 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
+
+	eautoconf
+}
+
+src_compile() {
+	local myconf
+	myconf="--prefix=/usr --with-cxx --enable-shared \
+		--with-gdal=$(which gdal-config)"
+
+	if use tcl || use tk ; then
+		myconf="${myconf} --with-tcltk \
+		    --with-tcltk-includes=/usr/include \
+		    --with-tcltk-libs=/usr/$(get_libdir)/tcl8.4"
+	else
+		myconf="${myconf} --without-tcltk"
+	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 freetype; 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 proj; then
+		myconf="${myconf} --with-proj --with-proj-includes=/usr/include --with-proj-libs=/usr/lib --with-proj-share=/usr/share/proj"
+	else
+		myconf="${myconf} --without-proj"
+	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
+	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 curses` \
+		`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` \
+		`use_with tcl tcltk` \
+		`use_with tk tcltk` \
+		`use_with X x` || 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/${P} \
+		|| die "Error: make install failed!"
+	sed -i "s:^GISBASE=.*$:GISBASE=/usr/${P}:" \
+		${D}usr/bin/grass61
+
+	einfo "Adding env.d entry for Grass6"
+	newenvd ${FILESDIR}/99grass-6.1.0 99grass
+}