8 files changed, 79 insertions, 49 deletions
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 6058c82519b6..7268b8aa81aa 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/orc/Manifest b/dev-lang/orc/Manifest
index d344cb0fb1eb..06e4bd220f1e 100644
--- a/dev-lang/orc/Manifest
+++ b/dev-lang/orc/Manifest
@@ -2,6 +2,6 @@ DIST orc-0.4.31.tar.xz 177768 BLAKE2B f06fd6be70063ebc82b45c1801a53aab66b5fc8a85
 DIST orc-0.4.32.tar.xz 180340 BLAKE2B fca41f0fc46bb6a841eb37f0f403afd0850053f93d34d50ba61c2e50c5029be7cb4fa0ba03828d87275aae1b4be2d968c32318d5d895ca7adf0f5edaf1f89efd SHA512 63e2ab05bc23e07cd5c1ed3192515ec3b1f666abb4f9ea5de4bd72461f3a5d7066860e2ad38f35d0acd81fadfa06f2a18d61838eae89c74dec6a78099a343567
 DIST orc-0.4.33.tar.xz 199024 BLAKE2B 45518ff948f794c5a0eb14ddd462b58760d178267da34fd449a20d1bef4f7d6378b499efe1c7782e83c55be060b6f67023074cf8134e6a5ce129921324562c9b SHA512 ae8adce5dd62f4054879e6f2db76ce8a7959fd32fef0fb99f73f450ff58c5237e15bca764f6780309a163e40afcf400345f12b0aed5b88dc698064e44f8eede0
 EBUILD orc-0.4.31.ebuild 1183 BLAKE2B f417e72dec8e15bdd4ffdef8cf7c8f3bf84ecbb31ba814a1f05535a8b92de410e2e0db25ae2e864beb13b62ded43f547e8ffac2b46f5acc3dc192d44cd32735a SHA512 4b70b2b82d107ef096714971ab9eebbe4c4a6c981bd26c0edf7751580dfba97b7db04cae401d6f7415bc36ee0905b3f7782b5d4e4bd446c20cfdd79d199a3cd2
-EBUILD orc-0.4.32.ebuild 1188 BLAKE2B 1304465b6693ca67faf74997cc99c195376704c4ccee8f4ba58abad9fc37f3b88e5883f1ebe8b5e4b26b5831dca6e2b39538401c9df9bcbaab370a597ca08742 SHA512 c179bf6d5de60573b0446d038a9b4067aa9b683d58dba807c054fa17b5bda9d1e3a44fd519219bcbde34c5f414803b9f90b07fe577c10914c7c60628e1a5545f
+EBUILD orc-0.4.32.ebuild 1184 BLAKE2B 1a85ed2dcac98a9740863c45e4bba4fc9d5827b734e2bcdab3b4a37b12e068dee53a10c56e7b63eed451a2ef37091b4f9d25448c4b14bd5dd5abea2b35a1397b SHA512 69b730395708d67934c7c6eefe46bcffc7bdb507b6c4ba403d3ad298a85ff3f00b81a8ac1ae103de17293d0b37ef5756e55d129ed46643cccb24e1c747901311
 EBUILD orc-0.4.33.ebuild 1189 BLAKE2B 794a3bb760fb3bb41fe6ab84eebd481023fcacc03312d7d8cd640e40faaa9e617d66c1203fef9375ffae7ff3ee5fe639e789908bfacb5f698371b16255412fd7 SHA512 a9b8fb18f081e65f2c53ada3ef4150ee7b18ec1b2c52db3867b4df2b34f35cde2c0e4eea0ad2daebfcbe154876f0dacb60074bdbcb5dab64e3ab1804fdded48c
 MISC metadata.xml 265 BLAKE2B 15de31a2337fe8b9175ffe3fd29cb1eb24148d7463f772b18a7fe8b38bd4edb05005df1ce6996cf23dad21db879c18b95d245fa9d096a002b95155c01088f516 SHA512 78a0c7a2a820f7032f384cf68d2affdd92d6f1466778f879909d0acfcc1cdc3bd64eee700ba06979f561583981033aae59b5d61eb4cfd01fc71fc13e4433305f
