dev-tcltk/tix: EAPI BUmp to use new features

Package-Manager: portage-2.2.0_alpha148/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

7 files changed, 52 insertions, 390 deletions

diff --git a/dev-tcltk/tix/ChangeLog b/dev-tcltk/tix/ChangeLog
index eab4fc4a67e1..18b2a591b0ca 100644
--- a/dev-tcltk/tix/ChangeLog
+++ b/dev-tcltk/tix/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-tcltk/tix
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tix/ChangeLog,v 1.39 2012/09/09 21:30:25 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tix/ChangeLog,v 1.40 2012/12/13 07:31:34 jlec Exp $
+
+  13 Dec 2012; Justin Lecher <jlec@gentoo.org> -files/tix-8.2.0-gentoo.diff,
+  -files/tix-8.4.2-tcl85.patch, tix-8.4.3.ebuild, +files/tix-8.4.3-link.patch,
+  metadata.xml:
+  EAPI BUmp to use new features
 
   09 Sep 2012; Anthony G. Basile <blueness@gentoo.org> tix-8.4.3.ebuild:
   Keyword ~ppc64, bug #413433
diff --git a/dev-tcltk/tix/Manifest b/dev-tcltk/tix/Manifest
index 3e4b0a981880..b1ba7e436148 100644
--- a/dev-tcltk/tix/Manifest
+++ b/dev-tcltk/tix/Manifest
@@ -1,16 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX tix-8.2.0-gentoo.diff 9779 SHA256 a5beac4da80e3166a24be171dd9d253cf12a5c6cd030f41fec3eabaac31d08f0 SHA512 ff69b3fc1bc7625466f23033b513719bdd3f663a5e18246f223c8b8b2869418b5bb862fb168cac96453d81dd28384282373f7e601414c34a00eecea1f7d89045 WHIRLPOOL 86ea10ad526393d1daea76af58b36c0a5771815d6eb3f3a35d8b94261290d113b12971175384129d7e4bbce4d3062ccf522b050f28bad966da2cf552387826e0
-AUX tix-8.4.2-tcl85.patch 765 SHA256 614eea5e55c6ab61d6010bf91e4eb6b7d588e635d277b0273f157df4378efd35 SHA512 36293cc60af47bd1b5cdb008915f3467cb458a7d41628114882a0d705e05a4f8a723dd73378531c68d5c6e53dd20fb05c74431e485f957f6163b75dd9f08f953 WHIRLPOOL bd3f47c3720c283acf2932ff09cebdc2d1dd3eabb2b8846716e33a4115cea5e7748cd4956538253223c1ca9adba8dd4e24e0d32ed85c87c1276966f192f1a08c
+AUX tix-8.4.3-link.patch 402 SHA256 d4992c9d78b90c8e2ae79b1be63218f6d05cfbce31cc5ceadb5bb54571cb9696 SHA512 e220035cc8d71592dfe72e73e1fb92f79f7750b5c8a97d749bdb67aef9488a3684aad7873041ba6054083287c758889cb243d6cac5b83281f738b1392f29a821 WHIRLPOOL 2be7a639fd78020e79a6bb9d340113e58efe78c8ac491ba34ab48fda5a9668cee0b511af756af702b0dffe267993935af5f7b9570d5c50cdd25a7853faed0008
 DIST Tix8.4.3-src.tar.gz 1831503 SHA256 562f040ff7657e10b5cffc2c41935f1a53c6402eb3d5f3189113d734fd6c03cb SHA512 f13217dad0f52c0b706d2fb8ee0886942db64be0325e5d0d51801dbf9a92a7919c743c1445b76dbfa98815817685205e238e2d63f9366a8745ace1e1e9a01852 WHIRLPOOL 5f72582d30eb1be27b3e5a9d7a49b5e5b46d7d8a0bdd1228c592c1b2192bf0d627f50b63990c8bd43f0e2713d61e7e903bdedd8135f5ef67464d51bd6f23110a
