moved tkdiff from dev-tcltk to dev-util

7 files changed, 0 insertions, 279 deletions

diff --git a/dev-tcltk/tkdiff/ChangeLog b/dev-tcltk/tkdiff/ChangeLog
deleted file mode 100644
index 60ce9d8409da..000000000000
--- a/dev-tcltk/tkdiff/ChangeLog
+++ /dev/null
@@ -1,48 +0,0 @@
-# ChangeLog for dev-tcltk/tkdiff
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkdiff/ChangeLog,v 1.12 2009/05/12 16:58:41 fmccor Exp $
-
-  12 May 2009; Ferris McCormick <fmccor@gentoo.org> tkdiff-4.1.4.ebuild:
-  Sparc stable, bug #259833.
-
-  12 May 2009; Federico Ferri <mescalinum@gentoo.org> tkdiff-4.1.4.ebuild:
-  depend on >=tk-8.4.18-r1, as suggested on bug #259833 comment #6
-
-*tkdiff-4.1.4 (23 Dec 2008)
-
-  23 Dec 2008; Federico Ferri <mescalinum@gentoo.org>
-  +files/tkdiff-4.1.4-hg.patch, +tkdiff-4.1.4.ebuild:
-  version bump + patch for mercurial, bug #251778 - thanks Ottxor
-
-  27 Apr 2007; Christian Faulhammer <opfer@gentoo.org> tkdiff-4.1.3.ebuild:
-  stable amd64, bug 155797
-
-  27 Apr 2007; Joseph Jezak <josejx@gentoo.org> tkdiff-4.1.3.ebuild:
-  Marked ppc stable for bug #155797.
-
-  26 Apr 2007; Christian Faulhammer <opfer@gentoo.org> tkdiff-4.1.3.ebuild:
-  stable x86, bug 155797
-
-  25 Apr 2007; Ferris McCormick <fmccor@gentoo.org> tkdiff-4.1.3.ebuild:
-  sparc stable --- Bug #155797 --- tkdiff has actually been around forever.
-
-*tkdiff-4.1.3 (24 Sep 2006)
-
-  24 Sep 2006; MATSUU Takuto <matsuu@gentoo.org> +tkdiff-4.1.3.ebuild:
-  Version bumped.
-
-*tkdiff-4.1.1 (08 Jan 2006)
-
-  08 Jan 2006; MATSUU Takuto <matsuu@gentoo.org> -tkdiff-4.0.2.ebuild,
-  +tkdiff-4.1.1.ebuild:
-  Version bumped.
-  Removed old version wrt security bug 116908.
-
-  03 Apr 2005; MATSUU Takuto <matsuu@gentoo.org> tkdiff-4.0.2.ebuild:
-  Added ~ppc and ~sparc.
-
-*tkdiff-4.0.2 (27 Mar 2005)
-
-  27 Mar 2005; MATSUU Takuto <matsuu@gentoo.org> +tkdiff-4.0.2.ebuild:
-  Initial ebuild. Bug #31348.
-
diff --git a/dev-tcltk/tkdiff/Manifest b/dev-tcltk/tkdiff/Manifest
deleted file mode 100644
index 4b05c833afd5..000000000000
--- a/dev-tcltk/tkdiff/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX tkdiff-4.1.4-hg.patch 6459 RMD160 9a5688c7dcdf3a12ef3f1e8f5b86de933a002fc6 SHA1 55625f8c61c88bb7b0f7b57c988666f27869d685 SHA256 7660b36809bd5df8e3561b602459345a64c04c834fd0236f504f14597ee895d9
-DIST tkdiff-4.1.3-unix.tar.gz 89665 RMD160 717bae3d774ee08647c0378b7108739534180b22 SHA1 5d5bb97c8404d73e41232930bc25728b680f6388 SHA256 5af91ab5490e88a19d6cd63f92cd88cea2f085ac19640751c84067798e6d9291
-DIST tkdiff-4.1.4-unix.tar.gz 89870 RMD160 1cd9be047eec6c5edb503503829a17a1e4bb0f00 SHA1 b44386cde4ff46cff0ee563dd96d004fe8028943 SHA256 cd93523e1480129b6edec6fc0ac10cb58023b35c511349dcab53bec507bdb8a7
-DIST tkdiff_4_1_1.tar.gz 88450 RMD160 99b3f0e13b023415835952ac1f06f1f78edd9b7b SHA1 c3d2f81026ea57dedd10c9afac79619578a28c47 SHA256 95a0c619b91d84b1ff9898b572a08c4cb1c670c950757bdff9a485cd152a690e
-EBUILD tkdiff-4.1.1.ebuild 579 RMD160 7ef5bf7b7e02bbeb1d5d43514b79573c7e989089 SHA1 28a8869b62c32992cf3671f78966ca873b0ba566 SHA256 7ae10d6f3656fba0cf9c93d09e9496b58a8d289abd48527e9cf2db1f5a03983b
-EBUILD tkdiff-4.1.3.ebuild 564 RMD160 09239ab95e6199619c0f94a12e527f7f5086f2f2 SHA1 fb0c190dd29b10e0bbeb7f5ae5ef2b6ecb070364 SHA256 3100a7a8ddaf67f2b47a0edda442f3ff3e8b3eb77f4239e87fc89ac2c2c19b64
-EBUILD tkdiff-4.1.4.ebuild 668 RMD160 f25d732cb5a87d10d6bf59af71ca0b8ccac3c29a SHA1 27d4ab59087609576e754d9f112ebece952c3a37 SHA256 91156c33539595ccbee8e371d8cd733c67397a6d40a6f47ee6c15a94948b5a78
-MISC ChangeLog 1655 RMD160 68ec02407c9f50f8f1a169d44c0b51b387afde0d SHA1 0cec23ec39ff981fda7a8d9ce33d3b1b37f53400 SHA256 79d6768b291e6eb66791a871373e029bc3389fb806997f213f9a50ea5e69e8ee
-MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
diff --git a/dev-tcltk/tkdiff/files/tkdiff-4.1.4-hg.patch b/dev-tcltk/tkdiff/files/tkdiff-4.1.4-hg.patch
deleted file mode 100644
index d179b4e65448..000000000000
--- a/dev-tcltk/tkdiff/files/tkdiff-4.1.4-hg.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-Added support for Mercurial (hg) source control.  Mercurial is an
-open-source distributed source control system, conceptually similar to
-Git, Bazaar (bzr), Darcs, and the commercial system BitKeeper 
-(which tkdiff already supports).  
-
-While Mercurial already comes with a tkdiff wrapper called "hgdiff",
-this script does not support arbitrary revisions in the way that the
-actual hg diff command does (e.g. "hg diff -r2 -r5 filename).  This
-patch gives tkdiff support for all the revision numbers that "hg diff"
-supports.
-
-The code changes are small and mostly boilerplate, but I did add one
-new procedure called "is-mercurial-repository".  This was added
-because mercurial uses a single ".hg" directory at the top-level
-directory of a repository rather than having a directory at each
-different directory inside the repository.  The new procedure simply
-traverses up the parent directories until it either finds a .hg
-directory (indicating that we're in a Mercurial repository) or hits
-the root directory (indicating that we're not).
-
-Since the list of supported source control systems is getting large, I
-alphabetized the list in the command-line help text and also modified
-other parts of this help text to say things like "RCS, CVS, etc."
-rather than exhaustively listing all the supported systems yet again.
-
-More information on Mercurial can be found at
-  http://www.selenic.com/mercurial/wiki/ and
-  http://en.wikipedia.org/wiki/Mercurial_(software)
-
-diff -r 92c7c897cdd3 -r d32253d0cd0f tkdiff
---- a/tkdiff	Sat Jan 05 00:42:06 2008 -0800
-+++ b/tkdiff	Wed Jan 09 06:05:01 2008 -0800
-@@ -743,6 +743,7 @@ proc get-file-rev {f index {r ""}} {
-         set bkopt ""
-         set pvcsopt ""
-         set p4file "$f"
-+        set hgopt ""
-     } else {
-         set rev "r$r"
-         set acrev "\"$r\""
-@@ -754,6 +755,7 @@ proc get-file-rev {f index {r ""}} {
-         set bkopt "-r$r"
-         set pvcsopt "-r$r"
-         set p4file "$f#$r"
-+        set hgopt "-r$r"
-     }
- 
-     set finfo(pth,$index) [tmpfile $index]
-@@ -907,6 +909,23 @@ proc get-file-rev {f index {r ""}} {
-             puts "Couldn't deal with $f, exiting..."
-             exit
-         }
-+    } elseif {[is-mercurial-repository $dirname]} {
-+        # mercurial support
-+        set cmd "hg"
-+        if {$::tcl_platform(platform) == "windows"} {
-+            append cmd ".exe"
-+        }
-+        if {"$r" == "" || "$rev" == "PARENT"} {
-+            # in hg, the revision for cat defaults to the parent revision
-+            # of the working directory
-+            set finfo(lbl,$index) "$f (HG PARENT)"
-+            debug-info "  Setting lbl $finfo(lbl,$index)"
-+            die-unless "exec $cmd cat $f" $finfo(pth,$index)
-+        } else {
-+            set finfo(lbl,$index) "$f (HG $rev)"
-+            debug-info "  Setting lbl $finfo(lbl,$index)"
-+            die-unless "exec $cmd cat $hgopt $f" $finfo(pth,$index)
-+        }
-     } else {
-         fatal-error "File '$f' is not part of a revision control system"
-     }
-@@ -916,6 +935,19 @@ proc get-file-rev {f index {r ""}} {
-         set finfo(lbl,$index) $finfo(userlbl,$index)
-         debug-info "  User label: $finfo(lbl,$index)"
-     }
-+}
-+
-+proc is-mercurial-repository {dirname} {
-+    # check for a .hg directory in all parent directories
-+    set dirname [file normalize $dirname]
-+    set prevdir {}
-+    while {$dirname != $prevdir} {
-+        set hgfilename [file join $dirname .hg]
-+        if {[file isdirectory $hgfilename]} { return true }
-+        set prevdir $dirname
-+        set dirname [file dirname $dirname]
-+    }
-+    return false
- }
- 
- proc sccs-is-bk {} {
-@@ -6105,8 +6137,8 @@ proc do-usage {mode} {
-     Plain file with conflict markers:
-      	tkdiff -conflict FILE
- 
--    Source control (AccuRev, BitKeeper, CVS, Subversion, Perforce, PVCS,
--      RCS, SCCS, ClearCase)
-+    Source control (AccuRev, BitKeeper, ClearCase, CVS, Mercurial, Perforce, 
-+      PVCS, RCS, SCCS, and Subversion)
-      	tkdiff FILE
- 	tkdiff -rREV FILE
- 	tkdiff -rREV1 -rREV2 FILE
-@@ -6125,7 +6157,9 @@ proc do-usage {mode} {
-       directory with the same name. It detects and supports PVCS by looking \
-       for a vcs.cfg file. It detects and supports AccuRev, Perforce and \
-       ClearCase by looking for the environment variables named ACCUREV_BIN, \
--      P4CLIENT, and CLEARCASE_ROOT respectively.
-+      P4CLIENT, and CLEARCASE_ROOT respectively.  It detects and supports \
-+      Mercurial by looking for a directory named ".hg" in the current \
-+      directory or any of its ancestor directories.
- 
- In the first form, tkdiff will present a dialog to allow you to choose the \
-       files to diff interactively. At present this dialog only supports a \
-@@ -6139,9 +6173,9 @@ In the second form, at least one of the 
- 
- In the remaining forms, <cmp>REV</cmp> (or <cmp>REV1</cmp> and \
-       <cmp>REV2</cmp>) must be a valid revision number for <cmp>FILE</cmp>. \
--      Where AccuRev, RCS, CVS, Subversion, SCCS, PVCS or Perforce is implied \
-+      When a source control system (RCS, CVS, etc.) is detected (see above) \
-       but no revision number is specified, <cmp>FILE</cmp> is compared with \
--      the the revision most recently checked in.
-+      the revision most recently checked in.
- 
- To merge a file with conflict markers generated by "<cmp>merge</cmp>", \
-       "<cmp>cvs</cmp>", or "<cmp>vmrg</cmp>", use \
-@@ -6149,13 +6183,10 @@ To merge a file with conflict markers ge
-       files which you can merge as usual (see below).
- 
- For "<cmp>tkdiff FILE</cmp>" The CVS version has priority, followed by the \
--      Subversion version, followed by the SCCS version -- i.e. if a CVS \
-+      Subversion version, followed by the SCCS version, followed by RCS, \
-+      PVCS, Perforce, AccuRev, ClearCase, and Mercurial -- i.e. if a CVS \
-       directory is present, CVS; if not and a Subversion directory is \
--      present, Subversion; if not and an SCCS directory is present, SCCS is \
--      assumed; otherwise, if a CVS.CFG file is found, PVCS is assumed; \
--      otherwise RCS is assumed. If none of the above apply and the AccuRev \
--      environment variable ACCUREV_BIN is found, AccuRev is used. If P4CLIENT \
--      is found, Perforce is used. If CLEARCASE_ROOT is found, ClearCase is used.
-+      present, Subversion; etc.
- 
- If the merge output filename is not specified, tkdiff will present a dialog \
-       to allow you to choose the name of the merge output file.
diff --git a/dev-tcltk/tkdiff/metadata.xml b/dev-tcltk/tkdiff/metadata.xml
deleted file mode 100644
index d9408d8ab078..000000000000
--- a/dev-tcltk/tkdiff/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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-tcltk/tkdiff/tkdiff-4.1.1.ebuild b/dev-tcltk/tkdiff/tkdiff-4.1.1.ebuild
deleted file mode 100644
index b2f8f9ab7e6e..000000000000
--- a/dev-tcltk/tkdiff/tkdiff-4.1.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkdiff/tkdiff-4.1.1.ebuild,v 1.1 2006/01/08 14:48:58 matsuu Exp $
-
-MY_P="${PN}_${PV//./_}"
-DESCRIPTION="tkdiff is a graphical front end to the diff program"
-HOMEPAGE="http://tkdiff.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tkdiff/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/tk-8.4"
-
-S="${WORKDIR}/${PN}-unix"
-
-src_install() {
-	dobin tkdiff
-	dodoc Changelog
-}
diff --git a/dev-tcltk/tkdiff/tkdiff-4.1.3.ebuild b/dev-tcltk/tkdiff/tkdiff-4.1.3.ebuild
deleted file mode 100644
index 2bd3791a9480..000000000000
--- a/dev-tcltk/tkdiff/tkdiff-4.1.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkdiff/tkdiff-4.1.3.ebuild,v 1.5 2007/04/27 06:05:35 opfer Exp $
-
-MY_P="${P}-unix"
-DESCRIPTION="tkdiff is a graphical front end to the diff program"
-HOMEPAGE="http://tkdiff.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tkdiff/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/tk-8.4"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	dobin tkdiff
-	dodoc Changelog
-}
diff --git a/dev-tcltk/tkdiff/tkdiff-4.1.4.ebuild b/dev-tcltk/tkdiff/tkdiff-4.1.4.ebuild
deleted file mode 100644
index 4ae9253d763b..000000000000
--- a/dev-tcltk/tkdiff/tkdiff-4.1.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkdiff/tkdiff-4.1.4.ebuild,v 1.3 2009/05/12 16:58:41 fmccor Exp $
-
-inherit eutils
-
-MY_P="${P}-unix"
-DESCRIPTION="tkdiff is a graphical front end to the diff program"
-HOMEPAGE="http://tkdiff.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tkdiff/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/tk-8.4.18-r1"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-hg.patch"
-}
-
-src_install() {
-	dobin tkdiff
-	dodoc Changelog
-}