added interim version (bug 72353) and removed broken 5.0.3 version

Package-Manager: portage-2.0.51.22-r2

6 files changed, 105 insertions, 126 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index 818eb6ccf2e5..0691d476eab7 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-geosciences/grass
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.8 2005/07/25 01:22:29 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.9 2005/08/08 06:38:25 nerdboy Exp $
+
+*grass-5.4.0 (08 Aug 2005)
+
+  08 Aug 2005; Steve Arnold <nerdboy@gentoo.org> +grass-5.4.0.ebuild
+  -grass-5.0.3.ebuild:
+  added interim version (bug 72353) since 5.0.3 is broken wrt newer freetype
 
 *grass-6.0.0-r2 (25 Jul 2005)
 
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 57dd99330120..1bc24e59ae12 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,9 +1,9 @@
-MD5 163c80711cdc1a15061317b97d819e5f ChangeLog 3226
+MD5 b58927ef8ae5a65c9e1dfb12003ff829 ChangeLog 3424
 MD5 3bd6e46846f23339b4e13fb95dc58a71 grass-5.0.2.ebuild 2644
-MD5 61bbfbc01bab6d1de078f9df119e8bad grass-5.0.3.ebuild 3257
 MD5 e3525ea07aea3bae2424110708012cd1 metadata.xml 480
+MD5 bb85285083e9ad3bc9643ce48b4bcb0e grass-5.4.0.ebuild 2748
 MD5 65be15bed93bda35cae55279743df6d8 grass-6.0.0-r2.ebuild 3171
 MD5 f41ae1ddcca30e1eeea2a74100f36ba4 files/99grass-6 100
 MD5 bdf9112abfe51ff3b2cd0547318640df files/digest-grass-5.0.2 69
-MD5 0595fca992dc9e3ab6f3ddf331323b79 files/digest-grass-5.0.3 209
 MD5 c0ab8e2beb1ed62c15e81642c2f99eba files/digest-grass-6.0.0-r2 64
