add tcl85 patch. fixes bug #250354

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

4 files changed, 80 insertions, 13 deletions

diff --git a/dev-tcltk/tix/ChangeLog b/dev-tcltk/tix/ChangeLog
index 4bfd5d95d9ff..172c3b37285b 100644
--- a/dev-tcltk/tix/ChangeLog
+++ b/dev-tcltk/tix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tcltk/tix
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tix/ChangeLog,v 1.23 2008/04/27 20:09:05 maekke Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tix/ChangeLog,v 1.24 2009/04/17 20:22:49 mescalinum Exp $
+
+*tix-8.4.2-r2 (17 Apr 2009)
+
+  17 Apr 2009; Federico Ferri <mescalinum@gentoo.org>
+  +files/tix-8.4.2-tcl85.patch, +tix-8.4.2-r2.ebuild:
+  add tcl85 patch. fixes bug #250354
 
   27 Apr 2008; Markus Meier <maekke@gentoo.org> tix-8.4.2-r1.ebuild:
   amd64 stable, bug #211972
diff --git a/dev-tcltk/tix/Manifest b/dev-tcltk/tix/Manifest
index b8e155b270b5..89a064d089d9 100644
--- a/dev-tcltk/tix/Manifest
+++ b/dev-tcltk/tix/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX tix-8.2.0-gentoo.diff 9779 RMD160 97d7378aa2006bbafaa73781e03323bd4228d445 SHA1 58507fadb72fa0bdeb5ffb7d4dfaa9e6643b7e61 SHA256 a5beac4da80e3166a24be171dd9d253cf12a5c6cd030f41fec3eabaac31d08f0
+AUX tix-8.4.2-tcl85.patch 765 RMD160 3d7db3ef6252a0eca25121ba60487dadf4305074 SHA1 ca982f9eae18b49e66cca4969184349782c655fb SHA256 614eea5e55c6ab61d6010bf91e4eb6b7d588e635d277b0273f157df4378efd35
 DIST Tix8.4.2-src.tar.gz 1828189 RMD160 98145818e58e3520013fc0bd2ec5fef82222560e SHA1 2872e371c4f0ab01e4cfeaca526ed43eddf96486 SHA256 3a6987d94f7857665573712eb1f18c8994c68a6d238d8783d61884a5515148ab
 DIST tix-8.4.0.tar.gz 1820202 RMD160 7307402c9e11371e03fc8ae0263cbbaa33587123 SHA1 a967aa3c71eeef7e9b5af591cb70f5a9d589e4a2 SHA256 debe3ac9b148b0559a13c54edfdab6f005741ecf8972de11694b0296493b596d
 DIST tix8.2.0b1.tar.gz 1374621 RMD160 1a80662812ce2b97f7d052f77556de6782f5ee47 SHA1 c9114e56c41fc492532639127439d6f267c51402 SHA256 77ec8071e14445a183e92b7bb14f05d2da0e08dca97f548741a24356bd8961f9
 EBUILD tix-8.2.0-r1.ebuild 1091 RMD160 c8ca564743ca6b5b324c30943dea6a6e0c89ed5a SHA1 6269bf1c4290a3db0d5509208845ed7265b27416 SHA256 b2b918608d0bca9c9f1aa41d8d37e4c194f8388aa9333f68f2b1356e0fed9425
 EBUILD tix-8.4.0.ebuild 715 RMD160 14559f226d769f741de1db5605bc70f2e8e8a4dc SHA1 5d78ec6ae20d3453c936a51645e7d6d47a0a9d51 SHA256 2e3fae896600cd96ee330c6f1011c060d1aaf59046df8ce4f78391c4e928aab7
 EBUILD tix-8.4.2-r1.ebuild 914 RMD160 81cc0e1dfb715c3bfb3686e6f7eacc8947a66d41 SHA1 4064ba7a48a6cfcbcfccef2933426dc93e6d0f4f SHA256 e2fea3fc4d50cc111ab04edff94a013db54733c35df9fcc05b3606fc558508fa
