dev-tcltk/blt: Add fix for tk8.6

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

6 files changed, 163 insertions, 13 deletions

diff --git a/dev-tcltk/blt/ChangeLog b/dev-tcltk/blt/ChangeLog
index fe101a41a087..ad5508f28365 100644
--- a/dev-tcltk/blt/ChangeLog
+++ b/dev-tcltk/blt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tcltk/blt
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v 1.64 2012/12/05 07:22:37 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v 1.65 2013/01/09 21:27:59 jlec Exp $
+
+*blt-2.4z-r11 (09 Jan 2013)
+
+  09 Jan 2013; Justin Lecher <jlec@gentoo.org> blt-2.4z-r10.ebuild,
+  +blt-2.4z-r11.ebuild, +files/blt-2.4z-tk8.6.patch, metadata.xml:
+  Add fix for tk8.6
 
   05 Dec 2012; Justin Lecher <jlec@gentoo.org> blt-2.4z-r10.ebuild:
   Respect RANLIB, #444076
diff --git a/dev-tcltk/blt/Manifest b/dev-tcltk/blt/Manifest
index a4c5d123e471..5dc780a10eff 100644
--- a/dev-tcltk/blt/Manifest
+++ b/dev-tcltk/blt/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX blt-2.4z-darwin.patch 1186 SHA256 3cbdbbf123aeb4b4a727704c2daabddb7a4a44e23c2d0bd7652c0b0b0aa8d297 SHA512 31941da432004eec1837fda164365327e39f44345581c8f87d6c37e95ed609b61ee6420e832c67b91277418ff232cc1b6c7ee85cd5e9a8859bf8530e16d354c5 WHIRLPOOL 33a3fce0e6066e975ee2d564ae7176cfb4220f3371576531e4be3821a7cc43c96cd80892bb138006f5ce4dc38e1c970e68640b0e565a45634cc12427454730ac
 AUX blt-2.4z-gbsd.patch 1980 SHA256 b020b0043847bc05bda1b5c4c96c888dc0075ba3ef397bbb4af8181c20c69ce9 SHA512 9e3b833445f998af5c070d755c4c6904d78175640b771abc020289c857bb12ab82fdd504eebc16771c3b057b94643d20acf4eb5952184ca2d2f9233ecd55f92c WHIRLPOOL f2c43489ee0edf9fda259e4d9f03deac98432ece74fb01c9d97ef2b294d0d52b86d7601a754e004b859a0f0965a403ff98f657f360a06b07b75a51f72872da6a
@@ -8,17 +8,19 @@ AUX blt-2.4z-linking.patch 684 SHA256 cd19df698ca40ce743c81fe2c18dce615a6db385c6
 AUX blt-2.4z-r4-fix-makefile.patch 817 SHA256 fd8ada3720c85856770f4770a93f4e668a75de3cf68d35d25597215996e023e8 SHA512 c3b9aedc9c0557a10f66f0d1f9e61a028367e190fcb49ae0af8acdacc5a466168f4a1f26012a8b4f6aceb644adc532bcf0e1348cd0231efd821b66107cf5c7b9 WHIRLPOOL 2f54db3233eb62e805d072448d31c5dd7c69d8fb15aec902a1f12c8b7e82aa6ff9604504b1b021a4dbaf3b00cc2ee0974bb0f5bd0f176f475b41c8a6a3fc0e70
 AUX blt-2.4z-r4-fix-makefile2.patch 728 SHA256 aece52e1771d097498cf88bb1fe286ac698a46af0d07163c4b9d184440ab7d39 SHA512 5f9b5ab26101bf89bb7161bd4bfb4974144c61ae692f67b7598fe0c42929f84b14ac459fdfc29a1436b64924085b8047c90a84501c031f9d8575d4dc38c22681 WHIRLPOOL d76b7c2e350e562401a4b247b6f29e4286c35c2ca100e8b28892d63bf5874bfe1e3d8ef817bde66a43c3b2c2d81d6af8b08a87622d97d783c1e1480bb472ce87
 AUX blt-2.4z-tcl8.5-fixpkgruntime.patch 1976 SHA256 a44ed43bbb946d8fc11bb8f416680a536ffc7c0d78faf33030ec378d67d3d287 SHA512 036cc9672c6c5f7554ab883d89602f8ead92c7533fb45742a082b97162f32d6442ac52e1e4f7154d669d917915b840cc6191ae544e1261e430222e0a293c0f41 WHIRLPOOL b3089b7ca520990ebd7fd1160342538e086a5414a049f6affa8a67020df889579ef4d0c5c683b75e0cbfc99deb7ca823c96396ddaac024f4ffde8c3ddc02b5c4
