dev-util/dirdiff: Add fix for tcl-8.6, #455032; get some fixes from debian

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

7 files changed, 313 insertions, 5 deletions

diff --git a/dev-util/dirdiff/ChangeLog b/dev-util/dirdiff/ChangeLog
index 3dca373e0aea..4acb69d5fe07 100644
--- a/dev-util/dirdiff/ChangeLog
+++ b/dev-util/dirdiff/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/dirdiff
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dirdiff/ChangeLog,v 1.12 2012/05/29 19:29:19 ranger Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dirdiff/ChangeLog,v 1.13 2013/02/01 15:31:07 jlec Exp $
+
+*dirdiff-2.1-r2 (01 Feb 2013)
+
+  01 Feb 2013; Justin Lecher <jlec@gentoo.org> +dirdiff-2.1-r2.ebuild,
+  +files/dirdiff-2.1-build.patch, +files/dirdiff-2.1-funky-chars.patch,
+  +files/dirdiff-2.1-tcl8.6.patch, +files/dirdiff-2.1-vcs.patch, metadata.xml:
+  Add fix for tcl-8.6, #455032; get some fixes from debian
 
   29 May 2012; Brent Baude <ranger@gentoo.org> dirdiff-2.1-r1.ebuild:
   Marking dirdiff-2.1-r1 ppc for bug 391617
