changing datafile location, removing old version

6 files changed, 32 insertions, 43 deletions

diff --git a/sci-astronomy/predict/ChangeLog b/sci-astronomy/predict/ChangeLog
index 023a4392bcd1..9eac172f616c 100644
--- a/sci-astronomy/predict/ChangeLog
+++ b/sci-astronomy/predict/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-astronomy/predict
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/predict/ChangeLog,v 1.2 2004/12/24 19:58:32 swegener Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/predict/ChangeLog,v 1.3 2005/01/05 09:30:49 phosphan Exp $
+
+*predict-2.2.2-r3 (05 Jan 2005)
+
+  05 Jan 2005; Patrick Kursawe <phosphan@gentoo.org> -predict-2.2.1.ebuild,
+  +predict-2.2.2-r3.ebuild:
+  Putting data files in the right location now, removing old version.
 
 *predict-2.2.2-r2 (23 Dec 2004)
 
diff --git a/sci-astronomy/predict/Manifest b/sci-astronomy/predict/Manifest
index e5e2cbfa62a2..e70e8f37e230 100644
--- a/sci-astronomy/predict/Manifest
+++ b/sci-astronomy/predict/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 9255fb0170b029096b27e345d97ab533 predict-2.2.2-r2.ebuild 4312
 MD5 33bf97554f5a3e2b8c3a9b23da45d91d predict-2.2.1.ebuild 4541
+MD5 46f3651d068dcdd48f7ac2b15125d20b predict-2.2.2-r3.ebuild 4348
 MD5 26c7b650fd73bead0f8927a96e36ca9c ChangeLog 1626
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 729e9f2e1ecbb139b17f650d2916da21 files/digest-predict-2.2.2-r2 66
+MD5 729e9f2e1ecbb139b17f650d2916da21 files/digest-predict-2.2.2-r3 66
 MD5 e9851bdcd10870d0cf8dd12a543acb05 files/digest-predict-2.2.1 65
 MD5 95dc86360de601d5c7c9d2f7d87c2c79 files/predict-update 4037
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBzHTtI1lqEGTUzyQRAg/wAJ9ZkkbQvQlLCE+he3bCTapRsYAMZQCfZXPk
-kzEGGzdUSpFjCob4cKNnTRg=
-=ccUN
------END PGP SIGNATURE-----
diff --git a/sci-astronomy/predict/files/digest-predict-2.2.1 b/sci-astronomy/predict/files/digest-predict-2.2.1
deleted file mode 100644
index d3378a337957..000000000000
--- a/sci-astronomy/predict/files/digest-predict-2.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3d22565d53e7aaa5173899f3f231d319 predict-2.2.1.tar.gz 576709
diff --git a/sci-astronomy/predict/files/digest-predict-2.2.2-r3 b/sci-astronomy/predict/files/digest-predict-2.2.2-r3
new file mode 100644
index 000000000000..8786565e5599
--- /dev/null
+++ b/sci-astronomy/predict/files/digest-predict-2.2.2-r3
@@ -0,0 +1 @@
+MD5 2512bc6b584ece66de027e46f114ab53 predict-2.2.2.tar.gz 1637893
diff --git a/sci-astronomy/predict/predict-2.2.2-r2.ebuild b/sci-astronomy/predict/predict-2.2.2-r2.ebuild
index 15b48a8919e6..69c7407a7f3c 100644
--- a/sci-astronomy/predict/predict-2.2.2-r2.ebuild
+++ b/sci-astronomy/predict/predict-2.2.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/predict/predict-2.2.2-r2.ebuild,v 1.1 2004/12/24 04:03:03 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/predict/predict-2.2.2-r2.ebuild,v 1.2 2005/01/05 09:30:49 phosphan Exp $
 
 DESCRIPTION="Satellite tracking and orbital prediction."
 HOMEPAGE="http://www.qsl.net/kd2bd/predict.html"
diff --git a/sci-astronomy/predict/predict-2.2.1.ebuild b/sci-astronomy/predict/predict-2.2.2-r3.ebuild
index 8053cb2c8386..e2146427d590 100644
--- a/sci-astronomy/predict/predict-2.2.1.ebuild
+++ b/sci-astronomy/predict/predict-2.2.2-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/predict/predict-2.2.1.ebuild,v 1.1 2004/12/24 04:03:03 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/predict/predict-2.2.2-r3.ebuild,v 1.1 2005/01/05 09:30:49 phosphan Exp $
 
 DESCRIPTION="Satellite tracking and orbital prediction."
 HOMEPAGE="http://www.qsl.net/kd2bd/predict.html"
