Fix & cleanup

5 files changed, 24 insertions, 116 deletions

diff --git a/app-misc/grass/ChangeLog b/app-misc/grass/ChangeLog
index 7ca5116f3c28..9fb040b5dd32 100644
--- a/app-misc/grass/ChangeLog
+++ b/app-misc/grass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/grass
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/grass/ChangeLog,v 1.2 2003/04/17 22:37:38 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/grass/ChangeLog,v 1.3 2003/08/17 21:39:09 mholzer Exp $
+
+  17 Aug 2003; Martin Holzer <mholzer@gentoo.org> grass-5.0.1.ebuild,
+  grass-5.0.2.ebuild:
+  Fixed install dir. Marked stable
 
 *grass-5.0.2 (17 Apr 2003)
 
diff --git a/app-misc/grass/Manifest b/app-misc/grass/Manifest
index aa20b1d51e7d..ffb1898d7d26 100644
--- a/app-misc/grass/Manifest
+++ b/app-misc/grass/Manifest
@@ -1,5 +1,3 @@
-MD5 effaaef4aea50ceaf8c5af17b78fb5cd files/digest-grass-5.0.1 131
+MD5 00d9786d0ef10d03eb6ccf553250c7cf ChangeLog 747
+MD5 56ea71c43462ff49a16fae03631bc4b4 grass-5.0.2.ebuild 2590
 MD5 bdf9112abfe51ff3b2cd0547318640df files/digest-grass-5.0.2 69
-MD5 7fef31a2e377e5bc0eebfe0ec6af7ada ChangeLog 619
-MD5 31ea14f89fc0769cc785a557eee7f7d8 grass-5.0.1.ebuild 2420
-MD5 c2665d292d81b76349465453cc78d55a grass-5.0.2.ebuild 2649
diff --git a/app-misc/grass/files/digest-grass-5.0.1 b/app-misc/grass/files/digest-grass-5.0.1
deleted file mode 100644
index 4429fb9acac7..000000000000
--- a/app-misc/grass/files/digest-grass-5.0.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a9eece5c25df811f444937dc596a272d /grass-5.0.1.ebuild 2425
-MD5 c1d8a5fb45607e47d3531779da0427e9 grass-5.0.1_src.tar.gz 24344421
diff --git a/app-misc/grass/grass-5.0.1.ebuild b/app-misc/grass/grass-5.0.1.ebuild
deleted file mode 100644
index 0870dad5b3ab..000000000000
--- a/app-misc/grass/grass-5.0.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/grass/grass-5.0.1.ebuild,v 1.2 2003/06/29 23:17:15 aliz Exp $
-
-DESCRIPTION="An open-source GIS with raster and vector functionality."
-HOMEPAGE="http://grass.baylor.edu/"
-SRC_URI="http://grass.baylor.edu/grass5/source/${P}_src.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-IUSE="tcltk png jpeg tiff postgres odbc gd motif truetype"
-
-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
-	>=x11-base/xfree-4.2.1
-	>=sys-libs/gdbm-1.8.0
-	>=sys-devel/gcc-3.2.2
-	>=dev-libs/fftw-2.1.3
-	>=app-sci/lapack-3.0
-	>=app-sci/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/libgd-1.8.3 )
-	motif? ( >=x11-libs/lesstif-0.93.36 )
-	truetype? ( >=media-libs/freetype-2.1.3 )"
-
-S=${WORKDIR}/grass5.0.1
-
-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" \
-	|| myconf="${myconf} --without-motif"
-
-	use truetype \
-	&& myconf="${myconf} --with-freetype" \
-	|| myconf="${myconf} --without-freetype"
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=${D}/usr/local \
-		--infodir=/usr/local/share/info \
-		--mandir=/usr/local/share/man \
-		${myconf} || die "./configure failed"
-	make || die
-}
-
-src_install() {
-	make install || die
-	dosed "s:^GISBASE=.*$:GISBASE=/usr/local/grass5:" \
-	  /usr/local/bin/grass5
-}
diff --git a/app-misc/grass/grass-5.0.2.ebuild b/app-misc/grass/grass-5.0.2.ebuild
index d0c1a0649470..6e435c7eac8c 100644
--- a/app-misc/grass/grass-5.0.2.ebuild
+++ b/app-misc/grass/grass-5.0.2.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/grass/grass-5.0.2.ebuild,v 1.1 2003/04/17 22:37:38 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/grass/grass-5.0.2.ebuild,v 1.2 2003/08/17 21:39:09 mholzer Exp $
 
 DESCRIPTION="An open-source GIS with raster and vector functionality."
 HOMEPAGE="http://grass.baylor.edu/"
-SRC_URI="http://grass.ibiblio.org/grass5/source/${P}_src.tar.gz"
+SRC_URI="http://grass.ibiblio.org/${PN}5/source/${P}_src.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 IUSE="tcltk png jpeg tiff postgres odbc gd motif truetype"
-# Internal USE flags for still-unstable packages with no system USE flags.
-IUSE="${IUSE} nviz"
+# Removed cause mesa never goes stable.
+# IUSE="${IUSE} nviz"
 
 DEPEND=">=sys-devel/make-3.80
 	>=sys-libs/zlib-1.1.4
@@ -27,7 +27,7 @@ DEPEND=">=sys-devel/make-3.80
 	>=media-libs/netpbm-9.12
 	>=dev-lang/R-1.6.1
 	tcltk? ( >=dev-lang/tcl-8.3.4
-		 >=dev-lang/tk-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 )
@@ -35,8 +35,9 @@ DEPEND=">=sys-devel/make-3.80
 	odbc? ( >=dev-db/unixODBC-2.0.6 )
 	gd? ( >=media-libs/libgd-1.8.3 )
 	motif? ( >=x11-libs/lesstif-0.93.36 )
-	truetype? ( >=media-libs/freetype-2.1.3 )
-	nviz? ( >=media-libs/mesa-3.5 )"
+	truetype? ( >=media-libs/freetype-2.1.3 )"
+	#nviz? ( >=media-libs/mesa-3.5 )"
+
 S=${WORKDIR}/${P/-/}
 
 src_compile() {
@@ -79,21 +80,21 @@ src_compile() {
 	&& myconf="${myconf} --with-freetype" \
 	|| myconf="${myconf} --without-freetype"
 
-	use nviz \
-	&& myconf="${myconf} --with-glw" \
-	|| myconf="${myconf} --without-glw"
+	#use nviz \
+	#&& myconf="${myconf} --with-glw" \
+	#|| myconf="${myconf} --without-glw"
 
 	./configure \
 		--host=${CHOST} \
-		--prefix=${D}/usr/local \
-		--infodir=/usr/local/share/info \
-		--mandir=/usr/local/share/man \
+		--prefix=${D}/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
 		${myconf} || die "./configure failed"
 	make || die "make failed"
 }
 
 src_install() {
 	make install || die
-	dosed "s:^GISBASE=.*$:GISBASE=/usr/local/grass5:" \
-	  /usr/local/bin/grass5
+	dosed "s:^GISBASE=.*$:GISBASE=/usr/grass5:" \
+	  /usr/bin/grass5
 }