gentoo resync : 30.10.2021

6 files changed, 85 insertions, 4 deletions

diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index b3d6e2abd060..395dd9e32ed9 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/itcl/Manifest b/dev-tcltk/itcl/Manifest
index f6a519710c7f..abea552bea77 100644
--- a/dev-tcltk/itcl/Manifest
+++ b/dev-tcltk/itcl/Manifest
@@ -1,5 +1,7 @@
+DIST itcl-4-2-1.tar.gz 516035 BLAKE2B 795641559aa2c9039ecabaf0a25214360a379740dc9925015d3a08205b54ee6e1049497155d728b8c4d539976c5557d528ca2428c8cd5e33d6023a5bc1d1051b SHA512 902847885ca3aaa9b15497f8f95897cf3cfca664ba3ee9a57878402b0c47ad099ff63df1e5439d3d52a5df8e45376b233f1a361318dcad0831cf29f6c11c2275
 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 1459 BLAKE2B a33a51849728c19d5c21d08aa2bb6ba9a7d764dd2016b510523f8f989d3e40c0b2d5e8822ec24f4da3f664385ca6255190e256d531ffff0d3238a977cbe90594 SHA512 ead62902ce4d5f82c139aa65953b410d190603ba0d0cecbee0802a8a41e16c18bbbd66410edc20a8eccbaef66d2a4077ecf8d0ac3a88b892cc73ce1b6b7eb011
-MISC metadata.xml 331 BLAKE2B cbfdc70f22edb7232306f89415cbcc6fa3470bea62eafd86b3a6f9fe81c78a5623a3b88c44b2d30d9029fe0d8a551c607abd63abe012dbf2891101d1f2270ff6 SHA512 fc1787936c65143bf99af7adb3f83d4e4166c2584de2608bdc19e6ad2a749055df5337cb7417c34ca9adc112197d55ec7058acaf85695d1bd9215abdcc073ac4
+EBUILD itcl-4.2.1.ebuild 1538 BLAKE2B ce708d738449847b3d40a189a4c357a1063de6de8c4e729aa92dd555209b99fdad360bf9fab33e19a270ece9b8249e52da9583652e3cc989524a815d2d761e2e SHA512 07fc92ad190f95c7fa9e42d6c8ddba17b8ef4ac7472e9287ee3ffc2c1208c7f722e9f1e0afa7e366bd6e7f49c91e6e90e98d3ec19b1c2733a89b29b9194351aa
+MISC metadata.xml 381 BLAKE2B 10be715b2d7375efe50d58e9fa2ac732553271e077bdebed3a0422b0a3f0932aa6d2ccb15f4c1db1aca8d619b20efc593d417b5adbec6c1dfb41ddda409e98b5 SHA512 6343f2deffd5ac471db9b2ebfa6ed602a4ce2beed9aa47e58e3bf49c040f847d12f209549151ca4947f6690f001effa8e8ab60172e8b2a182c59b77938761417
diff --git a/dev-tcltk/itcl/itcl-4.2.1.ebuild b/dev-tcltk/itcl/itcl-4.2.1.ebuild
new file mode 100644
index 000000000000..f91441c20dc7
--- /dev/null
+++ b/dev-tcltk/itcl/itcl-4.2.1.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/itcl/metadata.xml b/dev-tcltk/itcl/metadata.xml
index 687db9f341b7..f4dfd385d77b 100644
--- a/dev-tcltk/itcl/metadata.xml
+++ b/dev-tcltk/itcl/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">incrtcl</remote-id>
+		<remote-id type="github">tcltk/itcl</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-tcltk/tcl3d/Manifest b/dev-tcltk/tcl3d/Manifest
index 0cc148f8956d..d5b0e7787aa6 100644
--- a/dev-tcltk/tcl3d/Manifest
+++ b/dev-tcltk/tcl3d/Manifest
@@ -1,4 +1,4 @@
 AUX tcl3d-0.5.0-include-tk-dir-and-permissive.patch 2544 BLAKE2B c982924cffd60db538428d225a23023bcedbd3a9bf5e1087815d3a8fbe49d4f2be3f4dd3aadee3274a85f11a9c2d0e442bd739a0da3a415c15ac32eb8a116abe SHA512 ff5bb6df033cfa1ce9d01305cf3346653cc9ff6c144e19609b8cacc659993f0df0a8e0db741e0733e7c3f44aff6ed7f02596e382bd2b813980a8fbbfbbb376e6
 DIST tcl3d-src-0.5.0.zip 3936271 BLAKE2B 97bd3815c05254162d8af4b2029dd2ac4218ed4bfb94e19a6454f41c12953b48f616444e466dda5359433f84a9284a2e20316b6c97b0e3a20deada47f583510c SHA512 24f799d5cc0ad9daf060b6b723d1197be678c0716b2099287e004221889c56da03f7368d6cd4c47dbbbbfe936b0bf65366cd452d3d9c2335cdfbae6ff3860a29
-EBUILD tcl3d-0.5.0.ebuild 1988 BLAKE2B 33800bb3247d1333db5f6b1ae25673bdc3313b6fe33a73894a400f4e54d3de7a60540af998a2dae787c3f45c17c67aa7b81edec96c349e73453d23037eaab5a3 SHA512 9c8dac928962a75c962f69a895284aa54b54a4aa359a1766f14bbc1a5273a3ac14b845cf6a8aa6b7c118b0735cb203dcf7a85af7f5ef5782e4106fa41b30bf16
+EBUILD tcl3d-0.5.0.ebuild 2150 BLAKE2B 4c06fcab623975b22deb1c6de6e720bb6ca1f8c9c6c1a9c0c0658b2d47b3b5a598bae2ab97a9f5b4b7e57ad477b911c1f237ea448435c6a0002c4006b39106a6 SHA512 1b8b67aa7e84308987dff5a2860567e87fda85b0670d7bb7394d1993bdc11e623e5da1cf26b9478bf8b5a6b09e56fd44b93001007ecc038256d15714edc3af24
 MISC metadata.xml 1312 BLAKE2B 4201d0bb5484fa80df0439ea9e4b8a91823c7c47690bf10d525331edeb43f8799c33eb71d2e1305d84e1b916fa10ea3906104bd13f6c169f3c02279555491e9a SHA512 8269b94e36e04835c1deb69ece8ba04801a8e9daf08fd8f18fbc2a42687b9ceedf8f8fa5e525f10699a32c98de07a6944c70a3bbc9d5f673f8868bf5b090e3e2
diff --git a/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild b/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
index f24710e3f1e8..7a07697e35ae 100644
--- a/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
+++ b/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic toolchain-funcs
 
@@ -31,6 +31,15 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${PN}"
 PATCHES=( "${FILESDIR}/${P}-include-tk-dir-and-permissive.patch" )
 
+src_prepare() {
+	sed -i \
+		-e '/\..$(DSEP)pkgIndex.tcl/d' \
+		tcl3d*/Makefile \
+		|| die
+
+	default
+}
+
 src_configure() {
 	local _TCL_V=( $(echo 'puts [info tclversion]' | tclsh | tr '.' ' ') )
 	local _TCL_FV="${_TCL_V[0]}.${_TCL_V[1]}"
@@ -74,4 +83,6 @@ src_compile() {
 
 src_install() {
 	emake INSTDIR="${D}/usr" DESTDIR="${D}" INSTLIB="${D}/usr/$(get_libdir)" install
+	insinto /usr/$(get_libdir)/${PN}${PV}
+	doins pkgIndex.tcl
 }