sci-chemistry/relax: Fix icons

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

3 files changed, 40 insertions, 19 deletions

diff --git a/sci-chemistry/relax/ChangeLog b/sci-chemistry/relax/ChangeLog
index 2fd134f6d94d..b8edf91fe9b6 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.11 2013/11/29 08:38:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/ChangeLog,v 1.12 2013/11/29 09:14:58 jlec Exp $
+
+*relax-3.1.0-r1 (29 Nov 2013)
+
+  29 Nov 2013; Justin Lecher <jlec@gentoo.org> -relax-3.1.0.ebuild,
+  +relax-3.1.0-r1.ebuild:
+  Fix icons
 
 *relax-3.1.0 (29 Nov 2013)
 
diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest
index cb66120618c3..3a72ddc43a59 100644
--- a/sci-chemistry/relax/Manifest
+++ b/sci-chemistry/relax/Manifest
@@ -18,23 +18,23 @@ EBUILD relax-2.2.1.ebuild 1337 SHA256 4c65b74e17d1928bfc0f42230e1ccbc6abd5963901
 EBUILD relax-2.2.5.ebuild 1521 SHA256 f9192d970b2e70dcebdfc6ebd4658459cf5ac88a1b74886cf456108633ccf2c3 SHA512 7a4f13a4be29ef48082e82e6ec7bc6f6b3e1da72ed32e914b9f202c83f61868d850f3c4f2410407ad4c1be5ce5939fb16330d403bcdbdea12fc69e0070a15007 WHIRLPOOL ba6768c596b799456d18f85450520b7de81b5688df9ec3762023b54bf82f3398ed9eea862d242a064ffd3f71f8f73315b15d8734ace7a0196e4fc0b82be8ad99
 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.ebuild 1609 SHA256 19b52e4b492705815850c2073403214d3774cdc0ab4755ff3840cc8f567aec38 SHA512 72415c6207f79182cc5990e92c84b1edecce14aca5495660161d34abf09f63e5ead19fc79888959c2eb3d8155bd4d97c84a074d65556c21382654fae6e4ed11c WHIRLPOOL a031272eb826e199774b1921d8ef126a1316da431d1e8ba9c06e8e758669fc64fcdf84a1160f284ed7114c69df4deb631e40d41d5a6c6b68b5b4c655f3aadc55
