Fix nm-signal-*.png icons with media-gfx/pngcrush built against libpng15 for -fix -force to correct IDAT lenght wrt #466190

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 30 insertions, 9 deletions

diff --git a/gnome-extra/nm-applet/ChangeLog b/gnome-extra/nm-applet/ChangeLog
index f4a02748bce3..b3758961abe3 100644
--- a/gnome-extra/nm-applet/ChangeLog
+++ b/gnome-extra/nm-applet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/nm-applet
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.98 2013/03/29 17:40:45 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.99 2013/05/03 10:07:43 ssuominen Exp $
+
+  03 May 2013; Samuli Suominen <ssuominen@gentoo.org> nm-applet-0.9.6.4.ebuild,
+  nm-applet-0.9.8.0.ebuild:
+  Fix nm-signal-*.png icons with media-gfx/pngcrush built against libpng15 for
+  -fix -force to correct IDAT lenght wrt #466190
 
   29 Mar 2013; Pacho Ramos <pacho@gentoo.org> nm-applet-0.9.8.0.ebuild:
   Fix configure option
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index c4953ecb8334..3d38f5678605 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -5,16 +5,21 @@ DIST network-manager-applet-0.9.4.1.tar.xz 1102856 SHA256 b6b6de75e28d1fbcdfdbb5
 DIST network-manager-applet-0.9.6.2.tar.xz 1125536 SHA256 96c79ce199fe7770b66f2ddc5ee0a4b07a0ea1eaf5e2186b78d8dd69e38a3069 SHA512 713ea1f6788ff106b35d39da0a9ff81af7b3c2ff9a8887be5b808317b471080967d594e3d7e02c0e9d830cacb78921a58666316fbfd0a9b1c78719fd009ef6e3 WHIRLPOOL 0276296371b3a92adf0b02316fb2f5e87bdbd5e94bae5790d2a06c1b18485c878c72eef935aaaf5741042576d6e60f80c609139882fcc0352fa43ab62aef2956
 DIST network-manager-applet-0.9.6.4.tar.xz 1140868 SHA256 ae5667b165f0f83244ec76c42f17553ec2169f5250e144904994497137374141 SHA512 16aab6e5786d0d6e89b880e34c6b8883bd57a190fb7ae73048db69ad2757317822eff4c8e825239fba969f67a760ce90ac94c27c79780158f3a2d82a9069d242 WHIRLPOOL 940c31ef95cd0b3b7a78ca5083c442dd229c98cf389a0615e4a6ba39b39e3df947b2d3e9b59100e8379b8cdfb845eb2899b637a89a09647b777b2143018e5e80
 DIST network-manager-applet-0.9.8.0.tar.xz 1214956 SHA256 1afb6e736870ba95132bf0d211c46849e02a820ba3902a059a616be888053590 SHA512 0c2acb8ded7621369e96a9fc748bfbc75af1eb03415c2109e6f577c9c5d8996cc6b9b11d9c2c445ae7b50c2016f5c90f5a649632738eb056bfa99f115a3b1270 WHIRLPOOL e49e11bec0c2a292567c403b689db429db0aab71778f8b328106a33d95dee66da9d36f04dea7c2f55bb0e887342b3c7ea9ad6f43b2a80e4df592f6a3b495bc41
+DIST pngcrush-fixed-nm-signal-icons.tar.xz 2052 SHA256 49adffa785572463e17674caec605d9ce5b6021f1c91b918380654cfc380defa SHA512 88af2109e2e2a26775af1121b4e9bab0a03aa817fe60cd4bdb0bed5e56e046fdb87d2783cf96b36d22da66869884313d9635e4a70f1e2579b5536e7d62595b39 WHIRLPOOL f50b2ba429e9bded025e97995ecd96c7a3b2b668cb6aafaae1d4c3785393fbebb5bdd61f44eff2398023550524c0459b281a07813b94d38e61dc865aec584c0d
 EBUILD nm-applet-0.9.4.1.ebuild 1171 SHA256 6e7423d8166bcae904f3f171abe601a31e0f502de49eff6c61963ca80d7fce72 SHA512 7cf3d485a14f3e5338592b7d151af674a49c0e03f01922ff961e96fe8728a4f9608cf1b715a835898a8da716d02060d14de64ab8c8e6f0f25650b12e5b631a18 WHIRLPOOL bd2b507b8f87acae44b478a457c3eadd796212b87b120c682c79801ffbca534520bf4ca7dcbcfecd5e6549b904496250913b7ae97954def1ccac8a281308e62b
 EBUILD nm-applet-0.9.6.2.ebuild 1223 SHA256 ac62fd8018cefd57f90599e5efa06a90ab0828044ddbaf0c3ff082d83cdd75b6 SHA512 5aae5f2eaf7f68ebe0cf67f85594742ce414597a3042410dcef75b7c5bf177dcd2fea1bb9099927ac579dd701d3282d1dde36c03cc6a26847bb619d89968ad8d WHIRLPOOL 5d860d6a731527483adb2b3448f21facbf8b6abff897aa0513f1e747e5d3eb343bc3dae5cb510ca121726f9b3f5fdde107868ecf70be53eb8427cadb2a87d9c8
