gentoo resync : 04.01.2022

10 files changed, 43 insertions, 86 deletions

diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 6b51e6f87aa3..1cf212155969 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/tdom/Manifest b/dev-tcltk/tdom/Manifest
index 0963680d4c9e..0e2705574545 100644
--- a/dev-tcltk/tdom/Manifest
+++ b/dev-tcltk/tdom/Manifest
@@ -1,7 +1,8 @@
 AUX tdom-0.9.1-useCC.patch 868 BLAKE2B f4d3a7a0d79d7213ead1fb29dcaca2e33202901a33f0a2f4b97313f5e4db79cd92ec79db179a1ce4d2d93813c3616c6e32c82fd6c6abdc89dac43477fdab1043 SHA512 765ba2e77c48fcb13530e92c483a48e3f57921e4b721cc9149e054c4cbb4a022ac0036c23e88f7b3a8cd7820a056240ab6e2ec2d9cf83e6fe4d8bb1dd01b1b4f
+AUX tdom-0.9.2-nothreads.patch 659 BLAKE2B e0ac4d7f8821d6e53d4f5b0577a66cf7ba3721d8df9ef0e13237553c932e7d4631326d87cd72d2288b822cbc2a1292adfcb52d3132f64bb700b974083c7b762b SHA512 c087b4643ba3c4885fe3c84fddefe01f20b1e35fa3067650720c22865229f6897ab4a125765ddf89c8bf2f4f1d85113831270d18f91cc034650ec5ff5c6b7ea2
 AUX tdom-0.9.2-useCC.patch 868 BLAKE2B e5d41422bfd8336dacbd177f16b19126f3af1a2ddffaa1f8676546b4db29a5adc679ff4bccf3debe32bc656c3d8b5d9523c6d6a478a202ae739b6e2a08597624 SHA512 59388e3ffa2c21daae3770c2d337337ec28c0845286114337e23c374c310a2dc6f790d6df4ec6f8b741040936cce021197aaf76fd162aca2f391fb480d057d20
 DIST tdom-0.9.1-src.tgz 1100163 BLAKE2B 25fca8ae7b2dbcfaca711df90e42479dfba57e9aaf0e616c519b6e74bafb1b5fa371c48abe0875126aa8e1979196a10f6030a0ffe8786b21f7685e8c2ddcb16c SHA512 40dd5ec942ac4cce2fd78f53caf3a2b5e2fae9fbc5617923d94f07c9f530fa936696d79abe080ade2edbc4f4a86c35898b000180f20d9320edd8bfa3fa19d863
 DIST tdom-0.9.2-src.tgz 1215099 BLAKE2B 1d720043ee4acc27d3fad138baced96b291c2e39dc1535fb1927a9968e07324d5e0e0bb0c71d8e5678b8c6f4bb69fb09ce05ac9447712422af0d91c9e06c163e SHA512 ba6611db866f3afffd112887cf6b0f250273f29ab4ed8e29de89405b997a0f7569216f86206040462aba9a4b8548c346bc72945cf7d617cf45a644fa8ded7121
 EBUILD tdom-0.9.1.ebuild 1661 BLAKE2B 21365c0cbf2524b654252dffa468eec6158a800d217841ca62235010acd0c63be09e725d84cea8298d674b4eb1b2d329f933a79aba2e678561f04a615f2069ed SHA512 98301434e986af67c505939ceba0f15aec6aa6942951b54c39f130f870254818bbbadd6c347891e226d27d1be169207be9679700d478c396599e5da9b1600a55
-EBUILD tdom-0.9.2.ebuild 1691 BLAKE2B f211b0b4bc4502360d2a5f8ef1eb6e0f5eba75bbf16f97bd843d7edde45b32dde861f54f3d9efdd082a4992da5b4717aaecfd76a73386ec43dfdc1e40abeac98 SHA512 5d87fce9460d06f8b4b4fc4ff1b56c0044e4f67bac0ffbf3a2c5ec97632c2d3a784ba02e127605694a140391344799fc52f80b909118c7c5464c13b7afac84d7
+EBUILD tdom-0.9.2.ebuild 1661 BLAKE2B 9304df610b4911c496e7f428984132175d7a0c357d31b76e89f03bbc59c4c0be8142777927242a67f4ba1ace3856b71f91173f04f1bf9eb3e10475f1ec959fd2 SHA512 fcf1c184eea8c7ce7ee0b8ff74735abf1642603c5792f60a0775424dc1cf7e72f23c0bbf574645896ae0301ed551306ed46c7fdcb027b168d1b0ce2bcbd1f393
 MISC metadata.xml 610 BLAKE2B 42fe1fa871ca6b3c5e75d651355fbf02ef69a92737b0099996b6a90a25fed48d65dfbd7f0ab6b2739e6da6c57f60e593935896c1995409644400d818598fcff4 SHA512 fd35befa90577793076d3cefdde556cbe950ace29418ea0df84292731a267852b1be2ee4e1b232e6fe6280e61f299e5ca3be2b99a6c156de1375d84a530c223b
