Remove icon from files/ dir and mirror it manually instead. Fixes #471886

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x296C6CCA35A64134

4 files changed, 14 insertions, 24 deletions

diff --git a/app-misc/zygrib/ChangeLog b/app-misc/zygrib/ChangeLog
index 1e8aee73adba..06e25017d9af 100644
--- a/app-misc/zygrib/ChangeLog
+++ b/app-misc/zygrib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/zygrib
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/zygrib/ChangeLog,v 1.2 2013/05/21 12:42:58 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/zygrib/ChangeLog,v 1.3 2013/06/01 08:59:57 mschiff Exp $
+
+  01 Jun 2013; Marc Schiffbauer <mschiff@gentoo.org> -files/zygrib.png,
+  zygrib-6.1.4.ebuild:
+  Remove icon from files/ dir and mirror it manually instead. Fixes #471886
 
   21 May 2013; Marc Schiffbauer <mschiff@gentoo.org> zygrib-6.1.4.ebuild:
   Updated coastline maps to 2.4
diff --git a/app-misc/zygrib/Manifest b/app-misc/zygrib/Manifest
index 46997c026e09..74fac2451ad8 100644
--- a/app-misc/zygrib/Manifest
+++ b/app-misc/zygrib/Manifest
@@ -3,19 +3,19 @@ Hash: SHA256
 
 AUX zygrib 44 SHA256 0b2a74c7ccb4901e18a114aa152c85a32ca86fd09f8b70f6cc915909036e3b08 SHA512 5552d011137665cf81ea0bb728eef609f46707d4fc6f8fba737979cdbcbd477ce1281ae58e97be6438d2056b4ff7267b0b020b6fb95a4c49a2b14a4df0a11c1f WHIRLPOOL 9141a553238849524afabeb36e1b45c088ff2f249a69320b42a0eb07561bcbf5993a4b9fdbc5d09a00a5f018347267ccc7d7ac86ee11621041025c9a73bd355c
 AUX zygrib.desktop 210 SHA256 2ede38d856946029473c317921a8a08f8782a7cbc8e7863d98d9084a913667da SHA512 fd88b992d248d0ad01374f291d792682e6ee2b5625fc792ba002f2d912bd2982c8d20aeb9bed5cf5e43a92344f1c580573e4bcf0f949cd6cebc09eff6e407b9d WHIRLPOOL 1c8a5d01518cb6f0739340c64a8f58e4780fb81fa4489df9601f11a597e1c26b03ea7b3a892522481eeec9dadebbbd2f934f2f4f1fe41c6e0b6f0721b4d40768
-AUX zygrib.png 851 SHA256 42a9cea5b780fd1fef66b3ba5327f93690d29373e2d95434d8f96440bd1425e7 SHA512 9f36e96be1efa5df558321b631b43a7496ec812e76eb1eb5392b1a0afdec782f427b9d0b697102a661258ac1edd00b4bb0a84788c73e1fcd5f16584ad566fe5b WHIRLPOOL 72f2ae9d804977d6b8b04e5d9695c3e6cf1c7802b03e43ef0e7b760b614a65f01fe121134abc7357544b660a3afbe83cbf464fc371c21013c03beb988de524ee
 DIST zygrib-6.1.4.tgz 14448582 SHA256 3d5c3352f29049ae5a9b039b6d9ed10449bb72e6d10c90b755e581a7904d8e0c SHA512 64f643340c32f9d1381a9742cad4ebf6c3220c345a2eaad587b24d016a62811114fb957cb20aaf61ef0aaf52f829cbc23f531c27b3030882b8dc75fd030e697a WHIRLPOOL 38e2f0bc0782622631d444b955d94e80cb1fb3f667b09d36084004fcb93e6bdfc0241b05adee833924eefef64d0ce9fb29c053a20e0e1bb0ccfe0f35e2b321c0
 DIST zygrib-cities_0-300.txt.gz 517620 SHA256 443015f38acbe3cc972b04b80b0011c53bae939dcf1c23a2f1e4eb344048444b SHA512 f3c51e600e21d082759d3cf71c48742896e8cf3838e08c57eefa312ac7ef2dd1f23cbf02e9374aa9779be4bc5c04fd2748ef814b5b4b40b9d24fe4f1f5de4d80 WHIRLPOOL 41433660c8044f8f970acac4e4cc0754fc6ffa313bb1ca4ea06475760bf50423f8244d8efd56d31f796da2768fb0886f94afd07d1441f66e822717315c036da3
 DIST zygrib-cities_1k-3k.txt.gz 495119 SHA256 08a4071b0044d20410c894bab11fcaf05533d3d8299233b91430b8f8eafe1ce1 SHA512 010d6688b9c381f0ace549c53a45f8bd43f1d6846dc01241ab7bfdf30b0629f39ef2a9a715c55a534634ad8480bc2edc2796a09f0c369406027f35f6b4ba8c08 WHIRLPOOL 05a03c46932ab2911a33644050d16837879765db362ecad63ae6dbc5674e9c0974a66d0f58133c05294f8b46f46fa1e5b2af326161f7cfe2e7aa08b2e314e7c0
 DIST zygrib-cities_300-1k.txt.gz 512733 SHA256 6fb04f9c27420ec6f4793be4842a6e6831ee1219d1834a8c1c7d67c3c19cafd0 SHA512 f22f10c5d4d011593cf658acc2b2bdb6678d9ad26be0dfab67e2e6546439adc2c5a26d04889ddfd3544dbd2ff4d52e1d17e7d4b7d929e589fe55ceb6c0dc4112 WHIRLPOOL 2642614d918ac091aca958143aee686dc077ca020962db224713507a6453ebf48fdc16b92b58560746b10edc5041814628f238fc42105e0bf473d871c474258b
