Added beta version

(Portage version: 2.2.0_alpha89/git/Linux x86_64, signed Manifest commit with key 70EB7916)

14 files changed, 365 insertions, 0 deletions

diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
new file mode 100644
index 0000000..6f1ad27
--- /dev/null
+++ b/dev-lang/tk/ChangeLog
@@ -0,0 +1,14 @@
+# ChangeLog for dev-lang/tk
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*tk-8.6_beta2 (02 Mar 2012)
+
+  02 Mar 2012; Justin Lecher <jlec@gentoo.org> +files/tk-8.4.9-man.patch,
+  +files/remove-control-v-8.4.9.diff, +files/tk-8.4.11-multilib.patch,
+  +files/tk-8.4.15-aqua.patch, +files/tk-8.4.15-tclm4-soname.patch,
+  +files/tk-8.4-lastevent.patch, +files/tk-8.5_alpha6-tclm4-soname.patch,
+  +tk-8.6_beta2.ebuild, +files/tk-8.6_beta2-fedora-xft.patch,
+  +files/tk-CVE-2007-4851.patch, +files/tk-configure-LANG.patch, +metadata.xml:
+  Added beta version
+
diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
new file mode 100644
index 0000000..40a5e98
--- /dev/null
+++ b/dev-lang/tk/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX remove-control-v-8.4.9.diff 522 RMD160 393f14c68f75795bc10e94d00a2e4d470ab50e4d SHA1 e45327e49545a8ef6132bec7303ef0b19a06e794 SHA256 f82a147821e6eb4cda3674568450903de864c99d73cae6062b56c391e7290bba
+AUX tk-8.4-lastevent.patch 1095 RMD160 5e03fcb59320898429a3c1d438916eb0a65eeefc SHA1 433e2718f8eaa124ae87f53a276bb2208602fd6d SHA256 73bdd40b9e04ad705ac8956ea96967aaee5ac8ee9588a43e5c1bf30d50c0996d
+AUX tk-8.4.11-multilib.patch 896 RMD160 29152dde424c41555e132c1b279ccc7ab279e27f SHA1 7f6e6d808e2016b1283d45fa001482c7a76a66a7 SHA256 1f15653e3f68fdd6b32b985514d6b2bae7a3a6c717a326c85082394095376636
+AUX tk-8.4.15-aqua.patch 713 RMD160 aceaeca7033b68c198f8299a8e7d72ef331d3c0f SHA1 adf4e1098e73d42b0da2b0be7742782c6a84e28d SHA256 64eea5899c147cd1ad0b9da76de663f73570a50dc8a482c860c6caf2fd058470
+AUX tk-8.4.15-tclm4-soname.patch 533 RMD160 78caf459d2d06e769e01de5009cb63d8e1c19a62 SHA1 4c4614dc2a7f99ccdf1c1b0cfccd15ec74269333 SHA256 7b885a3307007613e32d15bd2ec144590079e291c0ee5315ed3425f066e784cc
+AUX tk-8.4.9-man.patch 800 RMD160 8d06c54ab7ae0edf584248a8f6f14f46e08eec97 SHA1 32513bf413dcd8387594da50be97e353d36eab49 SHA256 5e356b8d34fc6687af03f1aa93e2a05619e0df0bbef65a8bc76e0a9a3da56dfa
+AUX tk-8.5_alpha6-tclm4-soname.patch 540 RMD160 7ed0721d8ee1fda0b1109c753f2fa6602224706f SHA1 c83f403291bb0312f7ffe16669898bb494b48fe7 SHA256 6e6a6d9ae62040cc2f386c92854cb59e34f0824abeabdcb5a86d07f3f7eb6a4d
+AUX tk-8.6_beta2-fedora-xft.patch 681 RMD160 a71e19734ed5390ebc77c7dd0adf9f6c4d6f3684 SHA1 50317fc94b9749684ce71c67f1cee3bd0494c204 SHA256 8f98eae5de3f97b2f6d168bb98e2efc500c2e99d93d64c28fd70cec3b499a1b1
+AUX tk-CVE-2007-4851.patch 405 RMD160 bfc884fbe1f0f2facb892ff0100f59dae0fe5256 SHA1 31c34d01cc5372395d37d2e878a61a059933e5b8 SHA256 e57158583d127b3d9751becb03ee6e11c0fc602150396ce902d1fdee73cb4a32
+AUX tk-configure-LANG.patch 1686 RMD160 4ff8355af81705058fd411910dfae94887bcd884 SHA1 67ae0deff73689cb39cd6e7451262bdda9c25a39 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea
+DIST tk8.6b2-src.tar.gz 4611544 RMD160 1629b49e8e319d7f6f4aedee56d39f939fddda15 SHA1 46664613b6b832422df993598204c283b33c4a85 SHA256 81252186d04d44cff41e24384d6fd77e0034f116660f84cb5c2a8b3bd4b373ad
+EBUILD tk-8.6_beta2.ebuild 3077 RMD160 2b324003d33d285588241a04248e7f33447f6545 SHA1 a3e167ec28db043caed30b3a4c177c630277ce07 SHA256 3c7f38d2d5a348b65d30285dd43580e5b18c6cb25c44b477a4ae0b0e3362c684
+MISC ChangeLog 592 RMD160 ecfa415409e0e17f2947dfa5a705b699117fcf2a SHA1 b84c583f03bce6cd007dacb964eecc5a722dfadb SHA256 189dbdca94a2d63b900ab631d43a690eec6e3c3d79ef2ecdfe2746b4b4eb3090
+MISC metadata.xml 159 RMD160 0b3f1c7d1bf45f7283ab23b3d8fa0a02c688a044 SHA1 0446a3db32f76d33bf9f76b5229b2fd9900d08c6 SHA256 fe5eea9a276e11191a0c8e266e6dc128c3dd73347bb01020814acb0863316029
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEAREKAAYFAk9Q6A8ACgkQgAnW8HDreRbi3QCgrKLoWr0erjVBiqDP9lsbdQfP
+glMAniQFu/z5H5NyhMVVv/FH+O1yZ+5I
+=2DoH
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/tk/files/remove-control-v-8.4.9.diff b/dev-lang/tk/files/remove-control-v-8.4.9.diff
new file mode 100644
index 0000000..0196599
--- /dev/null
+++ b/dev-lang/tk/files/remove-control-v-8.4.9.diff
@@ -0,0 +1,18 @@
+diff -Naur tk8.4.9.orig/library/text.tcl tk8.4.9/library/text.tcl
+--- tk8.4.9.orig/library/text.tcl	2004-12-07 04:42:11.000000000 +0900
++++ tk8.4.9/library/text.tcl	2005-03-02 23:04:01.729780958 +0900
+@@ -347,14 +347,6 @@
+     catch { %W edit redo }
+ }
+ 
+-if {$tcl_platform(platform) ne "windows"} {
+-bind Text <Control-v> {
+-    if {!$tk_strictMotif} {
+-	tk::TextScrollPages %W 1
+-    }
+-}
+-}
+-
+ bind Text <Meta-b> {
+     if {!$tk_strictMotif} {
+ 	tk::TextSetCursor %W [tk::TextPrevPos %W insert tcl_startOfPreviousWord]
diff --git a/dev-lang/tk/files/tk-8.4-lastevent.patch b/dev-lang/tk/files/tk-8.4-lastevent.patch
new file mode 100644
index 0000000..f93d335
--- /dev/null
+++ b/dev-lang/tk/files/tk-8.4-lastevent.patch
@@ -0,0 +1,28 @@
+Source: Jeffrey Gardner (je_fro) <jeffrey.e.gardner@comcast.net> - http://overlays.gentoo.org/dev/je_fro/browser/dev-lang/tk/files/tk-8.4-lastevent.patch
+Upstream: N/A
+Reason: Fix ABI incompatibility introduced by x11-proto/xproto-7.0.13 (bug #225999)
+--- generic/tk.h.orig	2008-02-06 16:31:40.000000000 +0100
++++ generic/tk.h	2008-07-24 08:21:46.000000000 +0200
+@@ -635,17 +635,15 @@
+  *
+  *---------------------------------------------------------------------------
+  */
+-#define VirtualEvent	    (LASTEvent)
+-#define ActivateNotify	    (LASTEvent + 1)
+-#define DeactivateNotify    (LASTEvent + 2)
+-#define MouseWheelEvent     (LASTEvent + 3)
+-#define TK_LASTEVENT	    (LASTEvent + 4)
++#define VirtualEvent	    (MappingNotify + 1)
++#define ActivateNotify	    (MappingNotify + 2)
++#define DeactivateNotify    (MappingNotify + 3)
++#define MouseWheelEvent     (MappingNotify + 4)
++#define TK_LASTEVENT	    (MappingNotify + 5)
+ 
+ #define MouseWheelMask	    (1L << 28)
+-
+ #define ActivateMask	    (1L << 29)
+ #define VirtualEventMask    (1L << 30)
+-#define TK_LASTEVENT	    (LASTEvent + 4)
+ 
+ 
+ /*
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.4.9-man.patch b/dev-lang/tk/files/tk-8.4.9-man.patch
new file mode 100644
index 0000000..bb816f8
--- /dev/null
+++ b/dev-lang/tk/files/tk-8.4.9-man.patch
@@ -0,0 +1,29 @@
+diff -Naur tk8.4.9.orig/unix/installManPage tk8.4.9/unix/installManPage
+--- tk8.4.9.orig/unix/installManPage	2004-12-07 04:46:29.000000000 +0900
++++ tk8.4.9/unix/installManPage	2005-03-02 23:36:23.252797867 +0900
+@@ -3,7 +3,7 @@
+ ZIP=:
+ while true; do
+     case $1 in
+-        -s | --symlinks  )      S="-s ";;
++        -s | --symlinks  )   TK_S="-s ";;
+         -z | --compress  )    ZIP=$2;  shift ;;
+ 	-e | --extension )      Z=$2;  shift ;;
+ 	-s | --suffix    ) SUFFIX=$2;  shift ;;
+@@ -18,7 +18,7 @@
+ 
+ MANPAGE=$1
+ DIR=$2
+-test -z "$S" && S="$DIR/"
++test -z "$TK_S" && TK_S="$DIR/"
+ 
+ # A sed script to parse the alternative names out of a man page.
+ #
+@@ -62,6 +62,6 @@
+ 	$ZIP $DIR/$FIRST
+     else
+ 	rm -f $DIR/$f $DIR/$f.*
+-	ln $S$FIRST$Z $DIR/$f$Z
++	ln $TK_S$FIRST$Z $DIR/$f$Z
+     fi
+ done
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/files/tk-8.6_beta2-fedora-xft.patch b/dev-lang/tk/files/tk-8.6_beta2-fedora-xft.patch
new file mode 100644
index 0000000..67640db
--- /dev/null
+++ b/dev-lang/tk/files/tk-8.6_beta2-fedora-xft.patch
@@ -0,0 +1,13 @@
+--- tk8.5.9/unix/configure.in.old	2010-09-02 20:12:14.000000000 +0200
++++ tk8.5.9/unix/configure.in	2011-02-17 13:32:22.719116636 +0100
+@@ -530,8 +530,8 @@
+ 	XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
+ 	if test "$found_xft" = "no" ; then
+ 	    found_xft=yes
+-	    XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || found_xft="no"
+-	    XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || found_xft="no"
++	    XFT_CFLAGS=`pkg-config --cflags xft freetype2 2>/dev/null` || found_xft="no"
++	    XFT_LIBS=`pkg-config --libs xft freetype2 2>/dev/null` || found_xft="no"
+ 	fi
+ 	AC_MSG_RESULT([$found_xft])
+ 	dnl make sure that compiling against Xft header file doesn't bomb
diff --git a/dev-lang/tk/files/tk-CVE-2007-4851.patch b/dev-lang/tk/files/tk-CVE-2007-4851.patch
new file mode 100644
index 0000000..f461031
--- /dev/null
+++ b/dev-lang/tk/files/tk-CVE-2007-4851.patch
@@ -0,0 +1,12 @@
+diff -Naur tk8.4.15.orig/generic/tkImgGIF.c tk8.4.15/generic/tkImgGIF.c
+--- tk8.4.15.orig/generic/tkImgGIF.c	2006-03-27 21:13:56.000000000 +0900
++++ tk8.4.15/generic/tkImgGIF.c	2007-09-16 09:56:25.000000000 +0900
+@@ -995,7 +995,7 @@
+ 	 */
+ 	if (interlace) {
+ 	    ypos += interlaceStep[pass];
+-	    while (ypos >= height) {
++	    while (ypos >= rows) {
+ 		pass++;
+ 		if (pass > 3) {
+ 		    return TCL_OK;
diff --git a/dev-lang/tk/files/tk-configure-LANG.patch b/dev-lang/tk/files/tk-configure-LANG.patch
new file mode 100644
index 0000000..3ef76ef
--- /dev/null
+++ b/dev-lang/tk/files/tk-configure-LANG.patch
@@ -0,0 +1,41 @@
+The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in 
+option parsing, it may break.
+
+http://bugs.gentoo.org/103483
+
+--- configure
++++ configure
+@@ -54,6 +54,16 @@
+ infodir='${prefix}/info'
+ mandir='${prefix}/man'
+ 
++# NLS nuisances.
++# Only set these to C if already set.  These must not be set unconditionally
++# because not all systems understand e.g. LANG=C (notably SCO).
++# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
++# Non-C LC_CTYPE values break the ctype check.
++if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
++if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
++if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
++if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
++
+ # Initialize some other variables.
+ subdirs=
+ MFLAGS= MAKEFLAGS=
+@@ -452,16 +463,6 @@
+   esac
+ done
+ 
+-# NLS nuisances.
+-# Only set these to C if already set.  These must not be set unconditionally
+-# because not all systems understand e.g. LANG=C (notably SCO).
+-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
+-# Non-C LC_CTYPE values break the ctype check.
+-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
+-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
+-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
+-
+ # confdefs.h avoids OS command line length limits that DEFS can exceed.
+ rm -rf conftest* confdefs.h
+ # AIX cpp loses on an empty file, so make sure it contains at least a newline.
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.6_beta2.ebuild b/dev-lang/tk/tk-8.6_beta2.ebuild
new file mode 100644
index 0000000..c67c303
--- /dev/null
+++ b/dev-lang/tk/tk-8.6_beta2.ebuild
@@ -0,0 +1,113 @@
+# 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.ebuild,v 1.1 2011/10/04 17:08:05 jlec Exp $
+
+EAPI="3"
+
+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=""
+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}"/${P}-fedora-xft.patch
+	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
+
+	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 || die
+}
+
+src_install() {
+	#short version number
+	local v1
+	v1=${PV%.*}
+
+	cd "${S}"/unix
+	S= emake DESTDIR="${D}" install || die
+
+	# 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 || die
+	insinto /usr/${mylibdir}/tk${v1}/include/generic
+	doins "${S}"/generic/*.h || die
+	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) || die
+	dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a || die
+
+	dosym wish${v1} /usr/bin/wish || die
+
+	cd "${S}"
+	dodoc ChangeLog* README changes || die
+}