Version bump.

7 files changed, 53 insertions, 78 deletions

diff --git a/app-sci/maestro-data/ChangeLog b/app-sci/maestro-data/ChangeLog
index b4f6b884eb72..a0a76d492b91 100644
--- a/app-sci/maestro-data/ChangeLog
+++ b/app-sci/maestro-data/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-sci/maestro-data
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/maestro-data/ChangeLog,v 1.3 2004/03/20 02:40:26 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/maestro-data/ChangeLog,v 1.4 2004/04/02 03:39:34 zx Exp $
+
+*maestro-data-2004-r3 (01 Apr 2004)
+
+  01 Apr 2004; Chris Aniszczyk <zx@gentoo.org> maestro-data-2004-r1.ebuild,
+  maestro-data-2004-r3.ebuild, maestro-data-2004.ebuild:
+  Version bump with some new data. Thanks to <nosdr4g@hotmail.com> for the
+  update.
 
 *maestro-data-2004-r2 (23 Mar 2004)
 
diff --git a/app-sci/maestro-data/Manifest b/app-sci/maestro-data/Manifest
index dacc729fff64..9b6add75a37d 100644
--- a/app-sci/maestro-data/Manifest
+++ b/app-sci/maestro-data/Manifest
@@ -1,8 +1,6 @@
-MD5 dadc973b65ec4a33fd1c19bb7753ebe7 files/digest-maestro-data-2004 802
-MD5 912da47b7d660798af657e68c02a820c files/digest-maestro-data-2004-r1 1070
-MD5 ba8e3d9218be1a42dd9a391cdc05a82c files/digest-maestro-data-2004-r2 1250
-MD5 115072ccdb8456229707e1ea93ba2685 ChangeLog 774
-MD5 af98730ce6f3dd33337412040b9a684c maestro-data-2004-r1.ebuild 1480
-MD5 72c3bf1b7346f6dca271b27b22aa3650 maestro-data-2004-r2.ebuild 1621
-MD5 10ba5dc0b428a6100fa27fe9ec160adb maestro-data-2004.ebuild 1257
+MD5 239c3eacdc8f6b3a5c52c170c5c53b50 maestro-data-2004-r2.ebuild 1620
+MD5 ff9239c87ef79e40ed1d8411ae1941f9 ChangeLog 1029
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 cbcf36ca74ab5fcf57217343f6c12a89 maestro-data-2004-r3.ebuild 1646
+MD5 ba8e3d9218be1a42dd9a391cdc05a82c files/digest-maestro-data-2004-r2 1250
+MD5 277bc852ff3c26243a0156b12d4acbb1 files/digest-maestro-data-2004-r3 1430
diff --git a/app-sci/maestro-data/files/digest-maestro-data-2004 b/app-sci/maestro-data/files/digest-maestro-data-2004
deleted file mode 100644
index cefa6fb41f20..000000000000
--- a/app-sci/maestro-data/files/digest-maestro-data-2004
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 c465fe76f913509bc2b4a7c28912ec42 Maestro-Update01-LinuxAndSolaris.tar.gz 3597906
-MD5 933a7cc62e4f0b445480ef256103ea8a Maestro-Update02-LinuxAndSolaris.tar.gz 7674057
-MD5 32fcbb68446e394a28a86897d86973be MaestroUpdate-Spirit03-LinuxAndSolaris.tar.gz 3395166
-MD5 6a2d45728d9e39d1867c31d8b1b272cc MaestroUpdate-Spirit4-LinuxAndSolaris.tar.gz 10957769
-MD5 7312b9574edf48a0581dc8cce65eb768 MaestroUpdate-Spirit5-LinuxAndSolaris.tar.gz 13990212
-MD5 83be6dfde8bf2955e121bfcc265ea921 MaestroUpdate-Spirit6-LinuxAndSolaris.tar.gz 5472999
-MD5 7c334ab05022a2ded464efe9e0eabdb3 MaestroUpdate-Oppor1-LinuxAndSolaris.tar.gz 3888447
-MD5 cb823a74e08baf9fd19b192cfdb09a0e MaestroUpdate-Oppor2-LinuxAndSolaris.tar.gz 13055545
-MD5 21d59bb3ec91f0b133ab1cd41fcc4a3e MaestroUpdate-Oppor3-LinuxAndSolaris.tar.gz 17736829
diff --git a/app-sci/maestro-data/files/digest-maestro-data-2004-r1 b/app-sci/maestro-data/files/digest-maestro-data-2004-r3
index 34c3de1c3969..a81bec8a4e3d 100644
--- a/app-sci/maestro-data/files/digest-maestro-data-2004-r1
+++ b/app-sci/maestro-data/files/digest-maestro-data-2004-r3
@@ -5,8 +5,12 @@ MD5 6a2d45728d9e39d1867c31d8b1b272cc MaestroUpdate-Spirit4-LinuxAndSolaris.tar.g
 MD5 7312b9574edf48a0581dc8cce65eb768 MaestroUpdate-Spirit5-LinuxAndSolaris.tar.gz 13990212
 MD5 83be6dfde8bf2955e121bfcc265ea921 MaestroUpdate-Spirit6-LinuxAndSolaris.tar.gz 5472999
 MD5 a897cd5460621a636cdf9a9b8801e37e MaestroUpdate-Spirit7-LinuxAndSolaris.tar.gz 3374129