+EBUILD tix-8.4.2-r2.ebuild 991 RMD160 5238ee75fcf6a7b748e89ffb84f829dc6b632f44 SHA1 a74823525dcb47f3488a48e8c7f634ea90adde85 SHA256 42855d3fa70ce24e5ce50d283ec2cc7ab88a4ec7b210d7dc45aef8984c50adf3
 EBUILD tix-8.4.2.ebuild 822 RMD160 3c5b20b2dca92d2da11d3a5bfaccb8c54130555a SHA1 e866adac10619ab173d6d424f972c588a245f0f7 SHA256 869b4b423fcdd7d94f8a3dc217bb2fceabf84181ee52882991c9786a91932a27
-MISC ChangeLog 2925 RMD160 360cb61b187c5bf3348eea68d028b0a035fd87fd SHA1 a6a2813f2a9897f388962ee3e531776b4162da32 SHA256 a59fd5de5f4b8466fdf50d3cb0dac9c92800c34ea0696b478a7f9cdf17b940f1
+MISC ChangeLog 3104 RMD160 9583076c7508049cbb04a1aec115bcb38056f09e SHA1 42ca460a655c227399abe4855b196dc75f204a78 SHA256 31b08bc7fa44aa788a943719af78e3ce9a821e4eb9005318074cbf6888ee14d5
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgU3YgACgkQkKaRLQcq0GK3awCdHSUQfWcXFBiVieyea6hFBO9S
-CRMAmwUk4qIFwTX5qPctAN5mmjRxxg0Z
-=qVRe
------END PGP SIGNATURE-----
diff --git a/dev-tcltk/tix/files/tix-8.4.2-tcl85.patch b/dev-tcltk/tix/files/tix-8.4.2-tcl85.patch
new file mode 100644
index 000000000000..aaf995e0b6e2
--- /dev/null
+++ b/dev-tcltk/tix/files/tix-8.4.2-tcl85.patch
@@ -0,0 +1,26 @@
+Source: Mandriva - posted on http://bugs.gentoo.org/show_bug.cgi?id=250354
+Index: generic/tixPort.h
+===================================================================
+--- generic/tixPort.h
++++ generic/tixPort.h	2007-05-13 19:33:49.000000000 +0200
+@@ -21,6 +21,7 @@
+ #ifndef _TCL
+ #include "tcl.h"
+ #endif
++#include "tclInt.h"
+ 
+ #ifndef _TK
+ #include "tk.h"
+Index: generic/tixWidget.c
+===================================================================
+--- generic/tixWidget.c
++++ generic/tixWidget.c	2007-05-13 19:38:07.000000000 +0200
+@@ -228,7 +228,7 @@
+ 	    Tcl_SetVar2(interp, "errorCode", NULL, oldErrorCode,
+ 		TCL_GLOBAL_ONLY);
+ 	}
+-	iPtr->flags |= ERR_IN_PROGRESS;
++	iPtr->flags |= INTERP_TRACE_IN_PROGRESS;
+     }
+     if (rootCmd) {
+ 	ckfree(rootCmd);
diff --git a/dev-tcltk/tix/tix-8.4.2-r2.ebuild b/dev-tcltk/tix/tix-8.4.2-r2.ebuild
new file mode 100644
index 000000000000..3c5a76784f6d
--- /dev/null
+++ b/dev-tcltk/tix/tix-8.4.2-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tix/tix-8.4.2-r2.ebuild,v 1.1 2009/04/17 20:22:49 mescalinum Exp $
+
+EAPI="2"
+
+inherit eutils multilib
+
+MY_P="Tix${PV}"
+DESCRIPTION="A widget library for Tcl/Tk. Has been ported to Python and Perl, too."
+HOMEPAGE="http://tix.sourceforge.net/"
+SRC_URI="mirror://sourceforge/tix/${MY_P}-src.tar.gz"
+
+IUSE=""
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RESTRICT="test"
+
+DEPEND=">=sys-apps/sed-4
+	>=dev-lang/tk-8.4
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/"${P}-tcl85.patch"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	# Bug 168897
+	insinto /usr/include; doins generic/tix.h
+	# Bug 201138
+	dosym ${MY_P}/lib${MY_P}.so /usr/$(get_libdir)/lib${MY_P}.so || die
+
+	dodoc ChangeLog README.txt docs/*.txt
+	dohtml -r index.html ABOUT.html docs/
+}