6 files changed, 121 insertions, 1 deletions
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 68415869681b..6b51e6f87aa3 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/itcl/Manifest b/dev-tcltk/itcl/Manifest
index 29b082a07b1d..3e01f4b3d294 100644
--- a/dev-tcltk/itcl/Manifest
+++ b/dev-tcltk/itcl/Manifest
@@ -1,7 +1,9 @@
 DIST itcl-4-2-1.tar.gz 516035 BLAKE2B 795641559aa2c9039ecabaf0a25214360a379740dc9925015d3a08205b54ee6e1049497155d728b8c4d539976c5557d528ca2428c8cd5e33d6023a5bc1d1051b SHA512 902847885ca3aaa9b15497f8f95897cf3cfca664ba3ee9a57878402b0c47ad099ff63df1e5439d3d52a5df8e45376b233f1a361318dcad0831cf29f6c11c2275
+DIST itcl-4-2-2.tar.gz 522497 BLAKE2B 3bb79525e5796b37b9274fe514b2430f8cd3f17f9b63ad008e1cc011eb298d47efedc9b684ea23cc0811f2da5f14d5dbc2c6e4b3ebf8bd7787fcc71661a621db SHA512 60bb5fba6c1188cbec15236c2f33b2409ff7a77af89526552a865376703574d01075fa9422d89e6f10c188b3eb8b3553f6d449704f55444005d2050de1c255d6
 DIST itcl4.1.1.tar.gz 436718 BLAKE2B 50f5518460dc6569edcd0229b71439cb10a724b50c31387ebd1ffa85f9fbf58d5bd5163847a1d7ffa791d5acd5d72b08188f01f0e5c4730ba9060fc531071cd4 SHA512 1e08dbefe33e5464320c62e32d153b3e473462cded2d715ba1c504deacf190062672fbece40a021f25798440e2fbed4ecda763db5789fc6afb5eb2052bdf66e2
 DIST itcl4.2.0.tar.gz 428635 BLAKE2B 38898f3377583115eed3b4d5a8a610e0d0a515a1e4852fe3cea04eea68fe64f158bc79d7d5f3041831f97e5e28cee5a67721a187ed5cfbaa33c69e4668b55f31 SHA512 42d13d7f4f841bff49c508fe5d17c12e81b7e381db470d7db658c925b6e609a0821953aa8344764633a3b996eb5757aaae7014df13f4e38ade2dd7aa068ba385
 EBUILD itcl-4.1.1.ebuild 1448 BLAKE2B c16ab644f52d6e284a5d802c0bdbd4afe7939c7ea37c615b6dde0cbe6989bc31862aeba37e60da576e42671f4a2b16d0539d5325e609c9c17e5c8ad0f55fabc5 SHA512 d79dc61dd9a398e92bd393c219b73dddde85383439bf1e2109b78ec1f01dc25e8b4256d8c44466424e93e74a7f7f7b8ae9cecdfc4f110690f74bcabf01765bc4
 EBUILD itcl-4.2.0.ebuild 1454 BLAKE2B 21aafc38fcacb2a504e7c42b9077dcf078521e96035d3e1355427e6d8c92d083fb3367af1332db30e490bcda6d64aeff31f844c2ac9f96dd710fb2b02f468159 SHA512 8c029cf6a22cc2ec108f6b2c9ee4f6de32d9a21de0a52b9299e4b578121e9a440e64aaffdba0cbaf0eb55f1f67a6ff65e1ea3214bff784f327ed192f42eec8f9
 EBUILD itcl-4.2.1.ebuild 1538 BLAKE2B ce708d738449847b3d40a189a4c357a1063de6de8c4e729aa92dd555209b99fdad360bf9fab33e19a270ece9b8249e52da9583652e3cc989524a815d2d761e2e SHA512 07fc92ad190f95c7fa9e42d6c8ddba17b8ef4ac7472e9287ee3ffc2c1208c7f722e9f1e0afa7e366bd6e7f49c91e6e90e98d3ec19b1c2733a89b29b9194351aa
+EBUILD itcl-4.2.2.ebuild 1538 BLAKE2B ce708d738449847b3d40a189a4c357a1063de6de8c4e729aa92dd555209b99fdad360bf9fab33e19a270ece9b8249e52da9583652e3cc989524a815d2d761e2e SHA512 07fc92ad190f95c7fa9e42d6c8ddba17b8ef4ac7472e9287ee3ffc2c1208c7f722e9f1e0afa7e366bd6e7f49c91e6e90e98d3ec19b1c2733a89b29b9194351aa
 MISC metadata.xml 381 BLAKE2B 10be715b2d7375efe50d58e9fa2ac732553271e077bdebed3a0422b0a3f0932aa6d2ccb15f4c1db1aca8d619b20efc593d417b5adbec6c1dfb41ddda409e98b5 SHA512 6343f2deffd5ac471db9b2ebfa6ed602a4ce2beed9aa47e58e3bf49c040f847d12f209549151ca4947f6690f001effa8e8ab60172e8b2a182c59b77938761417
