gentoo resync : 18.05.2019

8 files changed, 40 insertions, 10 deletions

diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index b3d5fcff906c..f9679436def0 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/snack/Manifest b/dev-tcltk/snack/Manifest
index 4ede58505f8c..637d602881b8 100644
--- a/dev-tcltk/snack/Manifest
+++ b/dev-tcltk/snack/Manifest
@@ -2,9 +2,9 @@ AUX alsa-undef-sym.patch 1230 BLAKE2B 9551a46a1852a8503898d74927cd0b83c2508cb06d
 AUX snack-2.2.10-CVE-2012-6303-fix.patch 778 BLAKE2B f6f34248825da751e81f4079d70fa7dec4dcbc5e63931aee58ad1f021e0a47f0bfdc7a52e69693bf32bae618a49f5c35c757694dd14984ebc79cd62acce2bda7 SHA512 6e2f7fcf8ca0c2792cf52432340f2319b8c82677a3568c9e382f91758f5e6bf26c3a05939d4a748c4198c4e50f27141ebd2cb298d8363765ed6582192d64d3e8
 AUX snack-2.2.10-darwin.patch 1108 BLAKE2B 862cd6a36363b45c9a27af08fa4bf347fc3e1a8fbbf972b72dfb4faf4cb135365fbe06377a20a2b77e02126e27de723b642067d8ccedb9947b9aa873069152ce SHA512 0d82270d830c8b7d15dcbead05d80c15666d1bac164f26c045859f7f4dc4c098961b48272ecd0b059a1b36ba8d560c563fe8e40add822f311026faf5f7eeaf0a
 AUX snack-2.2.10-debian-args.patch 4593 BLAKE2B bebc3c5cab2fea2b3fdc1c1c1e419855e49f2457d2014b2aa0f8236a637489e8b79fdac50d0b3369b576eea9a0bb130d46854c79939e6d93711c520e83001810 SHA512 686218bb22c3c8b53dcb18e10025f1a602c06fe11989a6e46dc02022d581fd281c03d2cca0938c2bad5947f8819e3c631f90f0439a8f274742bef80755dbd20e
-AUX snack-2.2.10-test.patch 6924 BLAKE2B c161141a85f9e8f0b28f4f90f069f45bef9719998fc28832d7afe3504a2d6234d80c010dbd62931b8ff4420fbc03e8a43ead4a91a7e5b1045db52c7ea23de5c8 SHA512 e3af62714d3e35426a7187c3807281a943c16f492abc8166c3a2053b5f4f738584eac469d4271d30cafe8742d05032aaf01464c7821ce0dacb567a9e53ccadd5
+AUX snack-2.2.10-test.patch 7435 BLAKE2B 0aa9b4555b15f0609cc3f4ad4325a50c6e559db8a31db0705245cd756171d5834c8986e6c1278d15d1176d3ad7cbd3a09b5a539730e2aa9e4ec465fd3d59c018 SHA512 61ef185ebe1de5695d1a80cdba2cf702e38d2c1c217e38034cd04d92fb8ddd0d6dd0ec3372b1826298a8b91f3d298a816b075ea60ebdab6c4bf1305a176d9cbe
 DIST snack2.2.10.tar.gz 1798252 BLAKE2B e27b8e7d6082cdcfc06e7eea5ab832fb78ba104de9e56a69c6c9cd688183f7d4c6bdb974e4d5d2bf5ef2bc5518a913ddf17c90db8d10cef4dbee533307cc7718 SHA512 c17ad332fa4f3ded006b97ceca85cada079e4c7cd933768b289c13dadca1b8803fccaf709ec2def5af4abe92c307f25597ebfa6f94df2d681e40815cd7eccb9b
 EBUILD snack-2.2.10-r6.ebuild 2012 BLAKE2B db70db5649537e2a4fb3d4484eafd6366e016b384415ec40330c4ff345c934c8554fdd34a91734c074d37096401ae883ad8d359deeeb6fb465950c16157cb0bf SHA512 30849b4e77e6177d41d32004ad1026ef44a57d654d25e583ebe6e7a16a08d0224ea3a79e0df62c7238b19b3d92fb1ab51325404e7f1e5e324208e3ccbeb13d62
 EBUILD snack-2.2.10-r7.ebuild 1940 BLAKE2B e6e88ef6cba18d2b1de2cee927c48208a612e2929e47cfe4d4b3d5256984653acc5ebcac712084f3046d540aff81301ce2c4adcf0253a20f4f4d59472a1c37af SHA512 32339642f2f30d41df5f0f381cba807d80f63a6e1d10870c70865ddd11e653422109cdcdd5927cf0c703b314d7499ab578dcd012e528a102fc328d65f9050231