diff --git a/dev-tcltk/tdom/files/tdom-0.9.2-nothreads.patch b/dev-tcltk/tdom/files/tdom-0.9.2-nothreads.patch
new file mode 100644
index 000000000000..1170eb16bb5b
--- /dev/null
+++ b/dev-tcltk/tdom/files/tdom-0.9.2-nothreads.patch
@@ -0,0 +1,22 @@
+--- a/generic/tdomDecls.h	2021-12-31 20:52:18.070370435 +0100
++++ b/generic/tdomDecls.h	2021-12-31 20:53:45.892045820 +0100
+@@ -63,7 +63,7 @@
+ EXTERN domDocument *	tcldom_getDocumentFromName(Tcl_Interp *interp,
+ 				char *docName, char **errMsg);
+ /* 18 */
+-EXTERN SchemaData *	tdomGetSchemadata(void);
++EXTERN SchemaData *	tdomGetSchemadata(Tcl_Interp *interp);
+ 
+ typedef struct TdomStubs {
+     int magic;
+--- a/generic/schema.c	2021-12-31 23:19:47.869682736 +0100
++++ b/generic/schema.c	2021-12-31 23:20:14.474255669 +0100
+@@ -419,7 +419,7 @@
+ }
+ #else
+ SchemaData *
+-tdomGetSchemadata (void) 
++tdomGetSchemadata (Tcl_Interp *) 
+ {
+     return GETASI;
+ }
diff --git a/dev-tcltk/tdom/tdom-0.9.2.ebuild b/dev-tcltk/tdom/tdom-0.9.2.ebuild
index c8dbe69542c7..a18a18822f4b 100644
--- a/dev-tcltk/tdom/tdom-0.9.2.ebuild
+++ b/dev-tcltk/tdom/tdom-0.9.2.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=7
@@ -14,7 +14,7 @@ SRC_URI="http://tdom.org/downloads/${P}-src.tgz"
 LICENSE="MPL-1.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs threads"
+IUSE="threads"
 
 DEPEND="
 	dev-lang/tcl:0=
@@ -23,7 +23,10 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/${P}-src
 