+MD5 0e3b0ccea69bc452e2c7459466a30f97 MaestroUpdate-Spirit8-LinuxAndSolaris.tar.gz 12735880
+MD5 23f03c9ce716a601f19a50961586cc0a MaestroUpdate-Spirit9-LinuxAndSolaris.tar.gz 7238028
 MD5 7c334ab05022a2ded464efe9e0eabdb3 MaestroUpdate-Oppor1-LinuxAndSolaris.tar.gz 3888447
 MD5 cb823a74e08baf9fd19b192cfdb09a0e MaestroUpdate-Oppor2-LinuxAndSolaris.tar.gz 13055545
 MD5 21d59bb3ec91f0b133ab1cd41fcc4a3e MaestroUpdate-Oppor3-LinuxAndSolaris.tar.gz 17736829
 MD5 1c07c4f59ed07957dade76d130ce99ca MaestroUpdate-Oppor4-LinuxAndSolaris.tar.gz 6632350
 MD5 02bee4ad2bf715705c8bda907979d4a4 MaestroUpdate-Oppor5-LinuxAndSolaris.tar.gz 5366821
+MD5 d52ea0a448494144c59bb66fca5f34f9 MaestroUpdate-Oppor7-LinuxAndSolaris.tar.gz 11043631
+MD5 47951528cf0cc0da54aaf082001c56f1 MaestroUpdate-Oppor6-LinuxAndSolaris.tar.gz 6691212
diff --git a/app-sci/maestro-data/maestro-data-2004-r1.ebuild b/app-sci/maestro-data/maestro-data-2004-r1.ebuild
deleted file mode 100644
index b9af7aebcb67..000000000000
--- a/app-sci/maestro-data/maestro-data-2004-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/maestro-data/maestro-data-2004-r1.ebuild,v 1.1 2004/03/12 00:57:14 zx Exp $
-
-DESCRIPTION="Maestro data updates for the Spirit and Opportunity Rovers."
-SRC_URI="http://maestro2.sun.com/Maestro-Update01-LinuxAndSolaris.tar.gz
-		http://maestro2.sun.com/Maestro-Update02-LinuxAndSolaris.tar.gz
-		http://maestro2.sun.com/MaestroUpdate-Spirit03-LinuxAndSolaris.tar.gz
-		http://maestro2.sun.com/MaestroUpdate-Spirit4-LinuxAndSolaris.tar.gz
-		http://maestro2.sun.com/MaestroUpdate-Spirit5-LinuxAndSolaris.tar.gz
-		http://maestro2.sun.com/MaestroUpdate-Spirit6-LinuxAndSolaris.tar.gz
-		http://maestro.emporia.edu/MaestroUpdate-Spirit7-LinuxAndSolaris.tar.gz
-		http://maestro2.sun.com/MaestroUpdate-Oppor1-LinuxAndSolaris.tar.gz
-		http://maestro2.sun.com/MaestroUpdate-Oppor2-LinuxAndSolaris.tar.gz
-		http://maestro2.sun.com/MaestroUpdate-Oppor3-LinuxAndSolaris.tar.gz
-		http://maestro.emporia.edu/MaestroUpdate-Oppor4-LinuxAndSolaris.tar.gz
-		http://maestro.emporia.edu/MaestroUpdate-Oppor5-LinuxAndSolaris.tar.gz"
-HOMEPAGE="http://mars.telascience.org/"
-IUSE=""
-DEPEND="app-sci/maestro"
-LICENSE="maestro"
-SLOT="0"
-KEYWORDS="~x86"
-
-S=${WORKDIR}/JPL/SAP/WITS-db/mer
-
-src_install () {
-	local MAESTRODIR="/opt/maestro/JPL/SAP/WITS-db/mer"
-	dodir ${MAESTRODIR}
-	cp -r Spirit ${D}/${MAESTRODIR}
-	cp -r Opportunity ${D}/${MAESTRODIR}
-}
diff --git a/app-sci/maestro-data/maestro-data-2004-r3.ebuild b/app-sci/maestro-data/maestro-data-2004-r3.ebuild
new file mode 100644
index 000000000000..e79f31ba0924
--- /dev/null
+++ b/app-sci/maestro-data/maestro-data-2004-r3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-sci/maestro-data/maestro-data-2004-r3.ebuild,v 1.1 2004/04/02 03:39:34 zx Exp $
+
+DESCRIPTION="Maestro data updates for the Spirit and Opportunity Rovers."
+SRC_URI="http://maestro2.sun.com/Maestro-Update01-LinuxAndSolaris.tar.gz
+		http://maestro1.sun.com/Maestro-Update02-LinuxAndSolaris.tar.gz
+		http://maestro1.sun.com/MaestroUpdate-Spirit03-LinuxAndSolaris.tar.gz
+		http://maestro1.sun.com/MaestroUpdate-Spirit4-LinuxAndSolaris.tar.gz
+		http://maestro1.sun.com/MaestroUpdate-Spirit5-LinuxAndSolaris.tar.gz
+		http://maestro1.sun.com/MaestroUpdate-Spirit6-LinuxAndSolaris.tar.gz
+		http://maestro1.sun.com/MaestroUpdate-Spirit7-LinuxAndSolaris.tar.gz
+		http://maestro1.sun.com/MaestroUpdate-Spirit8-LinuxAndSolaris.tar.gz
+		http://maestro1.sun.com/MaestroUpdate-Spirit9-LinuxAndSolaris.tar.gz
+		http://maestro1.sun.com/MaestroUpdate-Oppor1-LinuxAndSolaris.tar.gz
+		http://maestro1.sun.com/MaestroUpdate-Oppor2-LinuxAndSolaris.tar.gz
+		http://maestro1.sun.com/MaestroUpdate-Oppor3-LinuxAndSolaris.tar.gz
+		http://maestro1.sun.com/MaestroUpdate-Oppor4-LinuxAndSolaris.tar.gz
+		http://maestro1.sun.com/MaestroUpdate-Oppor5-LinuxAndSolaris.tar.gz
+		http://maestro1.sun.com/MaestroUpdate-Oppor7-LinuxAndSolaris.tar.gz
+		http://maestro1.sun.com/MaestroUpdate-Oppor6-LinuxAndSolaris.tar.gz"
+HOMEPAGE="http://mars.telascience.org/"
+IUSE=""
+DEPEND="app-sci/maestro"
+LICENSE="maestro"
+SLOT="0"
+KEYWORDS="~x86"
+
+S=${WORKDIR}/JPL/SAP/WITS-db/mer
+
+src_install () {
+	local MAESTRODIR="/opt/maestro/JPL/SAP/WITS-db/mer"
+	dodir ${MAESTRODIR}
+	cp -r Spirit ${D}/${MAESTRODIR}
+	cp -r Opportunity ${D}/${MAESTRODIR}
+}
diff --git a/app-sci/maestro-data/maestro-data-2004.ebuild b/app-sci/maestro-data/maestro-data-2004.ebuild
deleted file mode 100644
index 1959cbd10715..000000000000
--- a/app-sci/maestro-data/maestro-data-2004.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/maestro-data/maestro-data-2004.ebuild,v 1.1 2004/03/09 05:03:33 zx Exp $
-
-DESCRIPTION="Maestro data updates for the Spirit and Opportunity Rovers."
-SRC_URI="http://maestro2.sun.com/Maestro-Update01-LinuxAndSolaris.tar.gz
-		http://maestro2.sun.com/Maestro-Update02-LinuxAndSolaris.tar.gz
-		http://maestro2.sun.com/MaestroUpdate-Spirit03-LinuxAndSolaris.tar.gz
-		http://maestro2.sun.com/MaestroUpdate-Spirit4-LinuxAndSolaris.tar.gz
-		http://maestro2.sun.com/MaestroUpdate-Spirit5-LinuxAndSolaris.tar.gz
-		http://maestro2.sun.com/MaestroUpdate-Spirit6-LinuxAndSolaris.tar.gz
-		http://maestro2.sun.com/MaestroUpdate-Oppor1-LinuxAndSolaris.tar.gz
-		http://maestro2.sun.com/MaestroUpdate-Oppor2-LinuxAndSolaris.tar.gz
-		http://maestro2.sun.com/MaestroUpdate-Oppor3-LinuxAndSolaris.tar.gz"
-HOMEPAGE="http://mars.telascience.org/"
-IUSE=""
-DEPEND="app-sci/maestro"
-LICENSE="maestro"
-SLOT="0"
-KEYWORDS="~x86"
-
-S=${WORKDIR}/JPL/SAP/WITS-db/mer
-
-src_install () {
-	local MAESTRODIR="/opt/maestro/JPL/SAP/WITS-db/mer"
-	dodir ${MAESTRODIR}
-	cp -r Spirit ${D}/${MAESTRODIR}
-	cp -r Opportunity ${D}/${MAESTRODIR}
-}