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

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

6 files changed, 45 insertions, 382 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/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/
 }