+DIST zygrib-icon.png 851 SHA256 42a9cea5b780fd1fef66b3ba5327f93690d29373e2d95434d8f96440bd1425e7 SHA512 9f36e96be1efa5df558321b631b43a7496ec812e76eb1eb5392b1a0afdec782f427b9d0b697102a661258ac1edd00b4bb0a84788c73e1fcd5f16584ad566fe5b WHIRLPOOL 72f2ae9d804977d6b8b04e5d9695c3e6cf1c7802b03e43ef0e7b760b614a65f01fe121134abc7357544b660a3afbe83cbf464fc371c21013c03beb988de524ee
 DIST zygrib-maps2.4.tgz 105735981 SHA256 3cd6bf3de709ff4afb193a7bb5455f28d6ab540687a97f2d978bd0a21592750e SHA512 0f10786ef81141299fd9550e36d976ce126b0d3523b56c10b19a839d56e17697ac93915b46f31d6691950f1e6d13c368fa1d198a5e2d830768fcb9e63034b487 WHIRLPOOL c92677721f234b80ee8f33c30f88f0ce5b82128ae189209f1d484fa1dae3a9dd1346ef8cf4b925cbdb1244f80f7ebb3adbe8229b3f27ce605e73dcce5f1fabee
-EBUILD zygrib-6.1.4.ebuild 2264 SHA256 fc7bb6e11c62d5d51b8d89a80bcec137dd81fd1942655e90a61d69d72c5d3cbd SHA512 90749d54f9c69f878e8a11b012a4455bbc29df39d2a79f9f791043d85664a97491a639f2e9a312b5257bd97650213dec8b2858a431f8dbf1a321f64bd708a83b WHIRLPOOL 27be871967e182c4840ca9c2edf887889195ed9a7480db8e55dfa315d5d7676a5b59df6ee9815462fee81b6d310fa4684837e819d6236c32caf09f2ca1150bce
-MISC ChangeLog 516 SHA256 c2c376dbc472b57c22ef330f766f14731ef3db87fbcadf5e15933a5866c53117 SHA512 db33203822969812b38b09dd09cc6ca017df2033f56e9d16c07d3e92a769e48c34e104d8c10540f0df229f8b3d81263384b97baaea85fd39db9cdc21a69d5044 WHIRLPOOL 863271ffb7349066efb014e9693dc84e1d30b728d3a936593332563c53899e8da39a8f76666ccfc6b4efdef30abd16b97a9b66779284d0ef24af2ef0293577bf
+EBUILD zygrib-6.1.4.ebuild 1673 SHA256 eb8ed3afad2c027f12a6f7d31effb5dc4d04b1d1b81c0a6b34c0d8909aaf8c29 SHA512 43601626ee82f210adb89f15e83d723efbf924fbe43feb29b97be03d551da46cbc4dbea7a7346a9406c0b88ee0d0105c8bfd91995e3a153444c46b3e14f3c98b WHIRLPOOL b3ea5ab0c794da5129a6e7e5a2fddc1a0ef0098f8d8fbe4d68ea563e401c6b4fd3897814b4a6ac80569430cc1e447b4815406b800c01112f0199d91a749792d5
+MISC ChangeLog 688 SHA256 c5a0e962ed1689fd86209bd445c29d3d5c5d0561417e89cdc9321f4f73cc9199 SHA512 6ccf0fb608079936a0c8e099899d1381a5f17da122a12592500c3f126f085393a19db6ae67aedd4dc513d74e4984a10a16512dcc951b14cab998a2451fe8926b WHIRLPOOL 118e2521e53cabbfc39e3c62139795898735684493513e228de7e8b898b9a0f2486cfcbb1cba41bb543544da6fad46c6e888282d92bbf943862ecb0d55b28db2
 MISC metadata.xml 324 SHA256 67c03595bd900b33c5155481b1336c1e4b2b0f25d2dbf91775c1a36ca0ebb73b SHA512 a9b2947009f936de186b0a9836098ddc79fcd2f55a58a345506ae188c2aa100b69b491727ec50abe1cd626d882a9f63018a2638fe8a0eb64b44efdd1cbcd6389 WHIRLPOOL 900ab50882647631c6ca09c49341d3f72b9573697c675cbcd047f68cfb2c2f7468afb067519ff33b11a8b94e32b301520226d73fd7e55c3c104fca30ee7b0656
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iD8DBQFRm2vTKWxsyjWmQTQRCLz9AJ4jm5kx6G5edumRpCmXdPfkAcOmbwCdGodZ
-jBU/scjRWg7+KYdWu4v+bJo=
-=7PpV
+iD8DBQFRqbgRKWxsyjWmQTQRCHtFAKCqOI1sWnOjKNzDM/649KVLU/oMOQCfWg/m
+kn7O+igCxL2e5iNxDJjdC5g=
+=mMfe
 -----END PGP SIGNATURE-----
