gentoo auto-resync : 05:05:2023 - 17:31:39

11 files changed, 85 insertions, 148 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index e778e83fd946..e3d69c0cc305 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/nim/Manifest b/dev-lang/nim/Manifest
index 5f25ab4fab21..2be6fc1a55ae 100644
--- a/dev-lang/nim/Manifest
+++ b/dev-lang/nim/Manifest
@@ -4,10 +4,7 @@ AUX nim-1.6.6-csources-flags.patch 371 BLAKE2B 903e9738f6c87bc40ef922c5abde50eda
 AUX nim-sets.conf 162 BLAKE2B 976422f31cf8a64e1fad537f4db38a07e0022b9460936c63e0220cb3858ba02704857841d5010ad8c7bde0e6192c4c3c1329aeca8080a48a728e8b288cefc0fb SHA512 61a07de9973fc77998515bbb62498ffd1de991241bf32805f4acc0e4325e39d767ac862f2546757763aa8d0a7f35b95a9e1df91e6aa6f241eed6e93c8e3c46f0
 DIST nim-1.6.10.tar.xz 5216284 BLAKE2B d5b7bdc488086260b84700e3022ff7fc45b98d78574a3d2e288c95968a580fa644e47612dc60d6e63f5e85687f5b59a28128be746abc55bd6d4527344dc3ab14 SHA512 2ba6c4db68030ace2b4dd9b7f85d2b7c882c62e8f7f68bd0b82f548c91c300ab0e03c66f56c678127058f56b75a5550dec48d68eb6d666a179994cd1a6e2cc47
 DIST nim-1.6.12.tar.xz 5180496 BLAKE2B d7c04ffdde273336770d9397dd255b7cfc442f6be9592afbfa5ceb1ac7836a8213d5cea673477ab55bd56c004cc477a6023b6a2799715f46689f3e328302e433 SHA512 17c31024ee19dfa36f25bf8a5091992b24a4adb1a817246119a2fc552075999f698a92e66243ddd5ee69d966deead37535c9aac00ebece3854c930f905eeb030
-DIST nim-1.6.8.tar.xz 5219880 BLAKE2B 16eac6f302b4ef1df14deaa0350e0e5553c7613515cc3e79cbe025af70955bef29c8261a1f91ba901023d9c53f9f00d62116301eb5a4ee4bb5314bb1e25a5755 SHA512 dd046dd393136fdcb78f463e267756bdb990b08e80e3a8be7fec1995b47a930447468e12bb9a59db6ec5546117f62ff4ccd032959879ef2d1d06a7bc5c438f83
-DIST nim-patches-1.6.6.tar.gz 1975 BLAKE2B 75490f4c61f4d920aadb2ad5908cb2773e270f80cee95f937ede8125bad5688b71840ed7f48659db892e4017437a0454b38eab18ae8b13c6b48207d0a7714371 SHA512 4d1590e7d05ad64432b943f8da9edb2b05213400181d1e07a0e40f479afbceb1997d0ea0f05a73d550afe60cf4b657f7e34840907ea16c3b9e96824e9f29e0e5
 DIST nim-patches-1.6.6_p1.tar.gz 2632 BLAKE2B 64980d9510dc48e3c566473dc618d00cafba04783882d62b12015e8435c9c0515d7726da30f0b74dca6a41aa88a9c9aed2189a65b3325c28839d0051de8a3365 SHA512 7ba251675cd564452669bf5ec3748565db818324f58506f20a5036e4b54df10f4d7c149cece8cb97c853222cfa7d4d8d26856d92aaa25e613e31c6f5c2a8243d
 EBUILD nim-1.6.10-r2.ebuild 4413 BLAKE2B 4a321ed1751fb582bba04413759d78e061d6d00751b6c1e15668b05ab2e57552a726bf0ac33b49355a881bb6543bd5357ca874cb39b6294d562c2a7900cd64b9 SHA512 afe55c756bf43f875d810e551f2f0d9f746bef5800de269d4a20260bbd6750647bd7da4352502f2e61e60b67f00156975eaf314e5beb373e65e0664152c7f104
 EBUILD nim-1.6.12.ebuild 4459 BLAKE2B d237b8243dcbb0ab941155e5a8abec2295f628ab98d2a92d5e8aee3d661e44d546fb71c36bfbec2fb29958a5736149d4a055a6b5b517a1ab42d3733b7d37f813 SHA512 ad440e3e94f3c91b1366e919b431ca1e51d967b94758921158799981749aeb4d7be9d953ba017811082778d8d3d5023896ea03b95551e2883cc2c90ef8afc15b
