dev-tcltk/tkimg: Fix for libpng-1.6.1, #465644

Package-Manager: portage-2.2.0_alpha172/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

4 files changed, 109 insertions, 10 deletions

diff --git a/dev-tcltk/tkimg/ChangeLog b/dev-tcltk/tkimg/ChangeLog
index fe8b2ad385c1..96507d787f6b 100644
--- a/dev-tcltk/tkimg/ChangeLog
+++ b/dev-tcltk/tkimg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tcltk/tkimg
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.57 2012/12/05 07:24:46 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.58 2013/04/12 09:11:02 jlec Exp $
+
+*tkimg-1.4-r8 (12 Apr 2013)
+
+  12 Apr 2013; Justin Lecher <jlec@gentoo.org> +tkimg-1.4-r8.ebuild,
+  metadata.xml:
+  Fix for libpng-1.6.1, #465644
 
   05 Dec 2012; Justin Lecher <jlec@gentoo.org> -tkimg-1.4-r4.ebuild,
   -tkimg-1.4-r5.ebuild, -tkimg-1.4-r6.ebuild,
diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index 08bf58bb28df..2b4e76a52945 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX tkimg-1.4-jbig.patch 910 SHA256 7ee39eb27556b3e990ff2514065a8a8c4b1e128aa1d7e2e61afb19d1e2384714 SHA512 fae1bb3d8524ebd47ca37e417b04327138308af83aa82269c5ff74f795e3a0b2334a84e66b84c80831708e95dce99f1cc295f0d755f07cad154d2c2f1520d33b WHIRLPOOL 0fda5415a005d2d219df950af1b2e36d8d64f0b5672b617964227ae11d561a9cb58ea894fb99303b525e33ee259312abaad58529af50e97a643852cc3e4b627c
 AUX tkimg-1.4-libtiff.patch 5069 SHA256 07c4f995aea0f135107a331b8df434b3af7ec934c108ace8367e61d9889c0f16 SHA512 123f3fed7121290164eefda5122cbe2705a642ca6826d96ea6be3cbc134d8ce5ed6adcb0a335599312a80fb8bf8b8d0dd35ec9f812fc25607ae489040b938e7e WHIRLPOOL e99ac303511968d2073ce247b7e0eaf3961410bd60b78d57199e7e27169186d2950179e4c092c6924f0c26cd55a054f1a153d542544a8c14fb70c47a56011f3b
@@ -7,14 +7,16 @@ AUX tkimg-1.4-libtiff4.patch 33987 SHA256 f6441799ad59afc12011b0ded8f1d2f6e45f7a
 AUX tkimg-1.4-zlib-1.2.6.patch 496 SHA256 4abf9ccffb9ddc186211b9955d52d566ecf6d9d7c3e11324dab18a86ac1dcc2d SHA512 d9b698da5abfbd5b2a921200a139e1d01244a8d983f0801e76d77ebcba15ba224707fe4290317b2fd06e0b597a254fbb2a97943c0220cd3e6fe9786f30bc4a8f WHIRLPOOL 4440cb147f9eeb0139b82d1d66e1404608b7b6ef1f9ab193eb8f5d9c6b7e74731942bb8a1a1f05bdeb82aae6b18d30fe3b2bfd12adbeb5bc6fc7ad317e1fa957
 AUX tkimg-1.4-zlib127-gzgetc_fix.patch 1518 SHA256 d44338b06f10da1f52a960e97bac6663f87dc852e20bccb1ece652fb7b430b82 SHA512 080add14d7e1edc5e0a6884a7aa9e8442c12156842c629e5a9393dcc3150a74d2a21293302fcf777a46fcc2e1f8ed3ba9e558eddd2caf35d3437112daf90bb42 WHIRLPOOL b0c9bda7f48ddeb7d36324b051d8bc11834942cdaf7e064365a61ae1ebfca901c76227cad4705788041371e2dccb7a9842c82dec4d337613e180e7cd8a3d7b38
 DIST tkimg-1.4-gentoo+bundled-tiff.patch.xz 10960 SHA256 b95d57d02ef144d50565c482edcec97533683e433d845ea50f830c1359d60457 SHA512 77155964f7b11b8f0d5d20f36fa48c90b6b3b2e1bf261933b14c4f58306ca6c92d126ddbcaadcc55c72435f690431ef93ba9bef1a4975380f6dc019e50d8103a WHIRLPOOL 926d94c1e7ff344cb354d596bbf367f4d70b00f9341d40c6cbc2f9aa4940d4cf3bb975f9f32f7b75a789095d76076e19fa347f6a6c4c930dc00d4bdf3dc36532
