[gentoo-commits] proj/hardened-dev:uclibc commit in: dev-lang/tk/, dev-lang/tk/files/

[Anthony G. Basile]

commit:     d56e0d4fcf33948b8b33481d51f79e7aacd1aff1
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  3 20:03:03 2012 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Nov  3 20:03:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=d56e0d4f

Avoid name collision with unshare in uclibc's <bits/sched.h>.

On a uclibc system, unshare() is defined as an extern int function
in /usr/include/bits/sched.h, while tk defines unshare as a static
Tcl_Obj in generic/ttk/ttkTreeview.c.  The name collision can be
avoided by renaming unshare in ttkTreeview.c.

X-Gentoo-Bug: xxxxx
X-Gentoo-Bug-URL: https://bugs.gentoo.org/xxxxx
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

---
 dev-lang/tk/ChangeLog                              |  697 ++++++++++++++++++++
 dev-lang/tk/files/tk-8.4.11-multilib.patch         |   24 +
 dev-lang/tk/files/tk-8.4.15-aqua.patch             |   20 +
 dev-lang/tk/files/tk-8.4.15-tclm4-soname.patch     |   12 +
 .../tk-8.5.10-fix-name-collision-uclibc.patch      |   35 +
 dev-lang/tk/files/tk-8.5_alpha6-tclm4-soname.patch |   12 +
 dev-lang/tk/metadata.xml                           |    5 +
 dev-lang/tk/tk-8.5.10-r99.ebuild                   |  114 ++++
 8 files changed, 919 insertions(+), 0 deletions(-)

diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
new file mode 100644
index 0000000..84eabe2
--- /dev/null
+++ b/dev-lang/tk/ChangeLog
@@ -0,0 +1,697 @@
+# ChangeLog for dev-lang/tk
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.173 2012/08/07 02:34:03 jer Exp $
+
+  03 Aug 2012; Mike Frysinger <vapier@g.o> tk-8.5.11-r1.ebuild:
+  Make sure we link against fontconfig since we use it.
+
+*tk-8.5.11-r1 (07 Jun 2012)
+
+  07 Jun 2012; Justin Lecher <jlec@g.o> +tk-8.5.11-r1.ebuild:
+  Drop standard lib location from tkConfig.sh equal to tcl, #420129
+
+  26 Apr 2012; Alexis Ballier <aballier@g.o> tk-8.5.11.ebuild:
+  keyword ~amd64-fbsd
+
+  26 Apr 2012; Alexis Ballier <aballier@g.o>
+  +files/tcl-8.5.9-gentoo-fbsd.patch, tk-8.5.11.ebuild:
+  port tcl fbsd patch to let it build sanely on FreeBSD: the patch is for
+  tcl.m4 and tk bundles it own unfixed version...
+
+  01 Apr 2012; Raúl Porcel <armin76@g.o> tk-8.5.10-r1.ebuild:
+  alpha/ia64/s390/sh/sparc stable wrt #406607
+
+  19 Mar 2012; Markus Meier <maekke@g.o> tk-8.5.10-r1.ebuild:
+  arm stable, bug #406607
+
+  19 Mar 2012; Justin Lecher <jlec@g.o> tk-8.5.11.ebuild:
+  Drop unnessecary stripping of slashes, #408261, thanks Kevin Pyle for the
+  patch
+
+  11 Mar 2012; Jeff Horelick <jdhore@g.o> tk-8.5.10-r1.ebuild:
+  marked x86 per bug 406607
+
+  06 Mar 2012; Jeroen Roovers <jer@g.o> tk-8.5.10-r1.ebuild:
+  Stable for HPPA (bug #406607).
+
+*tk-8.5.10-r1 (06 Mar 2012)
+
+  06 Mar 2012; Justin Lecher <jlec@g.o> -tk-8.5.10.ebuild,
+  +tk-8.5.10-r1.ebuild:
+  Revbump to force rebuild, which is needed because of the removed static
+  archives
+
+  06 Mar 2012; Justin Lecher <jlec@g.o> tk-8.5.10.ebuild:
+  Remove last bit of bad handling of static-libs, #407083
+
+  05 Mar 2012; Brent Baude <ranger@g.o> tk-8.5.10.ebuild:
+  Marking tk-8.5.10 ppc for bug 406607
+
+  05 Mar 2012; Agostino Sarubbo <ago@g.o> tk-8.5.10.ebuild:
+  Stable for amd64, wrt bug #406607
+
+  04 Mar 2012; Justin Lecher <jlec@g.o> tk-8.5.10.ebuild,
+  tk-8.5.11.ebuild:
+  Revert static-libs handling, #406905; push changes from 8.5.10 to .11
+
+  02 Mar 2012; Brent Baude <ranger@g.o> tk-8.5.10.ebuild:
+  Marking tk-8.5.10 ppc64 for bug 406607
+
+  02 Mar 2012; Justin Lecher <jlec@g.o> tk-8.5.10.ebuild:
+  Add missing dies, remove unnessecary dies, handle static-libs
+
+*tk-8.5.11 (02 Mar 2012)
+
+  02 Mar 2012; Justin Lecher <jlec@g.o> +tk-8.5.11.ebuild,
+  +files/tk-8.5.11-fedora-xft.patch:
+  Version Bump
+
+*tk-8.5.10 (04 Oct 2011)
+
+  04 Oct 2011; Justin Lecher <jlec@g.o> +tk-8.5.10.ebuild, metadata.xml:
+  Version Bump
+
+  23 Mar 2011; Kacper Kowalik <xarthisius@g.o> tk-8.5.9-r1.ebuild:
+  ppc64 stable wrt #353854
+
+  06 Mar 2011; Raúl Porcel <armin76@g.o> tk-8.5.9-r1.ebuild:
+  alpha/ia64/s390/sh stable wrt #353854
+
+  26 Feb 2011; Michael Weber <xmw@g.o> tk-8.5.9-r1.ebuild:
+  ppc/sparc stable (bug 353854)
+
+  20 Feb 2011; Markus Meier <maekke@g.o> tk-8.5.9-r1.ebuild:
+  arm stable, bug #353854
+
+  11 Feb 2011; Markos Chandras <hwoarang@g.o> tk-8.5.9-r1.ebuild:
+  Stable on amd64 wrt bug #353854
+
+  11 Feb 2011; Jeroen Roovers <jer@g.o> tk-8.5.9-r1.ebuild:
+  Stable for HPPA (bug #353854).
+
+  09 Feb 2011; Pawel Hajdan jr <phajdan.jr@g.o> tk-8.5.9-r1.ebuild:
+  x86 stable wrt bug #353854
+
+  13 Jan 2011; Kacper Kowalik <xarthisius@g.o> tk-8.5.8-r1.ebuild:
+  ppc64 stable wrt #332415
+
+  04 Jan 2011; Justin Lecher <jlec@g.o> tk-8.5.8-r1.ebuild:
+  Backport correct detection of truetype support
+
+  29 Dec 2010; Markos Chandras <hwoarang@g.o> tk-8.5.8-r1.ebuild:
+  Stable on amd64 wrt bug #332415
+
+*tk-8.5.9-r1 (09 Dec 2010)
+
+  09 Dec 2010; Justin Lecher <jlec@g.o> -tk-8.5.9.ebuild,
+  +tk-8.5.9-r1.ebuild:
+  Added missing patch for XFT handling
+
+  07 Dec 2010; Justin Lecher <jlec@g.o> tk-8.5.8-r1.ebuild,
+  tk-8.5.9.ebuild:
+  Corrected logic on die, thanks Guilherme Amadio for the patch #347929
+
+*tk-8.5.9 (06 Dec 2010)
+
+  06 Dec 2010; Justin Lecher <jlec@g.o> -tk-8.4.15-r1.ebuild,
+  tk-8.4.18.ebuild, tk-8.4.18-r1.ebuild, tk-8.4.19-r1.ebuild, tk-8.5.7.ebuild,
+  -tk-8.5.8.ebuild, tk-8.5.8-r1.ebuild, +tk-8.5.9.ebuild:
+  Version Bump, #347561; Fix for libXft recognition, #347569
+
+  24 Oct 2010; Brent Baude <ranger@g.o> tk-8.5.8-r1.ebuild:
+  Marking tk-8.5.8-r1 ppc for bug 332415
+
+  23 Oct 2010; Raúl Porcel <armin76@g.o> tk-8.5.8-r1.ebuild:
+  arm/ia64/s390/sh/sparc stable wrt #332415
+
+  20 Oct 2010; Christian Faulhammer <fauli@g.o> tk-8.5.8-r1.ebuild:
+  stable x86, bug 332415
+
+  06 Oct 2010; Jeroen Roovers <jer@g.o> tk-8.5.8-r1.ebuild:
+  Stable for HPPA (bug #332415).
+
+  03 Oct 2010; Tobias Klausmann <klausman@g.o> tk-8.5.8-r1.ebuild:
+  Stable on alpha, bug #332415
+
+  08 Jul 2010; Sébastien Fabbro <bicatali@g.o> tk-8.5.8-r1.ebuild:
+  Added an xscreensaver flag to avoid automagic
+
+  16 Jun 2010; Justin Lecher <jlec@g.o> tk-8.5.8-r1.ebuild:
+  Compile in src_compile, fix for 324201
+
+
+  15 Jun 2010; Justin Lecher <jlec@g.o> tk-8.5.8-r1.ebuild:
+  Removing epause reported in bug 324139
+
+*tk-8.5.8-r1 (15 Jun 2010)
+
+  15 Jun 2010; Justin Lecher <jlec@g.o> +files/tk-8.4.15-aqua.patch,
+  +tk-8.5.8-r1.ebuild:
+  QA, imported prefix changes
+
+*tk-8.5.8 (07 Jan 2010)
+
+  07 Jan 2010; Patrick Lauer <patrick@g.o> +tk-8.5.8.ebuild:
+  Bump for #297448
+
+  07 Oct 2009; Raúl Porcel <armin76@g.o> tk-8.5.7.ebuild:
+  ia64/s390/sh/sparc stable wrt #280845
+
+*tk-8.5.7-r1 (06 Oct 2009)
+
+  06 Oct 2009; Federico Ferri <mescalinum@g.o> +tk-8.5.7-r1.ebuild:
+  normalize $S path, bug #280766 (pkgcore)
+
+  27 Sep 2009; Markus Meier <maekke@g.o> tk-8.5.7.ebuild:
+  arm stable, bug #280845
+
+  22 Sep 2009; Markus Meier <maekke@g.o> tk-8.5.7.ebuild:
+  amd64 stable, bug #280845
+
+  31 Aug 2009; Brent Baude <ranger@g.o> tk-8.5.7.ebuild:
+  Marking tk-8.5.7 ppc64 for bug 280845
+
+  29 Aug 2009; nixnut <nixnut@g.o> tk-8.5.7.ebuild:
+  ppc stable #280845
+
+  29 Aug 2009; Tobias Klausmann <klausman@g.o> tk-8.5.7.ebuild:
+  Stable on alpha, bug #280845
+
+  27 Aug 2009; Jeroen Roovers <jer@g.o> tk-8.5.7.ebuild:
+  Stable for HPPA (bug #280845).
+
+  18 Aug 2009; Christian Faulhammer <fauli@g.o> tk-8.5.7.ebuild:
+  stable x86, bug 280845
+
+  07 May 2009; Tobias Klausmann <klausman@g.o> tk-8.4.18-r1.ebuild:
+  Stable on alpha, bug #268174
+
+  06 May 2009; Kenneth Prugh <ken69267@g.o> tk-8.4.18-r1.ebuild:
+  amd64 stable, bug #268174
+
+  06 May 2009; Jeroen Roovers <jer@g.o> tk-8.4.18-r1.ebuild:
+  Stable for HPPA (bug #268174).
+
+  06 May 2009; Ferris McCormick <fmccor@g.o> tk-8.4.18-r1.ebuild:
+  Sparc stable, bug #268174.
+
+  06 May 2009; Christian Faulhammer <fauli@g.o> tk-8.4.18-r1.ebuild:
+  stable x86, bug 268174
+
+  06 May 2009; Brent Baude <ranger@g.o> tk-8.4.18-r1.ebuild:
+  Marking tk-8.4.18-r1 ppc64 and ppc for bug 268174
+
+*tk-8.5.7 (17 Apr 2009)
+
+  17 Apr 2009; Federico Ferri <mescalinum@g.o> -tk-8.5.1.ebuild,
+  -tk-8.5.6.ebuild, +tk-8.5.7.ebuild:
+  bump to version 8.5.7
+
+  25 Feb 2009; Raúl Porcel <armin76@g.o> tk-8.4.19-r1.ebuild,
+  tk-8.5.6.ebuild:
+  Add ~s390
+
+*tk-8.5.6 (17 Jan 2009)
+
+  17 Jan 2009; Federico Ferri <mescalinum@g.o> -tk-8.5.5.ebuild,
+  +tk-8.5.6.ebuild:
+  version bump, #253571
+
+*tk-8.4.19-r1 (16 Nov 2008)
+
+  16 Nov 2008; Federico Ferri <mescalinum@g.o> -tk-8.4.19.ebuild,
+  +tk-8.4.19-r1.ebuild:
+  rev bump, fixes bug #246774
+
+*tk-8.4.18-r1 (27 Oct 2008)
+
+  27 Oct 2008; Federico Ferri <mescalinum@g.o>
+  +files/tk-8.4-lastevent.patch, +tk-8.4.18-r1.ebuild, tk-8.4.19.ebuild:
+  adding patch 8.4-lastevent, fixes bug #225999
+
+*tk-8.4.19 (26 Oct 2008)
+
+  26 Oct 2008; Federico Ferri <mescalinum@g.o> +tk-8.4.19.ebuild:
+  version bump for 8.4 too
+
+*tk-8.5.5 (26 Oct 2008)
+
+  26 Oct 2008; Federico Ferri <mescalinum@g.o> +tk-8.5.5.ebuild:
+  version bumped
+
+  07 Mar 2008; Christoph Mende <angelos@g.o> tk-8.4.18.ebuild:
+  Stable on amd64, bug #210326
+
+  25 Feb 2008; Jeroen Roovers <jer@g.o> tk-8.4.18.ebuild:
+  Stable for HPPA (bug #210326).
+
+  18 Feb 2008; Brent Baude <ranger@g.o> tk-8.4.18.ebuild:
+  Marking tk-8.4.18 ppc64 for bug 210326
+
+  17 Feb 2008; Raúl Porcel <armin76@g.o> tk-8.4.18.ebuild:
+  alpha/ia64/sparc stable wrt #210326
+
+  17 Feb 2008; nixnut <nixnut@g.o> tk-8.4.18.ebuild:
+  Stable on ppc wrt bug 210326
+
+  16 Feb 2008; Christian Faulhammer <opfer@g.o> tk-8.4.18.ebuild:
+  stable x86, bug 210326
+
+*tk-8.5.1 (16 Feb 2008)
+*tk-8.4.18 (16 Feb 2008)
+
+  16 Feb 2008; MATSUU Takuto <matsuu@g.o>
+  -files/tk-CVE-2006-4484.patch, -tk-8.4.9.ebuild, -tk-8.4.15-r2.ebuild,
+  -tk-8.4.17.ebuild, +tk-8.4.18.ebuild, -tk-8.5.0-r2.ebuild,
+  +tk-8.5.1.ebuild:
+  Version bumped, bug #208464.
+  Removed old versions.
+
+*tk-8.5.0-r2 (04 Feb 2008)
+*tk-8.4.17 (04 Feb 2008)
+*tk-8.4.15-r2 (04 Feb 2008)
+
+  04 Feb 2008; MATSUU Takuto <matsuu@g.o>
+  +files/tk-CVE-2006-4484.patch, +tk-8.4.15-r2.ebuild, -tk-8.4.16.ebuild,
+  +tk-8.4.17.ebuild, -tk-8.5.0.ebuild, -tk-8.5.0-r1.ebuild,
+  +tk-8.5.0-r2.ebuild:
+  Version bumped.
+  Fixed CVE-2006-4484, bug #208464.
+
+*tk-8.5.0-r1 (30 Dec 2007)
+
+  30 Dec 2007; MATSUU Takuto <matsuu@g.o> +tk-8.5.0-r1.ebuild:
+  Added truetype USE flag. bug #173467.
+
+*tk-8.5.0 (22 Dec 2007)
+*tk-8.4.16 (22 Dec 2007)
+
+  22 Dec 2007; MATSUU Takuto <matsuu@g.o> -tk-8.4.15.ebuild,
+  +tk-8.4.16.ebuild, -tk-8.5_alpha6.ebuild, -tk-8.5_alpha6-r1.ebuild,
+  -tk-8.5_beta3.ebuild, +tk-8.5.0.ebuild:
+  Version bumped. bug #194385.
+  Removed old versions.
+
+*tk-8.5_beta3 (25 Nov 2007)
+
+  25 Nov 2007; <matsuu@g.o> +tk-8.5_beta3.ebuild, -tk-8.5b.ebuild:
+  Version bumped.
+  Fixed wrong symlink wrt bug #200090.
+
+*tk-8.5b (03 Nov 2007)
+
+  03 Nov 2007; Markus Ullmann <jokey@g.o> +tk-8.5b.ebuild:
+  Version bump, dropping keywords as status wrt other packages is untested
+
+  23 Sep 2007; Ferris McCormick <fmccor@g.o> tk-8.4.15-r1.ebuild:
+  Sparc stable --- security Bug #192539 --- has been running fine.
+
+  20 Sep 2007; Brent Baude <ranger@g.o> tk-8.4.15-r1.ebuild:
+  keywording tk-8.4.15-r1 ppc64 for bug#190697
+
+  17 Sep 2007; Tobias Scherbaum <dertobi123@g.o> tk-8.4.15-r1.ebuild:
+  ppc stable, bug #192539
+
+  17 Sep 2007; Raúl Porcel <armin76@g.o> tk-8.4.15-r1.ebuild:
+  alpha/ia64 stable wrt security #192539
+
+  16 Sep 2007; Christoph Mende <angelos@g.o> tk-8.4.15-r1.ebuild:
+  Stable on amd64 wrt security bug #192539
+
+  16 Sep 2007; Markus Meier <maekke@g.o> tk-8.4.15-r1.ebuild:
+  x86 stable, security bug #192539
+
+  16 Sep 2007; Jeroen Roovers <jer@g.o> tk-8.4.15-r1.ebuild:
+  Stable for HPPA (bug #192539).
+
+*tk-8.5_alpha6-r1 (16 Sep 2007)
+*tk-8.4.15-r1 (16 Sep 2007)
+
+  16 Sep 2007; MATSUU Takuto <matsuu@g.o>
+  -files/tk-8.3.5-tclm4-soname.patch, +files/tk-CVE-2007-4851.patch,
+  -tk-8.4.14.ebuild, -tk-8.4.14-r1.ebuild, +tk-8.4.15-r1.ebuild,
+  +tk-8.5_alpha6-r1.ebuild:
+  Fixed CVE-2007-4851, bug #192539.
+  Removed old versions.
+
+  21 Aug 2007; Christoph Mende <angelos@g.o> tk-8.4.15.ebuild:
+  Stable on amd64 wrt bug #178320
+
+  18 Aug 2007; nixnut <nixnut@g.o> tk-8.4.15.ebuild:
+  Stable on ppc wrt bug 178320
+
+  15 Aug 2007; Jeroen Roovers <jer@g.o> tk-8.4.15.ebuild:
+  Stable for HPPA (bug #178320).
+
+  14 Aug 2007; Markus Rothe <corsair@g.o> tk-8.4.15.ebuild:
+  Stable on ppc64; bug #178320
+
+  14 Aug 2007; Raúl Porcel <armin76@g.o> tk-8.4.15.ebuild:
+  alpha/ia64/x86 stable wrt #178320
+
+  13 Aug 2007; Ferris McCormick <fmccor@g.o> tk-8.4.15.ebuild:
+  Sparc stable --- Bug #178320 --- no problems.
+
+  22 Jul 2007; Hans de Graaff <graaff@g.o> tk-8.4.9.ebuild,
+  tk-8.4.14.ebuild:
+  Drop virtual/x11 references.
+
+*tk-8.5_alpha6 (20 Jul 2007)
+*tk-8.4.15 (20 Jul 2007)
+
+  20 Jul 2007; MATSUU Takuto <matsuu@g.o>
+  +files/tk-8.4.15-tclm4-soname.patch,
+  +files/tk-8.5_alpha6-tclm4-soname.patch, +tk-8.4.15.ebuild,
+  +tk-8.5_alpha6.ebuild:
+  Version bumped, Bug #173467, #181597.
+
+*tk-8.4.14-r1 (12 Jul 2007)
+
+  12 Jul 2007; MATSUU Takuto <matsuu@g.o> +tk-8.4.14-r1.ebuild:
+  Fixed library filenames issue, bug #149037.
+
+  25 May 2007; Brent Baude <ranger@g.o> tk-8.4.14.ebuild:
+  Marking tk-8.4.14 ppc64 stable for bug 178320
+
+  20 May 2007; nixnut <nixnut@g.o> tk-8.4.14.ebuild:
+  Stable on ppc wrt bug 178320
+
+  16 May 2007; Christian Faulhammer <opfer@g.o> tk-8.4.14.ebuild:
+  stable amd64, bug 178320
+
+  15 May 2007; Raúl Porcel <armin76@g.o> tk-8.4.14.ebuild:
+  alpha/ia64/x86 stable wrt #178320
+
+  15 May 2007; Ferris McCormick <fmccor@g.o> tk-8.4.14.ebuild:
+  Sparc stable --- Bug #178320 --- Has been without problems for over 4 months.
+
+  15 May 2007; Jeroen Roovers <jer@g.o> tk-8.4.14.ebuild:
+  Stable for HPPA (bug #178320).
+
+  27 Apr 2007; MATSUU Takuto <matsuu@g.o>
+  -files/remove-control-v.diff, tk-8.4.9.ebuild, -tk-8.4.11-r1.ebuild,
+  -tk-8.4.12.ebuild, -tk-8.4.13.ebuild, tk-8.4.14.ebuild:
+  Fixed SONAME issue, bug #125971.
+  Fixed tkConfig.sh issue, bug #164649.
+  Added tc-export CC, bug #154328.
+  Removed old versions.
+
+  26 Mar 2007; Alec Warner <antarus@g.o> tk-8.4.9.ebuild,
+  tk-8.4.11-r1.ebuild, tk-8.4.12.ebuild, tk-8.4.13.ebuild, tk-8.4.14.ebuild:
+  Remove dependency on portage: ref bug 162516
+
+*tk-8.4.14 (06 Jan 2007)
+
+  06 Jan 2007; MATSUU Takuto <matsuu@g.o> -tk-8.3.4-r1.ebuild,
+  +tk-8.4.14.ebuild:
+  Version bumped.
+
+  26 Dec 2006; Mike Frysinger <vapier@g.o> tk-8.4.13.ebuild:
+  Clean up src_install() to use proper ebuild commands rather than running
+  `install` and use relative symlinks for libraries.
+
+*tk-8.4.13 (03 Jun 2006)
+
+  03 Jun 2006; MATSUU Takuto <matsuu@g.o>
+  +files/tk-8.3.5-tclm4-soname.patch, +tk-8.4.13.ebuild:
+  Version bumped, Bug 128681.
+  Added debug USE flag, Bug 123444.
+  Added soname patch, Bug 125971.
+
+  30 May 2006; Diego Pettenò <flameeyes@g.o> tk-8.4.12.ebuild:
+  Add ~x86-fbsd keyword.
+
+  24 Mar 2006; Aron Griffis <agriffis@g.o> tk-8.3.4-r1.ebuild,
+  tk-8.4.9.ebuild:
+  Copy bash-3 fix from tk-8.4.11-r1.ebuild to tk-8.4.9.ebuild #117982. Port
+  tk-8.3.4-r1 to modular X
+
+*tk-8.4.12 (03 Mar 2006)
+
+  03 Mar 2006; MATSUU Takuto <matsuu@g.o>
+  -files/remove-control-v-8.4.diff, -files/tk-wm-maxsize.patch,
+  -tk-8.4.6.ebuild, -tk-8.4.6-r1.ebuild, -tk-8.4.11.ebuild,
+  +tk-8.4.12.ebuild:
+  Version bumped, Bug 117122.
+  Removed old versions.
+
+  26 Feb 2006; Joshua Kinard <kumba@g.o> tk-8.4.9.ebuild:
+  Marked stable on mips.
+
+  03 Feb 2006; Mike Frysinger <vapier@g.o>
+  +files/tk-configure-LANG.patch, tk-8.4.9.ebuild, tk-8.4.11.ebuild,
+  tk-8.4.11-r1.ebuild:
+  Fix nls breakage #120133 by J.
+
+  30 Jan 2006; Michael Sterrett <mr_bones_@g.o> tk-8.4.6.ebuild,
+  tk-8.4.6-r1.ebuild, tk-8.4.9.ebuild:
+  more modular X dependencies
+
+*tk-8.4.11-r1 (08 Jan 2006)
+
+  08 Jan 2006; MATSUU Takuto <matsuu@g.o> +tk-8.4.11-r1.ebuild:
+  Fixed fails with bash3.1, Bug 117982
+
+  11 Dec 2005; Donnie Berkholz <spyderous@g.o>; tk-8.4.11.ebuild:
+  Fix them.
+
+  11 Dec 2005; Donnie Berkholz <spyderous@g.o>; tk-8.4.11.ebuild:
+  Add modular X dependencies.
+
+  03 Aug 2005; Bryan Østergaard <kloeri@g.o> tk-8.4.9.ebuild:
+  Stable on alpha.
+
+*tk-8.4.11 (02 Jul 2005)
+
+  02 Jul 2005; MATSUU Takuto <matsuu@g.o>
+  +files/tk-8.4.11-multilib.patch, +tk-8.4.11.ebuild:
+  Version bumped.
+  Added multilib patch.
+
+  06 Jun 2005; Markus Rothe <corsair@g.o> tk-8.4.9.ebuild:
+  Stable on ppc64
+
+  03 Jun 2005; Mike Frysinger <vapier@g.o> tk-8.4.9.ebuild:
+  Touchup libdir usage to get rid of all the // gremlins.
+
+  27 May 2005; Joseph Jezak <josejx@g.o> tk-8.4.9.ebuild:
+  Marked ppc stable.
+
+  09 May 2005; Gustavo Zacarias <gustavoz@g.o> tk-8.4.9.ebuild:
+  Stable on sparc
+
+  08 May 2005; Marcus D. Hanwell <cryos@g.o> tk-8.4.9.ebuild:
+  Stable on amd64.
+
+  07 May 2005; Aron Griffis <agriffis@g.o> tk-8.4.9.ebuild:
+  stable on ia64
+
+  07 May 2005; MATSUU Takuto <matsuu@g.o> tk-8.4.9.ebuild:
+  Stable on x86.
+
+*tk-8.4.9 (19 Mar 2005)
+
+  19 Mar 2005; MATSUU Takuto <matsuu@g.o>
+  +files/remove-control-v-8.4.9.diff, +files/tk-8.4.9-man.patch,
+  +tk-8.4.9.ebuild:
+  Version bumped, #83816
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@g.o> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  21 Dec 2004; Jeremy Huddleston <eradicator@g.o> tk-8.4.6-r1.ebuild:
+  Multilib fixes.
+
+  10 Nov 2004; Joseph Jezak <josejx@g.o> tk-8.4.6-r1.ebuild:
+  Marked ppc stable.
+
+  06 Oct 2004; Bryan Østergaard <kloeri@g.o> tk-8.4.6-r1.ebuild:
+  Stable on alpha.
+
+  21 Sep 2004; Danny van Dyk <kugelfang@g.o> tk-8.4.6-r1.ebuild:
+  Marked stable on amd64.
+
+  14 Sep 2004; Guy Martin <gmsoft@g.o> tk-8.4.6-r1.ebuild:
+  Stable on hppa.
+
+  09 Sep 2004; Gustavo Zacarias <gustavoz@g.o> tk-8.4.6-r1.ebuild:
+  Keyworded sparc
+
+  06 Sep 2004; Ciaran McCreesh <ciaranm@g.o> tk-8.3.4-r1.ebuild,
+  tk-8.4.6-r1.ebuild, tk-8.4.6.ebuild:
+  Switch to use epause and ebeep, bug #62950
+
+  30 Aug 2004; Tom Gall <tgall@g.o> tk-8.4.6-r1.ebuild:
+  stable on ppc64, bug #61745
+
+  25 Aug 2004; Doug Goldstein <cardoe@g.o> tk-8.4.6-r1.ebuild:
+  Stable on x86
+
+  18 Aug 2004; Aron Griffis <agriffis@g.o> tk-8.4.6.ebuild:
+  stable on alpha and ia64
+
+*tk-8.4.6-r1 (07 Aug 2004)
+
+  07 Aug 2004; Doug Goldstein <cardoe@g.o> tk-8.4.6-r1.ebuild
+  +files/tk-wm-maxsize.patch, +tk-8.4.6-r1.ebuild:
+  Fixed bug #56229. KDE 3.2 missing maximize button with tk apps.
+  http://bugs.kde.org/show_bug.cgi?id=67577
+  http://sourceforge.net/tracker/index.php?func=detail&aid=915350&group_id=12997
+  &atid=112997
+
+  15 Jun 2004; Ferris McCormick <fmccor@g.o> tk-8.4.6.ebuild:
+  Marked stable for sparc.
+
+  04 Jun 2004; Michael Sterrett <mr_bones_@g.o> tk-8.4.6.ebuild:
+  ppc64 needs a stable virtual/x11 first.  Removed keyword
+
+  31 May 2004; Tom Gall <tgall@g.o> tk-8.4.6.ebuild:
+  stable on ppc64
+
+  02 May 2004; <tuxus@g.o> tk-8.4.6.ebuild:
+  Stable on mips
+
+  25 Apr 2004; Michael Sterrett <mr_bones_@g.o> tk-8.3.4-r1.ebuild,
+  tk-8.4.6.ebuild:
+  don't depend on use echo
+
+  24 Apr 2004; Ian Leitch <port001@g.o> tk-8.3.4-r1.ebuild,
+  tk-8.4.6.ebuild:
+  Enable threads with local USE flag 'threads'. #2024
+
+  20 Apr 2004; Ian Leitch <port001@g.o> tk-8.4.6.ebuild:
+  Marked stable on amd64
+
+  20 Apr 2004; Ian Leitch <port001@g.o> -tk-8.3.3-r2.ebuild,
+  -tk-8.3.3-r3.ebuild, -tk-8.3.3.ebuild, -tk-8.3.4.ebuild, -tk-8.4.3.ebuild,
+  -tk-8.4.4.ebuild, -tk-8.4.5.ebuild:
+  Removed stale ebuilds
+
+  31 Mar 2004; Tom Gall <tgall@g.o> tk-8.4.5.ebuild,  tk-8.4.6.ebuild:
+  remove ppc64 for now, we're not ready
+
+*tk-8.4.6 (04 Mar 2004)
+
+  04 Mar 2004; Martin Holzer <mholzer@g.o> tk-8.4.6.ebuild:
+  Verison bumped.
+
+  04 Jan 2004; <tuxus@g.o> tk-8.4.3.ebuild:
+  Added mips to KEYWORDS
+
+  03 Jan 2004; Aron Griffis <agriffis@g.o> tk-8.4.5.ebuild:
+  Add ~alpha
+
+  03 Jan 2004; Brian Jackson <iggy@g.o> tk-8.3.4-r1.ebuild:
+  repoman still complaining, 8.3.4 to ia64 to match tcl
+
+  03 Jan 2004; Brian Jackson <iggy@g.o> tk-8.3.3-r2.ebuild,
+  tk-8.3.3-r3.ebuild, tk-8.3.3.ebuild, tk-8.3.4-r1.ebuild, tk-8.3.4.ebuild,
+  tk-8.4.3.ebuild, tk-8.4.4.ebuild, tk-8.4.5.ebuild:
+  adding ~ia64 keywords, it's installed on the releng ia64 box, so I assume it's
+  safe, needed for bitkeeper
+
+  19 Dec 2003; David Holm <dholm@g.o> tk-8.4.5.ebuild:
+  Added to ~ppc.
+
+*tk-8.4.5 (07 Dec 2003)
+
+  07 Dec 2003; Martin Holzer <mholzer@g.o> tk-8.4.5.ebuild:
+  Version bumped.
+
+  07 Dec 2003; Martin Holzer <mholzer@g.o> tk-8.4.3.ebuild,
+  tk-8.4.4.ebuild:
+  changing to sf
+
+  16 Nov 2003; Brad House <brad_mssw@g.o> tk-8.4.4.ebuild:
+  mark stable on amd64
+
+*tk-8.4.4 (22 Oct 2003)
+
+  22 Oct 2003; Martin Holzer <mholzer@g.o> tk-8.4.4.ebuild:
+  Version bumped.
+
+*tk-8.4.3 (30 Jun 2003)
+
+  30 Sep 2003; Joshua Kinard <kumba@g.o> tk-8.4.3.ebuild:
+  Added ~sparc & ~mips to KEYWORDS
+
+  30 Jun 2003; Daniel Ahlberg <aliz@g.o> tk-8.4.3.ebuild :
+  Version bump.
+
+*tk-8.4.2-r1 (19 May 2003)
+
+  19 May 2003; Stanislav Brabec <utx@g.o> tk-8.4.2-r1.ebuild:
+  Fixed man-pages installation (worked around bug in mkLinks script - unset
+  variable S for installation).
+
+*tk-8.4.2 (17 Apr 2003)
+
+  17 Apr 2003; Stanislav Brabec <utx@g.o> tk-8.4.2.ebuild,
+  files/remove-control-v-8.4.diff:
+  Updated to version 8.4.2 (bug #18483) and updated Control-V remove patch.
+
+*tk-8.3.4-r1 (28 Mar 2003)
+
+  28 Mar 2003; Seemant Kulleen <seemant@g.o> tk-8.3.4-r1.ebuild:
+  fixed sed expression, hopefully closes bug #18300 by Marc 'huz' REYNES
+  <marc.reynes@×××××××××.org>
+
+  06 Dec 2002; Rodney Rees <manson@g.o> : changed sparc ~sparc keywords
+
+*tk-8.3.4 (18 Dec 2002)
+
+  20 Mar 2003; Zach Welch <zwelch@g.o> tk-8.3.4.ebuild:
+  add arm keyword
+
+  08 Mar 2003; Guy Martin <gmsoft@g.o> tk-8.3.4.ebuild :
+  Added hppa to keywords.
+
+  18 Dec 2002; Stefan Jones <cretin@g.o>
+  New revision.
+
+*tk-8.3.3-r3 (11 Nov 2002)
+
+  20 Mar 2003; Zach Welch <zwelch@g.o> tk-8.3.3-r3.ebuild:
+  add arm keyword
+
+  11 Nov 2002; Karl Trygve Kalleberg <karltk@g.o>
+  tk-8.3.3-r3.ebuild files/digest-tk-8.3.3-r3:
+  Some legacy code for default handling of the Control-V keypress is now
+  patched away. Fixes #10154.
+
+*tk-8.3.3-r2 (25 Sep 2002)
+
+  25 Sep 2002; Karl Trygve Kalleberg <karltk@g.o>
+  tk-8.3.3-r2.ebuild files/digest-tk-8.3.3-r2:
+  -r1 placed header files in the wrong place, applied patch from
+  Scott Lampert <scott@×××××××.org> to fix it. Fixes #8054.
+
+  Removed tk-8.3.3-r1.ebuild files/digest-tk-8.3.3-r1
+
+*tk-8.3.3-r1 (13 Jul 2002)
+
+  02 Aug 2002; mark Guertin <gerk@g.o> tk-8.3.3-r1.ebuild :
+  Added ppc to keywords
+
+  13 Jul 2002; Seemant Kulleen <seemant@g.o> tk-8.3.3-r1.ebuild
+  files/digest-tk-8.3.3-r1 :
+
+  Symlink for the .so was not being created.  Thanks to
+  j_r_fonseca@××××××××.uk (Jose' Fonseca) in bug #4946 for the catch and
+  fix.
+
+
+  25 Apr 2002; Seemant Kulleen <seemant@g.o> tk-8.3.3.ebuild :
+
+  Fixed bug #2112 from arndtc@×××××××××××××××××××.org (Chris Arndt) to reflect
+  that the required tcl version may have a revision number on its ebuild
+
+*tk-8.3.3 (1 Feb 2002)
+
+  1 Feb 2002; G.Bevin <gbevin@g.o> ChangeLog :
+  
+  Added initial ChangeLog which should be updated whenever the package is
+  updated in any way. This changelog is targetted to users. This means that the
+  comments should well explained and written in clean English. The details about
+  writing correct changelogs are explained in the skel.ChangeLog file which you
+  can find in the root directory of the portage repository.

diff --git a/dev-lang/tk/files/tk-8.4.11-multilib.patch b/dev-lang/tk/files/tk-8.4.11-multilib.patch
new file mode 100644
index 0000000..092b806
--- /dev/null
+++ b/dev-lang/tk/files/tk-8.4.11-multilib.patch
@@ -0,0 +1,24 @@
+diff -Naur tk8.4.11.orig/unix/configure tk8.4.11/unix/configure
+--- tk8.4.11.orig/unix/configure	2005-06-30 01:43:10.000000000 +0900
++++ tk8.4.11/unix/configure	2005-07-02 23:22:35.000000000 +0900
+@@ -5721,7 +5721,7 @@
+     TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
+ fi
+ 
+-TK_LIBRARY='$(prefix)/lib/tk$(VERSION)'
++TK_LIBRARY='$(libdir)/tk$(VERSION)'
+ PRIVATE_INCLUDE_DIR='$(includedir)'
+ HTML_DIR='$(DISTDIR)/html'
+ TK_PKG_DIR='tk$(VERSION)$(TK_DBGX)'
+diff -Naur tk8.4.11.orig/unix/configure.in tk8.4.11/unix/configure.in
+--- tk8.4.11.orig/unix/configure.in	2005-06-30 01:43:10.000000000 +0900
++++ tk8.4.11/unix/configure.in	2005-07-02 23:22:16.000000000 +0900
+@@ -393,7 +393,7 @@
+     TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
+ fi
+ 
+-TK_LIBRARY='$(prefix)/lib/tk$(VERSION)'
++TK_LIBRARY='$(libdir)/tk$(VERSION)'
+ PRIVATE_INCLUDE_DIR='$(includedir)'
+ HTML_DIR='$(DISTDIR)/html'
+ TK_PKG_DIR='tk$(VERSION)$(TK_DBGX)'

diff --git a/dev-lang/tk/files/tk-8.4.15-aqua.patch b/dev-lang/tk/files/tk-8.4.15-aqua.patch
new file mode 100644
index 0000000..0131dbd
--- /dev/null
+++ b/dev-lang/tk/files/tk-8.4.15-aqua.patch
@@ -0,0 +1,20 @@
+--- unix/Makefile.in
++++ unix/Makefile.in
+@@ -280,7 +280,7 @@
+ TK_RSRC_FILE		= @TK_RSRC_FILE@
+ WISH_RSRC_FILE		= @WISH_RSRC_FILE@
+ REZ			= @REZ@
+-REZ_SWITCHES = @REZ_FLAGS@ -i $(GENERIC_DIR) -i $(TCL_GENERIC_DIR)
++REZ_SWITCHES = @REZ_FLAGS@ -i $(GENERIC_DIR) -i $(TCL_GENERIC_DIR) -i @GENTOO_PORTAGE_EPREFIX@/usr/include
+ 
+ #----------------------------------------------------------------
+ # The information below is modified by the configure script when
+@@ -468,7 +468,7 @@
+ 
+ AQUA_HDRS = $(MAC_OSX_DIR)/tkMacOSX.h $(GENERIC_DIR)/tkIntXlibDecls.h
+ 
+-AQUA_XLIB_HDRS = $(XLIB_DIR)/X11/*.h $(XLIB_DIR)/xbytes.h
++AQUA_XLIB_HDRS = 
+ 
+ AQUA_PRIVATE_HDRS = $(MAC_OSX_DIR)/tkMacOSXPort.h $(MAC_OSX_DIR)/tkMacOSXInt.h
+ 

diff --git a/dev-lang/tk/files/tk-8.4.15-tclm4-soname.patch b/dev-lang/tk/files/tk-8.4.15-tclm4-soname.patch
new file mode 100644
index 0000000..b427d27
--- /dev/null
+++ b/dev-lang/tk/files/tk-8.4.15-tclm4-soname.patch
@@ -0,0 +1,12 @@
+diff -Naur tk8.4.15.orig/unix/tcl.m4 tk8.4.15/unix/tcl.m4
+--- tk8.4.15.orig/unix/tcl.m4	2007-05-26 01:09:54.000000000 +0900
++++ tk8.4.15/unix/tcl.m4	2007-07-21 02:16:13.000000000 +0900
+@@ -1345,7 +1345,7 @@
+ 	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+ 
+ 	    if test "$have_dl" = yes; then
+-		SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
++		SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS} -Wl,-soname,${@}'
+ 		DL_OBJS="tclLoadDl.o"
+ 		DL_LIBS="-ldl"
+ 		LDFLAGS="$LDFLAGS -Wl,--export-dynamic"

diff --git a/dev-lang/tk/files/tk-8.5.10-fix-name-collision-uclibc.patch b/dev-lang/tk/files/tk-8.5.10-fix-name-collision-uclibc.patch
new file mode 100644
index 0000000..30ce843
--- /dev/null
+++ b/dev-lang/tk/files/tk-8.5.10-fix-name-collision-uclibc.patch
@@ -0,0 +1,35 @@
+diff -Naur tk8.5.10.orig/generic/ttk/ttkTreeview.c tk8.5.10/generic/ttk/ttkTreeview.c
+--- tk8.5.10.orig/generic/ttk/ttkTreeview.c	2011-06-20 16:17:08.000000000 -0400
++++ tk8.5.10/generic/ttk/ttkTreeview.c	2012-11-03 14:50:48.000000000 -0400
+@@ -486,11 +486,11 @@
+     }
+ }
+ 
+-/* + unshare(objPtr) --
++/* + unshared(objPtr) --
+  * 	Ensure that a Tcl_Obj * has refcount 1 -- either return objPtr
+  * 	itself,	or a duplicated copy.
+  */
+-static Tcl_Obj *unshare(Tcl_Obj *objPtr)
++static Tcl_Obj *unshared(Tcl_Obj *objPtr)
+ {
+     if (Tcl_IsShared(objPtr)) {
+ 	Tcl_Obj *newObj = Tcl_DuplicateObj(objPtr);
+@@ -2526,7 +2526,7 @@
+     } else {		/* set column */
+ 	int length;
+ 
+-	item->valuesObj = unshare(item->valuesObj);
++	item->valuesObj = unshared(item->valuesObj);
+ 
+ 	/* Make sure -values is fully populated:
+ 	 */
+@@ -2827,7 +2827,7 @@
+      */
+     for (parent = item->parent; parent; parent = parent->parent) {
+ 	if (!(parent->state & TTK_STATE_OPEN)) {
+-	    parent->openObj = unshare(parent->openObj);
++	    parent->openObj = unshared(parent->openObj);
+ 	    Tcl_SetBooleanObj(parent->openObj, 1);
+ 	    parent->state |= TTK_STATE_OPEN;
+ 	    TtkRedisplayWidget(&tv->core);

diff --git a/dev-lang/tk/files/tk-8.5_alpha6-tclm4-soname.patch b/dev-lang/tk/files/tk-8.5_alpha6-tclm4-soname.patch
new file mode 100644
index 0000000..3fdd484
--- /dev/null
+++ b/dev-lang/tk/files/tk-8.5_alpha6-tclm4-soname.patch
@@ -0,0 +1,12 @@
+diff -Naur tk8.5a6.orig/unix/tcl.m4 tk8.5a6/unix/tcl.m4
+--- tk8.5a6.orig/unix/tcl.m4	2007-04-27 06:02:27.000000000 +0900
++++ tk8.5a6/unix/tcl.m4	2007-07-21 02:47:58.000000000 +0900
+@@ -1425,7 +1425,7 @@
+ 	    # get rid of the warnings.
+ 	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+ 
+-	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
++	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS} -Wl,-soname,${@}'
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+ 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"

diff --git a/dev-lang/tk/metadata.xml b/dev-lang/tk/metadata.xml
new file mode 100644
index 0000000..815cc91
--- /dev/null
+++ b/dev-lang/tk/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>tcltk</herd>
+</pkgmetadata>

diff --git a/dev-lang/tk/tk-8.5.10-r99.ebuild b/dev-lang/tk/tk-8.5.10-r99.ebuild
new file mode 100644
index 0000000..d88f4cf
--- /dev/null
+++ b/dev-lang/tk/tk-8.5.10-r99.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.10-r1.ebuild,v 1.5 2012/04/01 15:24:52 armin76 Exp $
+
+EAPI=4
+
+inherit autotools eutils multilib toolchain-funcs prefix
+
+MY_P="${PN}${PV/_beta/b}"
+
+DESCRIPTION="Tk Widget Set"
+HOMEPAGE="http://www.tcl.tk/"
+SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm ~mips ppc ppc64 x86"
+IUSE="debug threads truetype aqua xscreensaver"
+
+RDEPEND="
+	!aqua? (
+		x11-libs/libX11
+		x11-libs/libXt
+		truetype? ( x11-libs/libXft )
+		xscreensaver? ( x11-libs/libXScrnSaver ) )
+	~dev-lang/tcl-${PV}"
+DEPEND="${RDEPEND}
+	!aqua? ( x11-proto/xproto )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch
+
+	epatch "${FILESDIR}"/${PN}-8.4.15-aqua.patch
+	eprefixify unix/Makefile.in
+
+	# Bug 125971
+	epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
+
+	# Bug to-be-filed
+	epatch "${FILESDIR}"/${PN}-8.5.10-fix-name-collision-uclibc.patch
+
+	sed -i 's/FT_New_Face/XftFontOpen/g' unix/configure.in || die
+
+	cd "${S}"/unix
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	cd "${S}"/unix
+
+	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
+
+	econf \
+		--with-tcl="${EPREFIX}/usr/${mylibdir}" \
+		$(use_enable threads) \
+		$(use_enable aqua) \
+		$(use_enable truetype xft) \
+		$(use_enable xscreensaver xss) \
+		$(use_enable debug symbols)
+}
+
+src_compile() {
+	cd "${S}"/unix && emake
+}
+
+src_install() {
+	#short version number
+	local v1
+	v1=${PV%.*}
+
+	cd "${S}"/unix
+	S= emake DESTDIR="${D}" install
+
+	# normalize $S path, bug #280766 (pkgcore)
+	local nS="$(cd "${S}"; pwd)"
+
+	# fix the tkConfig.sh to eliminate refs to the build directory
+	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
+	sed -i \
+		-e "s,^\(TK_BUILD_LIB_SPEC='-L\)${nS}/unix,\1${EPREFIX}/usr/${mylibdir}," \
+		-e "s,^\(TK_SRC_DIR='\)${nS}',\1${EPREFIX}/usr/${mylibdir}/tk${v1}/include'," \
+		-e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${nS}/unix,\1${EPREFIX}/usr/${mylibdir}," \
+		-e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${nS}/unix,\1${EPREFIX}/usr/${mylibdir}," \
+		"${ED}"/usr/${mylibdir}/tkConfig.sh || die
+
+	if [[ ${CHOST} != *-darwin* ]]; then
+		sed -i \
+				-e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:${EPREFIX}/usr/${mylibdir}'," \
+				-e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:${EPREFIX}/usr/${mylibdir}'," \
+				"${ED}"/usr/${mylibdir}/tkConfig.sh || die
+	fi
+
+	# install private headers
+	insinto /usr/${mylibdir}/tk${v1}/include/unix
+	doins "${S}"/unix/*.h
+	insinto /usr/${mylibdir}/tk${v1}/include/generic
+	doins "${S}"/generic/*.h
+	rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h
+	rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h
+	rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h
+
+	# install symlink for libraries
+	#dosym libtk${v1}.a /usr/${mylibdir}/libtk.a
+	dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname)
+	dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
+
+	dosym wish${v1} /usr/bin/wish
+
+	cd "${S}"
+	dodoc ChangeLog* README changes
+}