gentoo resync : 25.10.2021

8 files changed, 121 insertions, 44 deletions

diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 5cf1f5c34e20..5cd195530960 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/tclperl/Manifest b/dev-tcltk/tclperl/Manifest
index 83fdd712f99e..429bcf9b84ed 100644
--- a/dev-tcltk/tclperl/Manifest
+++ b/dev-tcltk/tclperl/Manifest
@@ -1,3 +1,3 @@
 DIST tclperl-3.2.tar.bz2 11765 BLAKE2B 408bfa98a706edfed45d57183f2152bfdc9e0a8fa7b53b3d612f1d15e3e3733fc1eb6ef8df501a28446429ec78912b937f143ce43d23ceebc2ced58c6668a6f5 SHA512 aed6fb4b0275cf75e6024336e81e3cd1502d82ae697e79b6142d2f9b3cfb0891541cc585fa83d6219632f11d6eda43b141d009caf5fe7433b2b2ca92aa875c00
-EBUILD tclperl-3.2-r1.ebuild 939 BLAKE2B c9693de9764249df6bf7688b063fcd00a5717fe7c14c8e12ce2397b7da61ed15420aa14812a035b0823a7bb54b1494d18ca0df34eb6400184202319910698968 SHA512 dcace10dc901e18cc047f50c57cb34db8a1c93eb9ccf53d45eee8fb1337f40ea359e3fafa2e3aa35c5c6bb90adf2b7b1efeacadde2fb9b4bd5ca8e31b5b08c79
+EBUILD tclperl-3.2-r1.ebuild 948 BLAKE2B 376c314f1196a06885ddd1b2e01ba224969f22aad5e86d816da60fc8db04a0781edfa78a912615264f540fc51482c999fbad4e31be23162c11ea8478a1771fb3 SHA512 cec39f097052924516e44e94beadbaad760f06072f9cffcd9fefbb89dce0a859d11832c4a5955166916d5a8e622f82c4d8e11b5a7f607e99ad367352d408ea0a
 MISC metadata.xml 260 BLAKE2B 9864f2503702b03d3ad715b3f2bd7ef7077f9ddef089de0d6a0840599d99a7f99d439ee50c12afc9ca99b0e288babf74b0bb2a6132ae6dd656b8d7c15e9b10a9 SHA512 3d1e4f14995736fb28198da21587a813a31f1330873ae3078dcd9a2452c1196d23e45983877d2e296353e1ac35cc6ff461b309585237bcc768e37e6b2728c23b
diff --git a/dev-tcltk/tclperl/tclperl-3.2-r1.ebuild b/dev-tcltk/tclperl/tclperl-3.2-r1.ebuild
index 64e82c79a3e1..199adc9af13d 100644
--- a/dev-tcltk/tclperl/tclperl-3.2-r1.ebuild
+++ b/dev-tcltk/tclperl/tclperl-3.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit flag-o-matic multilib toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Perl package for Tcl"
 HOMEPAGE="http://jfontain.free.fr/tclperl.htm"
@@ -20,6 +20,9 @@ DEPEND="
 	sys-libs/binutils-libs"
 RDEPEND="${DEPEND}"
 
+DOCS=( CHANGES README)
+HTML_DOCS=( tclperl.htm )
+
 src_compile() {
 	append-flags -fPIC
 
@@ -36,7 +39,5 @@ src_install() {
 	exeinto /usr/$(get_libdir)/${P}
 	doexe tclperl.so.${PV}
 	doexe pkgIndex.tcl
-
-	dodoc CHANGES README
-	dohtml tclperl.htm
+	einstalldocs
 }
diff --git a/dev-tcltk/tdom/Manifest b/dev-tcltk/tdom/Manifest
index 9a1d4102cda9..0963680d4c9e 100644
--- a/dev-tcltk/tdom/Manifest
+++ b/dev-tcltk/tdom/Manifest
@@ -1,4 +1,7 @@
 AUX tdom-0.9.1-useCC.patch 868 BLAKE2B f4d3a7a0d79d7213ead1fb29dcaca2e33202901a33f0a2f4b97313f5e4db79cd92ec79db179a1ce4d2d93813c3616c6e32c82fd6c6abdc89dac43477fdab1043 SHA512 765ba2e77c48fcb13530e92c483a48e3f57921e4b721cc9149e054c4cbb4a022ac0036c23e88f7b3a8cd7820a056240ab6e2ec2d9cf83e6fe4d8bb1dd01b1b4f
+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
 MISC metadata.xml 610 BLAKE2B 42fe1fa871ca6b3c5e75d651355fbf02ef69a92737b0099996b6a90a25fed48d65dfbd7f0ab6b2739e6da6c57f60e593935896c1995409644400d818598fcff4 SHA512 fd35befa90577793076d3cefdde556cbe950ace29418ea0df84292731a267852b1be2ee4e1b232e6fe6280e61f299e5ca3be2b99a6c156de1375d84a530c223b
diff --git a/dev-tcltk/tdom/files/tdom-0.9.2-useCC.patch b/dev-tcltk/tdom/files/tdom-0.9.2-useCC.patch
new file mode 100644
index 000000000000..cdfdcb8bf815
--- /dev/null
+++ b/dev-tcltk/tdom/files/tdom-0.9.2-useCC.patch
@@ -0,0 +1,28 @@
+--- a/tclconfig/tcl.m4	2019-12-07 22:00:18.094712146 +0100
++++ b/tclconfig/tcl.m4	2019-12-07 22:00:28.961515544 +0100
+@@ -434,7 +434,6 @@
+     AC_SUBST(TCL_STUB_LIB_SPEC)
+ 
+     AC_MSG_CHECKING([platform])
+-    hold_cc=$CC; CC="$TCL_CC"
+     AC_TRY_COMPILE(,[
+ 	    #ifdef _WIN32
+ 		#error win32
+@@ -446,7 +445,6 @@
+ 	    TEA_PLATFORM="windows"
+ 	    AC_CHECK_PROG(CYGPATH, cygpath, cygpath -m, echo)	]
+     )
+-    CC=$hold_cc
+     AC_MSG_RESULT($TEA_PLATFORM)
+ 
+     # The BUILD_$pkg is to define the correct extern storage class
+--- a/configure.ac	2019-12-07 22:06:56.954496437 +0100
++++ b/configure.ac	2019-12-07 22:07:53.538472872 +0100
+@@ -33,6 +33,7 @@
+ TEA_INIT([3.13])
+ 
+ AC_CONFIG_AUX_DIR(tclconfig)
++AC_CONFIG_SUBDIRS([extensions/tnc extensions/example])
+ 
+ #--------------------------------------------------------------------
+ # Load the tclConfig.sh file
diff --git a/dev-tcltk/tdom/tdom-0.9.2.ebuild b/dev-tcltk/tdom/tdom-0.9.2.ebuild
new file mode 100644
index 000000000000..c8dbe69542c7
--- /dev/null
+++ b/dev-tcltk/tdom/tdom-0.9.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+MY_P="tDOM-${PV}"
+
+DESCRIPTION="A XML/DOM/XPath/XSLT Implementation for Tcl"
+HOMEPAGE="https://core.tcl.tk/tdom/"
+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"
+
+DEPEND="
+	dev-lang/tcl:0=
+	dev-libs/expat"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${P}-src
+
+PATCHES=( "${FILESDIR}"/${P}-useCC.patch )
+
+src_prepare() {
+	append-libs -lm
+	sed \
+		-e 's:-O2::g' \
+		-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
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable threads)
+		--enable-shared
+		--with-tcl="${EPREFIX}"/usr/$(get_libdir)
+		)
+
+	cd "${S}"/unix && ECONF_SOURCE=".." econf ${myeconfargs} \
+		--disable-tdomalloc --with-expat
+	cd "${S}"/extensions/tdomhtml && econf
+	cd "${S}"/extensions/tnc && econf ${myeconfargs}
+}
+
+src_compile() {
+	local dir
+
+	for dir in "${S}"/unix "${S}"/extensions/tnc; do
+		pushd ${dir} > /dev/null
+			emake
+		popd > /dev/null
+	done
+}
+
+src_test() {
+	cd unix && default
+}
+
+src_install() {
+	local dir
+
+	dodoc CHANGES ChangeLog README*
+
+	for dir in "${S}"/unix "${S}"/extensions/tdomhtml "${S}"/extensions/tnc; do
+		pushd ${dir} > /dev/null
+			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/tklib/Manifest b/dev-tcltk/tklib/Manifest
index 18f6010c78d0..e4a45585a63c 100644
--- a/dev-tcltk/tklib/Manifest
+++ b/dev-tcltk/tklib/Manifest
@@ -1,7 +1,6 @@
 AUX tklib-0.6-doc.patch 447 BLAKE2B abd5a279a322ef7bbe44b8bcb0faf5729045e04903c2e152b79fbc05086dd7964bc7bc821cc527a9e39422229cb9f6b54fab2802cf32681dc7179d0aa291c664 SHA512 6848833a63898168d23b91a66052e8459b70e22dd5be9b6f938de5b3530473507ad2e65beee2258bbbf6d698d5162dd57af947fa112ccc9d2b678481679157a4
 DIST tklib-0.6.tar.bz2 5637725 BLAKE2B 9a0be896803c5e78e578d7c0b0bb38a742f29055708081dc858ea732895521c37fec35cc21ae544225409dff16d7b2cae93ddd0aa02150a4d7a2bd06e301759b SHA512 c4dbe6afe9d1d9c97edc154c807d429086e045f8b202870f21cafcd846b7ff759c8260d44d5e1e1322a0e7d3478c1dfb12d7a0c76200f583ac3bb85b21bf04b4
 DIST tklib-0.7.tar.bz2 5967953 BLAKE2B a7f6fa366045e78043652eea983f143cac78d847ce8b69575b1f0738b1da7e90cb3566b13412521edd62bf7beb3b92a582b2e3f0e71745bd95bd95232ff7d3ad SHA512 0322611c1dea8eebebe3f8f15ec33b695b074329ce9602aeb93d04985f486237f3ce89f1c42a5c148e12ae00b51be8c889c7db77977a0cc4204ac5eaad2cfec2
-EBUILD tklib-0.6-r1.ebuild 840 BLAKE2B a04e2ad3d4343119f6f68dca41aa3051b607e65d90c7855312a0d59227fb01be0cdf815d44de6c1311b531df823ecf5c615523839bb73f1ca76b18e96d2daa9f SHA512 dcfe0a410584c73e3a5c38359ee10dc585e32802f37c4e54599131dcace206f5f0b214f0e0118a670cbeb71585e79b06f6059c7e75b419ad7fe995b06d88e461
 EBUILD tklib-0.6-r2.ebuild 891 BLAKE2B 65a975a67d340c8d6849d85b6b30072a47fa7da931fa3b965bb182e4f4e17e65b9bdbf2c11aab8dddab1dde6a86b9c4da0bfcb5f917a3272747fcb1c042e4fd9 SHA512 14f3babf945f2ccbdaef9450720fd6d37aad6ac5657b0a75a5a10208f163b69991aa25fbe93e61267c9095e47c56d46e7e4c923687823c323c063f341f6bf84a
 EBUILD tklib-0.7.ebuild 780 BLAKE2B a5eebeae382961e3ff10c57fbb2fc1aa4d77c988a2325879a619574e015343a4759fef673a806ba85d49646d6fbb0f92d9c7bee40dc680cd12aae30894c33658 SHA512 b81addb18ca29cb1e2a74ea14dd0654356dabab00cdee4a6acb05eed4c5b14a7db106e177b5a5523b474f89b1adc0e2ccf278fa94fac9a0cf735b2cbc9e62e99
 MISC metadata.xml 260 BLAKE2B 9864f2503702b03d3ad715b3f2bd7ef7077f9ddef089de0d6a0840599d99a7f99d439ee50c12afc9ca99b0e288babf74b0bb2a6132ae6dd656b8d7c15e9b10a9 SHA512 3d1e4f14995736fb28198da21587a813a31f1330873ae3078dcd9a2452c1196d23e45983877d2e296353e1ac35cc6ff461b309585237bcc768e37e6b2728c23b
diff --git a/dev-tcltk/tklib/tklib-0.6-r1.ebuild b/dev-tcltk/tklib/tklib-0.6-r1.ebuild
deleted file mode 100644
index 9231c58cf5e7..000000000000
--- a/dev-tcltk/tklib/tklib-0.6-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib
-
-CODE=6a397dec6188148cf6a6fe290cf2bd92a9190c42
-
-DESCRIPTION="Collection of utility modules for Tk, and a companion to Tcllib"
-HOMEPAGE="http://www.tcl.tk/software/tklib"
-SRC_URI="http://core.tcl.tk/tklib/raw/tklib-0.6.tar.bz2?name=${CODE} -> ${P}.tar.bz2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="BSD"
-IUSE="doc"
-
-RDEPEND="
-	dev-lang/tk:0
-	dev-tcltk/tcllib"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	default
-	if use doc; then
-		emake DESTDIR="${D}" doc
-		dohtml doc/html/*
-	fi
-	dodoc DESCRIPTION.txt README*
-	dosym ${PN}${PV} /usr/$(get_libdir)/${PN}
-
-	mv "${ED}"/usr/share/man/mann/datefield{,-${PN}}.n || die
-	mv "${ED}"/usr/share/man/mann/menubar{,-${PN}}.n || die
-	mv "${ED}"/usr/bin/dia{,-${PN}} || die
-}