+DIST tkimg-1.4-patchset-1.tar.xz 17956 SHA256 b1eb9db771928ea71edb17852b23c6b760c112e3c776be51502b4f8b2cbd75f4 SHA512 bd20e0beaa224c42e856e6d44d86c2a5f04c28d096c561f44c4afcf8c821bf859c602156a9be60f23f906e8da2f43c89ca358d32e8f9497296e7c5a5bf23ed69 WHIRLPOOL 39099d752c4e6ccd96640c1287c218fff261a98e04455b9e8cba5c2aa308186916bc3583e4941c87f73323b3e46731ba2ed86358c10ab85cb6b913931585a778
 DIST tkimg1.4.tar.bz2 4912894 SHA256 a6beb98a8f98040f979eee60c133319f4338f1a5a3ab87379fb69b473e73e3b1 SHA512 b03aba6e21e35b8733dbc4fa66fae67284a05e68248e5afb2a85c1520c74d0c6c5091860a3ab682f4a662a318c562339e9b7b82f050e63bbf48d1b4757d379a1 WHIRLPOOL 0ace52c074389c09de240922c95a40ff4b1ab01d5bc060fca168396abad11a845326d15e582b039da6062c1b2780cee572299d21902947edd90195d4b99e6089
 EBUILD tkimg-1.4-r7.ebuild 2007 SHA256 559b0b849a65662a35297914bd641679e0b998b3973b1fbaa11d0777d9fe2dd3 SHA512 63c3877f5e93215360b706cc064c3ca6174de304d2d921d21f61c69d514df4e1755d8edc20cc9e3d8d3c21db402daf2d0309202382f04cbf998035b6618b17fe WHIRLPOOL 12d3a7695a89d58fc3fb33c72415c0f10ec1ede60ecb0fd5deef8e522205eb7ccf08c821c2ad89e66ffca363bc2bcd46c9a82a6cf840b517aa4ad3a42cb0e123
-MISC ChangeLog 9622 SHA256 8317f6d54f2bcb92f94d643b2ee280cb1fa2339dc2e73aaaf2a20d18b763c479 SHA512 6ea8e39dffae2ffcdc75ee3e5a0725160ecd56a62d699b7d78057f4f83291d8d33730ad23930b92b192bdd737b55735094c285606ec82ce8827638a5c2876eb5 WHIRLPOOL ca431558c102eac5eb8828f3328aa1d4c4a1fbdeaaf3128ecbbd6e9e09fbad82d1abbae8032b7f215a35ceb99e254477927bf8f9c3079c7bba536069e2d943df
-MISC metadata.xml 266 SHA256 fe07b2bee63764c9cb9e3aaeac927f511dd11d3ff45e40021def110ac46cebbe SHA512 5c39d5e104372129a084cdeb01a4e83c6c38892336deacb42e67a5cbfa7d16fd7b0d91409efcbcbccefdddb49b77b380ad8720335f126f3b592c0e99e1e2ba8e WHIRLPOOL 6ee7f4e916fb5ae931ca42d910e3e5c3055f87d98e1bcb92c64587788a95b200c3688e345e43918b6c5383185ef9f0860ef5174f3b344f4f13e8de91d24c3344
+EBUILD tkimg-1.4-r8.ebuild 1886 SHA256 b91b4641176de72f7bfb82c57f1d4a2368d90f0d0a26a43cb9612fbdb4960161 SHA512 937365b13bc10d6ddbfcbf7b59257557963838efb27a7d7c5a8bf1a618f8a9aba965e364b69ffc0298775e8c09d1a53b9e65f47af4477a1613f3521c796d30b0 WHIRLPOOL 6744aef418489596f6720a06a512bf69e8d851fa744872de317521772ff15fb3199af434d6d15825e0e4ec0c1a9816dfb37e4b287727af1de0dc64a852d02a45
+MISC ChangeLog 9769 SHA256 9733ea43b84cf24ff140248923c5092dd8ea0c726baafcc9bc0bd8c78134e475 SHA512 c1bde5ab502c69b42dc5ead93d4ee3b5c2e009243230329aacaddd37d98857e5132c854dbe864a256e1a20d7e690fe8de57df887618d56958c48220bc011a633 WHIRLPOOL b0179408bb85980b7dbdfdd99cdb9fe5d26483448d52fe854a00b5852e3ab8f633ceabea95284908dd89a696ac697ba0f9c328d969fc386b83bbb3f86b97f673
+MISC metadata.xml 268 SHA256 46e93319147e9bd7c28fd2b86953f51adf3b5614cadce70b4e8ffec42a6065f0 SHA512 82c879c78438886cd731e62bd1e04202c9400c8b4fc68f348ad97f0c32591ad4c55e1e721c8ca51bb25b6561cb0739c3003dcc09abff6fb6c2e32a32a1dec857 WHIRLPOOL 5bc269fe4fa4ead158d84c1c4aa1f114799aa143df31d394beae6f57c23a780fd48f61ca3dfe059c0c6971b7a076afd67abb2af37f1213913e3d517fe1c69561
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlC+9r4ACgkQgAnW8HDreRbmcgCglJRZBa2e9dYh7OglunYF3nLw
-9AwAoJP6tM7y5C1tFuJLL/uSKNxS1250
-=N+gj
+iEYEAREKAAYFAlFnz6wACgkQgAnW8HDreRbYvwCgoDbs1ip6z/ImjTwnYqtKUflg
+9ocAoLIcQepQqkAhKogl9j0cioTiqvVn
+=jk6V
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tkimg/metadata.xml b/dev-tcltk/tkimg/metadata.xml
index 6c44e51dcb60..0ea5b774b691 100644
--- a/dev-tcltk/tkimg/metadata.xml
+++ b/dev-tcltk/tkimg/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tcltk</herd>
-	<longdescription lang="en">
+  <herd>tcltk</herd>
+  <longdescription lang="en">
   The "Img" package adds a lot of image formats to Tcl/Tk.
 </longdescription>
 </pkgmetadata>
