gentoo resync : 28.04.2021

3 files changed, 4 insertions, 60 deletions

diff --git a/dev-tcltk/tclx/Manifest b/dev-tcltk/tclx/Manifest
index 7fee742f1d23..4de617dabcc6 100644
--- a/dev-tcltk/tclx/Manifest
+++ b/dev-tcltk/tclx/Manifest
@@ -1,7 +1,5 @@
 AUX tclx-8.4-ldflags.patch 359 BLAKE2B 275ed541e5f88bb9ebeaa0ea9e19b5a9554c6aa9c0dba904c4ea99cc97f5d360f1c1c4bd98a7bb5a9257c04f28d46ef7203731863b8a166f3878d0d7b4a024ee SHA512 a7fdd81a615222b805ab1dcb85a619b2621a187a39602f5d64dcf36027a1ee6e616328a7463f4cb9b6fe60169c887c925d133dc1df1cb20f9cb419ba13c870f1
 AUX tclx-8.4-varinit.patch 399 BLAKE2B 92173ca104c538655436b991914d421b32a7b09e2bb2b2c6205470653de405c413ebbd2ee5620f0067128f333033d8536f8bd93d05b7954ee36f39cdc07be864 SHA512 68f4e8a1bd1be1f98e286cf4ccba0a97aca2613c13059f8e06e446e376c4ebb8e66d16bbe5e5972e761a58417bb67fcc34b000ef0c95b740a4ad6801f8b43353
 DIST tclx-8.4.4.tar.gz 456569 BLAKE2B 50123f95ed780c28dae9e2f0db956b81b559ee9ea33563b999f33a727c451374a63c0cba3012d4dd46df020426c7fdb3b04f932fc5b6ec742156e9dad81a7d3b SHA512 dcf9cbd08eae0cc4901e8e871a440e6c85d7d5ac923306206afaf0a1d931866ce3b91177d7b3a37e87a5cdcccb068ed7b9c76cb1a71a13f4f26cf204b8c42090
-DIST tclx8.4.1.tar.bz2 330073 BLAKE2B bc9cd45945b1c9b945bcd139bfc52d42fc9bf1bf4251a8bb599ca6ee2b3804bc692aee6038a3cb84de82d24173473a57a8396fa598558f83237f1586cbe59b11 SHA512 faad58f5d8e0e1e759da639800f354b583fb01418c94f2274924aa07beb0ee9559beb87b3386ed5ae3694700a71dfe5b8ac54ead0ec75c6963507e9d3ead7060
-EBUILD tclx-8.4.1.ebuild 1111 BLAKE2B b24b78469d73489a10cb7d5dcd9443383bc1b427b6b11d366e7b4e87084e6bd3ba40dd54d9fffda5f00cbe88265a04e27d78b2972f70469409e317269d381136 SHA512 35e1dc6386742852f11fdde9777c0798dde7de081e9897a30762d75bd48073ec0b66f681e74f7b0e8c15b930526e60d2d57c65ea81bb2997b118b6db622038ec
-EBUILD tclx-8.4.4.ebuild 1026 BLAKE2B 6c2c726e53ced27768cc89de4dfbbd496ad2d90193d618b85753fb4b51e7ff2d3659ece7ef2488a513d1dc573cfbcbf1204cb4618506d0811f1b22c81d8010a2 SHA512 c6e9dd20348fb99edde04afdfe220c87f1255298469a00fdf011c7a2ccf752d7423f5877c011b45191a2865ea6c96d3d0cb0b18561966531b2fcda3aa58861e4
+EBUILD tclx-8.4.4.ebuild 1024 BLAKE2B 1a95d1b579f66e9476eaf7148cd93f228ca8e16b72f181f63ebe84ae26e4b77e7ae611fc5b9fb82217d3faedc9b33e2d6ec18bb11057e8ba776af802c9d38924 SHA512 ba36c5baea727b218320e8b0501c686208fc6c3ff854ab583ea589373af2eb803a81aa24944c8e6fa49ac9f44ce647b0b75402446fa39adf906594262eb08d6f
 MISC metadata.xml 320 BLAKE2B e1ea46abd6276e332673b42325554390b6a84a93e2b64672bf1d23db1e092bb224fb84a6e4f2688e5a825db8893b36f3749dd322ad1c1e8d0f4e52bd4138b657 SHA512 46a66ef4a96a446d7e0f3fa50abccc6ad90ed089f31f6376417092caa636f890639cc65901df49c9d5161586d26f3b416487aa5adbd6db248cabcf39e8435e1a
diff --git a/dev-tcltk/tclx/tclx-8.4.1.ebuild b/dev-tcltk/tclx/tclx-8.4.1.ebuild
deleted file mode 100644
index 96b6c636264d..000000000000
--- a/dev-tcltk/tclx/tclx-8.4.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib versionator
-
-DESCRIPTION="A set of extensions to TCL"
-HOMEPAGE="http://tclx.sourceforge.net"
-SRC_URI="mirror://sourceforge/tclx/${PN}${PV}.tar.bz2"
-
-LICENSE="BSD"
-IUSE="tk threads"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	dev-lang/tcl:0=
-	tk? ( dev-lang/tk:0= )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${PN}$(get_version_component_range 1-2)
-
-# tests broken, bug #279283
-RESTRICT="test"
-
-src_prepare() {
-	sed \
-		-e '/CC=/s:-pipe::g' \
-		-i tclconfig/tcl.m4 configure || die
-	epatch \
-		"${FILESDIR}"/${PN}-8.4-varinit.patch \
-		"${FILESDIR}"/${PN}-8.4-ldflags.patch
-}
-
-src_configure() {
-	econf \
-		$(use_enable tk) \
-		$(use_enable threads) \
-		--enable-shared \
-		--with-tcl="${EPREFIX}/usr/$(get_libdir)/"
-
-	# adjust install_name on darwin
-	if [[ ${CHOST} == *-darwin* ]]; then
-		sed -i \
-			-e 's:^\(SHLIB_LD\W.*\)$:\1 -install_name ${pkglibdir}/$@:' \
-				"${S}"/Makefile || die 'sed failed'
-	fi
-}
-
-src_install() {
-	default
-	doman doc/*.[n3]
-}
diff --git a/dev-tcltk/tclx/tclx-8.4.4.ebuild b/dev-tcltk/tclx/tclx-8.4.4.ebuild
index 7e7e1c5c56e0..37bbc76faed2 100644
--- a/dev-tcltk/tclx/tclx-8.4.4.ebuild
+++ b/dev-tcltk/tclx/tclx-8.4.4.ebuild
@@ -11,9 +11,9 @@ SRC_URI="https://github.com/flightaware/${PN}/archive/v${PV}.tar.gz
 	-> ${P}.tar.gz"
 
 LICENSE="BSD"
-IUSE="threads"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+IUSE="threads"
 
 DEPEND="dev-lang/tcl:0="
 RDEPEND="${DEPEND}"
@@ -22,8 +22,8 @@ RDEPEND="${DEPEND}"
 RESTRICT="test"
 
 PATCHES=(
-		"${FILESDIR}"/${PN}-8.4-varinit.patch
-		"${FILESDIR}"/${PN}-8.4-ldflags.patch
+	"${FILESDIR}"/${PN}-8.4-varinit.patch
+	"${FILESDIR}"/${PN}-8.4-ldflags.patch
 )
 
 src_prepare() {