-EBUILD nm-applet-0.9.6.4.ebuild 1264 SHA256 ebf7aa6f9cb9f3f476c2f847b2861596f24698e0244c30376c976c879e2be445 SHA512 88f2f39e7234d2bd24b299969c9bd1f6c6af28f8938b3ec962e64716828a28e11f2eae89c441875bc5b36c10746807186e63d552ee37350214ce6202233ac4b6 WHIRLPOOL 8b4f8e1db3126bf0095735e36cce942ca32bf667823f341dbe12af00bd985f76c3791828d5bc49b368176d8d0de5637ae16a96c98ada2fb694cf244b7d58d765
-EBUILD nm-applet-0.9.8.0.ebuild 1291 SHA256 71e2cee24b137ddeb68fc6ddaf60604ee7a36cba479feb906500c2995d4ab71f SHA512 f602feaa28ecfd7510a2a4377f8390c6c855bc372c01fccc85b17dd840f827af17331e056146ea4e6d434b4720895edca20f4f7f7608912644d1124f6c18db30 WHIRLPOOL 4158aedf9c8f090ddfa14223bc6b6c7d560d9420e8676f90d234f2cce95b90d69275e69d2059f84ef4d8578c4474a22d0b939bfb99eb161b7687aa47bdbe35c7
-MISC ChangeLog 16819 SHA256 b63516be021ea011dff628f5b252713061b8aebe75fa8abd5d34aecb1e039e90 SHA512 e83637005a25df6cd645ce567810ad575ff40e6572f96aac2f4f09525c9062e0f719a27ca09d18e6eef2013b81807440d8bb8c06e34ebd37e6b25ae2d6a2dd9c WHIRLPOOL c739fb5d24a3162d842f3fda76c29993a96dea4e25abdd63838bdaf6f65de31d3556b26481d685b3a0e4c68a44abb89dc5421e49f9ab58368f924bf897a3f3f2
+EBUILD nm-applet-0.9.6.4.ebuild 1410 SHA256 6c50aefdc6754be70240fca4841aad950ad99255640260827256322c3168bbd8 SHA512 0c0b5b028a08e1be60268c0797a9da79c8ff42b17d8e314ab040572d2de321bb66747945ce9a47ab78f34afea4032abdee0d832d5d7fbc3801074d2a6604ce05 WHIRLPOOL f3050eff77f2f67104c827ebf224b9b58ff297aad36ee69eb318d81f3d6dab215b58fcc982dd3f928b68786164734f262acd3d584ef876b979e42240c74cf621
+EBUILD nm-applet-0.9.8.0.ebuild 1473 SHA256 92a6af7633b7f9c1cfd0c6adb3e12881fa94fd194aeabc49dcd9576ecc0c0dbf SHA512 b8ae604cb33331d6e71c498108e6212f9a3adb5a57ac7afb94041abf30c6f5b10157f5d2e87b8c8a3eb631a6617eb6e209149979aa1c33e38a59b30b1eb70730 WHIRLPOOL c5bdb6fac86b30a4794851cad8eebeef2a22591b9847024d27368a4b64fbffcef4f8925f87cb9772d0e8f994d0492c0f4a453b1aed3cf455716e41a4cd45eb3a
+MISC ChangeLog 17060 SHA256 5db3746f6eaad9cd1d01da774c177364f5d274bb9aab81006ef88e14190ff56b SHA512 b3fb1df455b5c66de1de39f71182da7bb72a602557c07d1f4dd001b0b8be7e3c06fc80d3d665d74ff952c5b20007146e238da0bd91d0025c3fcde682f96bbe22 WHIRLPOOL c9c0ce06833b03798b702762c53fbd70c33b5fc7dc94288bbc5606b2ccbfed9981d65d28a26bd8f06729c3674ab3498273364f49f81d98d07b58b0260f5c17cf
 MISC metadata.xml 447 SHA256 368b19fcb850af1dffacb1bcab89609f1f98d759f4f7f95de581883fe5bbd709 SHA512 2aa151d51e5f92720bf632686ade35d5f10c662c151d8061f44d9e774889efa2a03c211d0a965fee27468e4b4d8179fd2936cca59e5a04c5744485f9fdda8a8e WHIRLPOOL 1efef4b07aa9af444753f9bb9e7278750ea5894998b5ad5e88dba4bceee8c92a62c59de349620e4ce139e4ca2caf7cefe8944e78935776b3ebeab90381a183b2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFV0h4ACgkQCaWpQKGI+9RpXQCdGIrR2B3sTgIKwQ7n7tq04JyO
