summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé María Alonso <nimiux@gentoo.org>2013-06-18 17:50:30 +0000
committerJosé María Alonso <nimiux@gentoo.org>2013-06-18 17:50:30 +0000
commit16a251f339e24c044a119e85435709cd54af84f9 (patch)
tree7787f79b4b341331788ea90d006a1852b00f07c4 /sci-astronomy
parentVersion bump (diff)
downloadhistorical-16a251f339e24c044a119e85435709cd54af84f9.tar.gz
historical-16a251f339e24c044a119e85435709cd54af84f9.tar.bz2
historical-16a251f339e24c044a119e85435709cd54af84f9.zip
Add earthtrack patch wrt bug 472686
Package-Manager: portage-2.1.12.2/cvs/Linux x86_64 Manifest-Sign-Key: 0xD628E536
Diffstat (limited to 'sci-astronomy')
-rw-r--r--sci-astronomy/predict/ChangeLog6
-rw-r--r--sci-astronomy/predict/Manifest15
-rw-r--r--sci-astronomy/predict/files/predict-2.2.3-earthtrack.patch27
-rw-r--r--sci-astronomy/predict/predict-2.2.3-r1.ebuild3
4 files changed, 44 insertions, 7 deletions
diff --git a/sci-astronomy/predict/ChangeLog b/sci-astronomy/predict/ChangeLog
index 39b01cbda0e9..73331cbdb116 100644
--- a/sci-astronomy/predict/ChangeLog
+++ b/sci-astronomy/predict/ChangeLog
@@ -1,6 +1,10 @@
# 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.18 2013/06/11 17:38:00 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/predict/ChangeLog,v 1.19 2013/06/18 17:50:17 nimiux Exp $
+
+ 18 Jun 2013; Chema Alonso <nimiux@gentoo.org> predict-2.2.3-r1.ebuild,
+ +files/predict-2.2.3-earthtrack.patch:
+ Add earthtrack patch wrt bug 472686
11 Jun 2013; Sébastien Fabbro <bicatali@gentoo.org> predict-2.2.3-r1.ebuild:
Fixed earthtrack and cleaning, bug #472686 thanks Chema Alonso
diff --git a/sci-astronomy/predict/Manifest b/sci-astronomy/predict/Manifest
index 78795aadce2c..6c32b644f415 100644
--- a/sci-astronomy/predict/Manifest
+++ b/sci-astronomy/predict/Manifest
@@ -1,19 +1,24 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
+AUX predict-2.2.3-earthtrack.patch 1175 SHA256 d43fe03b11b472fe6818cba1e0b27329c99b3c4eadba585c75434aa122109aab SHA512 908d5b323606d2655787fb50f456fba894b87398bc55298d9ce99d065b6a7625a3c564a0a047011d83a31af640f3b0f8a1b38e467ec7017159601bb9bc237fd3 WHIRLPOOL 72f39cbf3c9018f8089548a720e87b4937b31862a27949ceea0ef21e8edb01200621e7b59c494b96a788cb4aac9936dff8c1dd9fd80b5997bed842629d5391ea
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 5653 SHA256 6a2745cc09481a9c7ca97f8ff5e47f969ddd3da10a71feb07ff0cae2b1ca7236 SHA512 9a9cd7e7bf246cbbfc0c592409933bf7b936246757cd7576f23c14f2e3b089a4eeae46dd9fc592067b44a7f7cde360cd199041816fcc87bc316acb020a092253 WHIRLPOOL 2fd228d030430f7df81d994e9d20cb3ac4cb920de58e2a288f870fe5eaf77a48b860601637048009a4427965f1c57d760f38bc01c843d3a1b61eb2a39675cc7a
+EBUILD predict-2.2.3-r1.ebuild 5697 SHA256 28ba26b6009c0578f21c1ad439a36a1fbd75712c465be563c02bbf5114c496d4 SHA512 a3177edd7982e8b0787053edc8630994b1c0e17676968e8502e061c8f937ae3d33c8c30c73d408760619c172f9ebddeecf8adae4d3aa7c72f2956b6542599ff4 WHIRLPOOL 90da739f1e6667a7f036911ec83e81d43a82d39ad15dbf00b974649f8d702bdfed522520d1327e668822a02d274c9009f7c25ed4f1225bc59a97e015cdf2e6fe
EBUILD predict-2.2.3.ebuild 4589 SHA256 7bb671c6f1035677cf4408a2d950071de88128ff1fa078bb53821222b9d73ec8 SHA512 07c8e773252c5247d9fbc033805cd838068387c23608b6dafad15bb1856dd9d6f007ecc77c5f877b4ed65a3399b33a33f19ef88083f7beeaee4c291dde587044 WHIRLPOOL 1ffd22b62981847fbaed48defc20d14ac2c1778f5f01b53e75c7de2aa762fe19aeb82af6c9dc4be63a9ba456d0a014a46df4db232c5214b4c88d96451f07b94f
-MISC ChangeLog 4099 SHA256 78072edb4a4099b5e8c0b0df7fb5fd69f43f9ea49077d3c3a88e6ae0485fde0e SHA512 8384f7dc5060671fd798ad8fa9c0639b29a81c51c04f313c3c4b7bf7ef45bac5302616569526e49f32efc0b823e165755135ad784d1057985b7a9b6893c967e9 WHIRLPOOL 82c2a001032a5b2028c2356b681fbe4989474297ac4bf460b9117371a59e976e7e9e03455f9d2582782590864b2db6e5fcaa6a719d48298522577c9607a43953
+MISC ChangeLog 4250 SHA256 03e08360be757d3fc3ef7f0bafc610b2964540729a9dd5c36236ef0a03f9530b SHA512 f7783e67464e8671351f787fcb7bf2f413b5e30ca7b52cfe52641cdd92b6d01dcf8f7637ad511f2e380c8ec394e847cf771306debadb16a6f6bace5d1d216204 WHIRLPOOL 60dbebd968aa84c57e28964d580a77bfb6766fb05b2e32582b646b873421192f1633c1d0ced2cd026a066092bca50f02cb85d1b7d00db9e16ae9bc89bde205cd
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
+iQEcBAEBCAAGBQJRwJ3lAAoJEA2sAkrWKOU2a0IIAMcMgx3AmK+Wc2J3Hh9LH+I3
+4OOObxtr76pa+Cs7GnJiCZOI2wrsv7D51E5TRVMFE4pAFYeTmTKmtTwdFTp+TP/N
+QyDUNpRwKziaRmm1jKUjsNMRrfeCCbl9HFpVUn2f46QbkSUV8O6aCrPvXrJvA32j
+tgCdFXbmdakvUrmFucE85qF+I4R9gMFWUwIKRfcBrOapkM9o5r2BPPNAcNJOfwhX
+JA8McuAVuHQd0A9JCDW0ssr7ahWXEZgBagG0+V02VziJ/fIE2zLUIuZh8qDVejkd
+Qy2bDt5xUqjqlXzMbnWNJXfdIzjl38Ms7pGJRFrEQfqNGFoegImf8WVHrVrXL7s=
+=BzBi
-----END PGP SIGNATURE-----
diff --git a/sci-astronomy/predict/files/predict-2.2.3-earthtrack.patch b/sci-astronomy/predict/files/predict-2.2.3-earthtrack.patch
new file mode 100644
index 000000000000..65f18bf9512d
--- /dev/null
+++ b/sci-astronomy/predict/files/predict-2.2.3-earthtrack.patch
@@ -0,0 +1,27 @@
+diff -Nur a/clients/earthtrack/earthtrack.c b/clients/earthtrack/earthtrack.c
+--- a/clients/earthtrack/earthtrack.c 2013-06-08 20:03:55.629967192 +0200
++++ b/clients/earthtrack/earthtrack.c 2013-06-08 20:05:15.559966743 +0200
+@@ -495,11 +495,11 @@
+
+ fprintf(fd,"marker_file=%s\n",markerfile);
+ fprintf(fd,"arc_file=%s\n",greatarcfile);
+- fprintf(fd,"marker_font=/usr/local/share/xplanet/fonts/FreeMonoBold.ttf\n");
+- fprintf(fd,"\n## Your \"/usr/local/share/xplanet/config/default\" configuration file follows:\n\n");
++ fprintf(fd,"marker_font=/usr/share/xplanet/fonts/FreeMonoBold.ttf\n");
++ fprintf(fd,"\n## Your \"/usr/share/xplanet/config/default\" configuration file follows:\n\n");
+ fclose(fd);
+
+- x=AppendFile("/usr/local/share/xplanet/config/default",configfile);
++ x=AppendFile("/usr/share/xplanet/config/default",configfile);
+
+ if (x==1)
+ {
+@@ -509,7 +509,7 @@
+
+ if (x==2)
+ {
+- fprintf(stderr,"%c*** Error: Could not read \"/usr/local/share/xplanet/config/default\"\nIs xplanet installed?\n\n",7);
++ fprintf(stderr,"%c*** Error: Could not read \"/usr/share/xplanet/config/default\"\nIs xplanet installed?\n\n",7);
+ exit(-1);
+ }
+ }
diff --git a/sci-astronomy/predict/predict-2.2.3-r1.ebuild b/sci-astronomy/predict/predict-2.2.3-r1.ebuild
index 66a153a62a8f..648495fa29d6 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.4 2013/06/11 17:38:00 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/predict/predict-2.2.3-r1.ebuild,v 1.5 2013/06/18 17:50:17 nimiux Exp $
EAPI=4
@@ -26,6 +26,7 @@ RDEPEND="sys-libs/ncurses
DEPEND="${RDEPEND}"
src_prepare() {
+ epatch "${FILESDIR}"/"${P}"-earthtrack.patch
epatch -p1 "${WORKDIR}"/${DEB_P}-${DEB_PR}.diff
sed -i -e 's:predict\(.*\)/:predict-2.2.3\1/:g' \
debian/patches/140*.diff || die