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

Package-Manager: portage-2.2.0_alpha75_p11/cvs/Linux x86_64

diff --git a/dev-tcltk/tkimg/ChangeLog b/dev-tcltk/tkimg/ChangeLog
index f8e88f4a1e051bdbe5e656198822593bb390f9ff..7dc2922c34544e0a2296bada4986900a9a10bd72 100644 (file)
--- 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/Manifest b/dev-tcltk/tkimg/Manifest
index 010cfb278b86115dad13062cc3a004ce6991c0ba..3b7a6edf4f3c5124df30d6debbc3f12e03490395 100644 (file)
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -4,15 +4,17 @@ Hash: SHA512
 AUX tkimg-1.4.20100510-boolean.patch 373 RMD160 ff69fb2a48110947f38e30a0fe01c8827628bef8 SHA1 e9b12c418d87e7933fa64f6b183ec8802a1c9b37 SHA256 b68d29f6396bda665c5b11996a9f4c3b8295059a876ed7499509c6460e06fb97
 AUX tkimg-1.4.20100510-gentoo+use_bundled_libpng14.patch 6257 RMD160 c326a3fb052747c1494805f922a75b8f9cab455a SHA1 51b7f03a5095bcc7bd1443b9b64b4daffe4dc528 SHA256 b8b6eb2b2fe94fcb18fda0dd8d690abe963fd4e1422488942e8e9f770cafe718
 AUX tkimg-1.5_pre324-unbundle.patch 9950 RMD160 ceda455ef2abc0417eab3b5cee9473937a071f9f SHA1 c894acae64e0f408b12cb6b92048b057c2e4413a SHA256 6a83f1490ab55635cdf9d48255ad7a2910914b908ca164645afa0ed02c90a1f3
+DIST tkimg-1.4-gentoo+bundled-tiff.patch.xz 10960 RMD160 9ef4c328573de85cdd160b7d919dbb62275b8c3e SHA1 1a8f5db35619ef10dd379a65d9511ef5cf596456 SHA256 b95d57d02ef144d50565c482edcec97533683e433d845ea50f830c1359d60457
 DIST tkimg-1.4-gentoo.patch.xz 12132 RMD160 74af1404b50c971f7817fe1d9373acb7af79a0eb SHA1 9b379805e57b60a1f3828cbc52d3f0f476843665 SHA256 79dbf148134fb7862d51ab3a13c44476d41828dfce7c2b31d48510288b20e57b
 DIST tkimg1.4.tar.bz2 4912894 RMD160 a05adf3e911ce7ab9304bddd89cf53c55c27b8fc SHA1 aa519474e3eb9640977a0ea7c61da6ba5129220b SHA256 a6beb98a8f98040f979eee60c133319f4338f1a5a3ab87379fb69b473e73e3b1
-EBUILD tkimg-1.4-r3.ebuild 1669 RMD160 57128f21d3d6528c1d1318bb3c90b2af9e76f8c3 SHA1 002bdff4a6977a56698840a0ed44bd4b901c7042 SHA256 0d2b945df94716f91330e60ad374683d03dab43d51e0768cf6263e1fa12d99f6
-MISC ChangeLog 7045 RMD160 26f878c6eb16728d75501faf02c10060b99d502d SHA1 cd594b051b0db79cd143f283d6f517072316a344 SHA256 d531ef0445056635a183b2848532f97f947448520a5843ad21ab1ee0f3b8affd
+EBUILD tkimg-1.4-r3.ebuild 1669 RMD160 1d271e250579cd8f6cd36aee1830bf2168d1c3ea SHA1 35339d5cb7c21c1e48ec2a1d3495840034d21fe6 SHA256 14c45b8c890059d145b8ba6fb7c48a9ab18a1fc1bd06d42f73a670338995f26b
+EBUILD tkimg-1.4-r4.ebuild 1685 RMD160 83e69e2f06bf097e3b9331fdaf2f4c048751fd14 SHA1 81d842c82b9acd5cfa53db875c103c652d9e9cf3 SHA256 5aef98974bf06ed52900cacc4267e0f937fc92d6c81f153ba985e3012bf55499
+MISC ChangeLog 7242 RMD160 39c0b4c72bc3cf3bd9edf3a5f61604d64464e44e SHA1 e46ddf97f7804bc1fecaa10362afaad9b8fd4801 SHA256 c27b6624fbc26639a1bfce232c844f456983b2a4136e8b1287e703d948404e8a
 MISC metadata.xml 266 RMD160 d7c5f086c7291a9ac127633d31c5f78b0dbf6297 SHA1 88e958c8725427b9ce9156c4457703914a19992c SHA256 fe07b2bee63764c9cb9e3aaeac927f511dd11d3ff45e40021def110ac46cebbe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk7DkeQACgkQgAnW8HDreRaKWwCfahRLvTbr7wdYbU+p6wpJZhxU
-iMgAn0Zu3143WPWtzx8tzu3uGKSeGpmk
-=EgJT
+iEYEAREKAAYFAk7I368ACgkQgAnW8HDreRZINwCfdVNC6jCREsFzhIYMEHtuB+aS
+WucAoLk+Xr/MpeV7hFheTY9WsyMd1Nug
+=PD0I
 -----END PGP SIGNATURE-----

diff --git a/dev-tcltk/tkimg/tkimg-1.4-r3.ebuild b/dev-tcltk/tkimg/tkimg-1.4-r3.ebuild
index 22939bfe6fadd5ec6635f93da787737b073ec19f..568f94113cfa5c4d3d495410b02c72bcaf42c733 100644 (file)
--- 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 (file)
index 0000000..3b3deda
--- /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
+}