6 files changed, 129 insertions, 4 deletions
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 3af82a5e9271..643534c45fa2 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/icon/Manifest b/dev-lang/icon/Manifest
index 015434ac85c5..8751523a465a 100644
--- a/dev-lang/icon/Manifest
+++ b/dev-lang/icon/Manifest
@@ -1,5 +1,7 @@
 DIST icon-9.5.20i.tar.gz 3138826 BLAKE2B adb4010926f2a7bbfc03c12c1c669ac202c41949556fafdf8f6e41be418e329c5c4b0697a1af0eddd0cb6acd65d03dedabf171be99ba6e5c80a92fac91323027 SHA512 31f43f0ff672e81b459c8364960b780733820000c31405ddcd13d14927f065b48d1fae47aeb90a2cd31b65340c77ec7f85e8da27797fb186fa49474e7c8be394
 DIST icon-9.5.21b.tar.gz 3138053 BLAKE2B dbd507e28d51458b4e7fcc47088e8e8a4b8e1ef06a03af95180f3398caf7a74215a379d4a1c19632a501849e9a9226bd129f6404d4d20385bd07f474908b0745 SHA512 db54b0f858c32877bd72dea8c3cec06de7faaa0393ae56a19f6d6a212337c99ef50d698ef0b486369955f86d657a2e888a8b1c4e0e95328f5a67fbd9dce5d74b
+DIST icon-9.5.22e.tar.gz 3088775 BLAKE2B 0f0019f4f4bc0ed695bcb99d927c57e1fe041047d2b2e74590d23b4cb032aa4d459f916e3571a294e6d98d68be16bc55828337320173abfb5220fc4470d54903 SHA512 2a718999e7fc3f1cc2ad745215a06fecb5865f890ff83e8e61c8408df0bec2dea0c3123ab1edc0c3a9ec3cd415ca0fd116c5ff93c8ce0797a5f2abf5ff79003c
 EBUILD icon-9.5.20i.ebuild 3393 BLAKE2B 1cebf50867a91fa647634f8633b150c18eee036cd3466bf30aab3efb82941bd56eefba71b3d3ff0f1157c2a080444966c7b5731b833da5032bc7a3a4049a0745 SHA512 5de2efbee89b94ee1b043e65caf6c6da5a899f5c7eb46a0942fd4ec77f1307db93bdc78ee5e5d06bd4c9a20ec9d793ebd5aebae166c3e3cea8f0ecba0240b8fb
 EBUILD icon-9.5.21b.ebuild 3399 BLAKE2B 2a98332741de3650b5a52906e73025628735c8e38f23b2172b22b8389ef886ca21a1b9e234b3a9975cee9409246998297638e76f61e528cef9507ded0a0ecd57 SHA512 5cbfb4e14dd908f898c6b4c63889340635b42a8ecd18a701fa9dc6a0737077fa608fb3d80a04f552d989fb05589b249d621f76afd660bd8377c2636e0d5d7a96
+EBUILD icon-9.5.22e.ebuild 3408 BLAKE2B dcadd575f4f41d697c7f8878f4136e0155de38597a789ebcc680abd36781515db42c7511e368df3e08c9aae585698b04283140d1921a84db656c18dab85210f4 SHA512 810ba2e4ee77a09690597d0f5b1da8ca79b69e01d2e4ef1731be498aa9209722d949eca0d479c067d69c684c971cceaf5ddad5f9f336bcf91785af8e312bc363
 MISC metadata.xml 410 BLAKE2B 5f65752284d58a7678eb4e338e2d4c03e9e098dd8cbd28aeb7a0276bebe2a925cb4b00325ace7edad24c94e33664c1aafda84f3f4348e57bd02a7b655f7a29ac SHA512 d05b0eaffd002eeb0e9088d43847304bd1346cf4da75c801e3663518a3fbac77bba1b2fed04ac422bedfe1220109f00d1b3809d04a0e7edd4c418088dd010d89