diff --git a/dev-lang/orc/orc-0.4.32.ebuild b/dev-lang/orc/orc-0.4.32.ebuild
index 339391c2024e..38821fa6cd37 100644
--- a/dev-lang/orc/orc-0.4.32.ebuild
+++ b/dev-lang/orc/orc-0.4.32.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="BSD BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 RESTRICT="!test? ( test )"
 IUSE="gtk-doc static-libs test"
 
diff --git a/dev-lang/python-exec/Manifest b/dev-lang/python-exec/Manifest
index ce5b0df840bc..2e308bac48a5 100644
--- a/dev-lang/python-exec/Manifest
+++ b/dev-lang/python-exec/Manifest
@@ -1,3 +1,5 @@
+DIST python-exec-2.4.10.tar.bz2 84412 BLAKE2B 1fe79e0d31a48954959a5556f96c3868fcf762ebc473d17f03e78a95cca83ab40b4933b7e42bc5751b0546e6229f9fdde9171c3fcbdd184f993536f944870491 SHA512 8c7d3c6b1fa362c8c97ec74ee01b5a195dc409d883408033e9709773b6059deb5291f6e63df6d9a4e42a0951aad4a1d513d4baa00ad9ff3dce3e1d2d38b694e1
 DIST python-exec-2.4.9.tar.bz2 84300 BLAKE2B 77ad193f2602db392830eb4e2632562cfa1ca09bdc710e35dc141a036230ac21e63a51d297184740d85e6c3be8cb4b7ffefef270e51533ff15250f474437a52e SHA512 ad520dc7724bc71629e238226cd795214860e0a090a065dc85f782e6bd86c30ba46d58cb80d46221f4ff4a146332244b6670335a8f31f630088f477588ed8293
+EBUILD python-exec-2.4.10.ebuild 2008 BLAKE2B 44918788dbf080a2e8380635c56b0416a41e389419260387847b57fd9f3ff00f68e0a10fd1076f6158bcf355bf43d1373e81465b08ff47bec1abd1bad2e5ec9c SHA512 82698efb94d27ccc18f20c523d207befae8cb2f7bc5475b8a1b622669c3557a2c0a3fdfd6698cf647802160e48423a9ab9a76f81edb8d34befd80a5c44fab800
 EBUILD python-exec-2.4.9.ebuild 2001 BLAKE2B 7fa42527d3b5693a1dcd2a83c05ad1e0a1995616c68a6d1bd59593ff67fb8d69a2a0966adc85aae73c8d156e291b0279edccecfa6ba85bbace8f6b85e1f58399 SHA512 a1953a4481fec91f0556919a90729ac5195a33e4ded0014a14fbbdeb2b7092806513479726d38a5fe389cfc302f6408c0820a8a40c85c947e9047f8a76a9870e
-MISC metadata.xml 792 BLAKE2B 7358e3a57f7b55a2d166128d677d12bd29ab3b439b29b85fabbb28b0850d0d061f663817b422358d5effa8756bfe981099fdc096141add3058064d3e350f095a SHA512 a20e0c4bb1bae472324c3854295e6ab77d83cfbc816dc82f8d6b07b61beaddb61c67229fc0627675ce08e65363e1a916b73ee6be2419265b4a10a79f9bc7c621
+MISC metadata.xml 792 BLAKE2B 523252765f0c1aeb4986e5f2acae02959e040cb7f9586f3b4391db730e1fcee3297dafbf05850cf2a6cbce34ab5168bbc965c2dd680b240f944b8199013ad914 SHA512 da707d555bc3f0c2d70a1fe3700c427091c3ca5e12c812714d5f3e13a518b5986bfd6a219820e35223e848e88098df81f5e4c80de33146ee3b273048e83c0521
diff --git a/dev-lang/python-exec/metadata.xml b/dev-lang/python-exec/metadata.xml
index 95267dce890c..c942a12a85fc 100644
--- a/dev-lang/python-exec/metadata.xml
+++ b/dev-lang/python-exec/metadata.xml
@@ -10,8 +10,8 @@
       <email>mgorny@gentoo.org</email>
       <name>Michał Górny</name>
     </maintainer>
