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

(Portage version: 2.2.0_alpha172/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

3 files changed, 101 insertions, 4 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/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
+}