diff --git a/dev-util/dirdiff/dirdiff-2.1-r2.ebuild b/dev-util/dirdiff/dirdiff-2.1-r2.ebuild
new file mode 100644
index 000000000000..8680e0f43a4e
--- /dev/null
+++ b/dev-util/dirdiff/dirdiff-2.1-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dirdiff/dirdiff-2.1-r2.ebuild,v 1.1 2013/02/01 15:31:07 jlec Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="A tool for differing and merging directories"
+SRC_URI="http://samba.org/ftp/paulus/${P}.tar.gz"
+HOMEPAGE="http://samba.org/ftp/paulus/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="
+	dev-lang/tk
+	dev-lang/tcl"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-include.patch \
+		"${FILESDIR}"/${P}-build.patch \
+		"${FILESDIR}"/${P}-vcs.patch \
+		"${FILESDIR}"/${P}-tcl8.6.patch \
+		"${FILESDIR}"/${P}-funky-chars.patch
+	tc-export CC
+	append-cppflags -I"${EPREFIX}"/usr/include/tcl
+}
+
+src_install() {
+	dobin dirdiff
+	dolib.so libfilecmp.so.0.0
+	dosym libfilecmp.so.0.0 /usr/$(get_libdir)/libfilecmp.so.0
+	dosym libfilecmp.so.0.0 /usr/$(get_libdir)/libfilecmp.so
+	dodoc README
+}
diff --git a/dev-util/dirdiff/files/dirdiff-2.1-build.patch b/dev-util/dirdiff/files/dirdiff-2.1-build.patch
new file mode 100644
index 000000000000..bb5010265196
--- /dev/null
+++ b/dev-util/dirdiff/files/dirdiff-2.1-build.patch
@@ -0,0 +1,28 @@
+ Makefile | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index b4a49f8..410e018 100644
+--- a/Makefile
++++ b/Makefile
+@@ -7,12 +7,17 @@ LIBDIR=$(DESTDIR)/usr/lib
+ INSTALL=install
+ 
+ # You may need to change the -I arguments depending on your system
+-CFLAGS=-O3 -I/usr/include/tcl8.3/ -I/usr/include/tcl
++#CFLAGS=-O3 -I/usr/include/tcl8.3/ -I/usr/include/tcl
++
++LIBS = -ltcl
+ 
+ all:	libfilecmp.so.0.0
+ 
+-libfilecmp.so.0.0: filecmp.c
+-	$(CC) $(CFLAGS) -shared -o $@ filecmp.c
++.c.o:
++	$(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -c $< -o $@
++
++libfilecmp.so.0.0: filecmp.o
++	$(CC) $(LDFLAGS) -shared -Wl,-soname,libfilecmp.so.0 -o $@ filecmp.o $(LIBS)
+ 
+ install: dirdiff libfilecmp.so.0.0
+ 	$(INSTALL) -c dirdiff $(BINDIR)
diff --git a/dev-util/dirdiff/files/dirdiff-2.1-funky-chars.patch b/dev-util/dirdiff/files/dirdiff-2.1-funky-chars.patch
new file mode 100644
index 000000000000..1d4f715ac167
--- /dev/null
+++ b/dev-util/dirdiff/files/dirdiff-2.1-funky-chars.patch
@@ -0,0 +1,201 @@
+--- cvs-local.orig/dirdiff
++++ cvs-local/dirdiff
+@@ -563,7 +563,7 @@
+ 	    if {$d1 == $d2} continue
+ 	    set any 1
+ 	    $base.p.$sub1 add command -label "$d2" \
+-		    -command "makepatch \"$d1\" \"$d2\""
++		    -command [list makepatch $d1 $d2]
+ 	}
+ 	if {$any} {
+ 	    $base.p add cascade -label "$d1 ->" -menu $base.p.$sub1
+@@ -579,7 +579,7 @@
+     set i 0
+     foreach d $dirs {
+ 	if {!$dirreadonly($i)} {
+-	    $base.t add command -label $d -command "touchfiles \"$d\""
++	    $base.t add command -label $d -command [list touchfiles $d]
+ 	}
+ 	incr i
+     }
+@@ -677,7 +677,7 @@
+     set i 0
+     foreach d $dirs {
+ 	.bar.options add checkbutton -label "Read-only $d" \
+-		-variable dirreadonly($i) -command "readonlychange $i"
++		-variable dirreadonly($i) -command [list readonlychange $i]
+ 	incr i
+     }
+ 
+@@ -1153,7 +1153,7 @@
+ 	if {$xi != ""} {
+ 	    set x [lindex $dirs $xi]
+ 	    $diffbut add command -label "Show $x" \
+-		    -command "showfile \"$x\" \"$selfile\""
++		    -command [list showfile $x $selfile]
+ 	}
+     } elseif {$numgroups > 1} {
+ 	if {$numgroups > 2} {
+@@ -1163,7 +1163,7 @@
+ 		lappend x [lindex $dirs $i]
+ 	    }
+ 	    $diffbut add command -label "$numgroups-way diff" \
+-		-command "diffn {$x} {$selfile}"
++		-command [list diffn $x $selfile]
+ 	}
+ 	for {set gn 1} {$gn < $numgroups} {incr gn} {
+ 	    set yi [lindex $groupelts($gn) 0]
+@@ -1184,7 +1184,7 @@
+ 		set xi [lindex $groupelts($go) 0]
+ 		if {$xi == ""} continue
+ 		set x [lindex $dirs $xi]
+-		set cmd "diff2 \"$x\" \"$y\" \"$selfile\""
++		set cmd [list diff2 $x $y $selfile]
+ 		if {$numgroups <= 3} {
+ 		    if {$compound_ok} {
+ 			$diffbut add command -label "$x vs. $y" \
+@@ -1283,7 +1283,7 @@
+                 set cl2 [lindex $bgcolors($ng) $age]
+                 if {$im2 == "ex"} {set im2 ""}
+ 		set y [lindex $dirs $dst]
+-		set cmd "copyselfile \"$src\" \"$dst\" \"$selfile\" 0"
++		set cmd [list copyselfile $src $dst $selfile 0]
+ 		if {$any == 1} {
+ 		    if {$compound_ok} {
+ 			$copybut add command -label "$x -> $y" \
+@@ -1346,7 +1346,7 @@
+                 set im2 [lindex $agecolors($ng) $age]
+                 set cl2 [lindex $bgcolors($ng) $age]
+ 		set y [lindex $dirs $dst]
+-		set cmd "copyselfile \"$src\" \"$dst\" \"$selfile\" 1"
++		set cmd [list copyselfile $src $dst $selfile 1]
+ 		if {$any == 1} {
+ 		    if {$compound_ok} {
+ 			$copybut add command -label "$x -> $y" \
+@@ -1392,10 +1392,10 @@
+                 if {$compound_ok} {
+ 		    $copybut add command -label "Remove from $x" \
+                         -image ex -compound left \
+-			-command "removeselfile \"$dst\" \"$selfile\""
++			-command [list removeselfile $dst $selfile]
+                 } else {
+ 		    $copybut add command -label "Remove from $x" \
+-			-command "removeselfile \"$dst\" \"$selfile\""
++			-command [list removeselfile $dst $selfile]
+                 }
+ 	    }
+ 	}
+@@ -1415,7 +1415,7 @@
+ 		if {$dirreadonly($d)} continue
+ 		set y [lindex $dirs $d]
+ 		$copybut add command -label "$x -> $y" \
+-			-command "copyselfile \"$s\" \"$d\" \"$selfile\" 0"
++			-command [list copyselfile $s $d $selfile 0]
+ 	    }
+ 	}
+ 	set needsep 1
+@@ -1429,10 +1429,10 @@
+             if {$compound_ok} {
+ 	        $copybut add command -label "Remove from $x" \
+                     -image ex -compound left \
+-		    -command "removeselfile \"$s\" \"$selfile\""
++		    -command [list removeselfile $s $selfile]
+             } else {
+ 	        $copybut add command -label "Remove from $x" \
+-		    -command "removeselfile \"$s\" \"$selfile\""
++		    -command [list removeselfile $s $selfile]
+             }
+ 	}
+     }
+@@ -1469,7 +1469,7 @@
+ 
+     # Show the file in an external viewer
+     if { [llength $showprogram] > 0} {
+-       eval "exec $showprogram \"$fn\" &"
++       exec $showprogram $fn &
+        return
+     }
+     # Or make our own viewer
+@@ -1569,7 +1569,7 @@
+     set diffopts "-U $ctxlines $diffiflag $diffwflag $diffbflag $diffBflag $diffdflag"
+ 
+     if { [llength $diffprogram] > 0} {
+-       eval "exec $diffprogram \"$path1\" \"$path2\" &"
++       exec $diffprogram $path1 $path2 &
+        return
+     }
+     # If we used an external diff program, its options are used.  If we didn't,
+@@ -1750,7 +1750,7 @@
+ 	    if {$gx == $g && !$dirreadonly($k)} {
+ 		set f [lindex $dirs $k]
+ 		$mergebut.m add command -label "update $f" \
+-		    -command "diffmerge $i \"$f\""
++		    -command [list diffmerge $i $f]
+ 		set path [joinname $f $difffile]
+ 		set diffmtime($path) [file mtime $path]
+ 	    }
+@@ -1770,7 +1770,7 @@
+ 	    if {$gx == $g && !$dirreadonly($k)} {
+ 		set f [lindex $dirs $k]
+ 		$mpatchbut.m add command -label "for $f" \
+-		    -command "diffmpatch $i \"$f\""
++		    -command [list diffmpatch $i $f]
+ 	    }
+ 	    incr k
+ 	}
+@@ -3424,7 +3424,7 @@
+     $w.bar.edit.m add command -label Copy -command "tk_textCopy $w.t"
+     $w.bar.edit.m add command -label Paste -command "tk_textPaste $w.t"
+     $w.bar.edit.m add command -label Find \
+-	    -command "difffind :merge:$di:$fi $w.t"
++	    -command [list difffind :merge:$di:$fi $w.t]
+     pack $w.bar.edit -side left
+     frame $w.f -relief sunk -border 2
+     entry $w.f.filename
+@@ -3533,7 +3533,7 @@
+     $w.bar.edit.m add command -label Copy -command "tk_textCopy $w.t"
+     $w.bar.edit.m add command -label Paste -command "tk_textPaste $w.t"
+     $w.bar.edit.m add command -label Find \
+-	    -command "difffind :mpatch:$fi $w.t"
++	    -command [list difffind :mpatch:$fi $w.t]
+     pack $w.bar.edit -side left
+     frame $w.f -relief sunk -border 2
+     entry $w.f.filename
+@@ -3993,7 +3993,7 @@
+        $w.bar.edit.m add command -label Copy -command "tk_textCopy $w.t"
+        $w.bar.edit.m add command -label Paste -command "tk_textPaste $w.t"
+        $w.bar.edit.m add command -label Find \
+-	    -command "difffind :patch:$patchnum $w.t"
++	    -command [list difffind :patch:$patchnum $w.t]
+        pack $w.bar.edit -side left
+        frame $w.f -relief sunk -border 2
+        label $w.f.l -text "Filename: "
+@@ -4032,23 +4032,23 @@
+ 	set p1 [joinname $d1 $f]
+ 	set p2 [joinname $d2 $f]
+ 	if {[file exists $p1] && [file exists $p2]} {
+-	    set fh [open "|diff $contextopt $p1 $p2" r]
++	    set fh [open [list |diff $contextopt $p1 $p2] r]
+ 	} elseif {[file exists $p1] && ! [file exists $p2]} {
+-	    set fh [open "|diff $contextopt $p1 $nullfile" r]
++	    set fh [open [list |diff $contextopt $p1 $nullfile] r]
+ 	} elseif {! [file exists $p1] && [file exists $p2]} {
+-	    set fh [open "|diff $contextopt $nullfile $p2" r]
++	    set fh [open [list |diff $contextopt $nullfile $p2] r]
+ 	} else {
+             continue
+ 	}
+ 	fconfigure $fh -blocking 0
+-	fileevent $fh readable "readpatch $fh $pnum $w $d1 $d2 $i \"$f\""
++	fileevent $fh readable [list readpatch $fh $pnum $w $d1 $d2 $i $f]
+ 	return
+     }
+     if {[string match ".*" $w]} {
+        $w.t delete "end - 1c" end
+     } else {
+         close $w
+-        eval "exec $showprogram \"$patch_outfile\" &"
++        exec $showprogram $patch_outfile &
+         # Should we remove the tempfile here?  We don't have it if we used 
+         # the internal viewer
+     }
diff --git a/dev-util/dirdiff/files/dirdiff-2.1-tcl8.6.patch b/dev-util/dirdiff/files/dirdiff-2.1-tcl8.6.patch
new file mode 100644
index 000000000000..39d930a51724
--- /dev/null
+++ b/dev-util/dirdiff/files/dirdiff-2.1-tcl8.6.patch
@@ -0,0 +1,16 @@
+ filecmp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/filecmp.c b/filecmp.c
+index 673c1a8..fd4c6e5 100644
+--- a/filecmp.c
++++ b/filecmp.c
+@@ -341,7 +341,7 @@ FileCmpCmd(clientData, interp, argc, argv)
+     if (n1 < 0 || n2 < 0)
+ 	return TCL_ERROR;
+ 
+-    sprintf(interp->result, "%d", same);
++    sprintf(Tcl_GetStringResult(interp), "%d", same);
+     return TCL_OK;
+ }
+ 
diff --git a/dev-util/dirdiff/files/dirdiff-2.1-vcs.patch b/dev-util/dirdiff/files/dirdiff-2.1-vcs.patch
new file mode 100644
index 000000000000..b8db24509eaa
--- /dev/null
+++ b/dev-util/dirdiff/files/dirdiff-2.1-vcs.patch
@@ -0,0 +1,16 @@
+ dirdiff | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dirdiff b/dirdiff
+index c5522b6..f470348 100755
+--- a/dirdiff
++++ b/dirdiff
+@@ -37,7 +37,7 @@ set nxdirmode 0
+ set docvsignore 0
+ 
+ set defaultcvsignore {
+-    RCS SCCS CVS CVS.adm RCSLOG cvslog.* tags TAGS
++    RCS SCCS CVS CVS.adm RCSLOG cvslog.* .svn .git tags TAGS
+     .make.state .nse_depinfo *~ \#* .\#* ,* _$* *$
+     *.old *.bak *.BAK *.orig *.rej .del-* *.a *.olb
+     *.o *.obj *.so *.exe *.Z *.elc *.ln core
diff --git a/dev-util/dirdiff/metadata.xml b/dev-util/dirdiff/metadata.xml
index a40624fba8f0..1470e032181b 100644
--- a/dev-util/dirdiff/metadata.xml
+++ b/dev-util/dirdiff/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>