diff --git a/dev-tcltk/itcl/itcl-4.2.2.ebuild b/dev-tcltk/itcl/itcl-4.2.2.ebuild
new file mode 100644
index 000000000000..f91441c20dc7
--- /dev/null
+++ b/dev-tcltk/itcl/itcl-4.2.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MYP="${PN}-$(ver_rs 1- '-')"
+
+DESCRIPTION="Object Oriented Enhancements for Tcl/Tk"
+HOMEPAGE="http://incrtcl.sourceforge.net/"
+SRC_URI="https://github.com/tcltk/${PN}/archive/refs/tags/${MYP}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=dev-lang/tcl-8.6:0="
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-${MYP}"
+
+# somehow broken
+#RESTRICT=test
+
+src_prepare() {
+	default
+	cp -r itclWidget/tclconfig tclconfig || die
+}
+
+src_configure() {
+	econf \
+		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
+		--with-tclinclude="${EPREFIX}"/usr/include \
+		--disable-rpath
+}
+
+src_compile() {
+	# adjust install_name on darwin
+	if [[ ${CHOST} == *-darwin* ]]; then
+		sed -i \
+			-e 's:^\(SHLIB_LD\W.*\)$:\1 -install_name ${pkglibdir}/$@:' \
+			"${S}"/Makefile || die 'sed failed'
+	fi
+
+	sed 's:-pipe::g' -i Makefile || die
+
+	emake CFLAGS_DEFAULT="${CFLAGS}"
+}
+
+src_install() {
+	default
+
+	local MY_P=${PN}${PV}
+
+	sed \
+		-e "/BUILD_LIB_SPEC/s:-L${S}::g" \
+		-e "/BUILD_STUB_LIB_SPEC/s:-L${S}::g" \
+		-e "/BUILD_STUB_LIB_PATH/s:${S}:${EPREFIX}/usr/$(get_libdir)/${MY_P}/:g" \
+		-e "/INCLUDE_SPEC/s:${S}/generic:${EPREFIX}/usr/include:g" \
+		-e "s:${S}:${EPREFIX}/usr/$(get_libdir)/${MY_P}/:g" \
+		-i "${ED}"/usr/$(get_libdir)/${MY_P}/itclConfig.sh || die
+
+	cat >> "${T}"/34${PN} <<- EOF
+	LDPATH="${EPREFIX}/usr/$(get_libdir)/${MY_P}/"
+	EOF
+	doenvd "${T}"/34${PN}
+}
diff --git a/dev-tcltk/tclxml/Manifest b/dev-tcltk/tclxml/Manifest
index a23434e2fba7..c85f16065c38 100644
--- a/dev-tcltk/tclxml/Manifest
+++ b/dev-tcltk/tclxml/Manifest
@@ -1,5 +1,7 @@
 AUX tclxml-3.2-fix-implicit-declarations.patch 488 BLAKE2B 1feca37c6c6e87d8c04d884dc6cfcaaacf64eead99f48825cb6473a677161876b3c3be8db6dd04e30195379dbaff2647cfe3cbe8dde4ee3ee9b17d817390100b SHA512 9f8a0c55886c01324e318aec70c99b85f845567a486daddbb897900f242d8a9fec99026c8f6ec7d73e5dca8ee22bf851dc64eab2a83a3a2c959828a24e79e4ca
 AUX tclxml-3.2.7-bool.patch 590 BLAKE2B d651d04e44b3021d8be4631a52a65ffcb498e7c27b7b69acc261d91d6e4a09c5066aee71c6f096b2ac599e1b8eaacbf87ffba5a2a46ff403ae2948caf43c4979 SHA512 1178bb6588c5c0632e5611f5c913748943304d9f9a68a7a45b58d254beaca38ceec21120fdf00e7938949ef21037e2d2504e60cd9418a316f8923cc30b72d3e8
