Fix file collision, bug #547890; drop old

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

6 files changed, 67 insertions, 84 deletions

diff --git a/dev-tcltk/tklib/ChangeLog b/dev-tcltk/tklib/ChangeLog
index 593205163159..4365ba3b0b3a 100644
--- a/dev-tcltk/tklib/ChangeLog
+++ b/dev-tcltk/tklib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tcltk/tklib
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tklib/ChangeLog,v 1.5 2015/04/07 14:22:51 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tklib/ChangeLog,v 1.6 2015/05/06 06:55:44 jlec Exp $
+
+*tklib-0.6-r2 (06 May 2015)
+
+  06 May 2015; Justin Lecher <jlec@gentoo.org> +tklib-0.6-r2.ebuild,
+  -tklib-0.5-r1.ebuild, -tklib-0.5.ebuild, tklib-0.6-r1.ebuild:
+  Fix file collision, bug #547890; drop old
 
 *tklib-0.6-r1 (09 Jun 2013)
 
@@ -24,4 +30,3 @@
   29 Mar 2010; Justin Lecher <jlec@gentoo.org> +tklib-0.5.ebuild,
   +metadata.xml:
   new ebuild per 311845
-
diff --git a/dev-tcltk/tklib/Manifest b/dev-tcltk/tklib/Manifest
index 033158ebcc8c..a17113e39486 100644
--- a/dev-tcltk/tklib/Manifest
+++ b/dev-tcltk/tklib/Manifest
@@ -1,29 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-DIST tklib-0.5.tar.bz2 4022413 SHA256 65c0343a6629c98884d9ffd17e87994a3bd54c836195ab0f907c4dff12db66b0 SHA512 9d584a4df9129020736668185b5cb115698846efeb7b8992b1278501c59f134c3ba6c4f0317f1a5e55544e46497995324765df368f29156701aedd881e905da9 WHIRLPOOL 74f57c72241c7eb3c796ae4b177aba7eaf0eccfa6d64570195c165f3a7fdffad4963757c87bfe65bbad126d82f88793e670309121f4271d001010985dbe7eb43
 DIST tklib-0.6.tar.bz2 5637725 SHA256 d2e0648bdaf1ab0f874136f1e5645bd68a8fe206f1905d9f08614d90ee2e3025 SHA512 c4dbe6afe9d1d9c97edc154c807d429086e045f8b202870f21cafcd846b7ff759c8260d44d5e1e1322a0e7d3478c1dfb12d7a0c76200f583ac3bb85b21bf04b4 WHIRLPOOL afeb8f62d58f540eb7ecc99c150c719411a41e585ac09a868896484266e69f85ece4c408bc176d4cc87f123280b584b27b29780e8b9d2f58d22a8dae98b8d5d9
-EBUILD tklib-0.5-r1.ebuild 838 SHA256 b830e68eeecd51eb7a09b4f551ea45efd2df1346b26f5f229bf7a0f8043d7af4 SHA512 09446818658069444523f72e9b652d2a5e391ad45e6066bc5abb530645c31d15611fa55a98f23df6de7449bdcdc6ceaad71fb0b5e8ae2b826030ccf335bbb3cc WHIRLPOOL 91e2ea2f467aa9c83a7b7bcce62d5881da5fb3493429afcb3eee3b3dd26f1b3df3b3c47dd437e1283f6e07b6da51cdf4e169fdc7c56c9654934b155c8daa4484
-EBUILD tklib-0.5.ebuild 773 SHA256 bf6052776dacfaeafd83d0d6c20a23bd81f2374d31ad76be2d823a49716ff81c SHA512 f3bd414f0d56ad831a7e7c2425b4eaaefb014a5ad2f31d2ccb4a7fc8c72e00a48ddfca28408ab1a3a51e3f0d2328169dafea8726c733da48043f22dcf6376b50 WHIRLPOOL cecb477e0890d8f5b0eb901b0a0c583d0c039ed7f38c32df3bdd22f5881aa50dca49e0691cdf36df6906f868506202ce34590ee7451230bfe93f28a2678596e7
-EBUILD tklib-0.6-r1.ebuild 889 SHA256 ae3553cc25c179a3f5aaaaaa890b39a51e7201d8ffc328c737cf92bbda1363cd SHA512 8c0cbd8420e4072e5874893a1b7e1f3dad909e204e15d28a144b27f73146a0c54f0fa0e60544f7081aef53647c2001d7b605c26c7650630f869076ddab411afc WHIRLPOOL 9e8f1ea28465e8daeb31eb0c0ffaaf42f371329e1ed37d001d5e6f352ecd801eeee03febff66a1085d1f7098ced6207b3acdbc0fb9c687af8c40ccd369f74edb
-MISC ChangeLog 851 SHA256 5995980aa36da2a42092c18e64bc3fb6f3f0d8554ef1ee17c4ab87df8e87c669 SHA512 4a5ff09026e7862a919ac4d22f33079d973a81413f915381d19696caf139c16b79ca27de622676f8760ace36f1fb4de9fa9e502fc27319adb3edb25f147536e1 WHIRLPOOL 3390fb27ea1b7be7de5cfdfe95c264d8b2ebdc651c3bd71e75463cab68fa1da2356bce224f2381bdcf2d82d90c98ea255214b3173c5bcfd4964d89ec446f12ee
+EBUILD tklib-0.6-r1.ebuild 948 SHA256 741d9da2d5b3203c08fafa689e268b18840dba2ab16b693c97969d275b81275a SHA512 6e051ea630512aace04723cb72b7aa40c89f821ff88951d4844d7bf7b161dd8ac6f7e69067af30baadbbc7372763a98f0c583242f00e24a75693e5bf83165c5b WHIRLPOOL a319c1cc1cd3b6c2767c793cd56f6c1dfda28acc1ee1a218dc3867e713bd5029597ce2a0abce50b0499d3ea807ed017a35e2ab42f502b9c751448563444e5575
+EBUILD tklib-0.6-r2.ebuild 948 SHA256 7eb5175b65dba2198d2ccbe933b6f081e608ece86ddb562673843dddfcab4195 SHA512 d72220938424b461c6248ebbdaa17ea3adb5deefc8635deed147d976f98cb7fa5f549993a0c4f78d007621d0bf2d545e526247be46149409112da757ea7d5ba2 WHIRLPOOL b8ae924c6c8b1244b8b63d2f790a03c3730f07bceda1f13928d741a0f5d450f8ea189736e6530a89478c58dce3d371bb8245184f8442ddfc61bad5480182e34d
+MISC ChangeLog 1057 SHA256 6d4deba58856e27965a1db66378ce77c8e6c4b3eb7fc04a7451daea09687d0d7 SHA512 eee4d0e2c9ef47d84832d18adfaf26dd71e15328a1e283812c9f45b81219acf9b3f0809d0f6b671e25109be68927d3bcce42b54e214ccc6eddb5754d9ac4e2fc WHIRLPOOL d3d6113f2b94042d54230661208c1b161bdeb3412cedd6b01f17e55829a9307a4c3349dde6ba354f581399d2bce3a25988dfb755ed1085243f6e553624d417d5
 MISC metadata.xml 226 SHA256 e15c03af9a036ecbfee32b0098e8c8327390fe9f5ce3842f524abb860a1714dd SHA512 2be729c67b0770f9b7fe397519d9cc0068cb21e32e42653f3b3ef656bc4dc0d1753877f4984f6f1c886a9e09f447b508e729eaca1ad136bc0f706f09412cadff WHIRLPOOL efa911cc72b3581315ceff377d8ccd23827aa66eaa95c3d97970e7b71228f97045fa37a5b3ad607f36d17e3ac113ec021332b4f1b612894bb01223425d078a47
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJ8BAEBCgBmBQJVI+g8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVSbrxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirgtMQAJyD5Tmy81JgTC6wQwIh/jME
-Rs/EWqntdUePET5qGfEEJeLZvOa4kF+fpGZ4UHXPiTnaqe3udWgLO0tWE/ECVisx
-VTXs2g6VRqA8xCAL/3jwGmN/OkW+rvYxlFfbwUaN11My0/qxNVk3k1v2Z3Ow0Hq3
-hBDFZCmqg3ojKwUtxz520BV4qQTZbk5Tb4dqBCYgo40dcIQ6nMis6tCEwqZQLhhX
-EcfWUHY8eyo70wU0lNdN4Y9bFV11yUS8SPZKs6T0KKR0AqTUH6mh1/GmFzwP84lJ
-eaNMFqEg20BEgzigiBpgsrkvvj8dSDtqsMkWyry1/gxS1D8gaAogpa2m1hw1Ddl/
-4SauRZZ/6jryFEKYUvikkfLnWNIFOOwiv4wjGhk3bAIp9WkVx4wYcPltt58Qd64e
-do076hqt0tyPylMUQu322GRftHBX6mmrnZ8PZ3oLodWpH/Z5dZgEp6OdKXZANODr
-wTGXjIH2DBVhGtV2wof7AcU7S13FmpkFoF6onkpifGKHN6iOrPBZsPdJdg/q7u99
-l1WWPmel5SSykuKNWUIRMQuBWhtAQiKvdSx0tJnu2YayGlNQkYFQ87KJxjyeXijW
-EBg/47g3vlyqaU8EXftfFzFMSkOGWFIYGNnA7O7TSD3J8RNhxRtug2AjQRRkU8+v
-TOt6q3MKvKFoTn7lCSYj
-=wIbV
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirhckP/0Ot78hoUHuRUaH+93ClfWfP
+JkMjJWtx7faYcI+GJ4WQSjpb9OQDwHByrDqPjr3tMCecJ4SksmZP7WPZg3Arj8Nh
+IuxB9C+3uqKgMyP5k6oKQ1EHqX9FhUi2mX76cIO98MLrnEjXIHoTI331q+MItepo
+59p0+fa03k4S3bY0vFI/5OHWEbZDKJF9L3VmDRe7UtTk/NL6JfFM7YWB3IUr7rVb
+XgXB/XKOD01FqC2ebPlvt5GrlPFz9PReJZWhUqIiIjbn4DLMnW3wYb0XTbz0+CGg
+P2IvbJviZanzlTuvmC4NwbOCHWX/I/VdTcyUxBb69GQN4rok9mqDBga0VcYYynVp
+fSPcCUGOVXWZbFSWxXNqIMy208vXm3x/D7UUtaWEmld1gGx53I8x2kJHrRrjQyVo
+BtLkVG5UUKpZ27AmN/jHMlAlnHaGFpvCx2ONN2UVpwz/H9iu7OSfTbITXm3I6y6I
+oD3pY6yuTyDCqqamEfhZeGsr86IxqD00ggVBUFEBjILh0HaiQAdQJvbLzo4oXw0i
+QA2IDvl6lur3xtct8alB2gSmvwEkbFCwcEIcDdNW0b2TrYzfxUpVN4s6ObWGF5ba
+6Z8wQ6sw8S+FZyyPf26LFJPhz1C6QG9IT5MlrMsobJro/h5+5do1C7/4LcOFvPi+
+Qo7xzDTjXwOBku6KSD46
+=0uqO
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tklib/tklib-0.5-r1.ebuild b/dev-tcltk/tklib/tklib-0.5-r1.ebuild
deleted file mode 100644
index 25f7f9c4ef41..000000000000
--- a/dev-tcltk/tklib/tklib-0.5-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tklib/tklib-0.5-r1.ebuild,v 1.2 2013/06/06 08:04:42 jlec Exp $
-
-inherit multilib
-
-DESCRIPTION="Collection of utility modules for Tk, and a companion to Tcllib"
-HOMEPAGE="http://www.tcl.tk/software/tklib"
-SRC_URI="mirror://sourceforge/project/tcllib/${PN}/${PV}/${P}.tar.bz2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="BSD"
-IUSE="doc"
-
-RDEPEND="
-	dev-lang/tk
-	dev-tcltk/tcllib"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	if use doc; then
-		emake DESTDIR="${D}" doc || die
-		dohtml doc/html/* || die
-	fi
-	dodoc ChangeLog DESCRIPTION.txt README* || die
-	dosym ${PN}${PV} /usr/$(get_libdir)/${PN}
-
-	mv "${ED}"/usr/share/man/mann/datefield{,-${PN}}.n || die
-}
diff --git a/dev-tcltk/tklib/tklib-0.5.ebuild b/dev-tcltk/tklib/tklib-0.5.ebuild
deleted file mode 100644
index 36c42714f5a7..000000000000
--- a/dev-tcltk/tklib/tklib-0.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tklib/tklib-0.5.ebuild,v 1.3 2013/06/06 08:04:42 jlec Exp $
-
-DESCRIPTION="Collection of utility modules for Tk, and a companion to Tcllib"
-HOMEPAGE="http://www.tcl.tk/software/tklib"
-SRC_URI="mirror://sourceforge/project/tcllib/${PN}/${PV}/${P}.tar.bz2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="BSD"
-IUSE="doc"
-
-RDEPEND="
-	dev-lang/tk
-	dev-tcltk/tcllib"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	if use doc; then
-		emake DESTDIR="${D}" doc || die
-		dohtml doc/html/* || die
-	fi
-	dodoc ChangeLog DESCRIPTION.txt README* || die
-	mv "${ED}"/usr/share/man/mann/datefield{,-${PN}}.n || die
-}
diff --git a/dev-tcltk/tklib/tklib-0.6-r1.ebuild b/dev-tcltk/tklib/tklib-0.6-r1.ebuild
index 2a1f9a0acf26..b3c1ebd0a4d9 100644
--- a/dev-tcltk/tklib/tklib-0.6-r1.ebuild
+++ b/dev-tcltk/tklib/tklib-0.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tklib/tklib-0.6-r1.ebuild,v 1.1 2013/06/09 10:26:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tklib/tklib-0.6-r1.ebuild,v 1.2 2015/05/06 06:55:44 jlec Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ LICENSE="BSD"
 IUSE="doc"
 
 RDEPEND="
-	dev-lang/tk
+	dev-lang/tk:0
 	dev-tcltk/tcllib"
 DEPEND="${RDEPEND}"
 
@@ -32,5 +32,6 @@ src_install() {
 	dosym ${PN}${PV} /usr/$(get_libdir)/${PN}
 
 	mv "${ED}"/usr/share/man/mann/datefield{,-${PN}}.n || die
+	mv "${ED}"/usr/share/man/mann/menubar{,-${PN}}.n || die
 	mv "${ED}"/usr/bin/dia{,-${PN}} || die
 }
diff --git a/dev-tcltk/tklib/tklib-0.6-r2.ebuild b/dev-tcltk/tklib/tklib-0.6-r2.ebuild
new file mode 100644
index 000000000000..3a3b17557386
--- /dev/null
+++ b/dev-tcltk/tklib/tklib-0.6-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tklib/tklib-0.6-r2.ebuild,v 1.1 2015/05/06 06:55:44 jlec Exp $
+
+EAPI=5
+
+inherit multilib
+
+CODE=6a397dec6188148cf6a6fe290cf2bd92a9190c42
+
+DESCRIPTION="Collection of utility modules for Tk, and a companion to Tcllib"
+HOMEPAGE="http://www.tcl.tk/software/tklib"
+SRC_URI="http://core.tcl.tk/tklib/raw/tklib-0.6.tar.bz2?name=${CODE} -> ${P}.tar.bz2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LICENSE="BSD"
+IUSE="doc"
+
+RDEPEND="
+	dev-lang/tk:0
+	dev-tcltk/tcllib"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	default
+	if use doc; then
+		emake DESTDIR="${D}" doc
+		dohtml doc/html/*
+	fi
+	dodoc DESCRIPTION.txt README*
+	dosym ${PN}${PV} /usr/$(get_libdir)/${PN}
+
+	mv "${ED}"/usr/share/man/mann/datefield{,-${PN}}.n || die
+	mv "${ED}"/usr/share/man/mann/menubar{,-${PN}}.n || die
+	mv "${ED}"/usr/bin/dia{,-${PN}} || die
+}