-PATCHES=( "${FILESDIR}"/${P}-useCC.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-useCC.patch
+	"${FILESDIR}"/${P}-nothreads.patch
+)
 
 src_prepare() {
 	append-libs -lm
@@ -32,7 +35,9 @@ src_prepare() {
 		-e 's:-pipe::g' \
 		-e 's:-fomit-frame-pointer::g' \
 		-e '/SHLIB_LD_LIBS/s:\"$: ${TCL_LIB_FLAG}":g' \
-		-i {.,extensions/tnc}/configure tclconfig/tcl.m4 || die
+		-i tclconfig/tcl.m4 || die
+	mv extensions/tnc/configure.{in,ac} || die
+	mv extensions/example/configure.{in,ac} || die
 	default
 	eautoreconf
 }
@@ -74,9 +79,4 @@ src_install() {
 			emake DESTDIR="${D}" install
 		popd > /dev/null
 	done
-
-	if ! use static-libs; then
-		einfo "Removing static libs ..."
-		rm -f "${ED}"/usr/$(get_libdir)/*.{a,la} || die
-	fi
 }
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"
 
diff --git a/dev-tcltk/tkzinc/Manifest b/dev-tcltk/tkzinc/Manifest
index b2835b54f2c2..4f6ef5120ccc 100644
--- a/dev-tcltk/tkzinc/Manifest
+++ b/dev-tcltk/tkzinc/Manifest
@@ -1,5 +1,5 @@
 AUX 3.3.6-ldflags.patch 552 BLAKE2B ebd7496be2a97cf7325d25a46e272fe287e7bd17d7e8c660f584609057ba6823b75bfbcc611178fa70a66b90d2a699d41b7e6b673ded23db188bba47ecd4d11d SHA512 5ef1d02ac3b6eaffc4c7310e80e27204c5eb0ccc9d6627a5da4598a6b13d20fa1a1eab63194578a56a0650eb07c70879370e64030ccf86caf5226a1d1c6fea7e
-AUX tkzinc-3.3.4-latex.patch 331 BLAKE2B 03697cb54e5c82b7662bd41fc6c0cf35a27c252a849950ffabcdda927d796593a97e3cb4f968b280f0df6478264d9f3e3c532648393c370adb68130b9f255aeb SHA512 20e859529ff20b41193a43baeec4c632107208311de3815795cc2a013741034dac36880d88c11e7dc1c4719259e42a180203c1ac478251ff81eec0e3d7f77ee4
+AUX tkzinc-3.3.4-latex.patch 254 BLAKE2B 23b996d25c762c9598af86182a2aed1b13638183144d893ccbdc02ef1215f32041c161636dcf894e97720c0b41a94c7bf105c8b1dac0406a8fd68506ca03b9f0 SHA512 032ab424273f6b69fbbec3e2d028ca054e11bd49b7cb119756ba495edd81eba9e005d55d60bb5b759766c07c013d21a4d99b99137b3cb16d00be816168699d40
 DIST Tkzinc-3.3.6plus.tar.gz 1924729 BLAKE2B 9e02b113c37cfb870b2e238591e9b35cf5851c6534249312118c54d179d9ba7dbca17217cd924cfcfb1ef2444697840e3136d0fd1385b976a8a2bfda156c488d SHA512 ead998b69569ebec92e7f60415296262f60b91250b2fe15fdeb9fb71c38756006bedcd9ed2829d915cb6ce3a6461165a48c9037f8e397ba6049a76ae474f7838
-EBUILD tkzinc-3.3.6.ebuild 962 BLAKE2B 5e2c0cffa4ce4cb747f283d36063d5a12a15d90cbc07000c67736309e0a1e4711b3057bdedbb63009f8b18dc3ad533f1283a207cd88cc79a7b88c0f22b85251a SHA512 7b8df212e65a9d357e0b867d7f2058f73279aa9cdc55b8cdb2ca2c2e8eb88f03ab29cf59e629d57de6697a52a70097acfe66cfe6d1c5d63968e3dd2fed53ee39
+EBUILD tkzinc-3.3.6-r1.ebuild 962 BLAKE2B a94760e526f7ff1579e874924b2a66f3bb4cc0b996f2fc81052b56d26f3f9e94142c44517bcecc5a822c92867e7da51d62cd88a678762f06ab17f99cc506d1d0 SHA512 f867d9e31d72d070bbfe3aced62f100a4b8fb5da77e3f3edcd77d0aae2f3987a55858f0c1bc3e972fe4c152a78db5539e599a89fa6dbdc10789e0484d900a2cb
 MISC metadata.xml 253 BLAKE2B 3a90be836d3afaed7fe209751899dce43a503670cb48f71ece4ab952c1528a42bace06f56bca3766b559bf6a46d20279f25229bf274f16ecf9999a553f7ef47e SHA512 5a3283662c7649427a2c567889d47e32a83e4f619638588976b9864deac9868b5454e280283812f8d7c2a516ef0c99665900849095af028cfa0ea76066a6cda1
diff --git a/dev-tcltk/tkzinc/files/tkzinc-3.3.4-latex.patch b/dev-tcltk/tkzinc/files/tkzinc-3.3.4-latex.patch
index 6b697a7bfd78..f89ab9ac8e0e 100644
--- a/dev-tcltk/tkzinc/files/tkzinc-3.3.4-latex.patch
+++ b/dev-tcltk/tkzinc/files/tkzinc-3.3.4-latex.patch
@@ -1,12 +1,9 @@
- doc/refman.tex | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/doc/refman.tex b/doc/refman.tex
-index b384e97..be88fde 100644
 --- a/doc/refman.tex
 +++ b/doc/refman.tex
-@@ -1,3 +1,4 @@
+@@ -1,4 +1,6 @@
 +\RequirePackage{ifpdf}
  \documentclass[11pt,twoside,a4paper]{book}
++\usepackage [latin1]{inputenc}
  
  %----------------------------------------------------------------------
+ % $Revision: 1.94 $
diff --git a/dev-tcltk/tkzinc/tkzinc-3.3.6.ebuild b/dev-tcltk/tkzinc/tkzinc-3.3.6-r1.ebuild
index 7f39c89740af..a94dde7d11fe 100644
--- a/dev-tcltk/tkzinc/tkzinc-3.3.6.ebuild
+++ b/dev-tcltk/tkzinc/tkzinc-3.3.6-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools