bump to fix #40420

10 files changed, 24 insertions, 137 deletions

diff --git a/dev-util/tkcvs/ChangeLog b/dev-util/tkcvs/ChangeLog
index 5c25025a948e..513a1a73c611 100644
--- a/dev-util/tkcvs/ChangeLog
+++ b/dev-util/tkcvs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/tkcvs
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/tkcvs/ChangeLog,v 1.11 2004/08/02 12:37:58 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/tkcvs/ChangeLog,v 1.12 2004/08/11 10:30:09 scandium Exp $
+
+*tkcvs-7.2.1 (11 Aug 2004)
+
+  11 Aug 2004; Rainer Groesslinger <scandium@gentoo.org> +tkcvs-7.2.1.ebuild:
+  bump to fix #40420
 
   02 Aug 2004; Ferris McCormick <fmccor@gentoo.org> tkcvs-7.1.4.ebuild:
   Stable for sparc.  Based on bug 32391 and current versions of tcl/tk, this
diff --git a/dev-util/tkcvs/Manifest b/dev-util/tkcvs/Manifest
index a8165aa38514..ada35f8ce56a 100644
--- a/dev-util/tkcvs/Manifest
+++ b/dev-util/tkcvs/Manifest
@@ -1,9 +1,5 @@
-MD5 9697f7225d4ff78535ef2d1baa50fe38 ChangeLog 1906
-MD5 72443797f6b105817d89033569a3d75b tkcvs-6.4-r2.ebuild 2646
-MD5 141e41879777c520559777d8fe354642 tkcvs-7.03.ebuild 1011
-MD5 6fce8f5572498e3b1056909ae1543a2a tkcvs-7.1.2.ebuild 1004
-MD5 c6c155e631275c130e172ebc6c45ad44 tkcvs-7.1.4.ebuild 1139
-MD5 a2adb60698610b1d76c1e96c4602a728 files/digest-tkcvs-6.4-r2 61
-MD5 2db9709aee2b88cebb52bb629c6973f5 files/digest-tkcvs-7.03 62
-MD5 a486fecd4b2c20cadbf1c98802422084 files/digest-tkcvs-7.1.2 63
+MD5 c0adf7b7f51ee32613312c89caf88631 tkcvs-7.1.4.ebuild 1140
+MD5 f24c1833e1ec0aa35b71cafa76388b10 tkcvs-7.2.1.ebuild 1134
+MD5 fd21960eb3e1f9c77cb6101d9373a004 ChangeLog 2036
 MD5 4a6d3697b88a2a80ef6332cfe3a3748e files/digest-tkcvs-7.1.4 63
