gentoo resync : 28.04.2021

8 files changed, 16 insertions, 143 deletions

diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
index 2517bc51cb59..b39ff91bd453 100644
--- a/dev-lang/tk/Manifest
+++ b/dev-lang/tk/Manifest
@@ -7,18 +7,16 @@ AUX tk-8.6.10-test.patch 18201 BLAKE2B 305f761282b489ea462eb5cfecf1612770aa9a3b2
 AUX tk-8.6.11-test.patch 2589 BLAKE2B 8917d71ef1072dfd10f35d009323f3787479104d53071fc094d762d66b260b7d72584b8bf330cc76a09fd45b471b19982edbb62603471d0c4f3ce056240b1ab1 SHA512 08648d57f3e27e574f94ff15821514fd53b85554f7e182a20685f3d6f6c5c2ef7557088c49e5689cbc88c5117e452ed512dd748b8524b5a7af60f084344ab897
 AUX tk-8.6.8-libieee.patch 708 BLAKE2B ec8422ce98c68f2dd347bea807059fd8ee94fcd4540bdeb4c8d90cd7f028ff3dbe406ed26593ebd8815e611a1ae40390b4194bf8d3efd1863e8c15d04918681c SHA512 b25d2fbfc753296cef11b1943e19537aaf9f048f033078e516f36bc021107197f77b8f142fc7ace89ae6bdda037871ce7a5c45800ef0bebd04f77a5281bff457
 AUX tk-8.6.9-conf.patch 407 BLAKE2B 13662318b4c5029802f74551a6a194e27ddb6dbf2e5ceeecc45c98b27a5386a9b9443af7c329fc422c5249c3da6308552d5c879b5629ae47b705c0d2ddac5534 SHA512 10447a13d597c0917d15089dcfab64165927589ea0fbec7073699788f5ba003e561a6af6562b2ee3e3b40df2f9dc0719c2ca4209a927e506710a390c7a67eb70
-DIST tk8.5.17-src.tar.gz 4095985 BLAKE2B 4cbb140c30ca717ee499b9ad9e1a3df27a470a78613edbaec425c39afaa41d59276bbe487933a4e77a9722fcafa9113b203cf5c828660bdeb38f667c3263c3cd SHA512 ddadc738c2567e35d1257b59212c8a0eb70a1bf041d986bc6df3b841b51d934d79a0ef389c928223a64516a92cae3357b2c789edca9c8a626ff4c1cf320c4f4f
 DIST tk8.6.10-src.tar.gz 4444764 BLAKE2B f56647e005778c802352aee0257c0a8f5e0014c9d21362592f08030252d83141cca385f0fb95c0e7e930016255c3b2cef49a65064e056a877214b7d7a1a01246 SHA512 d12ef3a5bde9e10209a24e9f978bd23360a979d8fa70a859cf750a79ca51067a11ef6df7589303b52fe2a2baed4083583ddaa19e2c7cb433ea523639927f1be5
 DIST tk8.6.11-src.tar.gz 4496914 BLAKE2B c3050a48d5cb3bd3095b2c439b3d33992551f953a981bf23eedbf774368b383abc77fb3156aa4bcaae658d0706495cff03536ab8258f9d824ff8f4325b36cc38 SHA512 2e11490f2f51ef7e723661dd91c95622234fb97850e80d8ecd564be8c28f7c8fb0334a97cf8267af9d68f63e4adea887a1a4eec8d2e807d6a970b5912f99d3f2
 DIST tk8.6.11.1-src.tar.gz 4496008 BLAKE2B d7bae2fa535411ad8620ec81cdc0b34a1206fed82f50dbd98d3977af46ac43f794166cb7029f274f7903228c62ce83dfbd56cea06669ff1e382b185d733b0792 SHA512 e2a1d27ba63601731d43c4c4e2b658771a14afd97ef8231f8bc7854e762b83a42f23b8db600e4b4a4a14ae6fc97378d0b9a9a180ae09308b9d12436ec2b176c4
 DIST tk8.6.8-src.tar.gz 4319854 BLAKE2B 167c5dc6c32e49653c04bc067c3d75df022ca230657be32797021b0e2f7748215d9ad0493c8020b8d1be1f005b9b2d561339a6a0b209721c0d05dd222d47d377 SHA512 d0d30637b733fb0b0d38461b6d872934c04af422fcdb7ec41a72331b2529cc94414e6f441f95a98642d69505e4f41469847fedd1cbe58bd08cdd818fcabd1db9
 DIST tk8.6.9-src.tar.gz 4364606 BLAKE2B 9c96d977aa72dcc0c8d2a570d644284a1eef217ef082d8a78461bdcb4845e206ccad59cb5bc21ef80e32ea19951fa3a845e45059bb9eaf0756f128a95530260c SHA512 654d73aad006e628110057681477b958b7ec0a42287bc78259fb4b84635e7ebe757e69099d66c0c73479bc506ca66fa5baf13f13b0f403d60b2c54fd48a4a686
 DIST tk8.6.9.1-src.tar.gz 4364603 BLAKE2B 3d96637ceadc28977f8b4532be071907d64f11bd22881baf02aa6fa2778b607437edce8f1ed02e7011bcf78468128f7bfe81ee6dac9bd73a796e7fefae130dcf SHA512 b9c811ffc8326331ae03c6fb25ea71f7a5eaeebd9d5a16a51a1671d0f0422268bd351b077e17ae925f0a7eddac9642aa640658615c52d4269c299373af031a92
-EBUILD tk-8.5.17-r1.ebuild 3560 BLAKE2B 93ed1cb14c0c19a0550bbbac0e709bc4679af057b621655d7d6e708ae2f48f78146c64e507eed8db9ae67ffcdb1f3c1ce0b0a12c1b72bd6247190bd2708ba377 SHA512 3a635f4158f718ca599d2a27b1438ae4322410b4db224ec5026b7667f1e61550df0f979451cd87fa22c6e861e251704e64e53717bbff18daa0bc334f22b3a714
-EBUILD tk-8.6.10.ebuild 4156 BLAKE2B 9e1b4c777abe66af6a726cf13c083f24a3a272db6dd02b4f077412cbf0f957ad3b2e2b587ad0d730fb59c9afc2d280bb003881739dcc33c7ad3b551e89f8cfd7 SHA512 813ad0926c98367e2685ad32c0dc44d1003bcfb793dbb8869b8ccf3140eaf0c9f99f0a60e135ed8b2d92711cb67602298e42ffbf30ce4a36e3c361881009f052
-EBUILD tk-8.6.11.1.ebuild 4056 BLAKE2B 6c6d5f5f7d825e971e1fa9c31d1bd9c5ee0e2959ea1f7014bd3c10bb313eefb7a8334a60970b1f261ec17b09b23cd420fc9a1be4b608c883d93faf6fac289c63 SHA512 21cdb1f4580d76ade2fad0c6d28f46f3c9b1b00f835a1db4ebdf7eb9e5cdda7586721c5ebf236b947709dd44b5a0618e07d2a4b242eedcec474d2b544f61a3a0
-EBUILD tk-8.6.11.ebuild 4048 BLAKE2B 64f027de88ee55d7ad3b81d2bbc154913ff5525b01ca922ce32d81d5114fee12042dddfd41da878701e7bd12f9d79a3abe57333a11e48630c5ce705b6570a96c SHA512 40109fce5eb93a0501c2034a7fd38760d67d59df26c2439b395044a4bef73664f2843a62d87afa06add74772ca69ecd3c0c2e87efd80427b0d42befc9d4f2c9d
-EBUILD tk-8.6.8.ebuild 4109 BLAKE2B 143bb4e973d2dc0cbf2fe44d261115c17dee16936a865dd870d2f673fcf843ee9de82321087c8d4a4229185ec5e6eec96a92e2b51d3ea636e3a8ba4d88480faa SHA512 125ab4cbd73fc23d0aab1d426ebf21ac117c292de310cbd192f472db38b0249529857acfc8fdcb926b39d98584269aedd663adf2db9b85bda935eb4e215ef606
-EBUILD tk-8.6.9.1.ebuild 4054 BLAKE2B c43eb1108e479d3d68d0ad12f7949a9674368228c0273460f8947c287405bad09fc2b31e65cfc738cc3ed09813fe9a18ddeaed2eca8a26e0abf57ff3c840a53b SHA512 f5b53c321f8c535b4671464e230c78b8328b74e107b313d4338a7cfe421903cb1385410cbf1775292622a1b6db208c4f10272d1077e41ea37e0e5545e526d174
-EBUILD tk-8.6.9.ebuild 4020 BLAKE2B 521580f53726b28ba71830ded0e4b57d20beeb6cf73c8bbd976238b3c30d7bb01385d0da3c10fef9707bf6d03122c967a385076d63d44442985c3debf1161ad2 SHA512 8e6b0312c1a6a51f15f4322e6ab3e580fb411486337bed5129a77e3a9a7538c1730eea980c8e9e8f92496c697af3a6331445b379760143772d863b627e9b2828
+EBUILD tk-8.6.10.ebuild 4183 BLAKE2B 59c753fc26bd7dc8a5d9eb9fd05ea7a50da23a034ee80821e7e3d3454e2199108b68c9d0d5e66eb20fa76682128507cf570426ed6f37cf21773f6176a20e0622 SHA512 97e6061fd8fe6a5c5bf1af42975ca39839ff44d374394039a7e57404b6571f843a1c0c43984a151899f597ea8f37dc2e3aeb722ae3f5b9ba0cef501854b4160c
+EBUILD tk-8.6.11.1.ebuild 4083 BLAKE2B 5b3d33c8b631ad2b6ea2853464604486279f7bd680b45abd522169201cf7c81101711f1073c977533de287cd10d7bd93c6f0aa7cd8f7a5a09ab92925cab94134 SHA512 c5d20ad16f0ba451b06e35ef1fe02c331ee0344dca0aebfdd9d6d29dd40b55cd091589fe1e08dddeb6598ad14b2ee7075c9f7a4955f2c272b4b637f19b2c7674
+EBUILD tk-8.6.11.ebuild 4075 BLAKE2B a35ef5a05b06dc0c7fc1a46f70af632bad759be1d4e82f7885b3b792b9fe8cea912e9edbca79cfd57bf7eed2ec091f4dc0d7416b293cbbd9609dae955f8ac032 SHA512 d500d8fb66bc35ffe528488020bdcfb4aeba178dd22b7f2e884f7f6a6cc809d41990acae1775f606e5cc35daa4b77e9e3832bd3d00b2a3b9cf97c335033b8533
+EBUILD tk-8.6.8.ebuild 4124 BLAKE2B ec9e9716853e0122a200d39c0dbdaf7b95af3d1a74e592cfbbf394e3da0fe586205fb448a9a8f5ee5057a98c4da06dee55fc8a9ca5b9506d850143d64fec7ff9 SHA512 cdd239aa11c4bc73cca4290619ff99777695e5784127ac7cc968f43312094b1a6c706277eb11f1a8538a6553f6f7b90302bbb051d52bef5ec230ad9378107f05
+EBUILD tk-8.6.9.1.ebuild 4081 BLAKE2B 7512ade8b0699abae4b1d154d6c37028c54f1ed4c9dd115fcebc30c92715d63f29f28d9707689bcd9204caeb587594838432a54df1564e7f71d3ce6d96816550 SHA512 3d6aa7559404ee87c12db63d1384881cf8c5a3b3471872a18e33e2fc23796334065df2e874b951b6c2a3698840936b4ac240e4f796918866753fc55e073dd8a8
+EBUILD tk-8.6.9.ebuild 4047 BLAKE2B f2b580317322680810c80a0d70f7d986ef264db14838d6c20040b8d809aba3a518b6006d22f79d9d9c188ad7fd81f999c0aaecfb62ff2e277048cb8d4d73d521 SHA512 4d782276e316acb4eabd95a631102c9e1c23b52d160736e6f48896504daedd4b1c745f5892aed96e8ad4d0e42ca652197536fc76cec59213dbd6c11938a4d58d
 MISC metadata.xml 326 BLAKE2B 56e0bdfbc3f6226d3577786996e1d83e0a5e233f08966966b7f18366d103648cc8843afb08b23eb2ff5aafd7faa9b8a53d33f35a273ea5f70191b76d5f9faaea SHA512 0a3bc9dd4103f252027e5df1f1bec25c54b8e595c3161cf2e2e3dc083d9613c1cf7f810bae2eea1e4687d87195091d84c16ceac683d7bb508bd38ad565b5ba7d
diff --git a/dev-lang/tk/tk-8.5.17-r1.ebuild b/dev-lang/tk/tk-8.5.17-r1.ebuild
deleted file mode 100644
index 8d2d501f43f1..000000000000
--- a/dev-lang/tk/tk-8.5.17-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils multilib prefix toolchain-funcs versionator virtualx
-
-MY_P="${PN}${PV/_beta/b}"
-
-DESCRIPTION="Tk Widget Set"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
-
-LICENSE="tcltk"
-SLOT="0/8.5"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug threads truetype aqua xscreensaver"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!aqua? (
-		media-libs/fontconfig
-		media-libs/freetype:2
-		x11-libs/libX11
-		x11-libs/libXt
-		truetype? ( x11-libs/libXft )
-		xscreensaver? ( x11-libs/libXScrnSaver )
-	)
-	~dev-lang/tcl-${PV}:0="
-DEPEND="${RDEPEND}
-	!aqua? ( x11-base/xorg-proto )"
-
-SPARENT="${WORKDIR}/${MY_P}"
-S="${SPARENT}"/unix
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \
-		"${FILESDIR}"/${PN}-8.5.13-multilib.patch
-
-	epatch "${FILESDIR}"/${PN}-8.4.15-aqua.patch
-	eprefixify Makefile.in
-
-	# Bug 125971
-	epatch "${FILESDIR}"/${PN}-8.5.14-conf.patch
-
-	# Bug 648570
-	epatch "${FILESDIR}"/${PN}-8.6.8-libieee.patch
-
-	# Make sure we use the right pkg-config, and link against fontconfig
-	# (since the code base uses Fc* functions).
-	sed \
-		-e 's/FT_New_Face/XftFontOpen/g' \
-		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
-		-e 's:xft freetype2:xft freetype2 fontconfig:' \
-		-i configure.in || die
-	rm -f configure || die
-
-	sed \
-		-e '/chmod/s:555:755:g' \
-		-i Makefile.in || die
-
-	tc-export CC
-
-	eautoconf
-}
-
-src_configure() {
-	local mylibdir=$(get_libdir)
-
-	econf \
-		--with-tcl="${EPREFIX}/usr/${mylibdir}" \
-		$(use_enable threads) \
-		$(use_enable aqua) \
-		$(use_enable truetype xft) \
-		$(use_enable xscreensaver xss) \
-		$(use_enable debug symbols)
-}
-
-src_test() {
-	Xemake test
-}
-
-src_install() {
-	#short version number
-	local v1=$(get_version_component_range 1-2)
-	local mylibdir=$(get_libdir)
-
-	S= default
-
-	# normalize $S path, bug #280766 (pkgcore)
-	local nS="$(cd "${S}"; pwd)"
-
-	# fix the tkConfig.sh to eliminate refs to the build directory
-	# and drop unnecessary -L inclusion to default system libdir
-
-	sed \
-		-e "/^TK_BUILD_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
-		-e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
-		-e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \
-		-e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
-		-e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
-		-e "/^TK_BUILD_STUB_LIB_PATH=/s:${SPARENT}.*unix:${EPREFIX}/usr/${mylibdir}:g" \
-		-e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \
-		-i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
-	if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
-		sed \
-			-e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
-			-e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
-			-i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
-	fi
-
-	# install private headers
-	insinto /usr/${mylibdir}/tk${v1}/include/unix
-	doins "${S}"/*.h
-	insinto /usr/${mylibdir}/tk${v1}/include/generic
-	doins "${SPARENT}"/generic/*.h
-	rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/{tk,tkDecls,tkPlatDecls}.h || die
-
-	# install symlink for libraries
-	dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname)
-	dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
-
-	dosym wish${v1} /usr/bin/wish
-
-	dodoc "${SPARENT}"/{ChangeLog*,README,changes}
-}
diff --git a/dev-lang/tk/tk-8.6.10.ebuild b/dev-lang/tk/tk-8.6.10.ebuild
index 4502071389cb..c1ddce363a10 100644
--- a/dev-lang/tk/tk-8.6.10.ebuild
+++ b/dev-lang/tk/tk-8.6.10.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	~dev-lang/tcl-$(ver_cut 1-3):0=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	!aqua? ( x11-base/xorg-proto )"
-
+BDEPEND="virtual/pkgconfig"
 # Not bumped to 8.6
 #RESTRICT=test
 
diff --git a/dev-lang/tk/tk-8.6.11.1.ebuild b/dev-lang/tk/tk-8.6.11.1.ebuild
index f033c912f9c6..6123a0f496dd 100644
--- a/dev-lang/tk/tk-8.6.11.1.ebuild
+++ b/dev-lang/tk/tk-8.6.11.1.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	~dev-lang/tcl-$(ver_cut 1-3):0=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	!aqua? ( x11-base/xorg-proto )"
-
+BDEPEND="virtual/pkgconfig"
 # Not bumped to 8.6
 #RESTRICT=test
 
diff --git a/dev-lang/tk/tk-8.6.11.ebuild b/dev-lang/tk/tk-8.6.11.ebuild
index 741a2f709920..8e5f0752bdc4 100644
--- a/dev-lang/tk/tk-8.6.11.ebuild
+++ b/dev-lang/tk/tk-8.6.11.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	~dev-lang/tcl-$(ver_cut 1-3):0=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	!aqua? ( x11-base/xorg-proto )"
-
+BDEPEND="virtual/pkgconfig"
 # Not bumped to 8.6
 #RESTRICT=test
 
diff --git a/dev-lang/tk/tk-8.6.8.ebuild b/dev-lang/tk/tk-8.6.8.ebuild
index 46072ae5d35f..cd10397286df 100644
--- a/dev-lang/tk/tk-8.6.8.ebuild
+++ b/dev-lang/tk/tk-8.6.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools eutils multilib multilib-minimal prefix toolchain-funcs versionator virtualx
+inherit autotools multilib multilib-minimal prefix toolchain-funcs versionator virtualx
 
 MY_P="${PN}${PV/_beta/b}"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
 
 LICENSE="tcltk"
 SLOT="0/8.6"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug +threads truetype aqua xscreensaver"
 RESTRICT="!test? ( test )"
 
@@ -26,7 +26,9 @@ RDEPEND="
 		xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
 	)
 	~dev-lang/tcl-${PV}:0=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
 	!aqua? ( x11-base/xorg-proto )"
 
 # Not bumped to 8.6
diff --git a/dev-lang/tk/tk-8.6.9.1.ebuild b/dev-lang/tk/tk-8.6.9.1.ebuild
index 3dfd46f07414..c61e678cd22f 100644
--- a/dev-lang/tk/tk-8.6.9.1.ebuild
+++ b/dev-lang/tk/tk-8.6.9.1.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	~dev-lang/tcl-$(ver_cut 1-3):0=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	!aqua? ( x11-base/xorg-proto )"
-
+BDEPEND="virtual/pkgconfig"
 # Not bumped to 8.6
 #RESTRICT=test
 
diff --git a/dev-lang/tk/tk-8.6.9.ebuild b/dev-lang/tk/tk-8.6.9.ebuild
index 1564ef0f84db..62245c965ce0 100644
--- a/dev-lang/tk/tk-8.6.9.ebuild
+++ b/dev-lang/tk/tk-8.6.9.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	~dev-lang/tcl-${PV}:0=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	!aqua? ( x11-base/xorg-proto )"
-
+BDEPEND="virtual/pkgconfig"
 # Not bumped to 8.6
 #RESTRICT=test