Use bundled tiff so that we can have tiff-4 from tree installed, #391071

(Portage version: 2.2.0_alpha75_p11/cvs/Linux x86_64)

3 files changed, 88 insertions, 4 deletions

diff --git a/dev-tcltk/tkimg/ChangeLog b/dev-tcltk/tkimg/ChangeLog
index f8e88f4a1e05..7dc2922c3454 100644
--- a/dev-tcltk/tkimg/ChangeLog
+++ b/dev-tcltk/tkimg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tcltk/tkimg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.39 2011/11/16 10:35:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.40 2011/11/20 11:08:17 jlec Exp $
+
+*tkimg-1.4-r4 (20 Nov 2011)
+
+  20 Nov 2011; Justin Lecher <jlec@gentoo.org> tkimg-1.4-r3.ebuild,
+  +tkimg-1.4-r4.ebuild:
+  Use bundled tiff so that we can have tiff-4 from tree installed, #391071
 
   16 Nov 2011; Justin Lecher <jlec@gentoo.org> tkimg-1.4-r3.ebuild,
   -tkimg-1.4.20100510-r1.ebuild, -tkimg-1.5_pre324.ebuild,
diff --git a/dev-tcltk/tkimg/tkimg-1.4-r3.ebuild b/dev-tcltk/tkimg/tkimg-1.4-r3.ebuild
index 22939bfe6fad..568f94113cfa 100644
--- a/dev-tcltk/tkimg/tkimg-1.4-r3.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4-r3.ebuild,v 1.5 2011/11/16 10:35:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4-r3.ebuild,v 1.6 2011/11/20 11:08:17 jlec Exp $
 
 EAPI=3
 
@@ -24,10 +24,10 @@ KEYWORDS="~alpha amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
 RDEPEND="
 	dev-lang/tk
 	>=dev-tcltk/tcllib-1.11
-	virtual/jpeg
 	=media-libs/tiff-3*:0
 	media-libs/libpng:0
-	sys-libs/zlib"
+	sys-libs/zlib
+	virtual/jpeg"
 DEPEND="${RDEPEND}
 	test? (
 		x11-apps/xhost
diff --git a/dev-tcltk/tkimg/tkimg-1.4-r4.ebuild b/dev-tcltk/tkimg/tkimg-1.4-r4.ebuild
new file mode 100644
index 000000000000..3b3deda1bd08
--- /dev/null
+++ b/dev-tcltk/tkimg/tkimg-1.4-r4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4-r4.ebuild,v 1.1 2011/11/20 11:08:17 jlec Exp $
+
+EAPI=3
+
+VIRTUALX_USE=test
+
+inherit eutils prefix 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}-gentoo+bundled-tiff.patch.xz
+	mirror://sourceforge/${PN}/${PV}/${MYP}.tar.bz2"
+
+IUSE="doc test"
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-lang/tk
+	>=dev-tcltk/tcllib-1.11
+	media-libs/tiff:0
+	media-libs/libpng:0
+	sys-libs/zlib
+	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}-gentoo+bundled-tiff.patch
+	find compat/{libjpeg,libpng,zlib} -delete
+	sed \
+		-e 's:-O2 -fomit-frame-pointer::g' \
+		-e 's: -pipe::g' \
+		-i */configure  || die
+	eprefixify */*.h
+}
+
+src_test() {
+	Xemake test || die "Xmake failed"
+}
+
+src_install() {
+	local l bl
+
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_ROOT="${D}" \
+		install || die "emake install failed"
+
+	# 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 || die
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins demo.tcl || die
+		insinto /usr/share/doc/${PF}/html
+		doins -r doc/* || die
+	fi
+}