-EBUILD snack-2.2.10-r8.ebuild 2074 BLAKE2B 80c23d7432125fcf1841a7e3dfd484b519666fcaed23f36ab7f251fb2e74414bdeb320bb7f660630b49b3aaa904d3921e26e05d39b22647f4937edf9374b2ffc SHA512 96603fbf7c9d41c75d6846732fffcbaa2d62dd351e7444fad2938f979392cb445e089f2f35c5ded56b780e409cc9955165e7c8e24cac20051ef15915b1c28d69
+EBUILD snack-2.2.10-r8.ebuild 2116 BLAKE2B ff08f8f23fafc31f4c81bf3066b3c5ac0fd16386e0713a64c1a9b10a96f02cce98f328246a83cb7435cf4443f94d9190dbb10c3e7c7b61ebb9d467e851e6d605 SHA512 c9711f3b26a0bd90809782111165907ecab7157d64accf54dfb6fa261581969cfa667d2c01097cfd8b39e29d788c68fbbcd370626e71da3214cb14624fae4c38
 MISC metadata.xml 259 BLAKE2B 174c3c7b4292350e73a38b09d473abba172ee6e82ca1b5bcb6815a9927609a7fbac063a19498e7c5deaa32530d10d8c493760ff5b6e489f821410cfeccadf566 SHA512 5943f2c9dc9a55862bae4c01be9e1f27304ffc1ce48d67341b4a19793c0bb11fe3d1a419af924ac360aeeafbce28018971602019a559a8a6c5939e05e3567639
diff --git a/dev-tcltk/snack/files/snack-2.2.10-test.patch b/dev-tcltk/snack/files/snack-2.2.10-test.patch
index 724ccd686fc7..8d2dcc61fe15 100644
--- a/dev-tcltk/snack/files/snack-2.2.10-test.patch
+++ b/dev-tcltk/snack/files/snack-2.2.10-test.patch
@@ -20,3 +20,18 @@
  
  test power-1.2 {power command} {
    set s [snack::sound snd -load ex1.wav]
+--- a/tests/mixer.test	2019-05-15 08:41:24.761148030 +0200
++++ b/tests/mixer.test	2019-05-15 08:41:37.902919720 +0200
+@@ -13,12 +13,6 @@
+   set msg
+ } {bad option "junk": must be devices, select, input, inputs, output, outputs, channels, volume, lines, or update}
+ 
+-test mixer-1.2 {snack::mixer devices command} {
+-  set devs [snack::mixer devices]
+-  set res [expr [string length $devs] > 0]
+-  set res
+-} 1
+-
+ test mixer-1.3 {snack::mixer select command} {
+   catch {snack::mixer select junk} msg
+   set msg
diff --git a/dev-tcltk/snack/snack-2.2.10-r8.ebuild b/dev-tcltk/snack/snack-2.2.10-r8.ebuild
index 773eb22926a0..6d1db3f8e308 100644
--- a/dev-tcltk/snack/snack-2.2.10-r8.ebuild
+++ b/dev-tcltk/snack/snack-2.2.10-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -77,7 +77,8 @@ src_compile() {
 }
 
 src_test() {
-	TCLLIBPATH=${S} virtx default | grep FAILED && die
+	TCLLIBPATH=${S} virtx default | tee snack.testResult
+	grep -q FAILED snack.testResult && die
 }
 
 src_install() {
diff --git a/dev-tcltk/tcl-mccp/Manifest b/dev-tcltk/tcl-mccp/Manifest
index 36ed3f2a038f..4bf4d31c9ddf 100644
--- a/dev-tcltk/tcl-mccp/Manifest
+++ b/dev-tcltk/tcl-mccp/Manifest
@@ -1,4 +1,4 @@
 AUX tcl-mccp-0.6-flags.patch 542 BLAKE2B 79b55fa8fc3ec3a7a7db8070699b426ca50fb7d76dc6185a141e0490d430cc84ba8ca8eb131f5b6f3745a1c3ddd9125b88e739491aaaae6089a1e1a6e28849b0 SHA512 c89c93b56ad2fc5d30ab79b968e79ac4eb737b1e545108e4f1d76828418f5e5d3f38505ea4a0a2adbbc676f8f7e1e40eda0e6e2c4c79238087096b44cb690886
 DIST tcl-mccp-0.6.tar.gz 167446 BLAKE2B 6ebd6fb6fbaa8cd8c6438dd21e38fd19fca47c1e0c7e96c33fc183e7be2d2c42fbfb2b3225e49243c941a1f018d6efbef3183ef736a52117e2e3cf01d1698aec SHA512 d3f77b49454dc4f838b91d95146c71d6f8d46d293743b46b551e9217a92a9f6b03b26400cc21faf9bb22a0a0f92123b25f9b284453f756654e87b82201c395e6
-EBUILD tcl-mccp-0.6.ebuild 441 BLAKE2B a9a4b3c36307456c8872a65980ab51e160797c37b1e1c7d09a5f1a506851967472c2641baa405ce0f5964d708042d716c8a741979684615aea082d3580edb97d SHA512 631f610b198deeb1df7ca90c39ec0b4ba5d0484e169701bee00ab77b808d89cb36d2807fa04811b0c7bcd882686c379d8956da7838b45389e9df2722b6c5b771
+EBUILD tcl-mccp-0.6.ebuild 483 BLAKE2B 804495c264e70ffa6a1f276fe4978a3029c40c79270530ae84d9895d7a2e8be19b00ccc2b297c094a2a3c297e9f96b329f8373adf60ed3c0d24cdb991fc13a24 SHA512 45be67f435d5b7125f274182e45b5da86062063acbb3c1dd3fca8e868f4a62f2e7284f8b217fa3da008309e036148e187a5c1e242ef523ffe0562ff0e0d2314b
 MISC metadata.xml 331 BLAKE2B c997cc555632151748b711b082971ca85a7fc9649144465ca0d8b4ab32656f039eedffc742aace78ac6f32cd1fadae2ed9c55f4eb134946d4d539cca7c9e0a6b SHA512 b22d31f4f4502cd2efa5aeee0914277c7b3fe45967ed231b2514f26cad2b86ea03beb19b60e88c2a5fce6c26833bdf50d2b5aafd554af98fc0a7c976942c46d9
diff --git a/dev-tcltk/tcl-mccp/tcl-mccp-0.6.ebuild b/dev-tcltk/tcl-mccp/tcl-mccp-0.6.ebuild
index 8af98e3f15c7..136252e6cf21 100644
--- a/dev-tcltk/tcl-mccp/tcl-mccp-0.6.ebuild
+++ b/dev-tcltk/tcl-mccp/tcl-mccp-0.6.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit autotools-utils
+EAPI=6
 
 DESCRIPTION="mccp extension to TCL"
 HOMEPAGE="http://tcl-mccp.sf.net/"
@@ -18,3 +16,7 @@ DEPEND="dev-lang/tcl:0="
 RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}"/${P}-flags.patch )
+
+src_configure() {
+	econf --with-tcl="${EPREFIX}"/usr/$(get_libdir)
+}
diff --git a/dev-tcltk/tcllib/Manifest b/dev-tcltk/tcllib/Manifest
index d8e7490801be..9b951aabf085 100644
--- a/dev-tcltk/tcllib/Manifest
+++ b/dev-tcltk/tcllib/Manifest
@@ -2,5 +2,5 @@ DIST tcllib-1.15-patchset.tar.xz 16164 BLAKE2B 590f6ea38aa2cf98e80011591d5bf06f2
 DIST tcllib-1.15.tar.bz2 5030648 BLAKE2B 9731be4282bc3b3b0bb56021c3f0a7943ff4163d04ae397b1e0543cbce0642cbf5f64b66c57348a932d9e29c53273223998f2d8b0b087ff7ac679191e8a35ece SHA512 544b1193266e860eb59a4c313645376bba8488711b2afc629d99d0e719252db79caae73022ae1dc21dc123f949fa8930f81112c3f80328fc83952b64f93ca3c4
 DIST tcllib-1.19.tar.xz 6298564 BLAKE2B f137227004dd4acded7c8aae6b36fd50fedee67a725ecef0046f1af7abc7bb8e11207a141e15390a6ce3a1a3914b1cd2e5a798035eba631254792b2819383013 SHA512 08f549a3513316919c61f015a604aa671a73c0fd59a8a20b916d106e7d7d6f4bd59b485a92307778cfea1b00f78c2972a086b1bf960fe85a26fe273b7ada8d12
 EBUILD tcllib-1.15-r2.ebuild 1126 BLAKE2B 4230c77b24b9aa9a22c1bfca957622c1b1bdf987f41e704cac8ab9b71edb046b5c27837619b6e9440dc296abb43d15f3646b047ed812c52ec478384ee28b7d76 SHA512 8e3318997ebf7a07181d76fef022febf286ad44ea92b2a9b411a15e9e73154598d90c7a763f576e9f0afbe9ac95419aea6c568c037e0aa0321d87fa96d437201
-EBUILD tcllib-1.19.ebuild 916 BLAKE2B 33c4029786144e631c8f757c80d19367ad7c7b243e3934e6d79d9816d2d8ec5acdf168b09d392d54219433743009614323e737d7170d5bc00637249b618bc6e4 SHA512 5d3597e726d2c3c33adab6b7c84c582526cfd42f1bb4e31f452ef4664eb99d93ed436ba036f443e331f4786108ad3842f6aa7091125cafc3aed540fd4ab25dde
+EBUILD tcllib-1.19.ebuild 1166 BLAKE2B ecb357fa3cb0ed8bdd29029e8f0de9d8ae0da218d89053c0c0241cac7191fe667a5941535a150aede2e0a109fb481329dcdd6c6e8c16b8afe31177bd53268b0e SHA512 3331e50638491fad65f85bc1067bbb682c26c655d4da87fbb694ccb1fcdac26fde1b0144f94747d6a53e99710b0d21078556ee5273fb56500dbb815520d0a8db
 MISC metadata.xml 329 BLAKE2B 9c75c5b20f8ce9b566b4a422c4d768c3c2db1f593d8505ee7539932860f99ab5eeafb51d02e84d78f7be0c8be06e22fadb64aaf61cf01b7b14ac506035c70c79 SHA512 c16db3fedc73cc41391e15f198396908ebd047c165c2bbe3c465f126dfb8266818d79f11ec343a2880058850a8164801616632f361b69db914e7d66823bb1851
diff --git a/dev-tcltk/tcllib/tcllib-1.19.ebuild b/dev-tcltk/tcllib/tcllib-1.19.ebuild
index c2701e93c485..63a889b07792 100644
--- a/dev-tcltk/tcllib/tcllib-1.19.ebuild
+++ b/dev-tcltk/tcllib/tcllib-1.19.ebuild
@@ -27,6 +27,18 @@ DOCS=(
 )
 HTML_DOCS=( devdoc/devguide.html devdoc/releaseguide.html )
 
+src_prepare() {
+	default
+	if has_version ">=dev-lang/tcl-8.6.9"; then
+		sed -i \
+			-e "s|::hook::call|call|" \
+			-e "s|::string::token::shell|shell|" \
+			"${S}"/modules/hook/hook.test \
+			"${S}"/modules/string/token_shell.test \
+			|| die
+	fi
+}
+
 src_test() {
 	USER= virtx emake test_batch
 }