+DIST TclXML-3.3.1.tar.gz 681802 BLAKE2B e29bcdb2ef79aa1d1f41ff1338981c0c2d0592fbd146daad102552b2609ab844b12d5de5807a9a26400860783b94df7b754d4ef96a5ab377732dcefaae3c0c21 SHA512 8ee9e36fc8cb9a68da5f810442b5b6fa8d020ef772b9ee98d7c3e429c41ec158451c8994ec5800636db8b33f39a2df7e37c6b64a20a24f7fe4e72e0bba3f2ff3
 DIST tclxml-3.2.7.tar.gz 313751 BLAKE2B 43983d2d6c2f339fa320c4748f889db49fbe9cfff15219e898fdfe5a9a7d6526a2b40b7697fdca6f5272bdfb52cbe68af53ced711ad5d476dc2c5e31898c00ba SHA512 23cb17466f777538088998fa4cce55531708bba517d45cb8b4281401779c418f8532376e4aefcf4bb5f3674ee5bab2e0db25ab2a69c153d3e5820c509edf12ae
 EBUILD tclxml-3.2.7.ebuild 1035 BLAKE2B 34052cf4da4340545b3bd0b7f37dfcab7b71a9d433b8449d475f612d1421f2b4f000b106af11c7933dab5bcda29d6c2cbf741ab708cbf014c6db865f04d43712 SHA512 eb22be48a1c776937fdbc215dfd368a5c4dcccccbf1bf15164aecbe16e7f99cca9f144f761c7805f4b10d1abaf871dba20df80661cbb0906a011f4cf10f6d0aa
-MISC metadata.xml 330 BLAKE2B 2f76ff60c4d1a505a57e5bb2ee8758b73e53620029cc25e6b3a19a0640c965dd6e077ef596d8398eccf89ad6043d9b990f8940451c837b6d219ac6cb5aabf4fd SHA512 e59a753ed820a6962b3d19bf2e4f59117bd199a471a9931bf9768171d419903756658ff8e5f85582c956452881a9043d666ba9c190e9418df39fa38d32c2c792
+EBUILD tclxml-3.3.1.ebuild 1088 BLAKE2B 436e33c15709ad28a8d4006fc0f886be1d821f75334da984dcb5dd3c5202d3f6ad6cafc2dc13846a34c94e32071e60141d962868b3880fe56b32ddacb32df3ac SHA512 a99bdb9456bb569c16935893282f46bf14e7ea29ec4d27765b5f758294351d12ebe898c384391ddf3addcd4bc8da50e125491441b155adb46c10016a8bdbf5f2
+MISC metadata.xml 388 BLAKE2B f32ce767c8e958f0f541a9a203835b011689774859cb7dfd0c55456a72c3705112292f9a99b764ba8ad0ddce5c6ffbb89443257b2d9793d171face14de8037a3 SHA512 8a02cc78a66cc2d2d445ff9ec86ef498d3711f52681ea8be9e3bbfc903ba304175542389416dba31b046e986f0f6184f337effe8ce023bbf8b29c53d24508cf4
diff --git a/dev-tcltk/tclxml/metadata.xml b/dev-tcltk/tclxml/metadata.xml
index 90c01da0d799..1099a7702722 100644
--- a/dev-tcltk/tclxml/metadata.xml
+++ b/dev-tcltk/tclxml/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tclxml</remote-id>
+		<remote-id type="github">flightaware/TclXML</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-tcltk/tclxml/tclxml-3.3.1.ebuild b/dev-tcltk/tclxml/tclxml-3.3.1.ebuild
new file mode 100644
index 000000000000..21c1b65eadf8
--- /dev/null
+++ b/dev-tcltk/tclxml/tclxml-3.3.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MYPN=TclXML
+MYP=${MYPN}-${PV}
+
+DESCRIPTION="Pure Tcl implementation of an XML parser"
+HOMEPAGE="https://github.com/flightaware/TclXML"
+SRC_URI="https://github.com/flightaware/TclXML/archive/refs/tags/v${PV}.tar.gz
+	-> ${MYP}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="debug threads"
+
+DEPEND="
+	>=dev-lang/tcl-8.2:0
+	>=dev-libs/libxml2-2.6.9
+	dev-libs/libxslt
+	>=dev-tcltk/tcllib-1.2
+	dev-libs/expat"
+#	test? ( dev-tcltk/tclparser )
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2-fix-implicit-declarations.patch
+)
+
+S="${WORKDIR}"/${MYP}
+
+src_configure() {
+	local myconf=""
+
+	use threads && myconf="${myconf} --enable-threads"
+
+	econf ${myconf} \
+		--with-xml2-config="${EPREFIX}"/usr/bin/xml2-config \
+		--with-xslt-config="${EPREFIX}"/usr/bin/xslt-config \
+		--with-tclinclude="${EPREFIX}"/usr/include \
+		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
+		$(use_enable amd64 64bit) \
+		$(use_enable debug symbols)
+}