Version bump and a few little fixes, see bugs 6076 and 33192

4 files changed, 254 insertions, 1 deletions

diff --git a/app-sci/predict/Manifest b/app-sci/predict/Manifest
index c71fe4a3530c..cb01a43ef57c 100644
--- a/app-sci/predict/Manifest
+++ b/app-sci/predict/Manifest
@@ -1,6 +1,7 @@
-MD5 2f515d2290aea1e8524cf10bca4dc15d predict-2.2.2.ebuild 4563
+MD5 07720fa36e3a1fec8f79076bf8be1db0 predict-2.2.2.ebuild 4270
 MD5 163002f6f67fefdf7dd780158bdc45bd predict-2.2.1.ebuild 4562
 MD5 4eba43e8854212980b9dd6aa25f21c8e ChangeLog 422
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 e9851bdcd10870d0cf8dd12a543acb05 files/digest-predict-2.2.1 65
 MD5 729e9f2e1ecbb139b17f650d2916da21 files/digest-predict-2.2.2 66
+MD5 95dc86360de601d5c7c9d2f7d87c2c79 files/predict-update 4037
diff --git a/app-sci/predict/files/digest-predict-2.2.2 b/app-sci/predict/files/digest-predict-2.2.2
new file mode 100644
index 000000000000..8786565e5599
--- /dev/null
+++ b/app-sci/predict/files/digest-predict-2.2.2
@@ -0,0 +1 @@
+MD5 2512bc6b584ece66de027e46f114ab53 predict-2.2.2.tar.gz 1637893
diff --git a/app-sci/predict/files/predict-update b/app-sci/predict/files/predict-update
new file mode 100644
index 000000000000..d218fd18ed6d
--- /dev/null
+++ b/app-sci/predict/files/predict-update
@@ -0,0 +1,88 @@
+#!/bin/sh
+PV=
+
+if [ ! -f ~/.predict/predict.tle ]; then
+	oldpwd=$PWD
+	mkdir -p ~/.predict
+	cd ~/.predict
+	cat > predict.tle << EOF
+OSCAR-10
+1 14129U          02217.21791401  .00000442  00000-0  00000-0 0     7
+2 14129  25.6686 197.8739 6086930 273.5039  23.0795  2.05866525116000
+OSCAR-11
+1 14781U          02217.20425383  .00001813  00000-0  00000-0 0     6
+2 14781  98.0880 185.1059 0010359 119.2373 240.9876 14.76997913987094
+OSCAR-14
+1 20437U          02217.20572416  .00000181  00000-0  00000-0 0     8
+2 20437  98.3009 264.9286 0011799  68.5863 291.6580 14.31121869654267
+PACSAT
+1 20439U          02217.25154490  .00000231  00000-0  00000-0 0     9
+2 20439  98.3472 275.4922 0012032  74.6777 285.5743 14.31332429654304
+LUSAT
+1 20442U          02216.75520291  .00000242  00000-0  00000-0 0     5
+2 20442  98.3779 280.4632 0012985  73.9191 286.3409 14.31575156654338
+OSCAR-20
+1 20480U          02217.54003808 -.00000027  00000-0  00000-0 0     7
+2 20480  99.0206 212.5786 0540948  90.2870 276.0202 12.83318863585245
+OSCAR-22
+1 21575U          02216.97001758  .00000422  00000-0  00000-0 0     9
+2 21575  98.1264 214.2386 0008207  17.4055 342.7413 14.38915947579867
+OSCAR-23
+1 22077U          02216.94266766 -.00000037  00000-0  00000-0 0     9
+2 22077  66.0844 179.5905 0009538 319.0308  40.9993 12.86398497468888
+OSCAR-25
+1 22828U          02217.51170770  .00000176  00000-0  00000-0 0     9
+2 22828  98.2949 253.2889 0010744  97.6953 262.5454 14.29395258429974
+ITAMSAT
+1 22826U          02216.71294910  .00000212  00000-0  00000-0 0     2
+2 22826  98.2981 252.2691 0009565 119.2021 241.0116 14.29035332461667
+OSCAR-27
+1 22825U          02217.14273416  .00000182  00000-0  00000-0 0     3
+2 22825  98.2952 251.6595 0009305 119.9116 240.3013 14.28824165461683
+OSCAR-29
+1 24278U          02216.92953700 -.00000035  00000-0  00000-0 0     1
+2 24278  98.5168  30.2010 0351470   9.0561 351.6706 13.52846361294584
+OSCAR-36
+1 25693U          02217.47022698  .00000460  00000-0  00000-0 0     8
+2 25693  64.5605 253.8004 0008708 253.5019 106.5150 14.74585281177168
+OSCAR-40
+1 26609U          02217.05030362 -.00000251  00000-0  00000-0 0     6
+2 26609   7.5635 101.4360 7924755  75.7827 352.4675  1.25596086  8104
+RS-12/13
+1 21089U          02216.81449027  .00000082  00000-0  00000-0 0     9
+2 21089  82.9235 328.1138 0030158 114.6154 245.8150 13.74373061576622
+RS-15
+1 23439U          02216.86493965 -.00000037  00000-0  00000-0 0     6
+2 23439  64.8185   1.1847 0152424 152.9684 207.9281 11.27546726313309
+NOAA-12
+1 21263U          02216.96410173  .00000410  00000-0  00000-0 0     4
+2 21263  98.6066 205.1774 0011736 236.4413 123.5645 14.24842312583078
+NOAA-14
+1 23455U          02216.94655308  .00000224  00000-0  00000-0 0     1
+2 23455  99.1906 225.2382 0010223  66.1025 294.1215 14.13170722391563
+NOAA-15
+1 25338U          02216.96832533  .00000312  00000-0  00000-0 0     0
+2 25338  98.5657 239.3255 0010503 167.6220 192.5219 14.24094451219673
+UARS
+1 21701U          02217.09598012  .00001106  00000-0  00000-0 0     8
+2 21701  56.9808 110.9304 0004474 115.3921 244.7510 15.02171395596038
+HUBBLE
+1 20580U          02217.09786941  .00002710  00000-0  00000-0 0     4
+2 20580  28.4663 239.6798 0003524 339.3283  57.0940 14.96472945473016
+ISS
+1 25544U          02217.52476852  .00025143  00000-0  00000-0 0     9
+2 25544  51.6355 165.2615 0018093 106.6267  56.5198 15.57209040211722
+PCSAT
+1 26931U          02217.22743486  .00000269  00000-0  00000-0 0     9
+2 26931  67.0531  43.5764 0007786 258.8522 101.1704 14.28921812 44150
+STARSHINE 3
+1 26929U          02216.67548843  .00042169  00000-0  00000-0 0     9
+2 26929  67.0426 246.5544 0011326 237.9129 122.0981 15.57367567 47636
+EOF
+	cd $oldpwd
+fi
+wget -qc www.celestrak.com/NORAD/elements/amateur.txt -O /tmp/amateur.txt
+wget -qc www.celestrak.com/NORAD/elements/visual.txt -O /tmp/visual.txt
+wget -qc www.celestrak.com/NORAD/elements/weather.txt -O /tmp/weather.txt
+predict -u /tmp/amateur.txt /tmp/visual.txt /tmp/weather.txt
+rm /tmp/amateur.txt /tmp/visual.txt /tmp/weather.txt
diff --git a/app-sci/predict/predict-2.2.2.ebuild b/app-sci/predict/predict-2.2.2.ebuild
new file mode 100644
index 000000000000..27eea4d3b8a2
--- /dev/null
+++ b/app-sci/predict/predict-2.2.2.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-sci/predict/predict-2.2.2.ebuild,v 1.1 2003/11/11 09:15:31 phosphan Exp $
+
+DESCRIPTION="Satellite tracking and orbital prediction."
+HOMEPAGE="http://www.qsl.net/kd2bd/predict.html"
+SRC_URI="http://www.amsat.org/amsat/ftp/software/Linux/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+
+DEPEND="sys-libs/ncurses
+	gtk? ( =x11-libs/gtk+-1.2* )
+	xforms? ( x11-libs/xforms )"
+RDEPEND="gtk? ( =x11-libs/gtk+-1.2* )
+	xforms? ( x11-libs/xforms )"
+
+if [ -x /usr/bin/xearth ]; then
+	EARTHTRACKOK="yes"
+elif [ -x /usr/bin/xplanet ]; then
+	EARTHTRACKOK="yes"
+fi
+
+src_compile() {
+	# predict uses a ncurses based configure script
+	# this is what it does if it was bash based ;)
+
+	# set compiler string to a var so if compiler checks
+	# can be added at a later date
+	COMPILER="cc ${CFLAGS} -fomit-frame-pointer"
+
+	# write predict.h
+	echo "char *predictpath=\"/usr/share/predict/\";" > predict.h
+	echo "char soundcard=1;" >> predict.h
+	echo "char *version=\"${PV}\";" >> predict.h
+
+	# compile predict
+	einfo "compiling predict"
+	${COMPILER} -L/lib -lm -lncurses -lpthread predict.c -o predict
+
+	# write vocalizer.h
+	cd vocalizer
+	echo "char *path={\"/use/share/predict/vocalizer/\"};" > vocalizer.h
+
+	# compile vocalizer
+	einfo "compiling vocalizer"
+	${COMPILER} vocalizer.c -o vocalizer
+
+	einfo "compiling clients"
+
+	# earthtrack
+	if test "${EARTHTRACKOK}" = "yes"; then
+		einfo "compiling earthtrack"
+		cd ${S}/clients/earthtrack
+		${COMPILER} -lm earthtrack.c -o earthtrack
+	fi
+
+	# kep_reload
+	einfo "compiling kep_reload"
+	cd ${S}/clients/kep_reload
+	${COMPILER} kep_reload.c -o kep_reload
+
+	# map
+	if [ "`use xforms`" ]; then
+		einfo "compiling map"
+		cd ${S}/clients/map
+		TCOMP="${COMPILER} -I/usr/X11R6/include -L/usr/X11R6/lib -lforms -lX11 -lm map.c map_cb.c map_main.c -o map"
+		${TCOMP}
+	fi
+
+	# gsat
+	if [ "`use gtk`" ]; then
+		# 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-*
+		./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
+		cd ..
+		emake
+	fi
+}
+
+src_install() {
+	# install predict
+	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
+
+	#install vocalizer
+	cd vocalizer
+	insinto /usr/share/predict/vocalizer
+	doins vocalizer
+	chmod a+x ${D}/usr/share/predict/vocalizer/vocalizer
+	doins *.wav
+
+	mv README README.vocalizer
+	dodoc README.vocalizer
+
+	# install clients
+
+	# earthtrack
+	if test "${EARTHTRACKOK}" = "yes"; then
+		cd ${S}/clients/earthtrack
+		ln -s earthtrack earthtrack2
+		dobin earthtrack earthtrack2
+		mv README_FIRST README_FIRST.earthtrack
+		mv README README.earthtrack
+		dodoc README_FIRST.earthtrack README.earthtrack
+	fi
+
+	# kep_reload
+	cd ${S}/clients/kep_reload
+	dobin kep_reload
+	mv INSTALL INSTALL.kep_reload
+	mv README README.kep_reload
+	dodoc INSTALL.kep_reload README.kep_reload
+
+	# map
+	if [ "`use xforms`" ]; then
+		cd ${S}/clients/map
+		dobin map
+		for i in CHANGES README COPYING; do
+			mv ${i} ${i}.map
+			dodoc ${i}.map
+		done
+	fi
+
+	# gsat
+	if [ "`use gtk`" ]; then
+		# the install seems broken so do manually...
+		cd ${S}/clients/gsat-*
+		dodir /usr/lib/gsat/plugins
+		touch ${D}/usr/lib/gsat/plugins/.keep
+		cd src
+		dobin gsat
+		cd ..
+		for i in AUTHORS ABOUT-NLS COPYING ChangeLog INSTALL NEWS README Plugin_API; do
+			mv ${i} ${i}.gsat
+			dodoc ${i}.gsat
+		done
+	fi
+}
+
+pkg_postinst() {
+	einfo "to use the clients the following line will"
+	einfo "have to be inserted into /etc/services"
+	einfo "predict    1210/udp"
+	einfo "the port can be changed to anything"
+	einfo "the name predict is what is needed to work"
+	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 "the list of satellites so they are up to date."
+}