Fixed earthtrack and cleaning, bug #472686 thanks Chema Alonso

Package-Manager: portage-2.2.01.21938-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

3 files changed, 34 insertions, 21 deletions

diff --git a/sci-astronomy/predict/ChangeLog b/sci-astronomy/predict/ChangeLog
index 7e060f90b904..39b01cbda0e9 100644
--- a/sci-astronomy/predict/ChangeLog
+++ b/sci-astronomy/predict/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-astronomy/predict
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/predict/ChangeLog,v 1.17 2013/06/06 20:52:49 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/predict/ChangeLog,v 1.18 2013/06/11 17:38:00 bicatali Exp $
+
+  11 Jun 2013; Sébastien Fabbro <bicatali@gentoo.org> predict-2.2.3-r1.ebuild:
+  Fixed earthtrack and cleaning, bug #472686 thanks Chema Alonso
 
   06 Jun 2013; Michael Sterrett <mr_bones_@gentoo.org> predict-2.2.3-r1.ebuild:
   fix AM_CONFIG_HEADER issue (bug #469704); fix another buffer warning; tidy
diff --git a/sci-astronomy/predict/Manifest b/sci-astronomy/predict/Manifest
index afe86cf3adb5..78795aadce2c 100644
--- a/sci-astronomy/predict/Manifest
+++ b/sci-astronomy/predict/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX predict-2.2.3-xforms.patch 2498 SHA256 b639b8674b907692ff8780d9df8ae07d17c8e235f201635bccb2f2a6a941fe89 SHA512 ec5d8d24b7e468015f0bf42b73b418da94203d10f3ae64d8e0cf847bd68ab593919ef821f995094a0cbb476012f4df249b0f982f46b6892af8553088cc68000b WHIRLPOOL f645f4f61b19c2580577f3073a2a40d72df359070a55bf0948dffc7da2ff68e41d3999f7c0e2487eadd339b10dd563db9febf8664d97196f3d671e7f9235e1ec
 AUX predict-update 4039 SHA256 83dbf5f5e08f7d017391f7cfa7a30730f8930dec195dfa60bcd075188275d892 SHA512 8bcc89babe25f44ca985776b994265a12be8e3d6390e4301594f7a8d1402d7d42aa66f6ae1ab6f51c2d8d910d9f012920382928c0238fce4e1707cb8843a739a WHIRLPOOL f3244a54311356f5ff53e7a5510268380c720e58fcc7dcb0af3001d0f619c3f13072694363e32321d0c3ef9727779cdabd5a8b4fd8b733eaea4a3dfe85721578
 DIST predict-2.2.3.tar.gz 1639784 SHA256 fbaa7c78227a2216ee22b25c914c4dd538abfc22d96f0bb5d21e3e61976e5166 SHA512 7ab964db85d8fa0e7f32d9d93904599e25d7b50baa79e80cb72407991bf5522aaa91d266b09ce25e1281e4f013124f7e955ca85b46e44cc1c2035331aa54bc6e WHIRLPOOL 18d9be00066f4c5ea3e7256039cbc0f47f486ec643e5f42e62afeb12a226b82fe59d5e41aa587c2ae8aafe7755f498c6af6cbc612cd6b9050afa262b0e89e86f
 DIST predict_2.2.3-3.1.diff.gz 78624 SHA256 60c00a542c399e69dba154cc0827ea15f33dae61547f3604b8c232e9d26d06df SHA512 9fe2e3ffd931be7ab85f10db4cd35a2091a459c3fd0c48e9ecf8a4482c20400c267b38d31f72d28270d50b7305bc49418fefe35ff013ac9be1627d853205bd5f WHIRLPOOL 9e2ed3fd43d556bb8c5ad92c9502574650cdf13116b222bdcbb7ee18d9e431cbfe8de6262f034dd9ab7abcebc940864c61911e4a0e26de2c6e14c24b9d17bc9d
 DIST predict_2.2.3.orig.tar.gz 1444530 SHA256 47b7c185f1cf4d318b6b31a22a533c03c4a3f57394839df036367c7cdf2dd7ff SHA512 260f7f4dbc72cca4b0b5f7bc9dcf612b8a7e3ef12ab6f34afa3c06b1ac24427435af1c4bae9d39e7cbcdff6cccad72e3235dd191605464642f014207651d8c11 WHIRLPOOL 69ee83befef0ce413c826e6034b6b7ea2ab12749b9dc7071badc865208fd89141451c1f887cbefae6c7f1ec5d8adbd0d112a62fb89e805ddbef984e42ab05a63
-EBUILD predict-2.2.3-r1.ebuild 5532 SHA256 4763f8b242a534fa61fce975a617c85df6511089544634eac3f6084a923247b3 SHA512 8de1c8dc2718f0fb8c6686209a7dfd3a5e41c02f9d3c0f3b66c89f7c712f383c9ddc3e373371b8a1cb69e9af749f6468c84f23e2ca7d3a2902f53d626d10a7df WHIRLPOOL 363d9a4e880d8f937d4f2e155e8479feba334524cb206b292354fdcfb22f29da2e6c6853c14dc610b66b2925eb6c0ff9c17e642f04da81bba713fb9b0db80868
+EBUILD predict-2.2.3-r1.ebuild 5653 SHA256 6a2745cc09481a9c7ca97f8ff5e47f969ddd3da10a71feb07ff0cae2b1ca7236 SHA512 9a9cd7e7bf246cbbfc0c592409933bf7b936246757cd7576f23c14f2e3b089a4eeae46dd9fc592067b44a7f7cde360cd199041816fcc87bc316acb020a092253 WHIRLPOOL 2fd228d030430f7df81d994e9d20cb3ac4cb920de58e2a288f870fe5eaf77a48b860601637048009a4427965f1c57d760f38bc01c843d3a1b61eb2a39675cc7a
 EBUILD predict-2.2.3.ebuild 4589 SHA256 7bb671c6f1035677cf4408a2d950071de88128ff1fa078bb53821222b9d73ec8 SHA512 07c8e773252c5247d9fbc033805cd838068387c23608b6dafad15bb1856dd9d6f007ecc77c5f877b4ed65a3399b33a33f19ef88083f7beeaee4c291dde587044 WHIRLPOOL 1ffd22b62981847fbaed48defc20d14ac2c1778f5f01b53e75c7de2aa762fe19aeb82af6c9dc4be63a9ba456d0a014a46df4db232c5214b4c88d96451f07b94f
-MISC ChangeLog 3954 SHA256 a1d7c6dfdb0b5737597464821fc79640cf2fd73ac5ac268072a8a3f6e2129fb3 SHA512 4214d57c9ae3457b7b6250795934990a23d634860c7a744ce5e91aacfa33983e32fd846ffc27fd2e0d43575fa32f197edb8581966a30fac9659bf078e5bff59a WHIRLPOOL f6fe5a318e573d61610b62114e7d1ebc836c6b877c36611a08053bc4e6b6f23b487cb13b81da4cbefaf88878bc473d342de4a4038ce460a432c2866fc79139a9
+MISC ChangeLog 4099 SHA256 78072edb4a4099b5e8c0b0df7fb5fd69f43f9ea49077d3c3a88e6ae0485fde0e SHA512 8384f7dc5060671fd798ad8fa9c0639b29a81c51c04f313c3c4b7bf7ef45bac5302616569526e49f32efc0b823e165755135ad784d1057985b7a9b6893c967e9 WHIRLPOOL 82c2a001032a5b2028c2356b681fbe4989474297ac4bf460b9117371a59e976e7e9e03455f9d2582782590864b2db6e5fcaa6a719d48298522577c9607a43953
 MISC metadata.xml 739 SHA256 ea6824127fedb64c7e9a448ab044b8960048330b05d32c7d24045929bed5051d SHA512 3281df7692c473c61f4f391ef3ef35e44aec7479a4b54cc3c637bf1a48dd717b27a10fef061bab8683f8222c0437f8e2d5947493cef67b92ee58d06d2585daea WHIRLPOOL eccf7e56a13ac0c1e88459e662a49a2077fb29c7e41bc8a4b205827174f2c0f7fa692ae389b2ce500902079725f6d6fef01908a749db67ef22b466a411dc3eba
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iEYEAREIAAYFAlG3YHkACgkQ1ycZbhPLE2DgiACeN86gm5rvcRAOHkzk5neOh4oc
+eQUAnj6dEmFbjL0aQNu769+UcC7ix1vb
+=q+cM
+-----END PGP SIGNATURE-----
diff --git a/sci-astronomy/predict/predict-2.2.3-r1.ebuild b/sci-astronomy/predict/predict-2.2.3-r1.ebuild
index 16d9e8038eb7..66a153a62a8f 100644
--- a/sci-astronomy/predict/predict-2.2.3-r1.ebuild
+++ b/sci-astronomy/predict/predict-2.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/predict/predict-2.2.3-r1.ebuild,v 1.3 2013/06/06 20:52:49 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/predict/predict-2.2.3-r1.ebuild,v 1.4 2013/06/11 17:38:00 bicatali Exp $
 
 EAPI=4
 
@@ -22,7 +22,7 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 RDEPEND="sys-libs/ncurses
 	gtk? ( x11-libs/gtk+:2 )
 	xforms? ( x11-libs/xforms )
-	xplanet? ( x11-misc/xplanet )"
+	xplanet? ( x11-misc/xplanet[truetype] )"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
@@ -59,15 +59,15 @@ AC_CHECK_LIB(dl,dlclose)' \
 		clients/gsat-1.1.0/src/globals.h || die
 
 	if use gtk; then
-		cd "${S}"/clients/gsat-*
-		rm config.sub missing
+		cd "${S}"/clients/gsat-* || die
+		rm config.sub missing || die
 		eautoreconf
 	fi
 }
 
 src_configure() {
 	if use gtk; then
-		cd "${S}"/clients/gsat-*
+		cd "${S}"/clients/gsat-* || die
 		econf $(use_enable nls)
 	fi
 }
