Fix broken embedded .png file for libpng16 wrt #467036 by Johan Hattne. The patch has been applied also in upstream.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 76 insertions, 2 deletions

diff --git a/sci-chemistry/imosflm/ChangeLog b/sci-chemistry/imosflm/ChangeLog
index 62bb94f3ca48..cfdcce37ac17 100644
--- a/sci-chemistry/imosflm/ChangeLog
+++ b/sci-chemistry/imosflm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/imosflm
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/imosflm/ChangeLog,v 1.15 2013/06/19 04:21:04 bicatali Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/imosflm/ChangeLog,v 1.16 2014/04/08 13:12:57 ssuominen Exp $
+
+*imosflm-1.0.7-r1 (08 Apr 2014)
+
+  08 Apr 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/1.0.7-libpng16.patch, +imosflm-1.0.7-r1.ebuild:
+  Fix broken embedded .png file for libpng16 wrt #467036 by Johan Hattne. The
+  patch has been applied also in upstream.
 
   19 Jun 2013; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml:
   Switch to sci-chemistry herd
diff --git a/sci-chemistry/imosflm/files/1.0.7-libpng16.patch b/sci-chemistry/imosflm/files/1.0.7-libpng16.patch
new file mode 100644
index 000000000000..27efc6f36f4b
--- /dev/null
+++ b/sci-chemistry/imosflm/files/1.0.7-libpng16.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/467036
+
+--- src/contrast.tcl
++++ src/contrast.tcl
+@@ -3,7 +3,7 @@
+ 
+ package require palette
+ 
+-image create photo ::img::pixel_count_v -data "iVBORw0KGgoAAAANSUhEUgAAAA4AAABCCAIAAAGft0AHAAAABGdBTUEAAYagMeiWXwAAASFJREFUKJGtVFEWhCAINJ9H4f4n4jD7YauAA1jGT2EwAxNyMXMppZZu3bv6Q3t3iH7ob3fOPz3wdLoi7y8V1SOZp0NE02Hm7quc6VSVaokFKzMD8qKUUd0tyEQ0z1DchNQaud+JCHclzeIDOUCle7EjcA/XPZU4Klb9y2GDY68LVe8YiAihmXT052G9SQ0+m4yN2J7EZqrvnZpheMdGRLnq5/ViddTusPeux9o5G7fdsskrV9ej8rw3I80LhNUUgqmvwCY8izozZcvo5tGt1owfoGJhoEVtgcXg2da2gJa0JYESseRJ8gvyOYSGlxUkScYFoBoJB+RZrR+H2sWx2vEQrnv0pa4HYkFqF7UHrefRdjE5zQQFAp/Nqwf8XNePZ+AHq5sOPlXtupMAAAAASUVORK5CYII="
++image create photo ::img::pixel_count_v -data "iVBORw0KGgoAAAANSUhEUgAAAA4AAABCCAIAAAGft0AHAAAABGdBTUEAAYagMeiWXwAAASFJREFUeJytVFEWhCAINJ9H4f4n4jD7YauAA1jGT2EwAxNyMXMppZZu3bv6Q3t3iH7ob3fOPz3wdLoi7y8V1SOZp0NE02Hm7quc6VSVaokFKzMD8qKUUd0tyEQ0z1DchNQaud+JCHclzeIDOUCle7EjcA/XPZU4Klb9y2GDY68LVe8YiAihmXT052G9SQ0+m4yN2J7EZqrvnZpheMdGRLnq5/ViddTusPeux9o5G7fdsskrV9ej8rw3I80LhNUUgqmvwCY8izozZcvo5tGt1owfoGJhoEVtgcXg2da2gJa0JYESseRJ8gvyOYSGlxUkScYFoBoJB+RZrR+H2sWx2vEQrnv0pa4HYkFqF7UHrefRdjE5zQQFAp/Nqwf8XNePZ+AHq5sOPv4fGP4AAAAASUVORK5CYII="
+ 
+ class Contrast {
+     inherit Palette
diff --git a/sci-chemistry/imosflm/imosflm-1.0.7-r1.ebuild b/sci-chemistry/imosflm/imosflm-1.0.7-r1.ebuild
new file mode 100644
index 000000000000..505de7df3ab2
--- /dev/null
+++ b/sci-chemistry/imosflm/imosflm-1.0.7-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/imosflm/imosflm-1.0.7-r1.ebuild,v 1.1 2014/04/08 13:12:57 ssuominen Exp $
+
+EAPI=4
+
+inherit eutils multilib toolchain-funcs versionator
+
+MY_PV="$(delete_all_version_separators ${PV})"
+
+DESCRIPTION="A new GUI for the Mosflm crystallographic data processing tool"
+HOMEPAGE="http://www.mrc-lmb.cam.ac.uk/harry/imosflm"
+SRC_URI="${HOMEPAGE}/ver${MY_PV}/downloads/${P}.zip"
+
+LICENSE="ccp4"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-lang/tcl
+	>=dev-tcltk/itcl-3.3
+	>=dev-tcltk/itk-3.3
+	>=dev-tcltk/iwidgets-4
+	>=dev-tcltk/tdom-0.8
+	>=dev-tcltk/tkimg-1.3
+	>=dev-tcltk/tktreectrl-2.1
+	dev-tcltk/anigif
+	dev-tcltk/combobox
+	dev-tcltk/tablelist
+	>=sci-chemistry/mosflm-7.0.9"
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-libpng16.patch
+}
+
+src_install(){
+	rm -rf lib/{*.so,anigif,combobox}
+
+	insinto /usr/$(get_libdir)/${PN}
+	doins -r "${S}"/{src,bitmaps,lib}
+	fperms 775 /usr/$(get_libdir)/${PN}/src/imosflm
+
+	cat >> "${T}"/23imosflm <<- EOF
+	IMOSFLM_VERSION="${PV}"
+	EOF
+
+	doenvd "${T}"/23imosflm
+
+	make_wrapper imosflm /usr/$(get_libdir)/${PN}/src/imosflm
+}