+MD5 3856d089c392313ea91a67cb000a90a9 files/digest-grass-5.4.0 65
diff --git a/sci-geosciences/grass/files/digest-grass-5.0.3 b/sci-geosciences/grass/files/digest-grass-5.0.3
deleted file mode 100644
index 42b4aa3c194d..000000000000
--- a/sci-geosciences/grass/files/digest-grass-5.0.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8c1cca7f9f36dca671d0f753501f1f4f grass-5.0.3_src.tar.gz 17503696
-MD5 53fdec5bbbc02dff1bc95acb3456ecbd grass5.0.3_i18n_src.tar.gz 17600067
-MD5 13b07f28e0d771b47702a244b1e2d9ff tcltkgrass-i18n.tar.gz 312974
diff --git a/sci-geosciences/grass/files/digest-grass-5.4.0 b/sci-geosciences/grass/files/digest-grass-5.4.0
new file mode 100644
index 000000000000..c17d35eec691
--- /dev/null
+++ b/sci-geosciences/grass/files/digest-grass-5.4.0
@@ -0,0 +1 @@
+MD5 4faeb8cd6d9070f78a03fd5aed95f9a0 grass-5.4.0.tar.gz 20487737
diff --git a/sci-geosciences/grass/grass-5.0.3.ebuild b/sci-geosciences/grass/grass-5.0.3.ebuild
deleted file mode 100644
index d68bbc5f23dc..000000000000
--- a/sci-geosciences/grass/grass-5.0.3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-5.0.3.ebuild,v 1.5 2005/06/02 15:41:24 ribosome Exp $
-
-DESCRIPTION="An open-source GIS with raster and vector functionality"
-HOMEPAGE="http://grass.itc.it/
-	http://www.grass-japan.org/FOSS4G/GRASS/grass-inten.html"
-SRC_URI="!nls? ( http://grass.ibiblio.org/${PN}5/source/${P}_src.tar.gz )
-	nls? ( http://www.grass-japan.org/FOSS4G/GRASS/${P/-/}_i18n_src.tar.gz
-	tcltk? ( http://www.grass-japan.org/FOSS4G/GRASS/tcltkgrass-i18n.tar.gz ) )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~amd64"
-IUSE="tcltk png jpeg tiff postgres odbc gd motif truetype nls"
-# Removed cause mesa never goes stable.
-# IUSE="${IUSE} nviz"
-
-DEPEND=">=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
-	virtual/x11
-	>=sys-libs/gdbm-1.8.0
-	>=sys-devel/gcc-3.2.2
-	=sci-libs/fftw-2*
-	>=sci-libs/lapack-3.0
-	>=sci-libs/blas-19980702
-	>=media-libs/netpbm-9.12
-	>=dev-lang/R-1.6.1
-	tcltk? ( >=dev-lang/tcl-8.3.4
-		>=dev-lang/tk-8.3.4 )
-	png? ( >=media-libs/libpng-1.2.5 )
-	jpeg? ( >=media-libs/jpeg-6b )
-	tiff? ( >=media-libs/tiff-3.5.7 )
-	postgres? ( >=dev-db/postgresql-7.3.2 )
-	odbc? ( >=dev-db/unixODBC-2.0.6 )
-	gd? ( >=media-libs/gd-1.8.3 )
-	motif? ( virtual/motif )
-	truetype? ( >=media-libs/freetype-2.1.3 )
-	nls? ( x11-terms/mlterm )"
-	#nviz? ( >=media-libs/mesa-3.5 )"
-
-use nls && S="${WORKDIR}/${P}-i18n"
-
-src_compile() {
-
-	local myconf="--with-blas --with-lapack"
-
-	use tcltk \
-	&& myconf="${myconf} --with-tcltk" \
-	|| myconf="${myconf} --without-tcltk"
-
-	use png \
-	&& myconf="${myconf} --with-png" \
-	|| myconf="${myconf} --without-png"
-
-	use jpeg \
-	&& myconf="${myconf} --with-jpeg" \
-	|| myconf="${myconf} --without-jpeg"
-
-	use tiff \
-	&& myconf="${myconf} --with-tiff" \
-	|| myconf="${myconf} --without-tiff"
-
-	use odbc \
-	&& myconf="${myconf} --with-odbc" \
-	|| myconf="${myconf} --without-odbc"
-
-	use gd \
-	&& myconf="${myconf} --with-gd" \
-	|| myconf="${myconf} --without-gd"
-
-	use postgres \
-	&& myconf="${myconf} --with-postgres --with-postgres-includes=/usr/include/postgresql/server" \
-	|| myconf="${myconf} --without-postgres"
-
-	use motif \
-	&& myconf="${myconf} --with-motif --with-motif-includes=/usr/X11R6/include" \
-	|| myconf="${myconf} --without-motif"
-
-	use truetype \
-	&& myconf="${myconf} --with-freetype --with-freetype-includes=/usr/include/freetype2" \
-	|| myconf="${myconf} --without-freetype"
-
-	#use nviz \
-	#&& myconf="${myconf} --with-glw" \
-	#|| myconf="${myconf} --without-glw"
-
-	use nls \
-	&& myconf="${myconf} --with-nls --with-freetype"
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=${D}/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		${myconf} || die "./configure failed"
-	emake -j1 || die "emake failed"
-
-	# clean ccache directories left in ${S}
-	find . -type d -name ".ccache" | xargs rm -rf
-}
-
-src_install() {
-	make install || die
-	dosed "s:^GISBASE=.*$:GISBASE=/usr/grass5:" \
-	  /usr/bin/grass5
-
-	if use nls && use tcltk ; then
-		pushd ${D}/usr/grass5
-		unpack tcltkgrass-i18n.tar.gz
-		dodoc AUTHORS BUGS NEWS.html README TODO.txt
-		dohtml REQUIREMENTS.html
-		rm [A-Z]*
-		popd
-	fi
-}
diff --git a/sci-geosciences/grass/grass-5.4.0.ebuild b/sci-geosciences/grass/grass-5.4.0.ebuild
new file mode 100644
index 000000000000..ba3b06ed40c4
--- /dev/null
+++ b/sci-geosciences/grass/grass-5.4.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-5.4.0.ebuild,v 1.1 2005/08/08 06:38:25 nerdboy Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="An open-source GIS with raster and vector functionality"
+HOMEPAGE="http://grass.itc.it/"
+SRC_URI="http://grass.itc.it/grass54/source/${P}.tar.gz
+	http://grass.meteo.uni.wroc.pl/grass54/source/${P}.tar.gz
+	http://grass.ibiblio.org/grass54/source/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~sparc"
+IUSE="tcltk png jpeg tiff postgres odbc motif gdal mysql blas lapack X fftw truetype nls opengl"
+
+DEPEND=">=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
+	blas? ( virtual/blas )
+	lapack? ( virtual/lapack )
+	fftw? ( =sci-libs/fftw-2* )
+	gdal? ( >=sci-libs/gdal-1.2.6 )
+	jpeg? ( media-libs/jpeg )
+	tiff? ( media-libs/tiff )
+	png? ( >=media-libs/libpng-1.2.2 )
+	mysql? ( dev-db/mysql )
+	odbc? ( >=dev-db/unixODBC-2.0.6 )
+	postgres? ( >=dev-db/postgresql-7.3 )
+	tcltk? ( >=dev-lang/tcl-8.3.4
+		>=dev-lang/tk-8.3.4 )
+	truetype? ( >=media-libs/freetype-2.0.0 )
+	motif? ( x11-libs/openmotif )
+	X? ( virtual/x11 )
+	nls? ( x11-terms/mlterm )"
+
+src_compile() {
+	MYCONF="--prefix=${D}usr --host=${CHOST} --infodir=${D}usr/share/info \
+		--libdir=${D}usr/$(get_libdir) --mandir=${D}usr/share/man \
+		--enable-shared --with-cxx "
+
+	use truetype \
+		&& MYCONF="${MYCONF} --with-freetype \
+		--with-freetype-includes=/usr/include/freetype2 \
+		--with-freetype-libs=/usr/lib" \
+		|| MYCONF="${MYCONF} --without-freetype"
+
+	use gdal \
+		&& MYCONF="${MYCONF} --with-gdal=/usr/bin/gdal-config" \
+		|| MYCONF="${MYCONF} --without-gdal"
+
+	use mysql \
+		&& MYCONF="${MYCONF} --with-mysql --with-mysql-includes=/usr/include/mysql \
+		 --with-mysql-libs=/usr/lib/mysql" \
+		|| MYCONF="${MYCONF} --without-mysql"
+
+	mkdir ./grass-build
+	cd ./grass-build
+
+	../configure ${MYCONF} \
+		`use_with X` \
+		`use_with readline` \
+		`use_with tcltk` \
+		`use_with postgres` \
+		`use_with motif` \
+		`use_with blas` \
+		`use_with lapack` \
+		`use_with fftw` \
+		`use_with jpeg` \
+		`use_with png` \
+		`use_with tiff` \
+		`use_with odbc` \
+		`use_with nls` \
+		`use_enable amd64 64bit` \
+		`use_with opengl` || die "Error: configure failed!"
+	emake -j1 || die "Error: emake failed!"
+}
+
+src_install() {
+	cd ${WORKDIR}/${P}/grass-build
+	make DESTDIR=${D} install \
+		|| die "Error: make install failed!"
+	sed -i "s:^GISBASE=.*$:GISBASE=/usr/grass54:" \
+		${D}usr/bin/grass54
+	# Install grass always in one directory
+	mv ${D}usr/${P} ${D}usr/grass54
+}