-EBUILD nim-1.6.8-r1.ebuild 2541 BLAKE2B 87b418ad6e1dd07c41a1b8a816afd4fdeaf562d06c84ce04219add81b367b5e5a6aeb9ff2e8d1250ce68bea097bc5946353691918a7f497998179128c114cd70 SHA512 655ed80e70ab3590ca805d6cd0ed4cd99839694ebfcd3a7b23b970d71ebe91de94254615a86b7deccc07b79537bfbc8df0623acde62f543711f9ed38bf04197f
 MISC metadata.xml 2157 BLAKE2B bbbc15b0c5590a22e276056a55ef09957ae5e5b0429122411e9d7570756873a5147bc8a00ee2bc97e887aa0d76668e3ecab10b495d67e5fd10174a0411d02f5f SHA512 b6d3010ddd9a0dc4e5f9698ac832cebe794c1b4b222d561448d9e43d9e3a581e5983c5d771bdad96957a100029efdb2804ff30b8b223b33ba5864e68fdb25519
diff --git a/dev-lang/nim/nim-1.6.8-r1.ebuild b/dev-lang/nim/nim-1.6.8-r1.ebuild
deleted file mode 100644
index 4634c652fad3..000000000000
--- a/dev-lang/nim/nim-1.6.8-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 edo multiprocessing toolchain-funcs xdg-utils
-
-DESCRIPTION="compiled, garbage-collected systems programming language"
-HOMEPAGE="https://nim-lang.org/"
-SRC_URI="
-	https://nim-lang.org/download/${P}.tar.xz
-	experimental? (
-		https://git.sr.ht/~cyber/${PN}-patches/archive/1.6.6.tar.gz
-			-> ${PN}-patches-1.6.6.tar.gz
-	)
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="experimental"
-RESTRICT="test"  # need to sort out depends and numerous failures
-
-# BDEPEND="sys-process/parallel"
-# BDEPEND="test? ( net-libs/nodejs )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.20.0-paths.patch
-	"${FILESDIR}"/${PN}-1.6.6-csources-flags.patch
-)
-
-# Borrowed from nim-utils.eclass (guru overlay).
-nim_gen_config() {
-	cat > nim.cfg <<- EOF || die "Failed to create Nim config"
-	cc:"gcc"
-	gcc.exe:"$(tc-getCC)"
-	gcc.linkerexe:"$(tc-getCC)"
-	gcc.cpp.exe:"$(tc-getCXX)"
-	gcc.cpp.linkerexe:"$(tc-getCXX)"
-	gcc.options.speed:"${CFLAGS}"
-	gcc.options.size:"${CFLAGS}"
-	gcc.options.debug:"${CFLAGS}"
-	gcc.options.always:"${CPPFLAGS}"
-	gcc.options.linker:"${LDFLAGS}"
-	gcc.cpp.options.speed:"${CXXFLAGS}"
-	gcc.cpp.options.size:"${CXXFLAGS}"
-	gcc.cpp.options.debug:"${CXXFLAGS}"
-	gcc.cpp.options.always:"${CPPFLAGS}"
-	gcc.cpp.options.linker:"${LDFLAGS}"
-
-	$([[ "${NOCOLOR}" == true || "${NOCOLOR}" == yes ]] && echo '--colors:"off"')
-	-d:"release"
-	--parallelBuild:"$(makeopts_jobs)"
-	EOF
-}
-
-src_prepare() {
-	default
-
-	# note: there are consumers in the ::guru overlay
-	use experimental && eapply "${WORKDIR}"/${PN}-patches-1.6.6
-}
-
-src_configure() {
-	xdg_environment_reset  # bug 667182
-
-	unset NIMBLE_DIR
-	tc-export CC CXX LD
-
-	nim_gen_config
-}
-
-src_compile() {
-	local -x PATH="${S}/bin:${PATH}"
-
-	# Build from C sources
-	# Compiling with sys-process/parallel fails for some reason but hopefully
-	# we'll be able to enable it later...
-	edo bash build.sh  # --parallel "$(makeopts_jobs)"
-
-	edo ./bin/nim compile koch
-	edo ./koch boot -d:nimUseLinenoise --skipParentCfg:off
-	edo ./koch tools
-}
-
-src_test() {
-	local -x PATH="${S}/bin:${PATH}"
-
-	edo ./koch test
-}
-
-src_install() {
-	local -x PATH="${S}/bin:${PATH}"
-
-	edo ./koch install "${ED}"
-
-	# "./koch install" installs only "nim" binary
-	# but not the rest
-	exeinto /usr/bin
-	local exe
-	for exe in bin/* ; do
-		[[ "${exe}" == bin/nim ]] && continue
-		doexe "${exe}"
-	done
-
-	newbashcomp tools/nim.bash-completion nim
-	newbashcomp dist/nimble/nimble.bash-completion nimble
-}
diff --git a/dev-lang/nprolog/Manifest b/dev-lang/nprolog/Manifest
index 099fb73fea0c..d240d8feedee 100644
--- a/dev-lang/nprolog/Manifest
+++ b/dev-lang/nprolog/Manifest
@@ -1,5 +1,3 @@
-DIST nprolog-1.92.tar.gz 186417 BLAKE2B a71ae358d8d00bde69d435f88a5923045fc939ff8fb78cbd550e3ba47a92388b8d0fc2d03406932ea5245c000e96a1ee58dc94db71bc27241c3c55bfff4b6728 SHA512 784c766080dcee126667f5c6bf7e78cf1367031bafccb6ac01145961e56679b1a90a2cf2499676881473d4fcbe20a9e99f03a53d6958eeaa23999c3efa588110
 DIST nprolog-1.94.tar.gz 128172 BLAKE2B b3a2de8e5e247bce55fc6eabbd06dddee1d42d8d993b38a2effb505647e5a4a60f89f85f14be4e469d81b5488b4494e0a45c2672b2ba00b8f06ae0545951d08e SHA512 7db39847ecfa91b65fad1e035ddb9267856726adc9741a76fdd088c8f678ba8e98eef3890283b543d345a9441dabada4038984e12709898c6887a186a19136c9
-EBUILD nprolog-1.92.ebuild 641 BLAKE2B 75e91379662045c5f1a082d98a0749b0c3f7c3fa7bc28b406fdc8ad64c3492a494f18f719d80817cd3a8d95d4af39e7cbeec2f414353e6cb32eda3b969162e60 SHA512 3be76ac887a1b8a5bc8ab33d830f98c52bc859dcbaf77b78175688f8734aa332b1cdb42ca86065816f6df4728abf21d6e36c30bb7f0b3fdd087b10778aa963ea
 EBUILD nprolog-1.94.ebuild 634 BLAKE2B 822935947e92f30d24d24df388dc6510d81d110a797308305a95192caf1ce0204228e392d5044b553dc1662df5ac263d59b06e06bc3d85d0111524feb29341be SHA512 7cf886165103e200e8acb05903df2cde5457bf0daaebe83c7098edc003cafa21ff285eff13bfd24eac6ffd142c334c5ef0abe18fe14e58752f1bfeb5bf9f760d
 MISC metadata.xml 657 BLAKE2B 9331358542d57958385bc1218b4a1c5d38185ab0822d0cc68e51bcc5f8b00645a523a1a4f60d30188efc3ed7cb934f0a6a964d27bf0915c5956c69774c734590 SHA512 972ae4d1f2179887f77d8805f2e5482c17767e38b078fa9d9ee65a2f43e0b56b76fccd0166f4c5121de9a7cead4faa7683bd8e9076c257ffb2d1deb673eb276e
diff --git a/dev-lang/nprolog/nprolog-1.92.ebuild b/dev-lang/nprolog/nprolog-1.92.ebuild
deleted file mode 100644
index 98dfe542444d..000000000000
--- a/dev-lang/nprolog/nprolog-1.92.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Interpreter and compiler to be compatible with Arity/Prolog32"
-HOMEPAGE="https://github.com/sasagawa888/nprolog/"
-SRC_URI="https://github.com/sasagawa888/nprolog/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DOCS=( README{,-ja}.md document )
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LIBS="-lm -ldl ${LDFLAGS}"
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe npl
-
-	insinto /usr/share/${PN}
-	doins -r example library
-
-	einstalldocs
-}
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 586d11410259..6ab442cb91b7 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -4,6 +4,7 @@ AUX php-7.4.33-CVE-2022-31631.patch 1836 BLAKE2B 63a250c6ec5c1b3608f5e2b61118d89
 AUX php-7.4.33-CVE-2023-0567.patch 2780 BLAKE2B a35b8f7d24cfb8a325f65e465bd440930876f4b188d1ea5c12d616da39ec75809c13f9e37d08dc5245c7412f21899018f867681ecf89213fc5e7a1b01cb0dd41 SHA512 cdbbe235791027b804c8bbc71a203f954628cbf27af99be34c750dab3c8bf8e3928af87adb87ffe09b2d011c19ed5b339e345d5a55a7053fc82d4c72ba08e8b7
 AUX php-7.4.33-CVE-2023-0568.patch 1327 BLAKE2B ab7ad1f83bfeef8da091f159d41371d0f89e3dbcb79c1b7bec7bb76b329c60d2d10e0c6ef9c5c959a57846466a778345e697099e5c2a9555733918cc2faf41f4 SHA512 6015f6025e4e5e29aa699ef9a4b4b28a8f756cca0e83a4e2311c1735f25ef89395d4ea2c143ec45b375128f66b99a4b788e8bfb28d9ee74566345696a1a3c2f0
 AUX php-7.4.33-CVE-2023-0662.patch 1992 BLAKE2B d436b763a0131c1992e69821df1f8c5d7cfdc151c9470671189dd76acdf295d3108030a273d2c3314bf97c0e06a286541a64312a95d6b9bdea0c912a90db7e0d SHA512 71cda55f019b7dd3d74c598dc93e81674bf6954bee4fb37c325ca4b8449b6a1340d61ccd1f9b9f0ba86b9cb3069221614f9b50a01de674c157bf47d7906e25a7
+AUX php-capstone-optional.patch 2497 BLAKE2B f23236130be88d28d933d5482f1925c4e32e09c5022544ac2dec62465e9296baabe64f57fedd7ccb9f4499d354bd466d10cfb66596e8be029be6fa4f82dbc1a1 SHA512 a9000d789a7bc54d4b6cf8ed287dcfd71958dfc85c6417737dcd66b9461be5b1aa2568a19f5a9cd29927fe9d955ac24d04e2f64f1c4018110a8f81a6eb4813c5
 AUX php-fpm_at-simple.service 316 BLAKE2B 0ba10f3e3b004fbf14956e1e4f04f59b8a127e6717fe6b92c09b9f931033a11551c75fbbee9010f6b694c5a8758ca0eec9eed457ae304ba0dea8f2c256c3b8d4 SHA512 7367a3f8d3874f8e0c76f331ba613a0250db02f60ad9f87affaf448dcb5bc34bcecb91d88f415764a12b24b46ae3d1b738a002af9f77a4b707e916e83a0021fd
 AUX php-fpm_at.service 317 BLAKE2B f13fc38fcc0575a8517ee8d07b120efda37eabd2355061d0fdc303604c6b02ad42d7301180d86c977d5e585f5dd685343c592e37a6e0f44933707be79e0b77e0 SHA512 27982f9e2d958bfa75c89c7d3531e48d17fc388b1cdcbc8e09051b236b1184ee2baabdfcc567c19d9fcd067d4b3b86f171015616d8da42fccdabd89432d865e8
 AUX php-iodbc-header-location.patch 481 BLAKE2B 9ea6a5d529dc7a8c78eeee800900372bc14309a05e352b2838da32e1384b61b507fdb623c9400094aa5b637eb1a87da92c72600eff79b18b8989ef90af56a0fa SHA512 86469f657d8807f005c28fd2149770c881add8f243fdfea087956c7987277597fe400a7af23f624f26da270356604717ed9cd04771154d7cf2ffe7237972372b
@@ -27,7 +28,7 @@ EBUILD php-8.0.28.ebuild 21883 BLAKE2B b0c23c162b11e652a57ec6218a26b6792baf81190
 EBUILD php-8.1.12.ebuild 21815 BLAKE2B c1610ff5a4e439954b228744cd0223a4205dd1b53e6cff7a48535db414b6d20d307ba1b31c96ea6ab60b2ed1f811eb612c80e245b49acdf9659a6f8b2bb94b08 SHA512 73b766c5dec9b7231f1149b279b47e8621e527bbce2e1606bafdf1e6cd3f647ca30b2fcd16e1d9c3160c4a50c464fdeefbd05e1102f9debe7b79abd68fbceb4d
 EBUILD php-8.1.14.ebuild 21820 BLAKE2B cda25e68ea7ea22d38db686ebb940f52d616ec7f72320ef66ad12a7768f6f484a72045577ce2d5e3e250d5065a278aa96496bb84ae7686a5b1edc8f057f52785 SHA512 315620f4d75fe120620c149a45b84917cac7b0ca3138797a0894f9ad3907d8cfc73fb18e0233ab2b3f3891771c2aac585a2d2b6d04995129923936e132f7dd45
 EBUILD php-8.1.16.ebuild 21818 BLAKE2B 1782dc5c71cef2ac3ca067f4d53fcf64e61850044384dfe9bc0e64a025ab1dcf328a455b2aadbd17dd8c92cc65029337598763e3644f488122cde39a913d3343 SHA512 2215fb5851cfd28ffff620ffe86b0d924f61e9a24ff724fa019be7c788fb7de3c53f23489d21553fd81670887cd463b959f9f9857a53cc872e72f70478e330d9
-EBUILD php-8.1.18.ebuild 21822 BLAKE2B 51b237d02bb3f8ede91b498fec4925cfd0ce7c8b437644d894572fdd9dc97bc3c985efdfba9a238c67a8e27278ad1515d197ac8d9abb4469e12f6a712e336665 SHA512 509fb7e69b1f5b6ba8cdd0b70f69d601343807c49741817d054875fe2c5aab3257510a4dcae10afba0c6821c6c1555f915eb78661e2de7bd6a73fd098aa4edb2
+EBUILD php-8.1.18.ebuild 21865 BLAKE2B 678c8f65ad61230798ecf3626d5721700d2329bb85838ba537597817fd8ae6500f201f5fd1a5ecd96183e2d655c93f450e9a15060ca176bf62ef502fa5c19f51 SHA512 0396b11714958b3153471a0b4a4dde98279878147ea0cc632607ffab26753f7f7f5cbb35bee377d719c50729e07d5e821f921a1796260f226d4de5e9c6244910
 EBUILD php-8.2.4.ebuild 21938 BLAKE2B 961781609a864080f2a53f834ab59522bd8b61af484188fb770a24b482890aed9c3c04dbe7fd9b5717c2f6072653b2439572c0451eb64ba51e96149961308fe8 SHA512 0c1a248916133b760585f6622708c5abd0a5defe8a5c3018ff418b65c7399e9c96acb936d0fee85c0cfb15b9624f25b841dac64d3d163faabc9edc15dab8c649
-EBUILD php-8.2.5.ebuild 21938 BLAKE2B 961781609a864080f2a53f834ab59522bd8b61af484188fb770a24b482890aed9c3c04dbe7fd9b5717c2f6072653b2439572c0451eb64ba51e96149961308fe8 SHA512 0c1a248916133b760585f6622708c5abd0a5defe8a5c3018ff418b65c7399e9c96acb936d0fee85c0cfb15b9624f25b841dac64d3d163faabc9edc15dab8c649
+EBUILD php-8.2.5.ebuild 21981 BLAKE2B b22900e8aa5c1a424acac7856ddbf54bbf3221a28f16bc90d61ee93ab5c2edd3dd467a192ebf1cb9469daa5d66b8668202687b947b8f369aa21239d7a9898295 SHA512 3e692a301efa542d78d22154575d03c750d39355ad4685d90b29589f23d35550073fd885b66403f00e31b420c9942583a6ad30e8e5257ce2a13c48bbd4d82b45
 MISC metadata.xml 3940 BLAKE2B 30345df2362f848bcb46aae1822d7c70716bb45348b25a75a3d19acf450d777c247445bb24eb8a17f5bf72758894a2d2ebfe05e9256dbe4aad7459b0fe3c1db1 SHA512 e5d9f6281cab122b3239fb694344b8ff5ae0c30da4bb9ed92594d1cf70bf82ddfe6816db3ee0326adfa471f5aec508ab0a7284fc3efab98dfc73fcc6770551ef
diff --git a/dev-lang/php/files/php-capstone-optional.patch b/dev-lang/php/files/php-capstone-optional.patch
new file mode 100644
index 000000000000..a4719bbb6857
--- /dev/null
+++ b/dev-lang/php/files/php-capstone-optional.patch
@@ -0,0 +1,78 @@
+diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4
+index 444ded9976ac..fb3324cf82a3 100644
+--- a/ext/opcache/config.m4
++++ b/ext/opcache/config.m4
+@@ -18,6 +18,12 @@ PHP_ARG_ENABLE([opcache-jit],
+   [yes],
+   [no])
+ 
++PHP_ARG_WITH([opcache-capstone],,
++  [AS_HELP_STRING([--with-opcache-capstone],
++    [support opcache JIT disassembly through capstone])],
++  [no],
++  [no])
++
+ if test "$PHP_OPCACHE" != "no"; then
+ 
+   dnl Always build as shared extension
+@@ -68,41 +74,18 @@ if test "$PHP_OPCACHE" != "no"; then
+       DASM_FLAGS="$DASM_FLAGS -D ZTS=1"
+     fi
+ 
+-    PKG_CHECK_MODULES([CAPSTONE], [capstone >= 3.0.0],
+-        [have_capstone="yes"], [have_capstone="no"])
+-    if test "$have_capstone" = "yes"; then
+-        AC_DEFINE(HAVE_CAPSTONE, 1, [ ])
++    AS_IF([test x"$with_opcache_capstone" = "xyes"],[
++      PKG_CHECK_MODULES([CAPSTONE],[capstone >= 3.0.0],[
++        AC_DEFINE([HAVE_CAPSTONE], [1], [Capstone is available])
+         PHP_EVAL_LIBLINE($CAPSTONE_LIBS, OPCACHE_SHARED_LIBADD)
+         PHP_EVAL_INCLINE($CAPSTONE_CFLAGS)
+-    fi
+-
+-    PHP_SUBST(DASM_FLAGS)
+-    PHP_SUBST(DASM_ARCH)
+-
+-    AC_MSG_CHECKING(for opagent in default path)
+-    for i in /usr/local /usr; do
+-      if test -r $i/include/opagent.h; then
+-        OPAGENT_DIR=$i
+-        AC_MSG_RESULT(found in $i)
+-        break
+-      fi
+-    done
+-    if test -z "$OPAGENT_DIR"; then
+-      AC_MSG_RESULT(not found)
+-    else
+-      PHP_CHECK_LIBRARY(opagent, op_write_native_code,
+-      [
+-        AC_DEFINE(HAVE_OPROFILE,1,[ ])
+-        PHP_ADD_INCLUDE($OPAGENT_DIR/include)
+-        PHP_ADD_LIBRARY_WITH_PATH(opagent, $OPAGENT_DIR/$PHP_LIBDIR/oprofile, OPCACHE_SHARED_LIBADD)
+-        PHP_SUBST(OPCACHE_SHARED_LIBADD)
+-      ],[
+-        AC_MSG_RESULT(not found)
+       ],[
+-        -L$OPAGENT_DIR/$PHP_LIBDIR/oprofile
++        AC_MSG_ERROR([capstone >= 3.0 required but not found])
+       ])
+-    fi
++    ])
+ 
++    PHP_SUBST(DASM_FLAGS)
++    PHP_SUBST(DASM_ARCH)
+   fi
+ 
+   AC_CHECK_FUNCS([mprotect memfd_create])
+diff --git a/ext/opcache/jit/Makefile.frag b/ext/opcache/jit/Makefile.frag
+index 98c5cdaea249..f9ae2e0cf4b9 100644
+--- a/ext/opcache/jit/Makefile.frag
++++ b/ext/opcache/jit/Makefile.frag
+@@ -11,7 +11,6 @@ $(builddir)/jit/zend_jit.lo: \
+ 	$(srcdir)/jit/zend_jit_disasm.c \
+ 	$(srcdir)/jit/zend_jit_gdb.c \
+ 	$(srcdir)/jit/zend_jit_perf_dump.c \
+-	$(srcdir)/jit/zend_jit_oprofile.c \
+ 	$(srcdir)/jit/zend_jit_vtune.c \
+ 	$(srcdir)/jit/zend_jit_trace.c \
+ 	$(srcdir)/jit/zend_elf.c
diff --git a/dev-lang/php/php-8.1.18.ebuild b/dev-lang/php/php-8.1.18.ebuild
index 20d68c6387fd..7a0c8ba9fcf7 100644
--- a/dev-lang/php/php-8.1.18.ebuild
+++ b/dev-lang/php/php-8.1.18.ebuild
@@ -147,6 +147,7 @@ PHP_MV="$(ver_cut 1)"
 
 PATCHES=(
 	"${FILESDIR}/php-iodbc-header-location.patch"
+	"${FILESDIR}/php-capstone-optional.patch"
 )
 
 php_install_ini() {
diff --git a/dev-lang/php/php-8.2.5.ebuild b/dev-lang/php/php-8.2.5.ebuild
index bb2d5ee06588..d8e80841110d 100644
--- a/dev-lang/php/php-8.2.5.ebuild
+++ b/dev-lang/php/php-8.2.5.ebuild
@@ -148,6 +148,7 @@ PHP_MV="$(ver_cut 1)"
 
 PATCHES=(
 	"${FILESDIR}/php-iodbc-header-location.patch"
+	"${FILESDIR}/php-capstone-optional.patch"
 )
 
 php_install_ini() {
diff --git a/dev-lang/typescript/Manifest b/dev-lang/typescript/Manifest
index 8080fc0bdaac..39dad0776109 100644
--- a/dev-lang/typescript/Manifest
+++ b/dev-lang/typescript/Manifest
@@ -4,6 +4,6 @@ DIST typescript-5.0.3.tgz 7051270 BLAKE2B 6879f0b4ed07e23dbd7e050c2740100af922dd
 DIST typescript-5.0.4.tgz 7051452 BLAKE2B ed08425d8324a910f2d328fb02f27e08f75334fb190d1c4625452d076d615726d0e852da06f0f25146a4b02c6c99cd569bbcf7c50f5d6ff32c88a40101a59656 SHA512 716f53e56f71637edc73e8df127694bd7f757e8c6d1e4cdadcdc37c24a05e2c4a52a7d0c38d7647449dd8a0fea3c15973649a9961dcdcdac90cc2887338fe1ab
 EBUILD typescript-4.9.5.ebuild 823 BLAKE2B a3777280718dabb4c3cb85f24dd59af91eb2278f8720c1e00335a4ea12a2f5f5da823424cd7b2737ef460a3ff8492fca5e48e052bfb74ac1b87e5c3656d2c9af SHA512 e0eb4afa9fb0f1517987c08815f94dfeaf3e51c55acb3e362a3674f710883d562765dc461442cdcfbb4d25735ec6d70a4b7ae7f01998c19acacac9e68ed291aa
 EBUILD typescript-5.0.2.ebuild 823 BLAKE2B a3777280718dabb4c3cb85f24dd59af91eb2278f8720c1e00335a4ea12a2f5f5da823424cd7b2737ef460a3ff8492fca5e48e052bfb74ac1b87e5c3656d2c9af SHA512 e0eb4afa9fb0f1517987c08815f94dfeaf3e51c55acb3e362a3674f710883d562765dc461442cdcfbb4d25735ec6d70a4b7ae7f01998c19acacac9e68ed291aa
-EBUILD typescript-5.0.3.ebuild 824 BLAKE2B d82c95a8140e984bcaf32e8dafecff16f1a604fe7f56dbe1a5e91ec82f586060802ab6bffa8542ce4ac13b3fd35e79f46d24361985d570499ef43c0e19bc5855 SHA512 d35d657c16d34513f8f6622470514f0a7c9dbcca3e247496f7879de69d044825558eb8f034c2fe15dae6e39d5e297f9b0d6da4558cf12b3920286412bd9f353b
+EBUILD typescript-5.0.3.ebuild 823 BLAKE2B a3777280718dabb4c3cb85f24dd59af91eb2278f8720c1e00335a4ea12a2f5f5da823424cd7b2737ef460a3ff8492fca5e48e052bfb74ac1b87e5c3656d2c9af SHA512 e0eb4afa9fb0f1517987c08815f94dfeaf3e51c55acb3e362a3674f710883d562765dc461442cdcfbb4d25735ec6d70a4b7ae7f01998c19acacac9e68ed291aa
 EBUILD typescript-5.0.4.ebuild 824 BLAKE2B d82c95a8140e984bcaf32e8dafecff16f1a604fe7f56dbe1a5e91ec82f586060802ab6bffa8542ce4ac13b3fd35e79f46d24361985d570499ef43c0e19bc5855 SHA512 d35d657c16d34513f8f6622470514f0a7c9dbcca3e247496f7879de69d044825558eb8f034c2fe15dae6e39d5e297f9b0d6da4558cf12b3920286412bd9f353b
 MISC metadata.xml 733 BLAKE2B 903d85acefa054dd979ac181106cd604c351e4b81e18be7ad0f370501864f6789895244a797ec20041158d8c716907a06fa75c2ba4ea192e798719bbe73b1d45 SHA512 95806f8f442b0246867f0ba0ed70c093dfd772a558ae499be7e22bfe99cb3bc54debc7479ca9b4ac81a54156d3b8745cbb448e412f31ed2d5c43f76cbc642d72
diff --git a/dev-lang/typescript/typescript-5.0.3.ebuild b/dev-lang/typescript/typescript-5.0.3.ebuild
index 598301d43b33..7857fd2f036d 100644
--- a/dev-lang/typescript/typescript-5.0.3.ebuild
+++ b/dev-lang/typescript/typescript-5.0.3.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"/package
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm64 ~ppc64"
 
 RDEPEND="net-libs/nodejs"
 BDEPEND=">=net-libs/nodejs-16[npm]"