Fix test problem with tcl 8.5 vs 8.6, bug #543640; fix tcl SLOT usage

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

5 files changed, 52 insertions, 28 deletions

diff --git a/dev-tcltk/tcllib/ChangeLog b/dev-tcltk/tcllib/ChangeLog
index 07bdeff93f71..f0ad4db90f98 100644
--- a/dev-tcltk/tcllib/ChangeLog
+++ b/dev-tcltk/tcllib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tcltk/tcllib
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcllib/ChangeLog,v 1.52 2015/03/13 11:57:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcllib/ChangeLog,v 1.53 2015/03/20 10:13:29 jlec Exp $
+
+  20 Mar 2015; Justin Lecher <jlec@gentoo.org> tcllib-1.15-r1.ebuild,
+  tcllib-1.15-r2.ebuild, tcllib-1.16.ebuild:
+  Fix test problem with tcl 8.5 vs 8.6, bug #543640; fix tcl SLOT usage
 
   13 Mar 2015; Jeroen Roovers <jer@gentoo.org> tcllib-1.16.ebuild:
   Marked ~hppa (bug #541980).
diff --git a/dev-tcltk/tcllib/Manifest b/dev-tcltk/tcllib/Manifest
index 2df0bc658cc1..c807ec2055bc 100644
--- a/dev-tcltk/tcllib/Manifest
+++ b/dev-tcltk/tcllib/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX tcllib-1.14-test.patch 1374 SHA256 86b2665a5507d879fac178f51fe5115855d162a54cf597580e0ebbd0524d9e9d SHA512 388a5dd5be63b24f0043097f873c375a2bfafa19946038b83f86bdd627335ab18ad7cd6f57481eb9f08429e6f61e77a4ba172b5d5d43ab0212fc5821a837665b WHIRLPOOL 658e8f09ae2e3bae6c87f83d54e909c5317713ccce160389667a20786367ad4c11057c9b192251e76cc3a5157ea5dd8cef11e225fb14bda05a2f75a8fc96f4e0
 AUX tcllib-1.15-XSS-vuln.patch 29465 SHA256 bcb0741c2645137ca22db7fbeb74ba74cf5282dd35a6070ea197ecd77a2f6ddd SHA512 e3df9ae6c6bdf1da78ea7dc239e934608647fef47728de003a0f129d554c612ed4db17f8ed7119c57d4b16a5203a79fd958d399fcdfc8bdccfb7219e73d9ce02 WHIRLPOOL 18fbb0703c661b1caed5e54e3bb1ee155fd65b83f01c3a21b954684b92d2def675c4b4b7da56ce0614444abc863022f116bcaa71a4da1fb35bedce31736a7a97
@@ -11,15 +11,27 @@ DIST Tcllib-1.16.tar.bz2 6089076 SHA256 033334306d3ffc499c8830d393bf7528227e49c6
 DIST tcllib-1.15-manpage-rename.patch.xz 3188 SHA256 d86f60e98013fe35a1038247e1992a0afc9314462d693ee10ee30ded501e1869 SHA512 9bcdb6c7dcb492a58e767529a8bb5a2c83912577ae124fec40f3bbd6fb283a4befb2dfc3d7a986b287ba9709bba7261b676d78441c8be0f614f31bc123d81126 WHIRLPOOL 1ac9fd5fddba5adab9560cabb0a5df9a3e0c2bafda861cabb6519bcef2a94c54f2dcd2e04e3b3892cda2c374c0186d7e21e4e435f109a8915eaa507019a53db8
 DIST tcllib-1.15-test.patch.xz 3208 SHA256 16fbf7d564f3b0f338d3f21774199738ca0014e4d689b053bef8840023cf8889 SHA512 8b9de181cdc39e0f9361694fb1bb9ee42b3fba269d13e91be31643ce3509c34e3e6b74b043e067dda49d75b6f4a009a79361f7a9ecf4613a509decb3eacf8447 WHIRLPOOL 1b138a1d742e8b7aeb574ec1eb1d7688b9a7bcf469269b4b27004f23f9d7947b9dd4828322739606bd3a9aecc11202d3712f15cd459448f18f6e9a2896911a12
 DIST tcllib-1.15.tar.bz2 5030648 SHA256 7a1e27f6d2e625af15d13df6117958815c8482e662a914fc1cbd7f0b0e780e71 SHA512 544b1193266e860eb59a4c313645376bba8488711b2afc629d99d0e719252db79caae73022ae1dc21dc123f949fa8930f81112c3f80328fc83952b64f93ca3c4 WHIRLPOOL 75ef40710859c0f669fdac96ee7ed5d76d6a10081649d890cadc970c21478b2daddd8289853e38239d68ad9aae0dd9ee5ee94827f1bf0e4b5b511134024e062c
-EBUILD tcllib-1.15-r1.ebuild 1122 SHA256 32e242d18557f2c15684d8ef859c1f38c32d71e9aa525e605e6c8b5d1bd4d291 SHA512 3a51c7af575594f33df8ac563b3cc1374b6a6479bf0c51d75c02ef7e0ecc9ad27efa99bf6776bbeffdf21a32b9d661ec289df5bc43246fe8748f330f09bd9fac WHIRLPOOL cbfb35e52e953d36b64a22d5d5b722907779f367433b54e3a76ad2486a3f59d1f602dd3a8a8df89854fa35e340301468f0b536e81023df601cd947d012f92f0c
-EBUILD tcllib-1.15-r2.ebuild 1189 SHA256 72fa129546a4d1824ce1e04c8267c2e371d1f2a82798bfc2af1f5e3b95af61a7 SHA512 e7fb83493995ebe48c5125ca6dae790335f646f411884066ff31a25c54b1f9dd27b307c5b5154e29ec5fc73a80cc05ef3be14625ad2431956e2635fccb0ea247 WHIRLPOOL ad356343068b53cabb36ef3b493ba09e540da2a52355dea788c5372052dec6ae2ee0b2edd123e9ffbcf0f401f5399d86fe052c42614ec5a33d00696ff6ec00ee
-EBUILD tcllib-1.16.ebuild 1052 SHA256 fc08ac41e97a218ab1dd83af2ea91af474411c5ad2c8e858fe397143a00f159d SHA512 b698cdafc3fe982d2958bac77807e383386331db7af63d421383349c8bc2ee4d0cbec460d9ccac26876ff2b7c73448a7760d8dc8dd1e9519afcdcfc573b767d1 WHIRLPOOL c60f795bdb6ec0075b7385ae86d001e42de6500e19caafbf09b10fe4101ba190d6abc37540dabff5248d118f6cfb39898dd6070497121b1a618386235ce9354f
-MISC ChangeLog 6665 SHA256 897e760e18bd271de95e23da1b81f3f3a0f01fb4d51a71f4525d1f1baeeb7003 SHA512 fcc95a3e0c8a46770e4b21b043f6eddf50fab093e0d15f3d20f607b78672b17000e343ed6e503ad2efdf7652a61954dca2a06ef0f57499dc0e05b5f705492d99 WHIRLPOOL 4dea9ad16c4cabf510c5ec8dee3e855f5993f6c7a40eb53475bd98f993d10d9a2a72651e3421727d39970e5ef094ece374e7b72913e658ed8c0e8bb4ab2c72fb
+EBUILD tcllib-1.15-r1.ebuild 1127 SHA256 4f68163e3301208678bbc045acacab7e72ff1f80efd52b2f30201e5e7723c3ed SHA512 13c8caee6f98c980184885fbd3809820bc4f4c62279fd5f6422169b6475599f02369d33cc39ccb6486069c9b52733821f94efec5e5a426b9bb46e84cd4446065 WHIRLPOOL f2870974517d9d5da036cb6e8218e31c96e74f634d06d271795c8ff839d2fdc59850aaace9a3f8c7f57320f5333dd05642a679f79c62b8de5a39ce769211bf11
+EBUILD tcllib-1.15-r2.ebuild 1253 SHA256 5bf2725d38b31600d30726d65435321c15b04497f842c5095dd7612814d62ca8 SHA512 8c0c8f0311aafa7e221a6978b1163f947ed61fce53df04193ca5fdc2ae08954e51486e0fe0f232119bd4206db1bd267400b4e98aeaa30267273d175efd43c63f WHIRLPOOL 6cdc796b178f458fdf31f84e5331e46164091e3dd2580000c36bf690158df91d788c830276ba173420acef0b3820da9848333338324317334bf415c8e6eccb30
+EBUILD tcllib-1.16.ebuild 1161 SHA256 eeb24969adffeba55e5ee49e22fca57642ea6c121853d5b28b4b646f810e1e94 SHA512 c926ce2b3fad6ad6d4bb3b4861b9422f9eb0e5883536cebe7518476648b91a32b6409e618d9d075935b72f42a6efdf191b47e1ca9480afc509503b9d954da739 WHIRLPOOL 40d08132146beaae0bb1c517644e941ed44ef64da868f575ead8701fec588bf571180eeaecd21341d3246a9ed052267e547e2e5955cacd6fd83250e024e7fd6c
+MISC ChangeLog 6854 SHA256 b854582714b1473144ccaba6ae28fe4d6e5ba2feb7847467801a57e0e578879e SHA512 dfc249bd94e3fc5160447e0e8d69d72a28e6dbafddf0109f78fd19a1ca96924fd4dda7c829fae80d5f261e80e084cc6f122a5e653ae4553c5c77dceff8cc90ef WHIRLPOOL 05eb2a7055e36015fb0f0c4360642d56d39ffe72de33e6b8adbd3cba6db6309d39ea90ef20487fd421506c9ffa56005b6ff652bf213cc0467180b6e81e1acaee
 MISC metadata.xml 160 SHA256 225a6f78d287329cdf2f4ed57468be28bd6565fd9a62207c2cc48e25ac9d3537 SHA512 a50627bda9ed953daf422b5a2e89b5b64e296d1a023d767c8a4ebb2cd51cd0036cecce455762a54e7d669f94d17d9de21052bac94fc08b1365ef42eb2f267742 WHIRLPOOL 61fa22d50aaf2bdecc467e26c9675cf7949ad55a4a8821730c91d1bd73f83fc4c35660851961310efa450e337a7ef572a925e186b8b05984d6315efc509fd365
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlUC0LoACgkQVWmRsqeSphN09gCdGLhCt1GYtMzxoDkpFAj3WKbn
-u7gAn0gyB9OJMOe8gsNLT/2gs1JEUXXU
-=ZAvM
+iQJ8BAEBCgBmBQJVC/LKXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir2EIP/2A+K5ffTJg8aPptwIGC4Wqj
+DFwM+D6nrErTFGb78tbodlAjPJjj0tq/1Vq1exmR1+MMbXkXt1Z0+LBDYwT9gVBB
+ivgXj5Y01XNJECnMATSkqidG4HPR8nTKX7OmrCo9i3U5l0+/soNKRNbgu1/QgHbA
+kVIqlPnSbEsFcu7sf42aV/y8M9xD/A2vvvE5n/rZ9beXgBGojjIv6nq9V1Fh58+B
+dnOpC/V2HH4sQ8FTgRNV/OkeXXtGlA5hCU+gpu+BNAnDX93cCojYT6++E/g99Mj6
+IShMbQRxnDI0pSbemDRbO7cU9qFo4OFIBIlK1j1wRSOEoelM19uh8AmrZIVewrLH
+5+BLCBwnsfJKJOdoBfZPr6PFbzWtVJf72MoS0hXCqtdWRggdOzD0j+EsCoU9I6DY
+oEAOTsMd31MR4wVySFcukR6MLux9Rfq31WOCIw95EM5I9ROnUlTj4Qa3r9OGSKxv
+szoDMfhfunccRvpRw6ZWJWywZN+BZw7FBUL5Hxo/lIi6IgT4m1ixoI1vmL8c/eVE
+26nFDgpmlrq0NrPfzNwS4PXAivdQ8rYow625oh/Z9kk0axt2Qkc8qFEU2PtjmOsN
+G6b3r+cj0K4fsLUHeCjZr82lhpHXn1b9QRzs8plZU19ORhxOJKM957y45rWo1rC8
+vV1H4KSXdm6RUBv8R1rM
+=DRhT
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tcllib/tcllib-1.15-r1.ebuild b/dev-tcltk/tcllib/tcllib-1.15-r1.ebuild
index 4b02a663c549..5b8bf3b5337e 100644
--- a/dev-tcltk/tcllib/tcllib-1.15-r1.ebuild
+++ b/dev-tcltk/tcllib/tcllib-1.15-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/tcllib/tcllib-1.15-r1.ebuild,v 1.9 2013/06/30 18:07:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcllib/tcllib-1.15-r1.ebuild,v 1.10 2015/03/20 10:13:29 jlec Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SLOT="0"
 IUSE="examples"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc s390 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
 
-RDEPEND="dev-lang/tcl"
+RDEPEND="dev-lang/tcl:0="
 DEPEND="${RDEPEND}"
 
 DOCS=( DESCRIPTION.txt STATUS )
diff --git a/dev-tcltk/tcllib/tcllib-1.15-r2.ebuild b/dev-tcltk/tcllib/tcllib-1.15-r2.ebuild
index 9ba546714d70..863888fe5758 100644
--- a/dev-tcltk/tcllib/tcllib-1.15-r2.ebuild
+++ b/dev-tcltk/tcllib/tcllib-1.15-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcllib/tcllib-1.15-r2.ebuild,v 1.4 2015/03/08 14:01:54 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcllib/tcllib-1.15-r2.ebuild,v 1.5 2015/03/20 10:13:29 jlec Exp $
 
 EAPI=5
 
@@ -18,18 +18,22 @@ SLOT="0"
 IUSE="examples"
 KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
 
-RDEPEND="dev-lang/tcl"
+RDEPEND="dev-lang/tcl:0="
 DEPEND="${RDEPEND}"
 
 DOCS=( DESCRIPTION.txt STATUS )
 
+PATCHES=(
+	"${FILESDIR}"/${P}-tcl8.6-test.patch
+	"${WORKDIR}"/${P}-test.patch
+	"${WORKDIR}"/${P}-manpage-rename.patch
+	"${FILESDIR}"/${P}-XSS-vuln.patch
+)
+
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-tcl8.6-test.patch \
-		"${WORKDIR}"/${P}-test.patch \
-		"${WORKDIR}"/${P}-manpage-rename.patch \
-		"${FILESDIR}"/${P}-XSS-vuln.patch \
-		"${FILESDIR}"/${P}-test.patch
+	has_version ">=dev-lang/tcl-8.6" && \
+		PATCHES+=( "${FILESDIR}"/${P}-test.patch )
+	epatch ${PATCHES[@]}
 }
 
 src_test() {
diff --git a/dev-tcltk/tcllib/tcllib-1.16.ebuild b/dev-tcltk/tcllib/tcllib-1.16.ebuild
index da000de19c71..678c4a7e9c65 100644
--- a/dev-tcltk/tcllib/tcllib-1.16.ebuild
+++ b/dev-tcltk/tcllib/tcllib-1.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcllib/tcllib-1.16.ebuild,v 1.2 2015/03/13 11:57:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcllib/tcllib-1.16.ebuild,v 1.3 2015/03/20 10:13:29 jlec Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ IUSE="examples"
 KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
 
 RDEPEND="
-	dev-lang/tcl
+	dev-lang/tcl:0=
 	dev-tcltk/tdom
 	"
 DEPEND="${RDEPEND}"
@@ -28,15 +28,19 @@ DOCS=( DESCRIPTION.txt STATUS )
 
 S="${WORKDIR}"/${MY_P}
 
+PATCHES=( "${FILESDIR}"/${P}-XSS-vuln.patch )
+
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-test.patch \
-		"${FILESDIR}"/${P}-XSS-vuln.patch
+	has_version ">=dev-lang/tcl-8.6" && \
+		PATCHES+=( "${FILESDIR}"/${P}-test.patch )
+	epatch ${PATCHES[@]}
+
+	sed \
+		-e '/testsNeedTcl/s:8.5:8.6:g' \
+		-i modules/tar/tar.test || die
 }
 
 src_test() {
-#	emake test_interactive
-	#emake test_batch
 	Xemake test_batch
 }