+AUX blt-2.4z-tk8.6.patch 781 SHA256 3d9b1c70c1b347dd9406993fe99c371c95dae42848ab8f9ec573e585545070da SHA512 429d24edf55668827e638647e51131083b879d068d65c6d5d4f4665b42d7e02b26760bc78b8aaee5e089fa48b674a81d8cf861220493a7390aadba814a789602 WHIRLPOOL 898235c52cb2dab35ece7930d9f8339941cde63e76aca8fb10a4667d1a6d6c5d518aa736e03b75d46d6f47b1bf89aa9d73aeb8d7ef9b6128cc0ee009c6153880
 AUX blt2.4z-64bit.patch 891 SHA256 a0a3da1016eea86279d1648f4390b38083484582bdb5b7e460435408000ca2f5 SHA512 fee84b20e3cf8491567c11ed1cff3955963b68deda2d4d8a91b48691aa50d83db45a6aa4d86f80f8dd38b0b6bb1f68a1324e9f6805cc10fde2bcfb45f03f71e4 WHIRLPOOL 0140bbb6431cc958eb053d1483ede5a8599fb25c2cc6e7fa6674821eeb3e327b3082933c225b62c9d5f29090cc8f0602bc21068f51f9f447b9cf410b2416346f
 AUX blt2.4z-install.diff 1057 SHA256 6849139557c2846c332c4d81b04c03872933adfef0fa8432d6b757cfd02774c8 SHA512 2786eb7d59ef4f3e0b2e846f906e6f92cece13b8003ed220ddcdd22b42b761fa6aa31905a3a62af54e02db96bda37e21fae2361589d8c393586c37bcd33ef842 WHIRLPOOL a0db9fdc9d2199ac0e217015826a0ffe7b70c619e55e85a13a941202be3a325356cde627714d16d315f1647b5f95d16a6219720048b14560fdf7445c170995b2
 AUX pkgIndex.tcl 146 SHA256 79ff9c41afa3157d6f180dce21ddf82f5a55ed24a274eea0eeef511ec2f2659d SHA512 fedb327153b670f370773c1b57f7f831c291962fb375e27ba0b31314a94128edc7a4e6b9377e7c19426beb672fcb9b1b10f7e45ca0f197e19863b40d27bef439 WHIRLPOOL b3f6534323e28097656cfd2ff42433e07460d6dc3b247ed666712b7e664e086421640ff2320e8d71e5037e07fcefd690b845c9dd08e54baf0562c8659919bc6d
 DIST blt2.4z-8.5.2.tar.gz 2326234 SHA256 e4e60628f79e1899175b51a3398133131fac52021b9b9019b4483525c48d6d16 SHA512 afc465ba47ae43a0c6be17400d0a572dccd8c2a8adfd8fc3ed50f9ec28d02129f069d88096c1428c4b242550131092b4141035d7ce90c9e7181ccf712502f09a WHIRLPOOL a00a029e075916dd7656ca85acb308a48e6d80563a91ada9e9e7df7518ef0d4de2200b54e5d9c8a9602520c03472e73968956c0df30afb8ef7f7b364fdd5524f
