From 3517852e3b8a68d1e997770fc0650c5053bafc6c Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Tue, 4 Jan 2022 01:27:12 +0000
Subject: gentoo resync : 04.01.2022

---
 dev-tcltk/tdom/Manifest                         |  3 ++-
 dev-tcltk/tdom/files/tdom-0.9.2-nothreads.patch | 22 ++++++++++++++++++++++
 dev-tcltk/tdom/tdom-0.9.2.ebuild                | 18 +++++++++---------
 3 files changed, 33 insertions(+), 10 deletions(-)
 create mode 100644 dev-tcltk/tdom/files/tdom-0.9.2-nothreads.patch

(limited to 'dev-tcltk/tdom')

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
 }
-- 
cgit v1.2.3