gentoo Easter resync : 12.04.2020

4 files changed, 10 insertions, 9 deletions

diff --git a/dev-tcltk/itk/Manifest b/dev-tcltk/itk/Manifest
index d9b7cc95ffb6..689d62c029ff 100644
--- a/dev-tcltk/itk/Manifest
+++ b/dev-tcltk/itk/Manifest
@@ -2,8 +2,8 @@ DIST itk3.4.1.tar.gz 182311 BLAKE2B e1db1b9f7e6e8c5b93eec5bb29fc24af7e6cc5cb3f20
 DIST itk4.0.0.tar.gz 177838 BLAKE2B 6bb975c414d40c81bac4b8651ce89f0d84d712114e6f60e1555071d2079f778850f4de7df1a79254db1d1152e8d43f261e0bf9827737fb69abb2801e72d72d6d SHA512 4fd993e3683376bd2852a19e8ac63ec20a9319f3987737a32f7af78b645ff27416b18572b7e30fc1e41a5e4e06ac064280fd86d979738ca9906e2605069c51f3
 DIST itk4.0.1.tar.gz 182029 BLAKE2B fe3ed0adddf71af9bf795949b18baf7d983edc1e6e95939db18bdf896069083afbc8498935b0c59e2c5f4179fdc6f624e67198afa0755e8183d754c181d50642 SHA512 d64beeb42949e96b384ef2fd571971813697086df8b18af79399cedbb80eba19dc013677957959ea93dc0dcd7cdc4be012b3f9a5f0eedf0bd743550837bd78fc
 DIST itk4.1.0.tar.gz 253796 BLAKE2B 7d51689d41871f39fbdf940f1aede2c89ee0165cc6be989f7da65df85a0d15e5db037722a5e30a284e51129b7bfff20dfde0fbc78d2d72d8acb9031f328a5d16 SHA512 1deed09daf66ae1d0cc88550be13814edff650f3ef2ecb5ae8d28daf92e37550b0e46921eb161da8ccc3886aaf62a4a3087df0f13610839b7c2d6f4b39c9f07e
-EBUILD itk-3.4.1.ebuild 1348 BLAKE2B cce8c557f7d3a14d0c6c5ecace166f4cac390bdb5b61e40a000337595839a75395bf1ccbacdfa4f85b8b95beaf39a038d98293cd7c3aba63de8eb74094ebb8eb SHA512 68de5452eed995855462a3965d21eb44e3c625c8ee489ababfd3e8a8e9b2801abb1ce8537f1785db1580474d8f7289e2e4c8c0be3f5613d1b93cf5142e3e126f
+EBUILD itk-3.4.1.ebuild 1349 BLAKE2B 8fd619ccc9384226a1351713e77191b328553846627ae63354698512bde66db568249753e608786ca3596ec8d49e28dcb6a08ee14fdcb5307813b73fb325406f SHA512 fe3368daff0f40baa1402bc5a0e08680833cf11796c27ad14b111b0499f01965db2d22db40912b3e009d369215477a605e0281963d9e84025ac81a429f77a49a
 EBUILD itk-4.0.0.ebuild 1460 BLAKE2B 6ca21e3f336cd51cc6ff760bc5d81e02bf4f1148a26da3f98994cd9d873701479097c5f76ab75b4b1b1476a6c9f5fe57f29a906744ffe79b48faeba1ea504d1e SHA512 487bfdfe22e47699411ff5350d9809f66273ba054b933a9912bf0b9f5455de2e4043be8b976095c2ae87b6ddb7a67606badc034db5511d5d8be1f01d57162d02
