Unbundle libs and respect *FLAGS, #386003, #378261

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

3 files changed, 88 insertions, 10 deletions

diff --git a/dev-tcltk/tkimg/ChangeLog b/dev-tcltk/tkimg/ChangeLog
index cda9473a88cd..048b20dc189d 100644
--- a/dev-tcltk/tkimg/ChangeLog
+++ b/dev-tcltk/tkimg/ChangeLog
@@ -1,6 +1,11 @@
 # 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.31 2011/10/08 08:13:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.32 2011/10/08 13:12:04 jlec Exp $
+
+*tkimg-1.4-r2 (08 Oct 2011)
+
+  08 Oct 2011; Justin Lecher <jlec@gentoo.org> +tkimg-1.4-r2.ebuild:
+  Unbundle libs and respect *FLAGS, #386003, #378261
 
   08 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -tkimg-1.4.ebuild,
   -tkimg-1.4-r1.ebuild, -tkimg-1.4.20100510.ebuild,
diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index 3b801e885fc1..18ad7732540b 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,24 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+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.patch.xz 9388 RMD160 87bb8175360d279e815fd2ae1b3f96eefce8f4ac SHA1 dbbc083af48998651b0dbcf0bb8e27e6d460aef1 SHA256 f4b5c676dc01ce16c0bf8513299658422fe5cfbad73c0a9ab1f53eebd720ea30
 DIST tkimg-1.4.20100510.tar.bz2 4625881 RMD160 3d5a6e4186afd4487333e6b069a756810560147d SHA1 42befa7cf86c5c6271fe86bdbad2f0e0953acee1 SHA256 74b60431d6ae3767132d7f334af1a208b978d99e7b2710db84dc3da95b5ff0ae
 DIST tkimg-1.5_pre324.tar.xz 2663020 RMD160 76956a458aa9211a4e085a879e2b495c8b5c0500 SHA1 8dfa1081dac8cdd528eca4af88483a377979cd94 SHA256 e351f8f658fd82f8639a664ef32390ff143315419ce4f0eb1213d860c8be5214
+DIST tkimg1.4.tar.bz2 4912894 RMD160 a05adf3e911ce7ab9304bddd89cf53c55c27b8fc SHA1 aa519474e3eb9640977a0ea7c61da6ba5129220b SHA256 a6beb98a8f98040f979eee60c133319f4338f1a5a3ab87379fb69b473e73e3b1
+EBUILD tkimg-1.4-r2.ebuild 1570 RMD160 e63e64416c9b2ead7cf5bbf0b14ab277420882a3 SHA1 dd4f6086d30b5f4e0ca3b082da829c41cc6b069d SHA256 79f4a531f95c84cc8d782af30b85abd0d98b63aa53fc18479d205289d41b470a
 EBUILD tkimg-1.4.20100510-r1.ebuild 1543 RMD160 d1e3841fc2acda9a40dc3ad0ca6d5bca562172ce SHA1 68f40c83365fe075c0ce6ded0b7e4ab788b5caf8 SHA256 cbf46837c60ff33af43597d3cde1d7c266193d98dd6c1fbd7fdd5708b26c976e
 EBUILD tkimg-1.5_pre324-r1.ebuild 1967 RMD160 342cbc8318901c5b6f2ad28325c8978bfe7c8bcb SHA1 7697abd1df92a83e171c90a6a67c39653ccdb7f0 SHA256 7f0d8205242ea303c782324053aa3ce6e4ffb6eea7052eee614f36f910a3756b
 EBUILD tkimg-1.5_pre324.ebuild 1228 RMD160 0ed0c18b0ec7f49a05bb3c766e9f0e2972179692 SHA1 a8aafb9c3e0f2a7b48a45af7790fe5f593a80bef SHA256 97ee4ebaae30295a0bebc9e0ec8c6060aba5ceb44224bcf72abc2bf24d920986
-MISC ChangeLog 6018 RMD160 faad3ddc506e584f230389df3662eec59d497fbb SHA1 556a9ec06136503977f785a97c266f85995ef415 SHA256 621f4502fd96752faf3d96a993676adfc046f93d4afa21761be1a7cc9e0e6406
+MISC ChangeLog 6165 RMD160 05154dbff7e33839331c50d360eab720964e2b70 SHA1 8794d6cd2cc5e87fbda7434a12b6adf0e7e1370a SHA256 fbf892100886f0ff38f90fa17703a7b17cf223c438cde715fa92ac31c0f06a73
 MISC metadata.xml 266 RMD160 d7c5f086c7291a9ac127633d31c5f78b0dbf6297 SHA1 88e958c8725427b9ce9156c4457703914a19992c SHA256 fe07b2bee63764c9cb9e3aaeac927f511dd11d3ff45e40021def110ac46cebbe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOkAY9AAoJEEdUh39IaPFN0yIIAIQJXN1JcYbJm+xo2/SDCxjg
-cRLZ0rmKFrDc9aS/3qtHUKm1b+V2nmIe0UlzeWayfAH8VuKCIIHsOjy5oTjDcfUk
-mh4X+fqcDEyyDsw7cA9rDKVuS6OGFOnIngzx9Za8vqYxKiprVGUl2V8A0TA6nIEq
-Ff/0nONMN5wdZ7daPZobnQ+PBstJOWq8M4neSbzchCSiOFkXq3FcHyyW7MFrIbWV
-/ThRHGO/QGEUOW6kaO9PRmXdR/vPCw6BFNau3lROSmK20v5QSUCAQKq+CQKm1gBo
-vG+HR5b0evNSPzlLElTG3jYu2hB4rbV62t6Gm/VKR1WWcGVfUKfFytRAaA0xas8=
-=LbU+
+iEYEAREKAAYFAk6QTC4ACgkQgAnW8HDreRZ9jQCcDTka7LtY0k6bGJAPzA44QOax
+HnIAoMrTlJpiERFGai5Sj2mZMR4QDLf9
+=D0FS
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tkimg/tkimg-1.4-r2.ebuild b/dev-tcltk/tkimg/tkimg-1.4-r2.ebuild
new file mode 100644
index 000000000000..d717aed6b525
--- /dev/null
+++ b/dev-tcltk/tkimg/tkimg-1.4-r2.ebuild
@@ -0,0 +1,74 @@
+# 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-r2.ebuild,v 1.1 2011/10/08 13:12:04 jlec Exp $
+
+EAPI=3
+
+VIRTUALX_USE=test
+
+inherit autotools eutils prefix virtualx
+
+MYP="${PN}${PV}"
+
+DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
+HOMEPAGE="http://tkimg.sourceforge.net/"
+SRC_URI="
+	${P}-gentoo.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"
+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.patch
+	find compat/{libjpeg,libpng,libtiff,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
+}