-MISC ChangeLog 1940 SHA256 bf3f9de5b7af33f5fce38fdfb589638a60153b20304c84ced77d8bcf216e4665 SHA512 548074aca569cff90bd03f5933d86d65619f2615d397788842ed9c3b9c47d583cf34e07d89a662033829b6be66fa44f0cf0f77a143d86213c4b0cd21e75a0672 WHIRLPOOL 1c17884299dfedd44abbf611a96ba328f0e4675a45e95f397998f42af43f82f03408457d7c73a26d140ec60edc0e8422f1ae26dddf4e65bd32ebbccb70765f77
+EBUILD relax-3.1.0-r1.ebuild 1930 SHA256 e17162955de60efe8b24d836c1c53a67c40eb26095d1d7e1c5a96ef7468ccc0f SHA512 d8fc6a75ff2767cf2889817c4b4ec723306b8cd9888931610eca618dc2458f754b58cbd40a512d3cfd6360b93cfb80acb4ead31978af00e0444cff72625cf4c6 WHIRLPOOL eaa1a535b6fdf5223f5aef118e3b380be3c3b3cc90e8bd1e8a259a984cbe2bd7a36706baa446378210e312827f0ae934e61d64fe945a23d5b413c831fbe36e60
+MISC ChangeLog 2078 SHA256 901fbe10e20a47d48600f1e88338576e25bf34da3165ca60b4f09f27d921e0ca SHA512 6f27d174d8ea5fa4f04f1a2a5b03fe3ff787fcffd154c5f495c8edd909ef19407377b3e9411aa6e28a2809dbfb9bfe9304667c8f80f7a5f527d1be9c171148cf WHIRLPOOL e92f0a0e1b512d84438de8a6dc738dd621643447cbcdb981e7313d78233a775517ed7cc87106ec335c45b370ade15e483c94ec25f89b4d628b17e11545876002
 MISC metadata.xml 1315 SHA256 58aef1b2b940b7211a85032dfc7212025aca6a3cd313b1a6e203854bbd3dd03e SHA512 dcb1d935782546693b79aa74dc37d55701ff4cb1756860a7f0d9919534ad2ae6f1dcad20cace867b10297c577cb6444dd5e212b13f57c3d81b30b382d8458c04 WHIRLPOOL e2de7c85fb3494a98c2ee1b08dd06d28676f43f64367ad29a8723f712e12e9052daa82794bb6626506de568701b1ea09efe059a8d3a13f6aee5fd607a913e441
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSmFKTAAoJELnU8jG9FVirhHkP/RHfFw66WOuAixkicEeBrSiP
-Ps4OxZ8s9wndIYgr/6IcET2Wu7V7WK3OiaqX5Kx4SP8LSpnDfPrghdulgmgn/Gj3
-2zT/c8coUjyNoYHmFg4iJIGCUh/jPjPFO+zkujV6VQnYOMEOTGpP3wN1YgluHxj/
-OVQ5m2XLZEYFU5tHtDW4NUh5Hy/O/vq7z5MlQkIQEgWvXF7ZPggRjBunIlW6K7LN
-SKOOkAblqNFN45WNdSvBWV+dO6CU7EfYXRyGVAwwmHIeuSjE924CSwfEOjHABeu+
-LI5hge/vs5s4quY1OIZ0IcAIwbYcCZMCMuc68fuI8LZ/HerRDxhR6fMiwsAwLRwp
-j8rV0f8SHbCTsRpBGxrr40AojJkDJu4DDMewCPxqH+1ob7iBMFtevIGnfC1pCJar
-0Fliknvo3lY7nZDb3Zm22JL2wG0Wh4K1gcRZJwEINN8Tt5I0dZW9keOtZFiAoH2E
-jh+W7ULRsQxRUVAdy+zHrSSE8fkho5havEaBsDtVb0ZqETilcflbUjjU6YHDJwB7
-AVuJrTD/udW3bIi67TO7TZ41GAeKyUVKyl+/CypU/v+4wdi6JkzHG6IuyoBJ/EIv
-VITxXQNiF5jJUwiJwUsYxulr0vfRAfHVNZrD+3mdWl6FGd1zMQgzje0FMfDbCIFG
-8et7sXaf9j5xSdg+3OVO
-=3uax
+iQIcBAEBCgAGBQJSmFsTAAoJELnU8jG9FVir+/wP/2kGLHvAklNToGm1wjsnON6D
+QZtSfvZguU4CBWfNoJs+2Yj2xOiZ3jLO6hRKOwmzqKJ9S0Fdhrh/vnR8dPL8ibMp
+DnwohQUT87j7qkOtBxQLLE1LViiB+lwlFT9jhMt3vAa54eqIk/Pg7DLG8XUvZe0k
+yi0t6R9IxafQIrjvWAeoWR00tiNMBr0lyxqC3qeFK6kAtvKugqekbTrnNW3UwyZv
+22RSKTlVpOsJgMlkaMqcTdF2jq1m6sjM94MgzDiNZM99c+0n7867xlG7EPzLFxES
+351b0f16blnX5t5hyYwgZR3ixM9b8Hko5lpMLg+Yj3pSjpBSMZ403mEKSDrs6ETF
+aa++gLi75D19+gpa8h7tsiM++YJEujFKscimO8D2I7rO44xE0VO3V3k4gJJ6vBzE
+X/GEE9FgHFQHajC16liq4qqb5bB9SpQ67OkDHm8mEFbIiR173hON6ryy7W6fdRWz
+06pDSUJCObVxc6NCY2egMbqjD0S4lU6e2B4RkPQXA/LK4vTLI8qNnsFWSDieZgJU
+azaBTuv3fmM886+k/CJqWTihV1mEayBvDbG1cP8A6FM7g4cnsFJKp+VA7YoeRnOm
+4XpAQymHflP75EkgdssOdRGMBpx1dyCTsxHaJlMvD6W0On8qo+dHcJkmDdqPP8Sj
+aYj/rUfMfWDm8jsh1phY
+=EVpF
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/relax/relax-3.1.0.ebuild b/sci-chemistry/relax/relax-3.1.0-r1.ebuild
index f8dde3d0958c..355ce100f4b9 100644
--- a/sci-chemistry/relax/relax-3.1.0.ebuild
+++ b/sci-chemistry/relax/relax-3.1.0-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.0.ebuild,v 1.1 2013/11/29 08:38:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/relax/relax-3.1.0-r1.ebuild,v 1.1 2013/11/29 09:14: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/"
@@ -34,18 +34,33 @@ RDEPEND="
 	sci-visualization/grace
 	sci-visualization/opendx
 	x11-libs/wxGTK:${WX_GTK_VER}[X]"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	media-gfx/pngcrush"
 
 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.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() {