-EBUILD tix-8.4.3.ebuild 1008 SHA256 c870b730a67a7a60d2bad3f900cf59238bce8ff9776edc72ed9f1d461c90e210 SHA512 34efd5d867b4894a110bd4b2ee7d4011807af335f54d45a2c2f829ae36763fea71cdea6555fa851813668a36a873dad82a35d80d934b7336fe98494089904393 WHIRLPOOL 2f9afa829d53f5221a5189249b2db8d8937e82e556a678736a52b8581fbfb323280ce2273bbe3831854eef410aa4532c3c6bb4bfbb0494dbe528da7c4d370851
-MISC ChangeLog 4730 SHA256 f2fc54faeee111732fa6896d73ee844746eccdf9aca9e4ee48b260e8459484aa SHA512 9e4c85cc90216e4affdf0df3bbcedbc591d608a6b59609831c8627fb7ee745da354fdc4928cf846f2ebeef2299b4b20732026d7dbc97afd52f970eef9c362551 WHIRLPOOL c669dc11c8dd78e471171e6fb1d97e941f4d037f353ee9510943c01ddc94cb59a4207ed303da25536328714e34f885c820823e99f5e64143f4485dae28991776
-MISC metadata.xml 158 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290 SHA512 60ffb8f937083ebfa2a70b1a3ac90bd9ca29cae6194ab77341a78c17d44123cedf5bf740611910e9a2f65585d0973e489bb6062471d26d0a5107e1e8b7f267ae WHIRLPOOL ef7a6760bc24a47df7eb857c63984981cf6b92fc52ce6cb4f71d937308dbbb94590841c5870bf0d6d550084f8dbe59707be14e61e3482267c5268c8f7d3a1080
+EBUILD tix-8.4.3.ebuild 1411 SHA256 05dbe83946013cd41faef0f4c347fafa6875b58a38d3e3106e1d70e171302e90 SHA512 35b728aceab76d1081cc1a217ecc4e09efb80d9b94f1ba4f990ead31810f54cde887ea4c807015ae61467e8299318c62f6c549f1e4eb0a3872e06bb2845ebb4a WHIRLPOOL a6e7dc79d3264cf346333fc219cfafc1ad1bc94cb04576eae35ba99d294998036a409085d637aa846eca2d3e439f485d5cc53ecf434a9ff963c8c25baf419864
+MISC ChangeLog 4931 SHA256 06b15e3b1a01de4914ba58206b7feb782d9fc177a65a509d0e23e6d1038e4d9e SHA512 5d0f508ef848d0427b8916ba1694018a19bd371cd52f2a70d06dccd64f020267fbdc6f81df71372602dbce3556d97c8cb6a59be0ac04374dd9c2e88dafc65dea WHIRLPOOL 5d2df932211c1205abf6f8d3565775d6f3d5a73750393b2b969dc1b2db6afedef3bd9cf198c52cabf1b10bcb7307adb606cd4c93b3c589320c4f9aeaf1d09450
+MISC metadata.xml 160 SHA256 225a6f78d287329cdf2f4ed57468be28bd6565fd9a62207c2cc48e25ac9d3537 SHA512 a50627bda9ed953daf422b5a2e89b5b64e296d1a023d767c8a4ebb2cd51cd0036cecce455762a54e7d669f94d17d9de21052bac94fc08b1365ef42eb2f267742 WHIRLPOOL 61fa22d50aaf2bdecc467e26c9675cf7949ad55a4a8821730c91d1bd73f83fc4c35660851961310efa450e337a7ef572a925e186b8b05984d6315efc509fd365
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBNClwACgkQl5yvQNBFVTVsBwCfRsRuBOgmNAyxOqzJ8jZqRnMc
-KZgAoKDgsBlk1B53qARsD5Wj5q9WWP2u
-=w99q
+iEYEAREIAAYFAlDJhFcACgkQgAnW8HDreRZ9MQCeLDNWXYaN5BSTixV143+p8RFC
+628AoJ0bAUcC4u9rr2/KEO2l9F0xFzb3
+=IEMK
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tix/files/tix-8.2.0-gentoo.diff b/dev-tcltk/tix/files/tix-8.2.0-gentoo.diff
deleted file mode 100644
index d50cfc9fe1c8..000000000000
--- a/dev-tcltk/tix/files/tix-8.2.0-gentoo.diff
+++ /dev/null
@@ -1,345 +0,0 @@
-diff -aurN tix8.2.0/unix/Makefile.in funkhouser's/patch/Makefile.in 
---- tix8.2.0/unix/Makefile.in	2001-01-10 23:43:46.000000000 -0800
-+++ unix/Makefile.in	2002-10-11 13:58:52.000000000 -0700
-@@ -44,6 +44,9 @@
- # Directory in which to install libtix.so or libtix.a:
- LIB_INSTALL_DIR		= $(INSTALL_ROOT)$(libdir)
- 
-+# Directory in which to install tix.h
-+INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)
-+
- # Path name to use when installing library scripts.
- SCRIPT_INSTALL_DIR	= $(INSTALL_ROOT)$(TIX_LIBRARY)
- 
-@@ -584,7 +587,7 @@
- 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
- 	-rm -f config.status
- 
--install: install-binaries install-libraries install-doc
-+install: install-binaries install-libraries install-doc install-headers install-tools
- 
- install-strip:
- 	$(MAKE) install INSTALL_PROGRAM="$(INSTALL_PROGRAM) -s"
-@@ -619,6 +622,17 @@
- 	    "Installing $(TIX_EXE_FILE) as $(BIN_INSTALL_DIR)/$(TIX_EXE_FILE)"
- 	@$(INSTALL_PROGRAM) $(TIX_EXE_FILE) $(BIN_INSTALL_DIR)/$(TIX_EXE_FILE)
- 
-+install-headers: 
-+	@echo "Installing header files";
-+	@for i in $(GENERIC_DIR)/tix.h; \
-+	    do \
-+	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
-+	    done;
-+
-+install-tools:
-+	@echo "installing the tixindex program for building tclIndex for Tix scripts"
-+	@$(INSTALL_DATA) $(TIX_SRC_DIR)/tools/tixindex $(BIN_INSTALL_DIR)
-+
- install-libraries: libraries
- 	@for i in $(SCRIPT_INSTALL_DIR); \
- 	    do \
-
-diff -aurN tix8.2.0/library/HList.tcl haneef's/patch/HList.tcl 
---- tix8.2.0/library/HList.tcl	2001-01-23 23:28:35.000000000 -0800
-+++ library/HList.tcl	2002-10-11 13:57:35.000000000 -0700
-@@ -394,6 +394,9 @@
- 
- proc tixHList:AutoScan {w} {
-     case [tixHList:GetState $w] {
-+	{10 11} {
-+	    tixHList:GoState 11 $w
-+	}
- 	{29 30} {
- 	    tixHList:GoState 30 $w
- 	}
-@@ -491,17 +494,19 @@
-     tixHList:GoState 0 $w
- }
- 
-+# start auto-scanning inside a single/browse widget
- proc tixHList:GoState-10 {w} {
-     tixHList:StartScan $w
- }
- 
-+# repeat auto-scanning inside a single/browse widget
- proc tixHList:GoState-11 {w} {
-     global tkPriv
- 
-     tixHList:DoScan $w
- 
-     set oldEnt [$w info anchor]
--    set ent [tixHList:SetAnchor $w $tkPriv(x) $tkPriv(y)]
-+    set ent [tixHList:SetAnchor $w $tkPriv(x) $tkPriv(y) 0 1]
- 
-     if {$ent == "" || $oldEnt == $ent} {
- 	return
-@@ -718,12 +723,18 @@
-     tixHList:GoState 0 $w
- }
- 
-+# ctrl-button-1 has been pressed in extended selection mode
- proc tixHList:GoState-33 {w x y} {
-     set ent [tixHList:GetNearest $w $y]
-     if {$ent != ""} {
- 	$w anchor set $ent
--	$w selection set $ent
--	tixHList:Browse $w $ent
-+        if { [lsearch [$w info selection] $ent] >= 0 } {
-+            # toggle
-+            $w selection clear $ent
-+        } else {
-+            $w selection set $ent
-+            tixHList:Browse $w $ent
-+        }
-     }
- }
- 
-@@ -745,13 +756,15 @@
-     return $ent
- }
- 
--proc tixHList:SetAnchor {w x y {disableOK 0}} {
-+proc tixHList:SetAnchor {w x y {disableOK 0} {dontsee 0}} {
-     set ent [tixHList:GetNearest $w $y $disableOK]
- 
-     if {$ent != ""} {
- 	if {[$w entrycget $ent -state] != "disabled"} {
- 	    $w anchor set $ent
--	    $w see $ent
-+            if {!$dontsee} {
-+                $w see $ent
-+            }
- 	    return $ent
- 	} elseif $disableOK {
- 	    return $ent
-@@ -846,3 +859,230 @@
- }
- 
- 
-+#----------------------------------------------------------------------
-+#
-+# Header resizing. Based on Art Morel's work.
-+#
-+#----------------------------------------------------------------------
-+
-+bind TixHListHeader <Motion> {
-+    tixHList:header:setHeaderCursor [winfo parent %W] %W %x %y
-+}
-+bind TixHListHeader <Enter> {
-+    tixHList:header:setHeaderCursor [winfo parent %W] %W %x %y
-+}
-+bind TixHListHeader <Leave> {
-+    tixHList:header:setHeaderCursor [winfo parent %W] %W %x %y
-+}
-+bind TixHListHeader <1> {
-+    tixHList:header:mark [winfo parent %W] %x
-+}
-+bind TixHListHeader <Button1-Enter> {
-+    tixHList:header:drag [winfo parent %W] %x
-+}
-+bind TixHListHeader <Button1-Leave> {
-+    tixHList:header:drag [winfo parent %W] %x
-+}
-+bind TixHListHeader <Button1-Motion> {
-+    tixHList:header:drag [winfo parent %W] %x
-+}
-+bind TixHListHeader <ButtonRelease-1> {
-+    tixHList:header:endDrag [winfo parent %W] %x
-+}
-+
-+# tixHList:header:setHeaderCursor --
-+#     Change the header window's cursor to <-> when it's placed on top
-+#     of the border between two header columns.
-+# Arguments:
-+#     hlist     The HList whose column is being resized.
-+#     header    The private header window of the HList.
-+#     x         Mouse X location (relative to header window)
-+#     y         Mouse Y location (relative to header window)
-+# Results:
-+#     Returns nothing
-+#
-+proc tixHList:header:setHeaderCursor {hlist header x y} {
-+    global tixPriv
-+
-+    if {$y >= 0 && $y < [winfo height $header] &&
-+            [tixHList:header:getColumn $hlist $x] != -1} {
-+        if {![info exists tixPriv(hlist:oldcursor)]} {
-+	    set col [tixHList:header:getColumn $hlist $x]
-+	    set colx [tixHList:header:getColumnX $hlist $col]
-+            set tixPriv(hlist:col) $col
-+            set tixPriv(hlist:startx) $colx
-+            set tixPriv(hlist:oldcursor) [$hlist cget -cursor]
-+            $hlist config -cursor sb_h_double_arrow
-+        }
-+    } else {
-+        if {[info exists tixPriv(hlist:oldcursor)]} {
-+            $hlist config -cursor $tixPriv(hlist:oldcursor)
-+            unset tixPriv(hlist:oldcursor)
-+        }
-+    }
-+}
-+
-+# tixHList:header:mark --
-+#     Initialize the header dragging indicator line.
-+# Arguments:
-+#     hlist     The Hlist whose column is being resized.
-+#     x         Mouse X location (relative to header window)
-+# Results:
-+#     Returns nothing
-+#
-+proc tixHList:header:mark {hlist x} {
-+    global tixPriv
-+
-+    if {![info exists tixPriv(hlist:oldcursor)]} {
-+        return
-+    }
-+
-+    set col [tixHList:header:getColumn $hlist $x]
-+    set colx [tixHList:header:getColumnX $hlist $col]
-+    tixHList:header:drawDragLines set $hlist $colx
-+
-+    set tixPriv(hlist:startx) $x
-+    set tixPriv(hlist:col)  $col
-+}
-+
-+# tixHList:header:drag --
-+#     Move the header dragging indicator line.
-+# Arguments:
-+#     hlist     The Hlist whose column is being resized.
-+#     x         Mouse X location (relative to header window)
-+# Results:
-+#     Returns nothing
-+#
-+proc tixHList:header:drag {hlist x} {
-+    global tixPriv
-+
-+    if {![info exists tixPriv(hlist:oldcursor)]} {
-+        return
-+    }
-+
-+    set x [tixHList:header:restrictDrag $hlist $tixPriv(hlist:col) $x]
-+    set delta [expr $x - $tixPriv(hlist:startx)]
-+    set colx [tixHList:header:getColumnX $hlist $tixPriv(hlist:col)]
-+
-+    tixHList:header:drawDragLines update $hlist [expr $colx + $delta]
-+}
-+
-+# tixHList:header:endDrag --
-+#     End header dragging and resize the affected column
-+# Arguments:
-+#     hlist     The Hlist whose column is being resized.
-+#     x         Mouse X location (relative to header window)
-+# Results:
-+#     Returns nothing
-+#
-+proc tixHList:header:endDrag {hlist x} {
-+    global tixPriv
-+
-+    if {![info exists tixPriv(hlist:oldcursor)]} {
-+        return
-+    }
-+    tixHList:header:drawDragLines cancel $hlist
-+
-+    set x [tixHList:header:restrictDrag $hlist $tixPriv(hlist:col) $x]
-+    set width [$hlist column width $tixPriv(hlist:col)]
-+    set delta [expr $x - $tixPriv(hlist:startx)]
-+    set nwidth [expr $delta + $width]
-+    if {$nwidth < 8} {
-+        set nwidth 8
-+    }
-+    $hlist column width $tixPriv(hlist:col) $nwidth
-+    $hlist config -cursor $tixPriv(hlist:oldcursor)
-+
-+    unset tixPriv(hlist:startx)
-+    unset tixPriv(hlist:oldcursor)
-+    unset tixPriv(hlist:col)
-+    $hlist config -cursor {}
-+}
-+
-+# Returns the vertical line that divides col and col+1
-+proc tixHList:header:getColumnX {hlist col} {
-+    set colx 0
-+    for {set i 0} {$i <= $col} {incr i} {
-+        incr colx [$hlist column width $i]
-+    }
-+    incr colx -[$hlist xview]
-+
-+    return $colx
-+}
-+
-+proc tixHList:header:restrictDrag {hlist col x} {
-+    set min [expr [tixHList:header:getColumnX $hlist [expr $col - 1]] + 8]
-+    set max [expr [winfo width $hlist] - [$hlist cget -bd] - 2]
-+
-+    if {$x < $min} {
-+        set x $min
-+    }
-+    if {$x > $max} {
-+        set x $max
-+    }
-+
-+    if {$x < 0} {
-+        set x 0
-+    }
-+    if {$x > [winfo width $hlist]} {
-+        set x [expr [winfo width $hlist] - 1]
-+    }
-+    return $x
-+}
-+
-+
-+proc tixHList:header:drawDragLines {mode {hlist {}} {x {}}} {
-+    global tixPriv
-+
-+    if {$mode != "set"} {
-+        if {[info exists tixPriv(hlist:drX)]} {
-+            set oldX  $tixPriv(hlist:drX)
-+            set oldY1 $tixPriv(hlist:drY1)
-+            set oldY2 $tixPriv(hlist:drY2)
-+
-+            tixTmpLine $oldX $oldY1 $oldX $oldY2 $hlist
-+        }
-+    }
-+    
-+    if {$mode == "cancel"} {
-+        catch {
-+            unset tixPriv(hlist:drX)
-+            unset tixPriv(hlist:drY1)
-+            unset tixPriv(hlist:drY2)
-+        }
-+        return
-+    }
-+
-+    set y1 [$hlist cget -bd]
-+    set y2 [expr [winfo height $hlist] - 2 * $y1]
-+
-+    incr x  [winfo rootx $hlist]
-+    incr y1 [winfo rooty $hlist]
-+    incr y2 [winfo rooty $hlist]
-+
-+    tixTmpLine $x $y1 $x $y2 $hlist
-+
-+    set tixPriv(hlist:drX)  $x
-+    set tixPriv(hlist:drY1) $y1
-+    set tixPriv(hlist:drY2) $y2
-+}
-+
-+# Returns the column which is just to the left of the mouse cursor
-+proc tixHList:header:getColumn {hlist x} {
-+    set fuzzy 3
-+    set sum 0
-+    set max [expr [$hlist cget -columns] - 1]
-+    incr x [$hlist xview] 
-+
-+    for {set col 0} {$col < $max} {incr col} {
-+        set width [$hlist column width $col]
-+        incr sum $width
-+        if {abs($x - $sum) <= $fuzzy} {
-+            return $col
-+            break
-+        }
-+    }
-+
-+    return -1
-+}
-+
diff --git a/dev-tcltk/tix/files/tix-8.4.2-tcl85.patch b/dev-tcltk/tix/files/tix-8.4.2-tcl85.patch
deleted file mode 100644
index aaf995e0b6e2..000000000000
--- a/dev-tcltk/tix/files/tix-8.4.2-tcl85.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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/files/tix-8.4.3-link.patch b/dev-tcltk/tix/files/tix-8.4.3-link.patch
new file mode 100644
index 000000000000..d2d402dc8e49
--- /dev/null
+++ b/dev-tcltk/tix/files/tix-8.4.3-link.patch
@@ -0,0 +1,11 @@
+--- Tix8.4.2/Makefile.in.link	2006-11-18 04:41:06.000000000 +0100
++++ Tix8.4.2/Makefile.in	2006-11-18 04:43:13.000000000 +0100
+@@ -124,7 +124,7 @@
+ RANLIB		= @RANLIB@
+ RANLIB_STUB	= @RANLIB_STUB@
+ SHLIB_CFLAGS	= @SHLIB_CFLAGS@
+-SHLIB_LD	= @SHLIB_LD@
++SHLIB_LD	= @SHLIB_LD@ $(CFLAGS) -Wl,-soname=$(PKG_LIB_FILE)
+ SHLIB_LD_FLAGS	= @SHLIB_LD_FLAGS@
+ SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
+ STLIB_LD	= @STLIB_LD@
diff --git a/dev-tcltk/tix/metadata.xml b/dev-tcltk/tix/metadata.xml
index d9408d8ab078..70ac40499556 100644
--- a/dev-tcltk/tix/metadata.xml
+++ b/dev-tcltk/tix/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>
diff --git a/dev-tcltk/tix/tix-8.4.3.ebuild b/dev-tcltk/tix/tix-8.4.3.ebuild
index 01729c98555c..76e50688c03a 100644
--- a/dev-tcltk/tix/tix-8.4.3.ebuild
+++ b/dev-tcltk/tix/tix-8.4.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tix/tix-8.4.3.ebuild,v 1.13 2012/09/09 21:30:25 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tix/tix-8.4.3.ebuild,v 1.14 2012/12/13 07:31:34 jlec Exp $
 
-EAPI="2"
+EAPI=5
 
 inherit eutils multilib
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/tix/${MY_P}-src.tar.gz"
 IUSE=""
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 RESTRICT="test"
 
@@ -28,14 +28,32 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	(use x86-macos || use x64-macos) || epatch "${FILESDIR}"/${P}-link.patch
+	sed \
+		-e 's:-Os::g' \
+		-i configure tclconfig/tcl.m4 || die
+}
+
+src_configure() {
+	econf \
+		--with-tcl="${EPREFIX}/usr/$(get_libdir)" \
+		--with-tk="${EPREFIX}/usr/$(get_libdir)"
+}
+
 src_install() {
-	emake DESTDIR="${D}" install || die
+	default
 
 	# Bug 168897
-	insinto /usr/include; doins generic/tix.h || die
+	doheader 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 || die
-	dohtml -r index.html ABOUT.html docs/ || die
+	if use x86-macos || use x64-macos; then
+		mv "${ED}"/usr/$(get_libdir)/${MY_P}/libTix{,.}${PV}.dylib
+		dosym ${MY_P}/libTix.${PV}.dylib /usr/$(get_libdir)/libTix.${PV}.dylib
+	else
+		dosym ${MY_P}/lib${MY_P}.so /usr/$(get_libdir)/lib${MY_P}.so
+	fi
+
+	dodoc ChangeLog README.txt docs/*.txt
+	dohtml -r index.html ABOUT.html docs/
 }