-EBUILD itk-4.0.1.ebuild 1462 BLAKE2B a491cc3bf34f0aebd7ea44d4d43e4995b8181ab7b1674f407cc48fd2d2189d155c01c04472072b28231038ebb55ce6a941246047b587cb08fe101c7367af65c3 SHA512 4c342ad3d6c8fb4cb7ce941d603fe1273a17053279d828703fcd00a3daf08e7d8557c5b414ac2343a2d9719f09270e5a4c85b287e7a28731a623b578773e0021
-EBUILD itk-4.1.0.ebuild 1349 BLAKE2B dbdb438fd227da270c6edfc6b2cd41fcd425e46077dc0509982a3cfa82d643ed69df3675b695e4dc3bffea6144932891e03f1c16c37b88914fb029195b3b32d6 SHA512 9669aa6bb84323de37021955618c8777a00d24f4d57b46e8fb5f17e2e330773feffc1accd3cc442ac43e16b6fddad9475076368289811bdedec2dbf401d633d1
+EBUILD itk-4.0.1.ebuild 1463 BLAKE2B 3f07a6420076684e79676f6aeb892d67a1d8c04626457e4cef2815d6c496d01ad935a3d8f8ff2f65c29a1ccc92a74c345b8efc88faab1f8f505533cc7d5be70e SHA512 064661f251bb93ebcedc49f77cd00b25489014e324e06b532c05c05aa913f4b67817e3c89fa870551b6a4e0e729461aa0c26219c53dd4813765df7f55270896d
+EBUILD itk-4.1.0.ebuild 1435 BLAKE2B 686716f1d5e56b0ebd953bb18a97a3baf77109c80f254a59ca3e8e86ea6ca97d7fe08a7bb4e12099c38b69b439e0425e231d36b7794eb53246a99ac416d7cdc5 SHA512 358dbc3d3ca9431088834d0e0eeee47811c9a6fb9da01ae420f9752b4f3b4033e1ec5d897db380d43588764c2daa97f1b617505f826b5f0950a9e19e09d675c2
 MISC metadata.xml 330 BLAKE2B 31520e9c34731a6b9f743db2dc1ecd3dfa0600c77c64ec8d3274f65a3e4998086684a78bac8b55d3450310d0cc8d3de741fe924a6bc722821aa15deaf1360419 SHA512 404a351da7b77344ba6ad0969162591a9fdc582ca723b43d04ed073bdc164b4df173a3267b333ed4d19aaa48b34c696d485703c85cccd700320e23008ef189b1
diff --git a/dev-tcltk/itk/itk-3.4.1.ebuild b/dev-tcltk/itk/itk-3.4.1.ebuild
index 04fc85436e25..98286e3171dd 100644
--- a/dev-tcltk/itk/itk-3.4.1.ebuild
+++ b/dev-tcltk/itk/itk-3.4.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/project/incrtcl/%5BIncr%20Tcl_Tk%5D-source/${PV}/$
 IUSE=""
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
 RESTRICT="!test? ( test )"
 
 DEPEND="
diff --git a/dev-tcltk/itk/itk-4.0.1.ebuild b/dev-tcltk/itk/itk-4.0.1.ebuild
index 95b6ed04e96c..7178266a0e60 100644
--- a/dev-tcltk/itk/itk-4.0.1.ebuild
+++ b/dev-tcltk/itk/itk-4.0.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/project/incrtcl/%5Bincr%20Tcl_Tk%5D-4-source/itk%2
 IUSE=""
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=dev-lang/tk-8.6:=
diff --git a/dev-tcltk/itk/itk-4.1.0.ebuild b/dev-tcltk/itk/itk-4.1.0.ebuild
index 51ca9d3669c4..5c8acfb52d7d 100644
--- a/dev-tcltk/itk/itk-4.1.0.ebuild
+++ b/dev-tcltk/itk/itk-4.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,6 @@ EAPI=7
 inherit autotools multilib virtualx
 
 MY_PV=${PV/_beta/b}
-ITCL_VERSION=$(ver_cut 1-2)
 
 DESCRIPTION="Object Oriented Enhancements for Tcl/Tk"
 HOMEPAGE="http://incrtcl.sourceforge.net/"
@@ -15,12 +14,12 @@ SRC_URI="mirror://sourceforge/project/incrtcl/%5Bincr%20Tcl_Tk%5D-4-source/itk%2
 IUSE=""
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
 RESTRICT="!test? ( test )"
 
 DEPEND="
 	>=dev-lang/tk-8.6:=
-	=dev-tcltk/itcl-${ITCL_VERSION}*"
+	>=dev-tcltk/itcl-4.1"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}${MY_PV}"
@@ -33,6 +32,8 @@ src_prepare() {
 }
 
 src_configure() {
+	local ITCL_VERSION=$(best_version dev-tcltk/itcl)
+	ITCL_VERSION=${ITCL_VERSION:15} # remove category, package name and dash
 	source "${EPREFIX}"/usr/$(get_libdir)/itcl${ITCL_VERSION}*/itclConfig.sh || die
 	econf \
 		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \