gentoo resync : 04.01.2022

3 files changed, 3 insertions, 66 deletions

diff --git a/dev-tcltk/tix/Manifest b/dev-tcltk/tix/Manifest
index 16fb4bd69173..7b6b8d48f0a8 100644
--- a/dev-tcltk/tix/Manifest
+++ b/dev-tcltk/tix/Manifest
@@ -2,6 +2,5 @@ AUX tix-8.4.3-link.patch 402 BLAKE2B 229737acefdcea3f424ab0e961cbd6561b981b061c8
 AUX tix-8.4.3-tcl8.5.patch 6808 BLAKE2B f7344618960c685302192cfb4420cf1a18a973eb9e8baf9f7815938439d3a463035ee2724339700a75ace4705e7d03761bccf76b4f2b177a38876d945da4d58a SHA512 e3dacb53df3852c195306f9d7220f931592ea3ec606b121ac02e3b4f84684efb9da9cae4e51e4fb3b818d7277860bf72378fe63ae835d9eb3a2b7539aee9f9cd
 AUX tix-8.4.3-tcl8.6.patch 665 BLAKE2B 188df36874cedc7aade7f04b567dabbfe95c2451fc095d4ece12b1750bc4837c26bb6cb93ad33ee61632cf7d1e5ad82de479030d73b81bf2db7b6b8f8ec1f051 SHA512 3b390b551c6d59d4af695d5c60c8c47c9dc270f97b5e8fd8dab23540c2c0f41b2ef2a43d6dc21249930f294354012718866bcbf773f58c43df7c5e8ee8f22f9e
 DIST Tix8.4.3-src.tar.gz 1831503 BLAKE2B ec3a388bd8ce4f2b433defece3cafcd64aa07da9d8f9b1e23dc5c62f2dca0170cae3c5fc2e8df0ceeada7c48a749929ae9138346d8d38b528ba99b52d036f8da SHA512 f13217dad0f52c0b706d2fb8ee0886942db64be0325e5d0d51801dbf9a92a7919c743c1445b76dbfa98815817685205e238e2d63f9366a8745ace1e1e9a01852
-EBUILD tix-8.4.3-r1.ebuild 1343 BLAKE2B 46385a7d8c5e9111e905b38062fcbbeca51f7e077fe27a2cce0cdbe05d5e3cc6d385b324e008cda791244afaf45e05d02967c5b97ef42de3abd7bfca0fdc186d SHA512 1b55ff93abab0b456466f27c0a0e0827dc5c759258102401903e3f23dbd53f8c983c5771a1c68e80ee2067083d7f5f30baa75a67e665411625be1d2a98025c87
-EBUILD tix-8.4.3-r2.ebuild 1391 BLAKE2B 16974b1f71591772484396756c6bd2054aabe534db6f979a4d700d0cfa5173dd8b0f57e10ede7799cbfe0d8fa7f53618d0600121e04902a4fac634aa8f9f5e99 SHA512 b6f72e7dc88060994fcc3a1a62313d9ff0820d17aa45f7052d87f294cad863561600c427f07904b3cc412a8dcbfcf951e2059f960c8b363a8ea6663e8ecc7337
+EBUILD tix-8.4.3-r2.ebuild 1384 BLAKE2B d8735911038a3aabad2fa0fd6994f2627310b09b3cf390c7242a5a29fc0b2aba5c1ac6644fed809f8f21f57dc9278d1b69e74b9225d27a5727f90e8188543205 SHA512 15391cb0c6802b3e4d64221eb4479d9dd9726539862af17910cac82659f86fad855a3d2d13debd169ab4a1f65f145164823c80be2e2b7d40276f85bc14010d19
 MISC metadata.xml 327 BLAKE2B dd176eab1909873ba46ff7cb9b18031de4d7728f71427fc7fbbabbe988fda69020904f1d504b0f4cec968ae5de36fd893db5a20e3d5127eadf34ed629bc376d6 SHA512 d4289ef32294e0bdaa4d2111cfaf38e781808af2af0a9781993db085e1f4fdd7d84f7d975fd4f47d2c23aee63792ff01ce036588afdce4e695e0f883b2fe26bb
diff --git a/dev-tcltk/tix/tix-8.4.3-r1.ebuild b/dev-tcltk/tix/tix-8.4.3-r1.ebuild
deleted file mode 100644
index 63baac0ac81f..000000000000
--- a/dev-tcltk/tix/tix-8.4.3-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch multilib
-
-MY_P="Tix${PV}"
-DESCRIPTION="A widget library for Tcl/Tk"
-HOMEPAGE="http://tix.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tix/${MY_P}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RESTRICT="test"
-
-DEPEND="
-	dev-lang/tk:0=
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	[[ ${CHOST} == *-darwin* ]] || epatch "${FILESDIR}"/${P}-link.patch
-
-	sed \
-		-e 's:-Os::g' \
-		-i configure tclconfig/tcl.m4 || die
-
-	epatch \
-		"${FILESDIR}"/${P}-tcl8.5.patch \
-		"${FILESDIR}"/${P}-tcl8.6.patch
-}
-
-src_configure() {
-	econf \
-		--with-tcl="${EPREFIX}/usr/$(get_libdir)" \
-		--with-tk="${EPREFIX}/usr/$(get_libdir)"
-}
-
-src_install() {
-	default
-
-	# Bug #168897
-	doheader generic/tix.h
-
-	# Bug #201138
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		mv "${ED}"/usr/$(get_libdir)/${MY_P}/libTix{,.}${PV}.dylib || die
-		dosym ${MY_P}/libTix.${PV}.dylib /usr/$(get_libdir)/libTix.${PV}.dylib
-	else
-		dosym ${MY_P}/lib${MY_P}.so /usr/$(get_libdir)/lib${MY_P}.so
-	fi
-
-	dodoc ChangeLog README.txt docs/*.txt
-	dohtml -r index.html ABOUT.html docs/
-}
diff --git a/dev-tcltk/tix/tix-8.4.3-r2.ebuild b/dev-tcltk/tix/tix-8.4.3-r2.ebuild
index 778b62246342..e5534f6912ab 100644
--- a/dev-tcltk/tix/tix-8.4.3-r2.ebuild
+++ b/dev-tcltk/tix/tix-8.4.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/tix/${MY_P}-src.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RESTRICT="test"