update to current upstream release and consolidate environment settings

Package-Manager: portage-2.1.2.6

7 files changed, 226 insertions, 31 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/Manifest b/sci-geosciences/grass/Manifest
index 40752065347d..545ed00f340a 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,18 +1,11 @@
------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
-AUX 99grass-6.2.0 67 RMD160 832371f15402bd8bd12f1b664d62833ddf62fb40 SHA1 dfa27b0ac5c2fea63c62cf94d4dd5f00843bcbe0 SHA256 53bc02c87c2032451f23f465785cebe1258ea50c7461b3ec4749e77849a3e33b
-MD5 64cadb3af3adc7f0494a55264df7f452 files/99grass-6.2.0 67
-RMD160 832371f15402bd8bd12f1b664d62833ddf62fb40 files/99grass-6.2.0 67
-SHA256 53bc02c87c2032451f23f465785cebe1258ea50c7461b3ec4749e77849a3e33b files/99grass-6.2.0 67
+AUX 99grass-6.2 68 RMD160 08c932be282925ca1316664ba7ef9654a0543488 SHA1 ba73dcd993687fc0bfa95d97ff1ce30fb05bfa45 SHA256 bf7b1df4b9d9f71ffdd36cf924cb374032fd49ba0277a5cc7a4f77658cdc76e4
+MD5 9db830925c7d5ae42de04aedd6e6b903 files/99grass-6.2 68
+RMD160 08c932be282925ca1316664ba7ef9654a0543488 files/99grass-6.2 68
+SHA256 bf7b1df4b9d9f71ffdd36cf924cb374032fd49ba0277a5cc7a4f77658cdc76e4 files/99grass-6.2 68
 AUX grass-6.2.0-html-nonviz.patch 1721 RMD160 ad57109c03792e8376ccbe2ed8ff459b850cdf20 SHA1 20122b510bc7e52dfbaac04fd8587281d99a08e6 SHA256 492475975bb08f5b24f6c043a8bdfce32a1b22b5432127223dfe36e1ba66057c
 MD5 b75daa0a3523b22844a17b3968bd1dd6 files/grass-6.2.0-html-nonviz.patch 1721
 RMD160 ad57109c03792e8376ccbe2ed8ff459b850cdf20 files/grass-6.2.0-html-nonviz.patch 1721
@@ -20,6 +13,7 @@ SHA256 492475975bb08f5b24f6c043a8bdfce32a1b22b5432127223dfe36e1ba66057c files/gr
 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.2.0.tar.gz 12534549 RMD160 0173e1c7cd3a13af9fe0d9e77101e5e216df7dac SHA1 ace7ddcd3219550dd7068948865d96ce5f16d289 SHA256 2246008c1baadbb35398b35d8d069bee60c23c780e1573c22ae947e3f5a451a8
+DIST grass-6.2.1.tar.gz 12599109 RMD160 ff885023b926ece6545591666fdaa1189facc8bc SHA1 bbd179b9145d735873a13f40a25784b64762387b SHA256 fb7a1030a51222b586f1fd4cbd6ee2c99a0974dba72c70032d336a6a30b073f9
 EBUILD grass-5.4.0.ebuild 3129 RMD160 c3e510b3e256f26537324805818a74e19e48fb7e SHA1 31f41b997fca54cd4a757b100a985e6bd0efbff5 SHA256 af28091ba03ca1d01e0854006fef025e31f6bd61311613edea0b899776945a7e
 MD5 681a1af98a2208717339540bd693b927 grass-5.4.0.ebuild 3129
 RMD160 c3e510b3e256f26537324805818a74e19e48fb7e grass-5.4.0.ebuild 3129
@@ -28,14 +22,18 @@ EBUILD grass-6.0.1.ebuild 3397 RMD160 204899f11dea6a2adaff5152285d46ec9b1e8bef S
 MD5 098f22c4529a9f499b9a251de2cc5e9d grass-6.0.1.ebuild 3397
 RMD160 204899f11dea6a2adaff5152285d46ec9b1e8bef grass-6.0.1.ebuild 3397
 SHA256 b0c3c6a4b0b578c969a09f9f194b6974e30e64b8b6c1cc6dc1fffb2fce817124 grass-6.0.1.ebuild 3397
