cleaned up wrong ebuild (should've been 6.0.2 instead)

Package-Manager: portage-2.1.2_rc3-r2

3 files changed, 12 insertions, 144 deletions

diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index f2cd076a748b..8c426fe875c9 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -11,17 +11,17 @@ MD5 a248b70f3e8fe51275cf453721f42a9b files/99grass-6.2.0 75
 RMD160 fb5c1ca803d8da1c2258e9472484482741b0dace files/99grass-6.2.0 75
 SHA256 d310c69cedca3d7e494961e264f5f2ed0edfcace49f85aa9739b66ac0fe9841e files/99grass-6.2.0 75
 DIST grass-5.4.0.tar.gz 20487737 RMD160 76821edeff55e72ffad0fa5db275dca2221660a5 SHA1 3324bf8af1861c63d9d171577ffa7fb7e87582f1 SHA256 ac4cc3f1408750d7f9d54ea2155b7e8960041337d4e4d3662bffb41cb9899537
-DIST grass-6.0.2.tar.gz 8640862 RMD160 64a251c9fe9ae0920e86c0fba7e3081eb0b83fc3 SHA1 cc04474026b39d80cde6143c30de3c3adea262f9 SHA256 dabe7315be1147b40f148a93add29dd405725aca39f366f31826b17230f8437b
+DIST grass-6.0.1.tar.gz 8508427 RMD160 35cc84ecb593ddc83f78d41985d1ffe9db060295 SHA1 7faa22d1ac3e2272c12a82e284d2e3a8819b31ca SHA256 53127007260bf2181e711fa0520636ff497bd0c3406c16a1002945b1c4415340
 DIST grass-6.1.0.tar.gz 12152023 RMD160 e621051c4444219fb42cfddd884518225496fc97 SHA1 ea26163f42805a2571a0a35ac58457bffdbcfc1e SHA256 c772baf08cea32bb228463f2d696ecc56d1e55768ec7c4a39651cf6edaf8adb2
 DIST grass-6.2.0.tar.gz 12534549 RMD160 0173e1c7cd3a13af9fe0d9e77101e5e216df7dac SHA1 ace7ddcd3219550dd7068948865d96ce5f16d289 SHA256 2246008c1baadbb35398b35d8d069bee60c23c780e1573c22ae947e3f5a451a8
 EBUILD grass-5.4.0.ebuild 3189 RMD160 5b0f5e05f7da44571dbcd6e4372432018e8f0ad2 SHA1 8d34bea8dd8ba49459503a0bd04b01c12d5ad962 SHA256 aa9053132c469c7a873ff809d73e66fed2321cf24c6a158ea15f6c74e92bd5b8
 MD5 4e6ad10f74dbb30c937f097e8b234142 grass-5.4.0.ebuild 3189
 RMD160 5b0f5e05f7da44571dbcd6e4372432018e8f0ad2 grass-5.4.0.ebuild 3189
 SHA256 aa9053132c469c7a873ff809d73e66fed2321cf24c6a158ea15f6c74e92bd5b8 grass-5.4.0.ebuild 3189
-EBUILD grass-6.0.2.ebuild 3417 RMD160 4411e3f1566ad25e29d770e1ea531864e4149873 SHA1 2bc0cbf1cd3e3405dc44f62fe38353311d4aebd2 SHA256 daa9620838d2401803ad9d0b1c5f345fd7f1d78123aa709651de199bb1c40a7c
-MD5 e91633ba9601ebaeb5d10852938ef815 grass-6.0.2.ebuild 3417
-RMD160 4411e3f1566ad25e29d770e1ea531864e4149873 grass-6.0.2.ebuild 3417
-SHA256 daa9620838d2401803ad9d0b1c5f345fd7f1d78123aa709651de199bb1c40a7c grass-6.0.2.ebuild 3417
+EBUILD grass-6.0.1.ebuild 3493 RMD160 7ac7fa1669b8a97c37dfbe884ecee750ac35ed27 SHA1 bce11d17a670924559224ccb3ddbfb51c5c86e84 SHA256 2dab90eae5fb2fab88dcf7b5607633312161c6b07766721952f1f4c4f2e9bcc0
+MD5 fffe5198b73dd5e052becf09f52ccade grass-6.0.1.ebuild 3493
+RMD160 7ac7fa1669b8a97c37dfbe884ecee750ac35ed27 grass-6.0.1.ebuild 3493
+SHA256 2dab90eae5fb2fab88dcf7b5607633312161c6b07766721952f1f4c4f2e9bcc0 grass-6.0.1.ebuild 3493
 EBUILD grass-6.1.0.ebuild 4760 RMD160 ea3106f5fd5eacbeaec38ddd4c2b264055157f86 SHA1 c4ba1efd7b7c0549b2f17604224e90f22b089460 SHA256 bc7bc72a20e6178311048cd12e147140bf3e5080c077d195c38b924a02ceae6a
 MD5 04469d7811d97775760d6240d9738a86 grass-6.1.0.ebuild 4760
 RMD160 ea3106f5fd5eacbeaec38ddd4c2b264055157f86 grass-6.1.0.ebuild 4760
@@ -30,10 +30,10 @@ EBUILD grass-6.2.0.ebuild 5003 RMD160 3da6e939f946946e9a66c9be19cdb97f73be3af9 S
 MD5 8b6a1ee677fa48d30926f07750276daf grass-6.2.0.ebuild 5003
 RMD160 3da6e939f946946e9a66c9be19cdb97f73be3af9 grass-6.2.0.ebuild 5003
 SHA256 c3d62c7e39ee11969d368e4ee6959dff3b1765c7b70064ce3c389604a485e7d9 grass-6.2.0.ebuild 5003
-MISC ChangeLog 6246 RMD160 ea0d551d2c73f11d637013525e4235cd3c6ac3cf SHA1 d1f10fb7b82b82e249648d79855b9485d486799f SHA256 87ad564d4f058c2ad1e53d4b16df28453a046fa2901376401de9e58f666444e1
-MD5 c5d8549e7e96c2c0f60a145adfe761fb ChangeLog 6246
-RMD160 ea0d551d2c73f11d637013525e4235cd3c6ac3cf ChangeLog 6246
-SHA256 87ad564d4f058c2ad1e53d4b16df28453a046fa2901376401de9e58f666444e1 ChangeLog 6246
+MISC ChangeLog 6442 RMD160 8a01358f97579de797b7504a64bd1ce9cb43aa40 SHA1 06b1d808a833b2b110de656cec6d04b35b613054 SHA256 424fb3fc3504ff97d791bc5010a14a66b97de9d985dce690fd80a354fc0e77b8
+MD5 563d78b700b8408748334565bb174f3a ChangeLog 6442
+RMD160 8a01358f97579de797b7504a64bd1ce9cb43aa40 ChangeLog 6442
+SHA256 424fb3fc3504ff97d791bc5010a14a66b97de9d985dce690fd80a354fc0e77b8 ChangeLog 6442
 MISC metadata.xml 492 RMD160 03cf12a529c5443dffc366017b997d183a2bcf3b SHA1 bd8657499f8b6cb3b232684afd63c3b5d915ba5e SHA256 976d5771ed6fbabbeba026b0394186b7735135deb79c86aa9388fc5134467e8e
 MD5 efddef8657f71e6240e2d838ebf178d1 metadata.xml 492
 RMD160 03cf12a529c5443dffc366017b997d183a2bcf3b metadata.xml 492
@@ -41,9 +41,9 @@ SHA256 976d5771ed6fbabbeba026b0394186b7735135deb79c86aa9388fc5134467e8e metadata
 MD5 9afc7067ee42af39d149c5614b18dfee files/digest-grass-5.4.0 241
 RMD160 db217fb6e54054be59916e7b35b27ab8a07cff5a files/digest-grass-5.4.0 241
 SHA256 2a33429a8c21883ad4eebce6548896ff304d292d1e0b66b863c936978fdbce9f files/digest-grass-5.4.0 241
-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
+MD5 2a6b8167e8ead329a2dc3f2371d5ca90 files/digest-grass-6.0.1 238
+RMD160 e3423f590b4400168daff513e2b42c1403ec0265 files/digest-grass-6.0.1 238
+SHA256 50f9fc1916ee615d2490f1a84ed0321970f39c3664820724950a718becf63fa4 files/digest-grass-6.0.1 238
 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/digest-grass-6.0.2 b/sci-geosciences/grass/files/digest-grass-6.0.2
deleted file mode 100644
index d4d5551a1528..000000000000
--- a/sci-geosciences/grass/files/digest-grass-6.0.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e31887f84ff1f0c830c2b2e8760bbde7 grass-6.0.2.tar.gz 8640862
-RMD160 64a251c9fe9ae0920e86c0fba7e3081eb0b83fc3 grass-6.0.2.tar.gz 8640862
-SHA256 dabe7315be1147b40f148a93add29dd405725aca39f366f31826b17230f8437b grass-6.0.2.tar.gz 8640862
diff --git a/sci-geosciences/grass/grass-6.0.2.ebuild b/sci-geosciences/grass/grass-6.0.2.ebuild
deleted file mode 100644
index 6a9288ca36f6..000000000000
--- a/sci-geosciences/grass/grass-6.0.2.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# 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.0.2.ebuild,v 1.5 2006/11/23 16:49:13 vivo Exp $
-
-inherit eutils
-
-DESCRIPTION="An open-source GIS with raster and vector functionality"
-HOMEPAGE="http://grass.itc.it/"
-SRC_URI="http://grass.itc.it/grass60/source/${P}.tar.gz
-	http://grass.meteo.uni.wroc.pl/grass60/source/${P}.tar.gz
-	http://grass.ibiblio.org/grass60/source/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="6"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-# To-do: get ppc64 gdal deps fixed up
-
-# add gdal back to use flags once grass is fixed
-IUSE="fftw jpeg motif mysql nls odbc opengl png postgres readline tcltk 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
-	virtual/man
-	>=sci-libs/proj-4.4.7
-	sci-libs/gdal
-	fftw? ( =sci-libs/fftw-2* )
-	jpeg? ( media-libs/jpeg )
-	postgres? ( >=dev-db/postgresql-7.3 )
-	mysql? ( virtual/mysql )
-	odbc? ( >=dev-db/unixODBC-2.0.6 )
-	png? ( >=media-libs/libpng-1.2.2 )
-	readline? ( sys-libs/readline )
-	tiff? ( >=media-libs/tiff-3.5.7 )
-	truetype? ( >=media-libs/freetype-2.0 )
-	nls? ( x11-terms/mlterm )
-	opengl? ( virtual/opengl )
-	tcltk? ( >=dev-lang/tcl-8.3.4
-		>=dev-lang/tk-8.3.4 )
-	motif? ( x11-libs/openmotif )
-	|| (
-	    ( 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() {
-	unpack ${A}
-
-	cd ${S}
-	epatch rpm/fedora/grass-readline.patch
-}
-
-src_compile() {
-
-	MYCONF=" --with-cxx --enable-shared --with-gdal=/usr/bin/gdal-config"
-
-	if use truetype; then
-		MYCONF="${MYCONF} --with-freetype-includes=/usr/include/freetype2/"
-	fi
-
-	use mysql && MYCONF="${MYCONF} --with-mysql \
-		--with-mysql-includes=/usr/include/mysql \
-		--with-mysql-libs=/usr/$(get_libdir)/mysql" \
-		|| MYCONF="${MYCONF} --without-mysql"
-
-	if use opengl; then
-	    MYCONF="${MYCONF} --with-opengl-libs=/usr/$(get_libdir)/opengl/xorg-x11/lib/"
-	fi
-
-# apparently gdal isn't optional with this version
-# we'll temporarily make it a hard dep for now
-#	if use gdal; then
-#	    MYCONF="${MYCONF} --with-gdal=/usr/bin/gdal-config"
-#	else
-#	    MYCONF="${MYCONF} --without-gdal"
-#	fi
-
-	export LD_LIBRARY_PATH="/${WORKDIR}/image/usr/grass60/$(get_libdir):${LD_LIBRARY_PATH}"
-	./configure \
-		`use_with postgres` \
-		`use_with motif` \
-		`use_with fftw` \
-		`use_with truetype freetype` \
-		`use_with jpeg` \
-		`use_with png` \
-		`use_with tiff` \
-		`use_with odbc` \
-		`use_enable amd64 64bit` \
-		`use_with opengl` \
-		`use_with readline` \
-		`use_with tcltk` \
-		${MYCONF} || die "Error: configure failed!"
-	emake -j1 || die "Error: emake failed!"
-}
-
-src_install() {
-	make install \
-		prefix=${D}/usr UNIX_BIN=${D}/usr/bin BINDIR=${D}/usr/bin PREFIX=${D}/usr \
-		    || die "Error: make install failed!"
-	sed -i "s:^GISBASE=.*$:GISBASE=/usr/grass60:" \
-		${D}/usr/bin/grass60
-
-	# This is required for GRASS dependent ebuilds (ie. QGIS)
-	mv ${D}/usr/${P} ${D}/usr/grass60
-
-	einfo "Adding env.d entry for Grass6"
-	insinto /etc/env.d
-	newins ${FILESDIR}/99grass-6 99grass
-}