diff --git a/app-misc/zygrib/files/zygrib.png b/app-misc/zygrib/files/zygrib.png
deleted file mode 100644
index 1bb86e8b63f3..000000000000
--- a/app-misc/zygrib/files/zygrib.png
+++ /dev/null
diff --git a/app-misc/zygrib/zygrib-6.1.4.ebuild b/app-misc/zygrib/zygrib-6.1.4.ebuild
index 627573deb2ee..1d83031dd180 100644
--- a/app-misc/zygrib/zygrib-6.1.4.ebuild
+++ b/app-misc/zygrib/zygrib-6.1.4.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/app-misc/zygrib/zygrib-6.1.4.ebuild,v 1.2 2013/05/21 12:42:58 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/zygrib/zygrib-6.1.4.ebuild,v 1.3 2013/06/01 08:59:57 mschiff Exp $
 
 EAPI=5
 
@@ -11,6 +11,7 @@ MY_PN="zyGrib"
 DESCRIPTION="GRIB File Viewer - Weather data visualization"
 HOMEPAGE="http://www.zygrib.org/"
 SRC_URI="http://www.zygrib.org/getfile.php?file=${MY_PN}-${PV}.tgz -> ${P}.tgz
+	http://dev.gentoo.org/~mschiff/distfiles/${PN}-icon.png
 	maps?   (
 		http://zygrib.org/getfile.php?file=zyGrib_maps2.4.tgz -> zygrib-maps2.4.tgz
 		http://www.zygrib.org/getfile.php?file=cities_1k-3k.txt.gz -> zygrib-cities_1k-3k.txt.gz
@@ -40,25 +41,10 @@ src_prepare() {
 	sed -i 's,INSTALLDIR=$(HOME)/zyGrib,INSTALLDIR=$(DESTDIR)/opt/zyGrib,' Makefile
 }
 
-#Maps
-#cd /opt/zyGrib/data/
-#sudo wget http://zygrib.org/getfile.php?file=zyGrib_maps2.tgz
-#sudo tar -xvvzf getfile.php?file=zyGrib_maps2.tgz
-#sudo chown -R root:root maps/*
-#sudo rm -rf getfile.php?file=zyGrib_maps2.tgz
-##Cities
-#cd ./gis
-#sudo wget http://www.zygrib.org/getfile.php?file=cities_1k-3k.txt.gz
-#sudo wget http://www.zygrib.org/getfile.php?file=cities_300-1k.txt.gz
-#sudo wget http://www.zygrib.org/getfile.php?file=cities_0-300.txt.gz
-#sudo mv getfile.php?file=cities_1k-3k.txt.gz cities_1k-3k.txt.gz
-#sudo mv getfile.php?file=cities_300-1k.txt.gz cities_300-1k.txt.gz
-#sudo mv getfile.php?file=cities_0-300.txt.gz cities_0-300.txt.gz
-
 src_install() {
 	default
 	rm zyGrib
-	doicon -s 32 "${FILESDIR}/zygrib.png"
+	doicon -s 32 "${DISTDIR}/zygrib-icon.png"
 	make_wrapper "${PN}" "./bin/${MY_PN}" "/opt/${MY_PN}"
 	domenu "${FILESDIR}/zygrib.desktop"