-EBUILD grass-6.2.0-r1.ebuild 5486 RMD160 34a84424a0c53c435b56469a2221cc86abb2cf9d SHA1 3e0542f5710ef372ca5fb61dbdf42306d2b8bbbf SHA256 aaaf1691be91c672af6f163667d4306f992ff54efd78df2eb657a6cd4586afde
-MD5 8b8dabf3c3b1d0169288c02518ac0964 grass-6.2.0-r1.ebuild 5486
-RMD160 34a84424a0c53c435b56469a2221cc86abb2cf9d grass-6.2.0-r1.ebuild 5486
-SHA256 aaaf1691be91c672af6f163667d4306f992ff54efd78df2eb657a6cd4586afde grass-6.2.0-r1.ebuild 5486
-MISC ChangeLog 7509 RMD160 6e544e60055b286e1ba09ea91741e261da84af8a SHA1 61c017cd37f3a54847f4566946255d2e4b952ec9 SHA256 4c6688a94a58f4bd0b9495e8fbd24ad1a192058b4b95d4eb547328449ad89cfd
-MD5 e223f30246cbb75b1b2cad3d3e6f7252 ChangeLog 7509
-RMD160 6e544e60055b286e1ba09ea91741e261da84af8a ChangeLog 7509
-SHA256 4c6688a94a58f4bd0b9495e8fbd24ad1a192058b4b95d4eb547328449ad89cfd ChangeLog 7509
+EBUILD grass-6.2.0-r1.ebuild 5491 RMD160 74ac6f869bbb80fb3358ded2f0b2d3d1681f7bb9 SHA1 d0f90e3979a814b8af1603c444b8f1b8e809bbe8 SHA256 bbb938e86a37bb7586dc3e2c6682a9ba0e0c1bd71c65188fa512b37123eaac10
+MD5 309b070565b799c322543f6d90ef9bc6 grass-6.2.0-r1.ebuild 5491
+RMD160 74ac6f869bbb80fb3358ded2f0b2d3d1681f7bb9 grass-6.2.0-r1.ebuild 5491
+SHA256 bbb938e86a37bb7586dc3e2c6682a9ba0e0c1bd71c65188fa512b37123eaac10 grass-6.2.0-r1.ebuild 5491
+EBUILD grass-6.2.1.ebuild 5488 RMD160 f3704a1be9e2f2addc4a4d78441874552822fdf0 SHA1 bb40e154232f950b642da75855e94026de95143f SHA256 f89b26bafe19ae6c2d801c3231915e2f04801d26f5941b1c2319a1da8c478cf7
+MD5 2ff1d75b6d0bfe2b7609ae6691e08531 grass-6.2.1.ebuild 5488
+RMD160 f3704a1be9e2f2addc4a4d78441874552822fdf0 grass-6.2.1.ebuild 5488
+SHA256 f89b26bafe19ae6c2d801c3231915e2f04801d26f5941b1c2319a1da8c478cf7 grass-6.2.1.ebuild 5488
+MISC ChangeLog 7846 RMD160 43123f0651091a97694fe4ac16ccc9df43dbf69a SHA1 25f2bbb7b38f65de81fa43ff4ba3c7c7d7424e97 SHA256 187e5a5b12c56607f661164e0151edec335bd78b753e11de90933b4a7e7d90cf
+MD5 0b1ab1abaa05882119a90a077134fae3 ChangeLog 7846
+RMD160 43123f0651091a97694fe4ac16ccc9df43dbf69a ChangeLog 7846
+SHA256 187e5a5b12c56607f661164e0151edec335bd78b753e11de90933b4a7e7d90cf ChangeLog 7846
 MISC metadata.xml 492 RMD160 03cf12a529c5443dffc366017b997d183a2bcf3b SHA1 bd8657499f8b6cb3b232684afd63c3b5d915ba5e SHA256 976d5771ed6fbabbeba026b0394186b7735135deb79c86aa9388fc5134467e8e
 MD5 efddef8657f71e6240e2d838ebf178d1 metadata.xml 492
 RMD160 03cf12a529c5443dffc366017b997d183a2bcf3b metadata.xml 492
@@ -49,10 +47,6 @@ SHA256 50f9fc1916ee615d2490f1a84ed0321970f39c3664820724950a718becf63fa4 files/di
 MD5 74a5fc63e9fc9b7b327e0858baa19367 files/digest-grass-6.2.0-r1 241
 RMD160 a64da970229d571841614cb1097bd6c7dcc608aa files/digest-grass-6.2.0-r1 241
 SHA256 1e1ab91d1ef68251fd0784aa3e9ada0962ed1123bb11fe0dc931aa924ad4c045 files/digest-grass-6.2.0-r1 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGM4vwI1lqEGTUzyQRAlojAJ90+PQI8bwOm9b1cC6wHQyKaRZgJgCeLeRF
-HMdjkINddDSlGv5yLTdyAbE=
-=yNce
------END PGP SIGNATURE-----
+MD5 d73a5a6ecc1137672474e7e946209ac6 files/digest-grass-6.2.1 241
+RMD160 29aaefea6ba94dba41ceed9de0ad7b8f4ffb96d4 files/digest-grass-6.2.1 241
+SHA256 c9b8c1d19cd35c94509d387d6ba1cfbc474e9fb034446e4c7d88961781fcce32 files/digest-grass-6.2.1 241
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
+}