-yucAn10X19tmfV+IljsX8JGPQff07qrX
-=Wp9u
+iQEcBAEBCAAGBQJRg4xrAAoJEEdUh39IaPFNrzYH/2eZ/fxwLZJHpndXWLgkvR37
+odn8JYL3jBAcokyHhdA1OK8D8U04n+A/5Z9zuxDxRyltL7wkNM0pi1VpAgVJ9HT6
+pPU2nNYvkix1DLL5V3bbWLEtFu5Qh+d87o2k8qHzT7zWbZRXKSQ5j6N7QEuDlpoL
+HCIdPmflyl7WScd6x+z1TOs8Ttw40crtH55fiuUmGR4KOGmTX99w3ZGRIPkN/9NJ
+Om2HcuPxggFPvNQcTlSsRYyh1wv1IjIqaqEwCiOU7y04GmTysciobRMmU51g8twQ
+8ZYMyen39ZbeOiayJs8U8/Q75WPodjFL4MPhHy9NJpeQiCABG/d074ZTVq4oedA=
+=0NoA
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/nm-applet/nm-applet-0.9.6.4.ebuild b/gnome-extra/nm-applet/nm-applet-0.9.6.4.ebuild
index 1c415cec6d6e..817d99f14805 100644
--- a/gnome-extra/nm-applet/nm-applet-0.9.6.4.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-0.9.6.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/gnome-extra/nm-applet/nm-applet-0.9.6.4.ebuild,v 1.10 2013/02/02 22:41:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.9.6.4.ebuild,v 1.11 2013/05/03 10:07:43 ssuominen Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -11,6 +11,8 @@ inherit eutils gnome2
 
 DESCRIPTION="GNOME applet for NetworkManager"
 HOMEPAGE="http://projects.gnome.org/NetworkManager/"
+SRC_URI="${SRC_URI}
+	http://dev.gentoo.org/~ssuominen/pngcrush-fixed-nm-signal-icons.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -47,5 +49,7 @@ src_prepare() {
 		$(use_with bluetooth)
 		$(use_enable gconf migration)"
 
+	mv -f "${WORKDIR}"/nm-signal-*.png icons/22/
+
 	gnome2_src_prepare
 }
diff --git a/gnome-extra/nm-applet/nm-applet-0.9.8.0.ebuild b/gnome-extra/nm-applet/nm-applet-0.9.8.0.ebuild
index 32931eabe056..98f2c9a731d7 100644
--- a/gnome-extra/nm-applet/nm-applet-0.9.8.0.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-0.9.8.0.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/gnome-extra/nm-applet/nm-applet-0.9.8.0.ebuild,v 1.2 2013/03/29 17:40:45 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.9.8.0.ebuild,v 1.3 2013/05/03 10:07:43 ssuominen Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -11,6 +11,8 @@ inherit eutils gnome2
 
 DESCRIPTION="GNOME applet for NetworkManager"
 HOMEPAGE="http://projects.gnome.org/NetworkManager/"
+SRC_URI="${SRC_URI}
+	http://dev.gentoo.org/~ssuominen/pngcrush-fixed-nm-signal-icons.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -37,6 +39,11 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	>=dev-util/intltool-0.40"
 
+src_prepare() {
+	mv -f "${WORKDIR}"/nm-signal-*.png icons/22/
+	gnome2_src_prepare
+}
+
 src_configure() {
 	DOCS="AUTHORS ChangeLog NEWS README"
 	gnome2_src_configure \