@@ -9,7 +9,7 @@ SRC_URI="http://www.amsat.org/amsat/ftp/software/Linux/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="xforms gtk nls"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="~x86 ~ppc"
 
 DEPEND="sys-libs/ncurses
 	gtk? ( =x11-libs/gtk+-1.2* )
@@ -42,7 +42,7 @@ src_compile() {
 
 	# write vocalizer.h
 	cd vocalizer
-	echo "char *path={\"/use/share/predict/vocalizer/\"};" > vocalizer.h
+	echo "char *path={\"/usr/share/predict/vocalizer/\"};" > vocalizer.h
 
 	# compile vocalizer
 	einfo "compiling vocalizer"
@@ -57,11 +57,6 @@ src_compile() {
 		${COMPILER} -lm earthtrack.c -o earthtrack
 	fi
 
-	# geosat
-	einfo "compiling geosat"
-	cd ${S}/clients/geosat
-	${COMPILER} -lm geosat.c -o geosat
-
 	# kep_reload
 	einfo "compiling kep_reload"
 	cd ${S}/clients/kep_reload
@@ -80,11 +75,11 @@ src_compile() {
 		# note there are plugins for gsat but they are missing header files and wont compile
 		use nls || myconf="--disable-nls"
 		einfo "compiling gsat"
-		cd ${S}/clients/gsat-1.0.0
+		cd ${S}/clients/gsat-*
 		./configure --prefix=/usr ${myconf}
 		cd src
-		mv globals.h globals.h.orig
-		sed -e "s:#define DEFAULTPLUGINSDIR .*:#define DEFAULTPLUGINSDIR \"/usr/lib/gsat/plugins/\":" globals.h.orig > globals.h
+		sed -e "s:#define DEFAULTPLUGINSDIR .*:#define DEFAULTPLUGINSDIR \"/usr/lib/gsat/plugins/\":" -i globals.h
+		sed -e 's:int errno;::' -i globals.h
 		cd ..
 		emake
 	fi
@@ -95,18 +90,21 @@ src_install() {
 	cd ${S}
 	dobin predict ${FILESDIR}/predict-update
 	dodoc CHANGES COPYING CREDITS HISTORY README
-	dodoc default/predict.*
 	dodoc docs/pdf/predict.pdf
 	dodoc docs/postscript/predict.ps
 	doman docs/man/predict.1
 
+	insinto /usr/share/${PN}/default
+	doins default/predict.*
+
 	#install vocalizer
+	exeinto /usr/bin
 	cd vocalizer
+	doexe vocalizer
+	dodir /usr/share/predict/vocalizer
 	insinto /usr/share/predict/vocalizer
-	doins vocalizer
-	chmod a+x ${D}/usr/share/predict/vocalizer/vocalizer
-	doins 0 1 2 3 4 5 6 7 8 9
-	doins approaching azimuth elevation intro receding
+	dosym  /usr/bin/vocalizer /usr/share/predict/vocalizer/vocalizer
+	doins *.wav
 
 	mv README README.vocalizer
 	dodoc README.vocalizer
@@ -118,18 +116,11 @@ src_install() {
 		cd ${S}/clients/earthtrack
 		ln -s earthtrack earthtrack2
 		dobin earthtrack earthtrack2
-		mv INSTALL INSTALL.earthtrack
+		mv README_FIRST README_FIRST.earthtrack
 		mv README README.earthtrack
-		dodoc INSTALL.earthtrack README.earthtrack
+		dodoc README_FIRST.earthtrack README.earthtrack
 	fi
 
-	# geosat
-	cd ${S}/clients/geosat
-	dobin geosat
-	mv INSTALL INSTALL.geosat
-	mv README README.geosat
-	dodoc INSTALL.geosat README.geosat
-
 	# kep_reload
 	cd ${S}/clients/kep_reload
 	dobin kep_reload
@@ -150,7 +141,7 @@ src_install() {
 	# gsat
 	if use gtk; then
 		# the install seems broken so do manually...
-		cd ${S}/clients/gsat-1.0.0
+		cd ${S}/clients/gsat-*
 		dodir /usr/lib/gsat/plugins
 		keepdir /usr/lib/gsat/plugins
 		cd src
@@ -172,6 +163,6 @@ pkg_postinst() {
 	einfo "after that is set run 'predict -s'"
 	einfo ""
 	einfo "to get list of satellites run 'predict-update'"
-	einfo "before running predict also this script will update"
+	einfo "before running predict this script will also update"
 	einfo "the list of satellites so they are up to date."
 }