sci-chemistry/relax: Fix again png again

Package-Manager: portage-2.2.7/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

3 files changed, 37 insertions, 19 deletions

diff --git a/sci-chemistry/relax/ChangeLog b/sci-chemistry/relax/ChangeLog
index 1b943c4fed96..4c3511b4583a 100644
--- a/sci-chemistry/relax/ChangeLog
+++ b/sci-chemistry/relax/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/relax
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/ChangeLog,v 1.14 2013/12/11 07:58:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/ChangeLog,v 1.15 2013/12/11 10:05:58 jlec Exp $
+
+*relax-3.1.1-r1 (11 Dec 2013)
+
+  11 Dec 2013; Justin Lecher <jlec@gentoo.org> -relax-3.1.1.ebuild,
+  +relax-3.1.1-r1.ebuild:
+  Fix again png again
 
 *relax-3.1.1 (11 Dec 2013)
 
diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest
index 7ca789b849c2..fab4971185b8 100644
--- a/sci-chemistry/relax/Manifest
+++ b/sci-chemistry/relax/Manifest
@@ -21,24 +21,24 @@ EBUILD relax-2.2.5.ebuild 1521 SHA256 f9192d970b2e70dcebdfc6ebd4658459cf5ac88a1b
 EBUILD relax-3.0.1.ebuild 1510 SHA256 640d9964245a7c7b42db8e31f59cbb33c6c136481f9cedc46ad80e425e05d1df SHA512 773004e05d60024ba2b793cbe1cc0b95e9f2b788d5cd2a667e4d182598662181e82b03ca084f7690a6755b8bb6926a81b19190b8343f6e2b70ab7e781dd5b683 WHIRLPOOL d2eac52a53b0f7f6389b128ab4433aead2394e64ff1a10006b73a6633a407030918030e859d64657bd139d326cd38faba05f86094f7a684660dc08f48a761cb9
 EBUILD relax-3.0.2-r2.ebuild 1681 SHA256 15d6aa55fc61b7541b5855c96be559b381b3263b8193fbc2fa04a007bf50b39b SHA512 b80c1a5857df64e1e4c9015a4d65396ef186ac66713720ebead7cd72b6045524fba2103da6f5f4018c7c04453a9b89bf4018e237cda64834e003319ef2bfbb61 WHIRLPOOL 59f856b9b638384c3015a705ffcc391d209dc207fae07e9cb27e68bfa51668ad5c4ef8cc037a8ed04f6cae16c4732e69b465344b2eaaeeaf101170d6db77e030
 EBUILD relax-3.1.0-r2.ebuild 1942 SHA256 3395cad786225adb74b79d6cddec1979e419ff5f44236d010057b053d844880d SHA512 b0f64d0975e4d2309ddc566d2605a7c44f9bd9b383dc945034d6a96f642f50c8120c0ebc7f259e3234c25b2af8e1115fb7ad7396c40d89af46daf1fab7bacc56 WHIRLPOOL 17a86c67cd6bc90035ee5c7351d3dc9cd35091a5d6910fd323754eec90488c3ffa7c8b47799f17c5c8f0b61e9dfc44311d7d5e042f5ef3351be310f4450e1c39
