gentoo resync : 27.10.2021

5 files changed, 73 insertions, 3 deletions

diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 5cd195530960..b3d6e2abd060 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/tix/Manifest b/dev-tcltk/tix/Manifest
index 9967709f635e..16fb4bd69173 100644
--- a/dev-tcltk/tix/Manifest
+++ b/dev-tcltk/tix/Manifest
@@ -3,4 +3,5 @@ AUX tix-8.4.3-tcl8.5.patch 6808 BLAKE2B f7344618960c685302192cfb4420cf1a18a973eb
 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
 MISC metadata.xml 327 BLAKE2B dd176eab1909873ba46ff7cb9b18031de4d7728f71427fc7fbbabbe988fda69020904f1d504b0f4cec968ae5de36fd893db5a20e3d5127eadf34ed629bc376d6 SHA512 d4289ef32294e0bdaa4d2111cfaf38e781808af2af0a9781993db085e1f4fdd7d84f7d975fd4f47d2c23aee63792ff01ce036588afdce4e695e0f883b2fe26bb
diff --git a/dev-tcltk/tix/tix-8.4.3-r2.ebuild b/dev-tcltk/tix/tix-8.4.3-r2.ebuild
new file mode 100644
index 000000000000..778b62246342
--- /dev/null
+++ b/dev-tcltk/tix/tix-8.4.3-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-tcl8.5.patch
+	"${FILESDIR}"/${P}-tcl8.6.patch
+)
+
+src_prepare() {
+	[[ ${CHOST} == *-darwin* ]] || eapply "${FILESDIR}"/${P}-link.patch
+
+	sed \
+		-e 's:-Os::g' \
+		-i configure tclconfig/tcl.m4 || die
+	default
+}
+
+src_configure() {
+	econf \
+		--with-tcl="${EPREFIX}/usr/$(get_libdir)" \
+		--with-tk="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_install() {
+	DOCS=( ChangeLog README.txt docs/*.txt )
+	HTML_DOCS=(
+		index.html
+		ABOUT.html
+		docs/*.html
+		docs/html
+		docs/img
+		docs/tix-book
+	)
+
+	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
+}
diff --git a/dev-tcltk/tkpng/Manifest b/dev-tcltk/tkpng/Manifest
index 9268bca252b3..323e83a32118 100644
--- a/dev-tcltk/tkpng/Manifest
+++ b/dev-tcltk/tkpng/Manifest
@@ -1,3 +1,3 @@
 DIST tkpng0.9.tgz 127804 BLAKE2B f2377dd8bb3b0161168930d6355202789decbe6e248607cd3828a0553c20644aac05b23b90fdb2324689e30307bdfdb63cd9fb57993ca4d58f1b1108e0d001c6 SHA512 7f832ec19b53ba0f98d3db24d7b7106ae9bb6983d46ee33c46e90a1b152646f2a99ea417c9c6f9bed1f2859ef509510b531d26b3bb81f20d4e291ea1092896fb
-EBUILD tkpng-0.9.ebuild 692 BLAKE2B c826f361d8ecbb56d94e8cc0534a0722accf02e360a2199f50bcffe7d722551ebfd48ac69a6afb6f6cb1ef78359ac57a48b06183edf066dccc8c1a555affa516 SHA512 f095c3842eb3d85ba4fe214d010f7e368e5f8b586c0337073a20e55319652882e25db3400a67c43e10a3003779194a00749e4b185c2dc68a9d8e6a45021fa7a6
+EBUILD tkpng-0.9-r1.ebuild 689 BLAKE2B d42a01c7e0db9756b95e7fc9eb9c73fd96db1537aa9e5eb579a0562d322e18013302da17c83e2183401cef27e98c1f972a592995fae1702e42de061d42a4dcbd SHA512 2a0e2b28eb95f3547326ef8f281d6d781b4c02e475e64caa6cb63fe260721daee5099177f28a1c4fd91e3dc3c142deeaee614e51edb9fb2fe4c1409c94661c55
 MISC metadata.xml 329 BLAKE2B 79d2b2be270f088f56367c291af69686a7c0f3fcbf50e3d22ce0a0962980ad5cf08e39eafcbd1056fb41bfac0176f5fc0850a707b88d07ded439c5be7b278d59 SHA512 0cf5f48eba18c2731c51b6be6c09038a3d21011f302f043e887092bb46e5ec02a9a25d0c8d4ea10a70ef8f5bfac23e79cd899a8059587421dc48f75abcbb1577
diff --git a/dev-tcltk/tkpng/tkpng-0.9.ebuild b/dev-tcltk/tkpng/tkpng-0.9-r1.ebuild
index 316297207f53..e38d65c8ca05 100644
--- a/dev-tcltk/tkpng/tkpng-0.9.ebuild
+++ b/dev-tcltk/tkpng/tkpng-0.9-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P="${PN}${PV}"