-EBUILD blt-2.4z-r10.ebuild 3763 SHA256 d30222223816dd75f5fcc2df180a1334063e79342f3fa16b99b69579b6e903f0 SHA512 95cf88275dd99a21e384883a14d94aadd323472749e869b30209e059c7d4c225abae18f68fa392dd1c7472b663369861755aaf1dc66b08647302e2c1ed78070c WHIRLPOOL b6aaad74180930ac4c4a97ef4eb581dc01cc6964347620a749f0dadce361c50441f99b0dfa603cd7508df2fc7331ce810fcac49b0c5273a6d1f6173dfd059b6c
-MISC ChangeLog 8491 SHA256 beec8f8aaff16caf4be5d1b1234b4251faef0c795edbec91f678c3f6f6981075 SHA512 28cf7bb8cbe8c013806fb3e98fc5157cf761ce26f966d572b5aae7965011f64df6a316edf63e1f4f0281d19c70ae4ab1bb00eac803538a85dfcd9f798ebde3c9 WHIRLPOOL ff0ef9ad0601a971a78379a0960aa9f1d7a69c3235e011e6deaaefb553eb4e28039d922dd3b4b4e3a0565fa31c435a27ec8e0ab43a2f63162528fcada348381d
-MISC metadata.xml 159 SHA256 fe5eea9a276e11191a0c8e266e6dc128c3dd73347bb01020814acb0863316029 SHA512 7072291f336a01c6b6b0da289ab72b58c47062f94a06fed23a4982b776b5711df68662a3d8ff3a6954e2699817bda9780e01920056e29164944ead4d0fe815b6 WHIRLPOOL cb245ca2202ce7a680a703d76cf8dcb11e7627fddcc3c0bd9127855263f0e3d48db44511c2257ae793a0cb1d4a7764ffba5ceb992ff1a351d8f8a7ab96307683
+EBUILD blt-2.4z-r10.ebuild 3762 SHA256 cbbde88fb8433295982c6e22d6fdb6d81ead24555ca743943bbc79376a7eba4d SHA512 ab8231ee769828d8784bbb14c62a2ae64efc38d06b7e2fbdb5e35fc882daf90a41c17826b678f1d21ec9bb03ea7fc04f41b0dbd98a413bde6fbb2617d0a70864 WHIRLPOOL dd5f7126b224c74800aa7348889d145acd36022123371d2bde1908a12642f25bbadcc8285924f1de0e2fd13183e703bd35fd8e3203007f6ca5194130b2d568a5
+EBUILD blt-2.4z-r11.ebuild 3756 SHA256 3024c1f62b4d52cf24f0f219db21a1bf681bd337c2ff0ea2f5eb9d08aa0c3538 SHA512 5bfd4b17d0ade67424f4965030cc3a06e1e49308d7f45fbb3c5ae7a88bfa10df7dd72f2145bd475341d1d1daa22fb928466cd95f996b54b56cc02f52d30447d6 WHIRLPOOL 87d2e023d168d7955fd30e24a6f13b82ca436f99f77f563abe2991c7f63100b9d46ba0d76431aecd0430688faece72fe988e9ccacf910ea766d5f313a28d19fc
+MISC ChangeLog 8676 SHA256 97b1b31924f80d843a6c269199c761e50ded7d18df7a0eec0eb435bebf9a1d4d SHA512 3d4ae879b2789a29b6c1fdeaa638f19de2e3f729f0e223b0a0e1a44440006b979ab46cd1168faf72d4774914c85db4669e2b0162b0a6c49722b236fadfd75a0d WHIRLPOOL 76650b527a9e9e47d402b836885bf4d652f9714ae6f1a7227e3079bb11a8b7fecbe8e35be5697b768e53c059770dc97ae35706fbc7175e2375bb482ed2e52046
+MISC metadata.xml 160 SHA256 225a6f78d287329cdf2f4ed57468be28bd6565fd9a62207c2cc48e25ac9d3537 SHA512 a50627bda9ed953daf422b5a2e89b5b64e296d1a023d767c8a4ebb2cd51cd0036cecce455762a54e7d669f94d17d9de21052bac94fc08b1365ef42eb2f267742 WHIRLPOOL 61fa22d50aaf2bdecc467e26c9675cf7949ad55a4a8821730c91d1bd73f83fc4c35660851961310efa450e337a7ef572a925e186b8b05984d6315efc509fd365
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlC+9j0ACgkQgAnW8HDreRbkwQCfSApQ9wNWanUgGkhNR1qa12DM
-kkcAn0K107wbihbBt8UYefnJmNA+Nyiv
-=ORXY
+iEYEAREKAAYFAlDt4OAACgkQgAnW8HDreRbq7QCgpR2c/Vq2zukhuBVIHoKJfjSb
+d5YAn14U1LMIYJmq8/IZTDJuZHFa7fd1
+=ZT8n
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/blt/blt-2.4z-r10.ebuild b/dev-tcltk/blt/blt-2.4z-r10.ebuild
index 583af60e708d..093ea925e694 100644
--- a/dev-tcltk/blt/blt-2.4z-r10.ebuild
+++ b/dev-tcltk/blt/blt-2.4z-r10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r10.ebuild,v 1.15 2012/12/05 07:22:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r10.ebuild,v 1.16 2013/01/09 21:27:59 jlec Exp $
 
 EAPI="3"
 
@@ -79,7 +79,6 @@ src_configure() {
 		--with-gnu-ld \
 		$(use_enable jpeg) \
 		$(use_with X x)
-
 }
 
 src_compile() {
diff --git a/dev-tcltk/blt/blt-2.4z-r11.ebuild b/dev-tcltk/blt/blt-2.4z-r11.ebuild
new file mode 100644
index 000000000000..25a9af3aa876
--- /dev/null
+++ b/dev-tcltk/blt/blt-2.4z-r11.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r11.ebuild,v 1.1 2013/01/09 21:27:59 jlec Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+MY_V_SUFFIX="-8.5.2"
+
+DESCRIPTION="Extension to Tk, adding new widgets, geometry managers, and misc commands"
+HOMEPAGE="
+	http://blt.sourceforge.net/
+	http://jos.decoster.googlepages.com/bltfortk8.5.2"
+SRC_URI="
+	http://dev.gentoo.org/~jlec/distfiles/${PN}${PV}${MY_V_SUFFIX}.tar.gz
+	http://jos.decoster.googlepages.com/${PN}${PV}${MY_V_SUFFIX}.tar.gz"
+
+IUSE="jpeg static-libs X"
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="
+	dev-lang/tk
+	jpeg? ( virtual/jpeg )
+	X? ( x11-libs/libX11 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}${PV}${MY_V_SUFFIX}"
+
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+	epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile.patch"
+	epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile2.patch"
+	# From blt-2.4z-6mdk.src.rpm
+	epatch "${FILESDIR}"/blt2.4z-64bit.patch
+
+	#epatch "${FILESDIR}"/blt-2.4z-tcl8.5-fix.patch
+	epatch "${FILESDIR}"/blt-2.4z-tcl8.5-fixpkgruntime.patch
+
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+
+	# Set the correct libdir and drop RPATH
+	sed \
+		-e "s:\(^libdir=\${exec_prefix}/\)lib:\1$(get_libdir):" \
+		-e 's:LD_RUN_PATH=.*$:LD_RUN_PATH="":g' \
+		-e "/RANLIB/s:ranlib:$(tc-getRANLIB):g" \
+		-i configure* || die "sed configure* failed"
+	sed \
+		-e "/^scriptdir =/s:lib:$(get_libdir):" \
+		-i Makefile.in demos/Makefile.in || die "sed Makefile.in failed"
+
+	sed \
+		-e "/AR/s:ar:$(tc-getAR):g" \
+		-i src/Makefile.in || die
+
+	epatch \
+		"${FILESDIR}"/${P}-linking.patch \
+		"${FILESDIR}"/${P}-darwin.patch \
+		"${FILESDIR}"/${P}-gbsd.patch \
+		"${FILESDIR}"/${P}-tk8.6.patch
+
+	append-cflags -DUSE_INTERP_RESULT -fPIC
+}
+
+src_configure() {
+	LC_ALL=C \
+	econf \
+		--x-includes="${EPREFIX}/usr/include" \
+		--x-libraries="${EPREFIX}/usr/$(get_libdir)" \
+		--with-blt="${EPREFIX}/usr/$(get_libdir)" \
+		--with-tcl="${EPREFIX}/usr/$(get_libdir)" \
+		--with-tk="${EPREFIX}/usr/$(get_libdir)" \
+		--with-tclincls="${EPREFIX}/usr/include" \
+		--with-tkincls="${EPREFIX}/usr/include" \
+		--with-tcllibs="${EPREFIX}/usr/$(get_libdir)" \
+		--with-tklibs="${EPREFIX}/usr/$(get_libdir)" \
+		--with-cc="$(tc-getCC)" \
+		--with-cflags="${CFLAGS}" \
+		--with-gnu-ld \
+		$(use_enable jpeg) \
+		$(use_with X x)
+}
+
+src_compile() {
+	# parallel borks
+	emake LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	sed \
+		-e "s:\.\./src/bltwish:${EPREFIX}/usr/bin/bltwish:g" \
+		-e "s:\.\./bltwish:${EPREFIX}/usr/bin/bltwish:g" \
+		-e "s:/usr/local/bin/bltwish:${EPREFIX}/usr/bin/bltwish:g" \
+		-e "s:/usr/local/bin/tclsh:${EPREFIX}/usr/bin/tclsh:g" \
+		-i demos/{,scripts/}*.tcl || die
+
+	dodir /usr/bin \
+		/usr/$(get_libdir)/blt2.4/demos/bitmaps \
+		/usr/share/man/mann \
+		/usr/include
+
+	emake INSTALL_ROOT="${D}" install || die "make install failed"
+
+	dodoc NEWS PROBLEMS README
+	dohtml html/*.html
+	for f in `ls "${ED}"/usr/share/man/mann` ; do
+		mv "${ED}"/usr/share/man/mann/${f} "${ED}"/usr/share/man/mann/${f/.n/.nblt}
+	done
+
+	# bug 259338 - dev-tcltk/blt-2.4z-r4 provides empty pkgIndex.tcl
+	cp "${FILESDIR}"/pkgIndex.tcl "${ED}"/usr/$(get_libdir)/blt2.4/pkgIndex.tcl
+
+	# fix for linking against shared lib with -lBLT or -lBLTlite
+	dosym libBLT24$(get_libname) /usr/$(get_libdir)/libBLT$(get_libname)
+	dosym libBLTlite24$(get_libname) /usr/$(get_libdir)/libBLTlite$(get_libname)
+
+	use static-libs || \
+		find "${ED}"/usr/$(get_libdir) -name "*.a" -print0 | \
+		xargs -r -0 rm -fv
+}
diff --git a/dev-tcltk/blt/files/blt-2.4z-tk8.6.patch b/dev-tcltk/blt/files/blt-2.4z-tk8.6.patch
new file mode 100644
index 000000000000..f956c098138e
--- /dev/null
+++ b/dev-tcltk/blt/files/blt-2.4z-tk8.6.patch
@@ -0,0 +1,20 @@
+--- src/tkButton.c.orig	2013-01-04 23:24:45.000000000 -0500
++++ src/tkButton.c	2013-01-04 23:28:29.000000000 -0500
+@@ -526,8 +526,6 @@
+ static Blt_TileChangedProc TileChangedProc;
+ static Tcl_CmdProc ButtonCmd, LabelCmd, CheckbuttonCmd, RadiobuttonCmd;
+ 
+-EXTERN int TkCopyAndGlobalEval _ANSI_ARGS_((Tcl_Interp *interp, char *script));
+-
+ #if (TK_MAJOR_VERSION > 4)
+ EXTERN void TkComputeAnchor _ANSI_ARGS_((Tk_Anchor anchor, Tk_Window tkwin, 
+ 	int padX, int padY, int innerWidth, int innerHeight, int *xPtr, 
+@@ -1890,7 +1888,7 @@
+ 	}
+     }
+     if ((butPtr->type != TYPE_LABEL) && (butPtr->command != NULL)) {
+-	return TkCopyAndGlobalEval(butPtr->interp, butPtr->command);
++	return Tcl_EvalObjEx(butPtr->interp, butPtr->command, TCL_EVAL_GLOBAL);
+     }
+     return TCL_OK;
+ }
diff --git a/dev-tcltk/blt/metadata.xml b/dev-tcltk/blt/metadata.xml
index 815cc916f2b6..70ac40499556 100644
--- a/dev-tcltk/blt/metadata.xml
+++ b/dev-tcltk/blt/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tcltk</herd>
+  <herd>tcltk</herd>
 </pkgmetadata>