-EBUILD relax-3.1.1.ebuild 1651 SHA256 0bb60ffc1652935c0ff4eafa22c28c0f7ad67187420bd0aa028415b1c56db534 SHA512 69baa26f0f94171edd490eee54c42d55088976d688c8e99dad20a80dac3587b017cb42fdcba588b83084ef9c19f67ac5e7734847ffa23339a5c8095ca62d7dc3 WHIRLPOOL ba496ffab4c45b08c171c5a60d23523581917ff5df7b5c8383f8b19334bf16bc1ebc6a610a5d14042473ba2969cacc54375a529ff234783beccebe30f3b030c2
+EBUILD relax-3.1.1-r1.ebuild 1887 SHA256 94c9faa927538de9d6da536370eefe6aa7600588155d90ed69943cb21ec9c39b SHA512 0d6340bffe71c28f1a809b8a782147e64d5aee96ae7b11d30664d735388f5ecae855eeadfa63e1abe10e46b6b56183934b55b5b82eac32a592752fe467f8becb WHIRLPOOL ffa3d0110f1fc3450ae2aa5925613ab3bc011209a54e2f883289e5c68ad670bde499844cbcf215ab4d761e73beffcd582361ac3ccf2d36c9972b0b4f816a542c
 EBUILD relax-9999.ebuild 1621 SHA256 0f7a800c351dcc86fa2b43b10bc0cc1e0126a5cdf5d3489928070a475ec2ad2e SHA512 820143e457b8282ad7b33ac4013889c016b6763a834718f0c33a52b9da3f367776200206fc95aab4220866819898ad72e1fd48e8cb6f9f3272c278e44eb947fb WHIRLPOOL f4ced5b9c344f7a1abdffff6f8d8163701399ce45625cae26a328a8d80705ecfe6833bf8ec398decb5c4993080a212fc9b41653bca88f0c980e28d6b873ee4ab