-    <bugs-to>https://github.com/mgorny/python-exec/issues/</bugs-to>
-    <remote-id type="github">mgorny/python-exec</remote-id>
+    <bugs-to>https://github.com/projg2/python-exec/issues/</bugs-to>
+    <remote-id type="github">projg2/python-exec</remote-id>
   </upstream>
   <use>
     <flag name="native-symlinks">
diff --git a/dev-lang/python-exec/python-exec-2.4.10.ebuild b/dev-lang/python-exec/python-exec-2.4.10.ebuild
new file mode 100644
index 000000000000..1e2d60a1c74b
--- /dev/null
+++ b/dev-lang/python-exec/python-exec-2.4.10.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+inherit python-any-r1
+
+DESCRIPTION="Python script wrapper"
+HOMEPAGE="https://github.com/projg2/python-exec/"
+SRC_URI="https://github.com/projg2/python-exec/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="2"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# Internal Python project hack.  Do not copy it.  Ever.
+IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_} +native-symlinks test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-lang/python-exec-conf
+	!<=dev-lang/python-2.7.18-r3:2.7"
+BDEPEND="
+	test? (
+		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
+	)"
+
+python_check_deps() {
+	python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local pyimpls=() i EPYTHON
+	for i in "${_PYTHON_ALL_IMPLS[@]}"; do
+		if use "python_targets_${i}"; then
+			_python_export "${i}" EPYTHON
+			pyimpls+=( "${EPYTHON}" )
+		fi
+	done
+
+	local myconf=(
+		--with-fallback-path="${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin"
+		--with-python-impls="${pyimpls[*]}"
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	if use native-symlinks; then
+		local programs=( python python3 )
+		local scripts=( python-config python3-config 2to3 idle pydoc pyvenv )
+
+		local f
+		for f in "${programs[@]}"; do
+			# symlink the C wrapper for python to avoid shebang recursion
+			# bug #568974
+			dosym python-exec2c /usr/bin/"${f}"
+		done
+		for f in "${scripts[@]}"; do
+			# those are python scripts (except for new python-configs)
+			# so symlink them via the python wrapper
+			dosym ../lib/python-exec/python-exec2 /usr/bin/"${f}"
+		done
+	fi
+}
diff --git a/dev-lang/squirrel/Manifest b/dev-lang/squirrel/Manifest
index 3451f27f3acf..0b7e305bfacc 100644
--- a/dev-lang/squirrel/Manifest
+++ b/dev-lang/squirrel/Manifest
@@ -1,8 +1,6 @@
 AUX squirrel-3.2-CVE-2022-30292.patch 520 BLAKE2B 9c069837aa7c3981f5b14ddb717db217e9aa45e0411c00258df59361b87f44166d3363576d0615dff0789e4772cb44749fef7bb38f36dc3b105fb602b61d738a SHA512 8a9a5990cb9826771d3ce285194c957ed06df0846b7194d0f136e252427d6f9eeb7fb1550ac9932d864d72bf36da88b4862a21f650e5232f72030734115dfab4
 AUX squirrel.pc.in 223 BLAKE2B f6b6f909e53a59573b1d6e6ac1f902da20c139d69ae62d585c7631450dccac8316b55779f9a570cd59228750d024cda1481476e8447b09d040b7827fe5d198f5 SHA512 a9124dca1e013f55c0498b743230df626cebbd7fd793603303d88e2973ad50ff64a2b7f7f37a773b3aceaea65420e7570efb68554228328542ca0b230bbb515e
-DIST squirrel-3.1_p20200612.tar.gz 181047 BLAKE2B f6965b5e721919c6c33426843a9b73fb27f39b7341763c2ff01421e6b6dce6cb86c6a02df65af9cb2266e8a63d6612c0e857456c4bb6e2546760f937d1979990 SHA512 e9853c92c151ca35e137a91ba4e3c9ad9c4c6d95a22c3686ebbae74cea7c1bf704ec5274d610f9d8158d8662a2b1b1445664f3f33c11689553cfc090a957b204
 DIST squirrel-3.2.tar.gz 620486 BLAKE2B c03cee0dffc12ff48caa4a7c9c0fffec32cdfb23306f265b8475454b0b9f14a3d2ec620b0f2183de8e8bc83e4921d6853105ac1a8d37bf3f2d97e914a001c4fd SHA512 e488ccc07b851e1707f3fde923f691747b18dc2fcc4748d2a68f2590ab84a3c0db647c8ac9ee775796984d2302a3d3686459556ea0c49a0b96b1354fcb8a6c74
 DIST squirrel-config.cmake.in_3.2 143 BLAKE2B e9e795a4f855f41206c5aca89b949c279f35dce06dad73c9153a9c03701f1721d831bdc29e3a399a2a6b2cf6e97d3a966008d81dfe955b2f5412c818d5a054bc SHA512 4820835a233b2beb5768b39e6b3ce5f06f1f9bc57c4c19df2c4f7ce2b03e67c18554c3084259317092d1eb0fee7d909bdbc56a9fc556f57ed61ef8b0f181996d
-EBUILD squirrel-3.1_p20200612.ebuild 969 BLAKE2B 4e3862e00b94df35203c37e6ce4435b91a25af06bae774a777796ec05c5f3531eaa4ada5e02dee16bb53166829a33a9bce2fa0961d86f1ba506c79f777bfc2f9 SHA512 51194be28d9ef6bd7c8d2c3cd374369ddf4fc61112867abeb31655f9d889febd36d938684ea83b80ebbf3faddbbb24240a4d35f56597a4a25baae507f45027ca
 EBUILD squirrel-3.2.ebuild 1543 BLAKE2B 2e9da9312f5341478784e6a6291739981096b3e76b4f421972ba9c353ac66ec4efc640e4d856ce29b2f11b9560fbcae5645f08721f303e02e6946e6607c86dc2 SHA512 97b4a137e635302675d7c4be8bf83de4055d9f4ee2deac60255c9ef840f09deea9a503cd55248291d3d86ae27510a5096fc2e595e3a3ac2a04654064be705a80
 MISC metadata.xml 312 BLAKE2B c2cfcb7ffff475030a29560dcac42917662a733e7a6ab37b9224fa0967bec0bf7d517d6c47a9686b30940a80a6e05465b87be918c28622681ef6f596c889b23a SHA512 4f3f5a13638a29c21555a43e22bbb41b2c58708043d7b6eb9cb0eb549f1dfb383adc8c0a0ade1491f1a037fc93a4f057dd5572d258c060fee8023c97e67e0c1b
diff --git a/dev-lang/squirrel/squirrel-3.1_p20200612.ebuild b/dev-lang/squirrel/squirrel-3.1_p20200612.ebuild
deleted file mode 100644
index f8d5a1c568fb..000000000000
--- a/dev-lang/squirrel/squirrel-3.1_p20200612.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake vcs-snapshot
-
-DESCRIPTION="A interpreted language mainly used for games"
-HOMEPAGE="http://squirrel-lang.org/"
-commit=40050fa249733c85485adde533774ec066d29aca
-SRC_URI="https://github.com/albertodemichelis/squirrel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI="https://github.com/albertodemichelis/squirrel/archive/${commit}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(usex static-libs '' -DDISABLE_STATIC=YES)
-		# /usr/bin/sq is used by app-text/ispell
-		# /usr/lib/libsquirrel.so is used by app-shells/squirrelsh
-		-DLONG_OUTPUT_NAMES=YES
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	dodoc HISTORY
-
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/samples
-		dodoc -r samples
-	fi
-}