diff --git a/dev-tcltk/tkimg/tkimg-1.4-r8.ebuild b/dev-tcltk/tkimg/tkimg-1.4-r8.ebuild
new file mode 100644
index 000000000000..2397ce165214
--- /dev/null
+++ b/dev-tcltk/tkimg/tkimg-1.4-r8.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4-r8.ebuild,v 1.1 2013/04/12 09:11:02 jlec Exp $
+
+EAPI=5
+
+VIRTUALX_USE=test
+
+inherit eutils multilib prefix toolchain-funcs virtualx
+
+MYP="${PN}${PV}"
+
+DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
+HOMEPAGE="http://tkimg.sourceforge.net/"
+SRC_URI="
+	http://dev.gentoo.org/~jlec/distfiles/${P}-patchset-1.tar.xz
+	mirror://sourceforge/${PN}/${PV}/${MYP}.tar.bz2"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test static-libs"
+
+RDEPEND="
+	dev-lang/tk
+	>=dev-tcltk/tcllib-1.11
+	media-libs/tiff:0
+	media-libs/libpng:0
+	>=sys-libs/zlib-1.2.7
+	x11-libs/libX11
+	virtual/jpeg"
+DEPEND="${RDEPEND}
+	test? (
+		x11-apps/xhost
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc )"
+
+# Fails with jpeg-turbo silently, #386253
+RESTRICT="test"
+
+S="${WORKDIR}/${MYP}"
+
+src_prepare() {
+	epatch \
+		"${WORKDIR}"/${P}-jpeg.patch \
+		"${WORKDIR}"/${P}-tiff.patch \
+		"${WORKDIR}"/${P}-png.patch \
+		"${WORKDIR}"/${P}-zlib.patch
+
+	find compat/{libjpeg,libpng,zlib,libtiff} -delete
+
+	sed \
+		-e 's:-O2 -fomit-frame-pointer::g' \
+		-e 's: -pipe::g' \
+		-i */configure  || die
+
+	eprefixify */*.h
+	tc-export AR
+}
+
+src_test() {
+	Xemake test || die "Xmake failed"
+}
+
+src_install() {
+	local l bl
+
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_ROOT="${D}" \
+		install
+
+	if ! use static-libs; then
+		find "${ED}"/usr/$(get_libdir)/ -type f -name "*\.a" -delete || die
+	fi
+
+	# Make library links
+	for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
+		bl=$(basename $l)
+		dosym Img1.4/${bl} /usr/$(get_libdir)/${bl}
+	done
+
+	dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins demo.tcl
+		insinto /usr/share/doc/${PF}/html
+		doins -r doc/*
+	fi
+}