diff --git a/dev-lang/icon/icon-9.5.22e.ebuild b/dev-lang/icon/icon-9.5.22e.ebuild
new file mode 100644
index 000000000000..725a2f3acb18
--- /dev/null
+++ b/dev-lang/icon/icon-9.5.22e.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Very high level language"
+HOMEPAGE="http://www.cs.arizona.edu/icon/"
+
+SRC_URI="https://github.com/gtownsend/icon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="X"
+
+S="${WORKDIR}/icon-${PV}"
+
+RDEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libXpm
+	)"
+DEPEND="
+	${RDEPEND}
+	X? ( x11-libs/libXt )"
+
+src_prepare() {
+	default
+	# Add CFLAGS and LDFLAGS to Makefiles as needed
+	sed -i -e 's/CFLAGS="$(CFLAGS)"/& LDFLAGS="$(LDFLAGS)"/g' ipl/cfuncs/Makefile || die
+	sed -i -e 's/^CFLAGS = \(.*\)/CFLAGS = $(CFLAGS) \1/g' ipl/packs/loadfunc/Makefile || die
+	sed -i -e 's/CFLAGS="$(CFLAGS)"/& LDFLAGS="$(LDFLAGS)"/g' ipl/packs/loadfunc/Makefile || die
+	sed -i -e 's/-o $LIBNAME $CFLAGS/& $LDFLAGS/g' ipl/cfuncs/mklib.sh || die
+	sed -i -e 's/$LIBNAME -fPIC/$LIBNAME -fPIC $LDFLAGS/g' ipl/cfuncs/mklib.sh || die
+	sed -i -e 's/$(RLINK)/& $(LDFLAGS)/g' src/runtime/Makefile || die
+
+	# executables in src/common are only used to prep the build
+	sed -i -e 's/$(CC) $(CFLAGS)/& $(LDFLAGS)/g' src/common/Makefile || die
+	# executables in src/rtt are only used to perform the build
+	sed -i -e 's/$(CC) $(CFLAGS)/& $(LDFLAGS)/g' src/rtt/Makefile || die
+
+	# do not prestrip files
+	find "src" -name 'Makefile' -exec sed -i -e '/strip/d' '{}' \; || die
+}
+
+src_configure() {
+	# select the right compile target.  Note there are many platforms
+	# available
+	local mytarget;
+	if [[ ${CHOST} == *-darwin* ]]; then
+		mytarget="macintosh"
+	else
+		mytarget="linux"
+	fi
+
+	# Fails if more then one make job process.
+	# This is an upstream requirement.
+	emake -j1 $(usex X X-Configure Configure) name=${mytarget}
+
+	# sanitise the Makedefs file generated by 'make Configure'
+	sed -i \
+		-e 's:-L/usr/X11R6/lib64::g' \
+		-e 's:-L/usr/X11R6/lib::g' \
+		-e 's:-I/usr/X11R6/include::g' \
+		-e 's:-I/usr/X11R6/include::g' \
+		-e '/^CFLAGS/d' \
+		Makedefs || die "sed of Makedefs failed"
+
+	if use elibc_musl; then
+		append-flags "-D_MUSL"
+	fi
+	append-flags $(test-flags -fno-strict-aliasing -fwrapv)
+}
+
+src_compile() {
+	# Fails if more then one make job process.
+	# This is an upstream requirement.
+	emake -j1 CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_test() {
+	emake Samples
+	emake Test
+}
+
+src_install() {
+	# Needed for make Install
+	dodir /usr/$(get_libdir)
+
+	emake Install dest="${D}/usr/$(get_libdir)/icon"
+	dosym ../$(get_libdir)/icon/bin/icont /usr/bin/icont
+	dosym ../$(get_libdir)/icon/bin/iconx /usr/bin/iconx
+	dosym ../$(get_libdir)/icon/bin/icon  /usr/bin/icon
+	if use X; then
+		dosym ../$(get_libdir)/icon/bin/vib /usr/bin/vib
+	fi
+
+	cd "${S}/man/man1" || die
+	doman "${PN}"t.1
+	doman "${PN}".1
+
+	cd "${S}/doc" || die
+	local DOCS=( *.txt ../README )
+
+	local HTML_DOCS=( *.{htm,gif,jpg,css} )
+	einstalldocs
+
+	# Clean up items from make Install that get installed elsewhere
+	rm -r "${ED}"/usr/$(get_libdir)/${PN}/man || die
+	rm -r "${ED}"/usr/$(get_libdir)/icon/{doc,README} || die
+
+	cd "${S}" || die
+
+	# Install Icon Programming Library files
+
+	# Remove files only needed for building the library before copying
+	rm -v ipl/{BuildBin,BuildExe,CheckAll,Makefile,cfuncs/*.o} || die
+
+	insinto /usr/$(get_libdir)/icon
+	doins -r ipl
+}
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 1d9be4b11d76..1b02ab322911 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -43,9 +43,9 @@ EBUILD python-3.11.0_rc1.ebuild 13384 BLAKE2B 7ac3f74190fafd1321f2ae9b478cb1b738
 EBUILD python-3.8.13_p2.ebuild 10219 BLAKE2B c736d7417d2f7c8f8a6ee61182e1b2b9e22873343594a3779c83fc1af03103ae71f440f856d7dae7a661dc7190e70afa7c478dd7d8531d28637897c1ebd4106f SHA512 89f482e716b308565f41c4c6ce1db32f9a4023a41570070ddad4ac9d156f802d79f8ad7d2971b9ed02487482c50d8e4de64d212df092dd907d2c94838e6af921
 EBUILD python-3.8.13_p4.ebuild 9739 BLAKE2B 7baa8adde29baaea89a9f126a3090fba2186bcb2734ca737705c97d1b3f8d3036341ab2b626dc6e4cd5ab7630e386ef7f3444bb5847b79abf41806e2607715a6 SHA512 80ee67adf3b1c7461edb6b3ba60f5f825d93d89cc68f4a11b1de2bf84f4cb428718cee8079e68b074044a8e7f00d2423c97fc0cc3bfaa0848b6154b9abc3d6c7
 EBUILD python-3.8.13_p5.ebuild 9739 BLAKE2B 7baa8adde29baaea89a9f126a3090fba2186bcb2734ca737705c97d1b3f8d3036341ab2b626dc6e4cd5ab7630e386ef7f3444bb5847b79abf41806e2607715a6 SHA512 80ee67adf3b1c7461edb6b3ba60f5f825d93d89cc68f4a11b1de2bf84f4cb428718cee8079e68b074044a8e7f00d2423c97fc0cc3bfaa0848b6154b9abc3d6c7
-EBUILD python-3.8.13_p6.ebuild 9734 BLAKE2B 3647765a3fe766069b8689e970159a7f2660b9daf096eec27bff652c59cc2339bd2bb01aafb6c0289ca7e7a11c323f961f8882df9c5596e056fc2ff71e065ce5 SHA512 c7397835bb6ea3b47dd3649eafc1dfb472a98ff133967714b44632d80b2a439ed23088ab2a236129cdecf8292e59642ecb68ecedf8aade16f69117e3bb9f507a
+EBUILD python-3.8.13_p6.ebuild 9732 BLAKE2B 98a74977e90167cb9f5d03c72ae71b563aca09ead18e191dab62a952310272b76b52aa4ef713e5a4c42aee3fe91ddc5ecaab06ff63dac887700fc26ea886401b SHA512 b5010fdae1045995033d3f8f7ee92812d8e8f0fc088598adaf810907e2407a2713b89e8cf95a55ea1a146ff3b3b98c4db60077ea99c9dafba163d4b1c05d1635
 EBUILD python-3.9.13.ebuild 11462 BLAKE2B cfa217f58ee03528ce5dd467daa9023c67f89d4673def5a183eb7a0c2db6fe40527a78067803f7edcdcf32eef5dc72179b9be9d9a04f5766258945a4a16e3991 SHA512 4a7fbd6f6e7ae1fc1726a170879e26a6f7e74fe4fc2b52efacf5608350bd967ee52d63df4fb8d52aebe881bc003285e29d55fca5aedf74182cdb5f8b120ca8c4
 EBUILD python-3.9.13_p1.ebuild 10992 BLAKE2B 95d62e2bb7b6c3005020827484360929c7782563a545a914c61d0f54257525856bd5298273a39f73280036e738f532bba28abf6e9116f6c18a49725fd3f97d7a SHA512 fac82f66b21097cb564fc943a09bb61a834b4e51255bd5b2c8850b209eb5c20bdabad5028ee262fb0508672d1cc711394c217d48e0c2bb7427ffa670a25aa4d9
 EBUILD python-3.9.13_p2.ebuild 10992 BLAKE2B 95d62e2bb7b6c3005020827484360929c7782563a545a914c61d0f54257525856bd5298273a39f73280036e738f532bba28abf6e9116f6c18a49725fd3f97d7a SHA512 fac82f66b21097cb564fc943a09bb61a834b4e51255bd5b2c8850b209eb5c20bdabad5028ee262fb0508672d1cc711394c217d48e0c2bb7427ffa670a25aa4d9
-EBUILD python-3.9.13_p4.ebuild 10987 BLAKE2B 8a0baf0df1e89118c88ce5490bc3b2c25644ebfdcbebcf96b6f6d6b37e85bd16b1e1a3bc73d5578aeb12341d1be6755842fa2fc1c9d2639142c90ff4b2aa87ac SHA512 d127af36055dfb629132cad52e320a519e51428e40f047c924b1f2050efc53ea41734481a3c27d7e063a470e6e50c6d8b9ef3dad9d689d9850e09d842afab85b
+EBUILD python-3.9.13_p4.ebuild 10985 BLAKE2B bab57634a5babbfaf0570e2217d20d97bdbd3d0a942f477d7ad1391267ce1ffa2f083f1884fc9352333226ad34713461f0055e5981d2b33a81058693ff5884cd SHA512 ba4c783755c288c43d08b5d9bc01f92dfd6d6fb44fdb38f8415c842db0740111ea73a88efe1fd3be13467271907f77b0b3f4e2440dde2e6f3ca5575b2e7aa705
 MISC metadata.xml 1068 BLAKE2B 3c3511739ae8251d11bde32aa3a21225fd3468f2b1f31c459de956c5bb7dbc2de4103a288dd29b26d1023e40bac62631fa953d1515513e934f5c3962d9c715a7 SHA512 0f7d3f9305cc539619568aea7e54cdb9a3319579e811108cf03d7c66290e4f21080a87ca02f1a62264d4ecd41a243c91f0a639e6c064ccf2b24b460508c848b8
diff --git a/dev-lang/python/python-3.8.13_p6.ebuild b/dev-lang/python/python-3.8.13_p6.ebuild
index 5487cc4c3e38..43fde997547b 100644
--- a/dev-lang/python/python-3.8.13_p6.ebuild
+++ b/dev-lang/python/python-3.8.13_p6.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="
 	bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo
 	+readline +sqlite +ssl test tk wininst +xml
diff --git a/dev-lang/python/python-3.9.13_p4.ebuild b/dev-lang/python/python-3.9.13_p4.ebuild
index 4d81280410ae..7eef9040f2f1 100644
--- a/dev-lang/python/python-3.9.13_p4.ebuild
+++ b/dev-lang/python/python-3.9.13_p4.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="
 	bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo
 	+readline +sqlite +ssl test tk +xml