@@ -89,7 +89,7 @@ src_compile() {
 	local c
 	for c in fodtrack geosat moontracker; do
 		einfo "Compiling ${c}"
-		cd "${S}"/utils/${c}*
+		cd "${S}"/utils/${c}* || die
 		${COMPILER} ${c}.c -lm -o ${c} || die "failed ${c}"
 	done
 	einfo "Compiling kep_reload"
@@ -99,21 +99,21 @@ src_compile() {
 
 	if use xplanet; then
 		einfo "Compiling earthtrack"
-		cd "${S}"/clients/earthtrack
+		cd "${S}"/clients/earthtrack || die
 		${COMPILER} earthtrack.c \
 			-lm -o earthtrack || die "failed earthtrack"
 	fi
 
 	if use xforms; then
 		einfo "Compiling map"
-		cd "${S}"/clients/map
+		cd "${S}"/clients/map || die
 		${COMPILER} map.c map_cb.c map_main.c -lforms -lX11 -lm \
 			-o map || die "Failed compiling map"
 	fi
 
 	if use gtk; then
 		einfo "Compiling gsat"
-		cd "${S}"/clients/gsat-*
+		cd "${S}"/clients/gsat-* || die
 		emake
 		emake -C plugins
 	fi
@@ -128,44 +128,44 @@ src_install() {
 	doins default/predict.*
 	use doc && dodoc docs/pdf/predict.pdf
 
-	cd "${S}"/vocalizer
+	cd "${S}"/vocalizer || die
 	dobin vocalizer
 	dosym  ../../../bin/vocalizer ${PRED_DIR}/vocalizer/vocalizer
 	insinto ${PRED_DIR}/vocalizer
 	doins *.wav
 
-	cd "${S}"/clients/kep_reload
+	cd "${S}"/clients/kep_reload || die
 	dobin kep_reload
 	newdoc README README.kep_reload
 	doman "${S}"/debian/kep_reload.1
 
-	cd "${S}"/utils/fodtrack-0.1
+	cd "${S}"/utils/fodtrack-0.1 || die
 	insinto /etc
 	doins fodtrack.conf
 	doman fodtrack.conf.5 fodtrack.8
 	dobin fodtrack
 	newdoc README README.fodtrack
 
-	cd "${S}"/utils/geosat
+	cd "${S}"/utils/geosat || die
 	dobin geosat
 	newdoc README README.geosa
 	newman "${S}"/debian/geosat.man geosat.1
 
-	cd "${S}"/utils/moontracker
+	cd "${S}"/utils/moontracker || die
 	dobin moontracker
 	newdoc README README.moontracker
 	doman "${S}"/debian/moontracker.1
 
 	if use xplanet; then
-		cd "${S}"/clients/earthtrack
-		ln -s earthtrack earthtrack2
+		cd "${S}"/clients/earthtrack || die
+		ln -s earthtrack earthtrack2 || die
 		dobin earthtrack earthtrack2
 		newdoc README README.earthtrack
 		doman "${S}"/debian/earthtrack.1
 	fi
 
 	if use xforms; then
-		cd "${S}"/clients/map
+		cd "${S}"/clients/map || die
 		newbin map predict-map
 		newdoc CHANGES CHANGES.map
 		newdoc README README.map
@@ -173,7 +173,7 @@ src_install() {
 	fi
 
 	if use gtk; then
-		cd "${S}"/clients/gsat-*
+		cd "${S}"/clients/gsat-* || die
 		exeinto /usr/$(get_libdir)/gsat/plugins
 		doexe plugins/radio_{FT736,FT847,ICR10,print,test} plugins/rotor_{print,pictrack}
 		dobin src/gsat