-MISC ChangeLog 2475 SHA256 367555adcd0edc961e687ce9f2c57010efda190b4f9544bf5a2d0d09481eb5b8 SHA512 74927a83afd0d726308188c0d809a13764b545b2b18580198d21185ab9b03bf93127dc023ceb0a0ea3c06f37c59df7909e6d28c478d05084e580392fa7e69f7a WHIRLPOOL 578d75f1b5fc5cebfbdd86ba4704a48097a50a2423340cc901afcb84664aba2d8fc11fce05bc7563aaceab1f266f29d2b6e34375a72bf767f38c0c61ca62c4c9
+MISC ChangeLog 2623 SHA256 e160a7c7b4bd9ecbaa22151872211a3541954f501db8728c36ab43ba5862d7cb SHA512 83248c3405809bbee680116848de7e2faac0ca1833effdbf76e00833acb30c700de911d800e57895429d6a0283f65a903d1bec79e4dbf9879717501565404730 WHIRLPOOL 4f4f514eac601beaa8491c3074d54212d2b469132e03f3690a4b70946c07805eb06c529e4e472e9f6b668e6c5cb98cf2f3ac4dc0c4cd3b7c85f3f87ec4b2bdef
 MISC metadata.xml 1315 SHA256 58aef1b2b940b7211a85032dfc7212025aca6a3cd313b1a6e203854bbd3dd03e SHA512 dcb1d935782546693b79aa74dc37d55701ff4cb1756860a7f0d9919534ad2ae6f1dcad20cace867b10297c577cb6444dd5e212b13f57c3d81b30b382d8458c04 WHIRLPOOL e2de7c85fb3494a98c2ee1b08dd06d28676f43f64367ad29a8723f712e12e9052daa82794bb6626506de568701b1ea09efe059a8d3a13f6aee5fd607a913e441
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSqBsaAAoJELnU8jG9FVirgt0P/0PXGlna7y54j7hJGJwHnER9
-H9l0RP9O4XBzsnZ5PeeU6sM6n8/RX9IDGzM4Mz+jkui2RclOaSccvUvh3KW5fz4E
-IHC3XBMeesn7f3DOue5/hx/kC0NW9wzhhPY4kXRi0ZRnb8B1N/YDVO4lDeyOP7oN
-eM14VbbB4F2UU4IlkDTz9X801RfyOmKyzifu9xWNs05miuCTnJ+cltNeZpZNnXSr
-N/3qvyC8fWE9Xq3dGddKGqqPt/O3dRIx0b1aEgDTnkHDmB27Fp8gOH2znlh83+BN
-iM0cojEIjDWkod8c0LGYC4LUW1Xz9sC62JRx7IT7xBvSvpXiUHlmUkMsqfYgiK5Z
-NmCEGCSNLbq0QBEoipuFDS8CP8un5HgtApYBz4IiSHcNbiwDO6jL7IFxtPxU5vA/
-uHlcnJlm/UrAaevr3T8JMhWUWRKvIyw81d+/7I0FDnG1dMIWhMTEAIH+SB1GDlAn
-JFX0/nJglPc300ieKLvVlsbsfXaaIY9geG0wTlmlFmMKiPw36W6eSMBv1Rec1sRd
-8ONteYcQ6TAtMytoc9xv1NxJyyqiTx1gN7h4r9TTu5EP0NPbO8EhiOnCwHmGFF3L
-WL0yNSgrdpj5vYVgC3Z9YXfx2Dq1RjXOK6+yvG2FsqJnl2UrktmDV7lojyuxn3/q
-7DufdsCOWShOg7v9blN5
-=fZd1
+iQIcBAEBCgAGBQJSqDkHAAoJELnU8jG9FVirVU8P/igSUDO43zZpSARMJc05LNIR
+NXLsp/0n0Iy9Jgz10cW0RUk/K/xYbX3g4YvqEPo5G6YGVHvotwUVFmcVcUZVWwQ2
+p1Rfu+1xy2HM4VzM7XxqpVtG3xoSH1W8NO7PusT9paNAl6vMnr+1DNLFhI2ab4OJ
+FoMeuRrVGrkgrapdq/swJd37FscAOVkMSfie9+Ht0AwZG/pvuxpXTavzediELl2Z
+EpBtCn7gpqI/0Fy4lpmn95PFHFQcV7J6kbfuRkFEdG9JWL9sI22IZzpneTvozmA0
+nE7NL5o+pKYi9M9sJSY/vcR+6K0TvhoiTF0UA475f+Mul4NjmMQBBk8jeeUarwcy
++TVnIaoMN+OXOHao6ijgnPOBLKDwj7UqWtUEOtW07fHx1W2MAy4xx451GVl4r+DR
+4MSpG8PWEKIKjJlTI+VJB3kOIOvuk6lm4sdy7dzkIm9J4hCSLy2S8EnP5e2IJC54
+z4rNriREfLeBmjblxjenYjo3ytSvRlqvbNbgAuYVWL1zEWwqFFswJTAv0ExyS5AN
+8Uv1ijGsb1T1b4xDwRPY6CppFzBPcO59lyzO6ury0UDtDRz5SiKPzHFgKE+nsj7C
+TYDJxA8xOhK7eoBLxppWpDWBoiVbqBySKMZVJ0l3S21b1NW8GGu8msSBb1uLkxbM
+A43RnfeJq2uYp+gS21qy
+=KcFx
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/relax/relax-3.1.1.ebuild b/sci-chemistry/relax/relax-3.1.1-r1.ebuild
index 4ed84854ce37..4005868150fe 100644
--- a/sci-chemistry/relax/relax-3.1.1.ebuild
+++ b/sci-chemistry/relax/relax-3.1.1-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-chemistry/relax/relax-3.1.1.ebuild,v 1.1 2013/12/11 07:58:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/relax-3.1.1-r1.ebuild,v 1.1 2013/12/11 10:05:58 jlec Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 
 WX_GTK_VER="2.9"
 
-inherit eutils python-single-r1 scons-utils toolchain-funcs wxwidgets virtualx
+inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs wxwidgets virtualx
 
 DESCRIPTION="Molecular dynamics by NMR data analysis"
 HOMEPAGE="http://www.nmr-relax.com/"
@@ -41,13 +41,25 @@ pkg_setup() {
 	python-single-r1_pkg_setup
 }
 
+fix_png() {
+	pngcrush -q -fix -force ${1} ${1}-fixed &>/dev/null || die
+	mv ${1}-fixed ${1} || die
+	echo -e ".\c"
+}
 src_prepare() {
 	local png
 	rm -rf minfx bmrblib || die
 	epatch \
 		"${FILESDIR}"/${PN}-3.0.1-gentoo.patch
-#		"${FILESDIR}"/${P}-sample-script{,-backport}.patch
 	tc-export CC
+
+	ebegin "Fixing png files"
+	multijob_init
+	for png in $(find -type f -name "*.png"); do
+		multijob_child_init fix_png ${png}
+	done
+	multijob_finish
+	eend
 }
 
 src_compile() {