+MD5 84f449e2b115f6ebcccd5b06cf90bef9 files/digest-tkcvs-7.2.1 64
diff --git a/dev-util/tkcvs/files/digest-tkcvs-6.4-r2 b/dev-util/tkcvs/files/digest-tkcvs-6.4-r2
deleted file mode 100644
index be35302e7f8f..000000000000
--- a/dev-util/tkcvs/files/digest-tkcvs-6.4-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dec18bb61e49a4b3eceacfd83ca07a36 tkcvs-6.4.tar.gz 191411
diff --git a/dev-util/tkcvs/files/digest-tkcvs-7.03 b/dev-util/tkcvs/files/digest-tkcvs-7.03
deleted file mode 100644
index 7192fdeaca31..000000000000
--- a/dev-util/tkcvs/files/digest-tkcvs-7.03
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ef4bc8916234fac04f9e809faa416f8d tkcvs-7_03.tar.gz 218921
diff --git a/dev-util/tkcvs/files/digest-tkcvs-7.1.2 b/dev-util/tkcvs/files/digest-tkcvs-7.1.2
deleted file mode 100644
index 9f17448e9982..000000000000
--- a/dev-util/tkcvs/files/digest-tkcvs-7.1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 59c250d269aaae3982933d4133aa5b8b tkcvs_7_1_2.tar.gz 239874
diff --git a/dev-util/tkcvs/files/digest-tkcvs-7.2.1 b/dev-util/tkcvs/files/digest-tkcvs-7.2.1
new file mode 100644
index 000000000000..8aa7d8e2c629
--- /dev/null
+++ b/dev-util/tkcvs/files/digest-tkcvs-7.2.1
@@ -0,0 +1 @@
+MD5 a552cdccd7cde73eaa8a41294f499cfc tkcvs_7_2_1.tar.gz 1083178
diff --git a/dev-util/tkcvs/tkcvs-6.4-r2.ebuild b/dev-util/tkcvs/tkcvs-6.4-r2.ebuild
deleted file mode 100644
index 35bb824a298a..000000000000
--- a/dev-util/tkcvs/tkcvs-6.4-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/tkcvs/tkcvs-6.4-r2.ebuild,v 1.12 2004/07/15 00:12:28 agriffis Exp $
-
-
-DESCRIPTION="TkCVS"
-SRC_URI="http://www.twobarleycorns.net/${P}.tar.gz"
-HOMEPAGE="http://www.twobarleycorns.net/tkcvs.html"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc "
-IUSE=""
-
-RDEPEND=">=dev-lang/tk-8.1.1"
-
-src_compile() {
-	echo "It's tcl, you don't need to compile.  ;)"
-}
-
-src_install() {
-	dodir /usr/lib /usr/bin /usr/lib/tkcvs/ /usr/lib/tkcvs/bitmaps
-
-	# We need to do this 'cause the tcl install requires X to be running
-	# and the user that runs emerge to have DISPLAY set and working
-	cat tkcvs/tkcvs.blank | sed -e {s/_TCDIR_/"\/usr\/lib"/} \
-		> ${D}/usr/bin/tkcvs
-	chmod 755 ${D}/usr/bin/tkcvs
-	chmod 755 ${S}/tkdiff/tkdiff
-	dobin tkdiff/tkdiff
-
-	insinto /usr/lib/tkcvs
-	doins \
-		tkcvs/modtree.tcl tkcvs/cvs.tcl tkcvs/reports.tcl \
-		tkcvs/tooltips.tcl tkcvs/tkcvs_def.tcl \
-		tkcvs/gen_log.tcl tkcvs/logcanvas.tcl tkcvs/dialog.tcl \
-		tkcvs/import.tcl tkcvs/merge.tcl tkcvs/errors.tcl \
-		tkcvs/static.tcl tkcvs/search.tcl tkcvs/filebrowse.tcl \
-		tkcvs/modules.tcl tkcvs/commit.tcl tkcvs/modbrowse.tcl \
-		tkcvs/workdir.tcl tkcvs/help.tcl tkcvs/tclIndex
-
-	insinto /usr/lib/tkcvs/bitmaps
-	doins 	bitmaps/edit.gif bitmaps/files.gif \
-		bitmaps/loop-glasses.gif bitmaps/clean.gif \
-		bitmaps/clear.gif bitmaps/tclfish.gif bitmaps/diff.gif \
-		bitmaps/fileview.gif bitmaps/dir.gif \
-		bitmaps/loop-half.gif bitmaps/conflict.gif \
-		bitmaps/patches.gif bitmaps/fileedit.gif \
-		bitmaps/arrow_hl_up.gif bitmaps/branchtag.gif \
-		bitmaps/branch.gif bitmaps/checkin.gif bitmaps/tag.gif \
-		bitmaps/logfile.gif bitmaps/refresh.gif \
-		bitmaps/arrow_dn.gif bitmaps/remove.gif bitmaps/mod.gif \
-		bitmaps/import.gif bitmaps/patchfile.gif \
-		bitmaps/checkout.gif bitmaps/add.gif \
-		bitmaps/mergebranch.gif bitmaps/tags.gif \
-		bitmaps/adir.gif bitmaps/arrow_up.gif bitmaps/arrow.gif \
-		bitmaps/unedit.gif bitmaps/delete.gif bitmaps/mdir.gif \
-		bitmaps/modules.gif bitmaps/ball.gif bitmaps/who.gif \
-		bitmaps/export.gif bitmaps/loop.gif \
-		bitmaps/modbrowse.gif bitmaps/mergediff.gif \
-		bitmaps/arrow_hl_dn.gif bitmaps/amod.gif \
-		bitmaps/tclfish.xbm bitmaps/tkcvs32.xbm \
-		bitmaps/tkcvs48.xbm bitmaps/tkcvs32_mask.xbm \
-		bitmaps/tclfish_fly.xbm bitmaps/modbrowse.xbm \
-		bitmaps/trace.xbm
-
-	newman tkcvs/tkcvs.n tkcvs.1
-
-	# Add docs...this is important
-	dodoc CHANGELOG COPYING FAQ README.tkcvs README.windows
-
-	docinto tkdiff
-	dodoc tkdiff/PATCHES tkdiff/COPYING
-
-	docinto tkcvs
-	dodoc tkcvs/vendor.readme
-}
diff --git a/dev-util/tkcvs/tkcvs-7.03.ebuild b/dev-util/tkcvs/tkcvs-7.03.ebuild
deleted file mode 100644
index 9946bb979602..000000000000
--- a/dev-util/tkcvs/tkcvs-7.03.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/tkcvs/tkcvs-7.03.ebuild,v 1.9 2004/07/15 00:12:28 agriffis Exp $
-
-MY_P=${PN}-${PV/./_}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="TkCVS"
-SRC_URI="http://www.twobarleycorns.net/${MY_P}.tar.gz"
-HOMEPAGE="http://www.twobarleycorns.net/tkcvs.html"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc "
-IUSE=""
-
-RDEPEND=">=dev-lang/tk-8.1.1"
-
-src_compile() {
-	echo "It's tcl, you don't need to compile.  ;)"
-}
-
-src_install() {
-	dodir /usr/lib /usr/bin /usr/lib/tkcvs/ /usr/lib/tkcvs/bitmaps
-
-	./doinstall.tcl -nox -finallib /usr/lib ${D}/usr || die
-
-	# Move man pages to FHS compliant locations
-	dodir /usr/share/man/man1
-	mv ${D}/usr/man/man1/* ${D}/usr/share/man/man1
-	rm -rf ${D}/usr/man
-
-	# Add docs...this is important
-	dodoc CHANGELOG COPYING FAQ README.tkcvs README.windows
-
-	docinto tkdiff
-	dodoc tkdiff/PATCHES tkdiff/COPYING
-
-	docinto tkcvs
-	dodoc tkcvs/vendor.readme
-}
diff --git a/dev-util/tkcvs/tkcvs-7.1.4.ebuild b/dev-util/tkcvs/tkcvs-7.1.4.ebuild
index 670373b8ad60..424016444a1e 100644
--- a/dev-util/tkcvs/tkcvs-7.1.4.ebuild
+++ b/dev-util/tkcvs/tkcvs-7.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/tkcvs/tkcvs-7.1.4.ebuild,v 1.6 2004/08/02 12:37:58 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/tkcvs/tkcvs-7.1.4.ebuild,v 1.7 2004/08/11 10:30:09 scandium Exp $
 
 MY_P=${PN}_${PV//./_}
 S=${WORKDIR}/${MY_P}
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.twobarleycorns.net/tkcvs.html"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 sparc"
+KEYWORDS="x86 ~amd64 sparc"
 IUSE=""
 
 RDEPEND=">=dev-lang/tk-8.3
diff --git a/dev-util/tkcvs/tkcvs-7.1.2.ebuild b/dev-util/tkcvs/tkcvs-7.2.1.ebuild
index 28895e8b2626..774922cf3790 100644
--- a/dev-util/tkcvs/tkcvs-7.1.2.ebuild
+++ b/dev-util/tkcvs/tkcvs-7.2.1.ebuild
@@ -1,19 +1,21 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/tkcvs/tkcvs-7.1.2.ebuild,v 1.7 2004/07/15 00:12:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/tkcvs/tkcvs-7.2.1.ebuild,v 1.1 2004/08/11 10:30:09 scandium Exp $
 
 MY_P=${PN}_${PV//./_}
 S=${WORKDIR}/${MY_P}
-DESCRIPTION="TkCVS"
+DESCRIPTION="TkCVS is a Tcl/Tk-based graphical interface to CVS."
 SRC_URI="http://www.twobarleycorns.net/${MY_P}.tar.gz"
 HOMEPAGE="http://www.twobarleycorns.net/tkcvs.html"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="~x86 ~amd64 ~sparc"
 IUSE=""
 
-RDEPEND=">=dev-lang/tk-8.3"
+RDEPEND=">=dev-lang/tk-8.4
+	dev-util/cvs
+	sys-apps/diffutils"
 
 src_compile() {
 	echo "It's tcl, you don't need to compile.  ;)"
@@ -29,11 +31,14 @@ src_install() {
 	mv ${D}/usr/man/man1/* ${D}/usr/share/man/man1
 	rm -rf ${D}/usr/man
 
+	insinto /usr/lib/tkcvs/bitmaps
+	doins tkdiff/tkdiff.xbm
+
 	# Add docs...this is important
-	dodoc CHANGELOG COPYING FAQ README.tkcvs README.windows
+	dodoc CHANGELOG FAQ README.tkcvs README.windows
 
 	docinto tkdiff
-	dodoc tkdiff/PATCHES tkdiff/COPYING
+	dodoc tkdiff/COPYING
 
 	docinto tkcvs
 	dodoc tkcvs/vendor.readme