gentoo auto-resync : 11:03:2024 - 12:45:51

9 files changed, 193 insertions, 20 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 6b6a90d582a2..6f9aa3bdbab9 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/clojure/Manifest b/dev-lang/clojure/Manifest
index 019ba5b5dff2..97eb2fd1b5b9 100644
--- a/dev-lang/clojure/Manifest
+++ b/dev-lang/clojure/Manifest
@@ -1,12 +1,21 @@
 AUX add-compile-spec-ant-build-target.patch 1813 BLAKE2B 5a24f1457e298429bee3fe31deca54df3801665ed57a91c9ee760003418a34a3d5f59cfe432eedfb8a247e8b9c12dce701253dd9fc747b3bf1c84f10d8bc9ec5 SHA512 da5e5a61faa8c17244073dcfa0de40c9aec1ce698df60aa1b8ba89d5aa187e9974edd400fee711120c0181b152e461db8669a85f5b83ff037023c3f05a81f21b
 DIST clojure-1.11.1.tar.gz 705082 BLAKE2B 5f22fcb04cbb2aad8b90ceb93f620cef1a8704768663023db2a817efbe294dc232d60bd077fc748daec512f80f8425c0df5a417a40b279e3d65165948f615bb1 SHA512 b4e05f61e5a68b5dc8215b2158a32af891ee1e855240bc753bd1d5d28b6864f2e1c5ef45ad53a7f5fa5565fc19ff957939b7130ad44b432ad8ea95e459aa26e1
+DIST clojure-1.11.2.tar.gz 705898 BLAKE2B 8c7219dc607d968504e17421c01060b803750f9304bf211c7c8cf883c073b14938fe042ca9a05cd9506cda8b8a9442a405913dc754cd5bedc2ed95bec9978691 SHA512 8de77a6b434a147b7252bc9a36bde5552d063ffa8702153483c690caa231265314aa871c5409c92037ade7c5e6d1df1bf32244929cb4886cdd91e4391f249184
 DIST core.specs.alpha-0.2.62.tar.gz 11799 BLAKE2B 2e28043cdd9f3b71a9eabd30ec39ba88ccdb8f9af6b442bcf58d1da6fef73132e9f591865302d9cff43dd6aeca0200768e63993000ffc3c840b5c07bb823f20e SHA512 0707ef3f669d2eaf1595d1e333a9b1e62d97fcbe4cf7ed70c968a4ade3da7e06c281e8e075f953887346288d190bb1dfa7866d9a8d623662e6f844528eb1a45c
+DIST core.specs.alpha-0.3.70.tar.gz 12176 BLAKE2B 168b055ee1a518e750791cd010872b6d2f3a655c474f7feab93b0e06bca7cbaf9e029b9c042c2e218129213a5c787b3409c2ddc17f902907c1d38a4d9c22cdfd SHA512 223a8d1a2f1fbb93d9144e2a50fa7d9e5fa79657fcd0c96ece7170c33f23620aeb7645ace84edd3512fe87b88bb3e9422666c66343989bb07a4cd5fadc1216d7
 DIST data.generators-1.0.0.tar.gz 9940 BLAKE2B 981ac8f91ae05aecc7a9e7c85cbd59c5a50785bdc969309465374393234fd0a72d9803931acebbbbf369e812de33f0ac0c2ddc3009f8bb4237debd9e665301f3 SHA512 a8d5881c401b409e7e4192243e62288855b435d5979fd7950fcd3ee5291d16ce4aad913ea1dadf26db8a1297a21cab19e1e1e5d31e26db57a6fa4ed17bcefe0b
+DIST data.generators-1.1.0.tar.gz 11781 BLAKE2B cccbacb789f37a705d64c9467dcb0f737110176c92f3af89165688676c225179bdf17ca29126ab3578a54ace9137c991d2f1bf4b3024c7c6aaf9fe2f63f37fb8 SHA512 7b51fd44c9d58de639d036dbce343dd81a271e28db096c64e910ca6c87869fa6ccac9ba87d7313b53304017a335ee45bbd5ab9794bc166ec46b5a8d86b5aa82e
 DIST java.classpath-1.0.0.tar.gz 8955 BLAKE2B 1ab2d077d9f852ee72a1576b71d6aa8764f2fdb04eeed3f7710a7deb65942df8c0b1caff5847e329c191316c7218877b8b136b9dcefdb8f450f383beed5805ba SHA512 552f31f1f27fd80f262bbec4777626951bccef6689f4586fc327c3490669d25591c1a87907b15709dcb8d69f47ce33341d219694877b44481859b79fb38737fa
+DIST java.classpath-1.1.0.tar.gz 10881 BLAKE2B 1f3f9a103197990954e97725ffd581945fa27f2b50b44513a94a28bf0c50f0f2fd26a906f30eefbb110942d3ba157af945e009e3d5825a73ffb37aa85679bde6 SHA512 2d3c887a04f4c8a3a1189de719cfe020ff3989bb0c680328ef15311105b2244aa2d6797c017b1d39f6c025a8bf5ea36051d995dcebcae2ea032a5ca8cec12816
 DIST spec.alpha-0.3.218.tar.gz 41399 BLAKE2B e6d20afb42d26096077db5ea0346a3f1bd261f9b0ec71c2bc6f70849352ea38e2eb0d7c6e2124af4342b1b4f25966568d3054fa7447fbb1285eb539beab6a19b SHA512 bf89cb38777cd413804d7211519a62ee8b4dc80b93987cc4ecccb8065fb4c43b876e713c99a966663e6ec0ebd2dc3d35a567d43a38e8f73b80643b2653e3781c
+DIST spec.alpha-0.4.233.tar.gz 42433 BLAKE2B be243c2180903ababd23eb6f5f47caa855f730eef5efdc30f1f404ec6c7471e15dc6bbbd1a13a2ea911e82a97dbe8e64631cd4f18e4be09b3c8c5aa76fa59b78 SHA512 085d6833c58f607d222edc832fb78e786946d2d3e0644c990043f0a98c055eff0b56b0e920010253c898e643cbc43c72c222cd8c6a813c5c5cc663cdda337aa1
 DIST test.check-1.1.1.tar.gz 85399 BLAKE2B 752f0f0149dd5720dcabdcc65173906b124a85590f6b3cda41d3384a05e5b54c10b4cd399ba26ff466d637ea87e0fd81dc2a4943179818ba3d4fccdee977922d SHA512 e62ac00e302efbf4bb0c70721cd0b4438b2d302855146a052bfde492b0f36506fbd44c10c3e5c88a0eeb9b548eac40247f77d8ac590f758176e1d8f54270e196
 DIST test.generative-1.0.0.tar.gz 140414 BLAKE2B 8895fd2e86fe3ac54c826af10f914e43e3dcb0233e799102c6ec2024fb77fe8a47dfed1753a432ef4353ebbe0f790334f30a0b6d42195e869ecadb21d545578a SHA512 28aeed3dde40b1e02ee41219b698083e5ec7c63df0c779d1db75e07e5000faf0cd1415fe7418e241ebbea6979606db72696fb0090c4204d22ec1aea689b2ac34
+DIST test.generative-1.1.0.tar.gz 144819 BLAKE2B b6cbf42b401380e3977ac219ddbc8b26ddcfc285a06ce5f2d68c3a52bb6c36702922975e9c9e2bfd4198ec239f2efd676fdfc8293222b75eb5c417ef1d80681f SHA512 4ef4640be2f630c4ebbe81d7bafec1e6e32619480c09ef59882b182738a998941d442231148d8cd2fb4166454780fd72067e5dda4b64d0ae0b064c91928f5c67
 DIST tools.namespace-1.1.0.tar.gz 36182 BLAKE2B e93ef1151f3c1d4bdbda881712c008c50a4e40e2787c9de2708d918009bcbeaf2db143770fbe8d6d251688b1b1bb50d75a8fca1a684badae1634aa8f23b08c3c SHA512 9cdac4dc90192b621cfadb901bb9b2befb9684a6431e87938b6993b879bac2d9c946cdc0ec29226503b7c2406ef2db9be7d49a2398bcf27520d422b0dbfd0185
+DIST tools.namespace-1.5.0.tar.gz 37913 BLAKE2B bae6be788507d200f6e781754b46d5c7c34069b3340006f078a3f0360c0c5d2dea0398d5afe1ea6b49166baa482cc07a7687735474afc84abe644c2b8b53cd9d SHA512 c1f4dba4758ecb39460334e61f989cf92e3e2ca1f6ff03b9e12bc137de088f994d86feec827f40d33034e2f8978e099326aed3b85a21c68a910714b662bf9052
 DIST tools.reader-1.3.4.tar.gz 62300 BLAKE2B f8257166e62963f468987b6c926edfce852cfddc7b641e3af25aeee919f8b03f9e82c91bcd65f6b3110d3b042bb8b2d063468b7707db5965eb044546619ef711 SHA512 329e4afb9aa77231fe2d583ed6ac11089c2f7a9600db02109ad205bfdacb747a8af3af28202e545a4ffd71a77b4a04aab2a35a0e3a12f88085ef705060a15a74
+DIST tools.reader-1.4.0.tar.gz 63792 BLAKE2B 7d0af9ff628ca1f1e1001c134e7fd2bb1cc7258321d8d19621936cdbb7e95ea5cb842268a15115b0b6929cbc352f35ea47439657db4d5d6403cf82821f7e0ccf SHA512 55c04e94828c0bf5e854d2b1d0bfd9c27e8411def1b429aa131b5e03614955777d188ad1a43295dffce032e8347e4d9d189b7eca0df3edbb105b4257f4641581
 EBUILD clojure-1.11.1.ebuild 3301 BLAKE2B caabebd368ef317abe45238b10e22cff8732d936f4f11dde55b92ccc6429d13a00fc8306dff897b4e12fc6414c9cbfbf6bdd43b2f68720c9c8d43d2cc9efb32d SHA512 3ff8efe4772dd4ed2ea3c0e26b6420a1bb686298cf56fe7307c4b651567abcd965b645e4387f7ea89add53bc66ecf6f0157a900c14b601855ea430af5b700988
+EBUILD clojure-1.11.2.ebuild 3463 BLAKE2B a0ba8476b78602d79829623a2df2f46014c5842d5e9f113aef23267b15f88729a6ab89374028bf6a1e990eaa38e73d962549336d8c00c4102f1e1ecee628640b SHA512 455042c4f2f009f47db8a9c9988dbb0110d4765cbdd703b4c21996f32e0d6ff9c9609d9ef83f11ebcf4f9e175744a1fa422768d9abfc42d86e38f1b88bc7cfca
 MISC metadata.xml 335 BLAKE2B 9d5549eaaf88d24a1023d47406828fe19bb004dd23a8d53180d2f7cc3368b55105a3940051229a04f5a0071ef51591ec905c4fd1e527fc82b35f5f7920004267 SHA512 5d9f342b3e530281c617e5ffbc68ad085d6171148ff48c6842c5053cd35be57a244014b4b917610b833cbfa3d960f3e667aa6601d7e5cb29f05bd2030cc39200
diff --git a/dev-lang/clojure/clojure-1.11.2.ebuild b/dev-lang/clojure/clojure-1.11.2.ebuild
new file mode 100644
index 000000000000..169b3bad4187
--- /dev/null
+++ b/dev-lang/clojure/clojure-1.11.2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+SPEC_ALPHA_VER=0.4.233
+CORE_SPECS_ALPHA_VER=0.3.70
+
+TOOLS_NAMESPACE_VER=1.5.0
+JAVA_CLASSPATH_VER=1.1.0
+TOOLS_READER_VER=1.4.0
+TEST_GENERATIVE_VER=1.1.0
+DATA_GENERATORS_VER=1.1.0
+TEST_CHECK_VER=1.1.1
+
+JAVA_PKG_IUSE="test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="General-purpose programming language with an emphasis on functional programming"
+HOMEPAGE="https://clojure.org/
+	https://github.com/clojure/clojure/"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/${P}.tar.gz
+
+	https://github.com/clojure/spec.alpha/archive/v${SPEC_ALPHA_VER}.tar.gz
+		-> spec.alpha-${SPEC_ALPHA_VER}.tar.gz
+	https://github.com/clojure/core.specs.alpha/archive/v${CORE_SPECS_ALPHA_VER}.tar.gz
+		-> core.specs.alpha-${CORE_SPECS_ALPHA_VER}.tar.gz
+
+	test? (
+		https://github.com/clojure/tools.namespace/archive/v${TOOLS_NAMESPACE_VER}.tar.gz
+			-> tools.namespace-${TOOLS_NAMESPACE_VER}.tar.gz
+		https://github.com/clojure/java.classpath/archive/v${JAVA_CLASSPATH_VER}.tar.gz
+			-> java.classpath-${JAVA_CLASSPATH_VER}.tar.gz
+		https://github.com/clojure/tools.reader/archive/v${TOOLS_READER_VER}.tar.gz
+			-> tools.reader-${TOOLS_READER_VER}.tar.gz
+		https://github.com/clojure/test.generative/archive/v${TEST_GENERATIVE_VER}.tar.gz
+			-> test.generative-${TEST_GENERATIVE_VER}.tar.gz
+		https://github.com/clojure/data.generators/archive/v${DATA_GENERATORS_VER}.tar.gz
+			-> data.generators-${DATA_GENERATORS_VER}.tar.gz
+		https://github.com/clojure/test.check/archive/v${TEST_CHECK_VER}.tar.gz
+			-> test.check-${TEST_CHECK_VER}.tar.gz
+	)
+"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="EPL-1.0 Apache-2.0 BSD"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+
+PATCHES=( "${FILESDIR}/add-compile-spec-ant-build-target.patch" )
+
+DOCS=( changes.md CONTRIBUTING.md readme.txt )
+
+src_prepare() {
+	default
+	java-utils-2_src_prepare
+
+	ln -rs \
+		../spec.alpha-${SPEC_ALPHA_VER}/src/main/clojure/clojure/spec \
+		src/clj/clojure/spec || die "Could not create symbolic link for spec-alpha"
+	ln -rs \
+		../core.specs.alpha-${CORE_SPECS_ALPHA_VER}/src/main/clojure/clojure/core/specs \
+		src/clj/clojure/core/specs || die "Could not create symbolic link for core-specs-alpha"
+}
+
+src_compile() {
+	eant -f build.xml jar
+}
+
+src_test() {
+	ln -rs \
+		../tools.namespace-${TOOLS_NAMESPACE_VER}/src/main/clojure/clojure/tools \
+		src/clj/clojure/tools || die "Could not create symbolic link for tools-namespace"
+	mv \
+		../java.classpath-${JAVA_CLASSPATH_VER}/src/main/clojure/clojure/java/* \
+		src/clj/clojure/java || die "Could not move java-classpath"
+	mv \
+		../tools.reader-${TOOLS_READER_VER}/src/main/clojure/clojure/tools/* \
+		src/clj/clojure/tools || die "Could not move tools-reader"
+	mv \
+		../test.generative-${TEST_GENERATIVE_VER}/src/main/clojure/clojure/test/* \
+		src/clj/clojure/test || die "Could not move test-generative"
+	ln -rs \
+		../data.generators-${DATA_GENERATORS_VER}/src/main/clojure/clojure/data/ \
+		src/clj/clojure/data || die "Could not create symbolic link for data-generators"
+	mv \
+		../test.check-${TEST_CHECK_VER}/src/main/clojure/clojure/test/* \
+		src/clj/clojure/test || die "Could not move test-check"
+
+	eant -f build.xml test
+}
+
+src_install() {
+	java-pkg_newjar "${PN}.jar"
+	java-pkg_dolauncher "${PN}-${SLOT}" --main clojure.main
+
+	einstalldocs
+}
diff --git a/dev-lang/kotlin-bin/Manifest b/dev-lang/kotlin-bin/Manifest
index d2ced1fcedc0..7b65e63f47d6 100644
--- a/dev-lang/kotlin-bin/Manifest
+++ b/dev-lang/kotlin-bin/Manifest
@@ -1,3 +1,5 @@
 DIST kotlin-compiler-1.9.22.zip 91026092 BLAKE2B 2fc776b27e30a9d75640dc8fc004bfec5207b1b79c2742aa6a8a75971a8b41310cc16712d6d0921e1fa7545031a75ca8256c48f5c1e13f4e36d82df2574d5699 SHA512 d0e1bdfb1918f007444b1cef6e0c29c2c1846819edd60d016ed62327ea6d2cb505aa18658f916f88b91d9fbdfe0b155ad3361728d6a7a9062806d982bc9b8c6c
+DIST kotlin-compiler-1.9.23.zip 91045770 BLAKE2B f15bf111b0de8527312ae3ffced8fd80812a8ea949f4157d21085966ec7f9c19facf116cc70915d41aca2fb4b3c3d1d9d3cebe23c5312728f295204528c82f2d SHA512 6baea5f968b8cd21a89fd80302a26761b775d2631d5a434775eecf1c4bbc1e07b657f389da4c4d2cd10e3687908e0417d12b94ed822b029a7126ae1988dba445
 EBUILD kotlin-bin-1.9.22.ebuild 1005 BLAKE2B 0c2efbc96602feaa82e87463c19ab244d44bd7b9596177346ae08331d37a53e1f033f41cc0ee557e7b806997a1d553b8e33eb8abd69bd8552db316053276d21f SHA512 c96c829a4c8f21ed7a82de4af30756806d27f72394242115a1cc34fa755f93f1d1cd7a42abfc6bb40ab3c4209ea6428464ccc9a32aadb16e077f132194abb085
+EBUILD kotlin-bin-1.9.23.ebuild 1005 BLAKE2B 0c2efbc96602feaa82e87463c19ab244d44bd7b9596177346ae08331d37a53e1f033f41cc0ee557e7b806997a1d553b8e33eb8abd69bd8552db316053276d21f SHA512 c96c829a4c8f21ed7a82de4af30756806d27f72394242115a1cc34fa755f93f1d1cd7a42abfc6bb40ab3c4209ea6428464ccc9a32aadb16e077f132194abb085
 MISC metadata.xml 696 BLAKE2B 5ff5c3681ab7e083f1a2ea607b183c279c50a022eea2237bfc705d67b8e3ddac7d61fdb1774ac2d6214e03d61d0fb03367cd399734a4b537dcf53a3d8cb14de1 SHA512 44186263fa0709e3d4fadd54cc80e1063d215f908855be9476062259387ec9d968f35bfe8da6fbc716be22a53212630676157fd08fbebd67c20dc4a4485b5a44
diff --git a/dev-lang/kotlin-bin/kotlin-bin-1.9.23.ebuild b/dev-lang/kotlin-bin/kotlin-bin-1.9.23.ebuild
new file mode 100644
index 000000000000..7e3629cfadfc
--- /dev/null
+++ b/dev-lang/kotlin-bin/kotlin-bin-1.9.23.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2 wrapper
+
+DESCRIPTION="Statically typed language that targets the JVM and JavaScript"
+HOMEPAGE="https://kotlinlang.org/
+	https://github.com/JetBrains/kotlin/"
+SRC_URI="https://github.com/JetBrains/kotlin/releases/download/v${PV}/kotlin-compiler-${PV}.zip"
+S="${WORKDIR}/kotlinc"
+
+LICENSE="Apache-2.0 BSD MIT NPL-1.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+BDEPEND="
+	app-arch/unzip
+"
+
+src_prepare() {
+	default
+
+	rm bin/*.bat || die
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	java-pkg_dojar lib/*
+
+	# Follow the Java eclass JAR installation path.
+	local app_home="/usr/share/${PN}"
+
+	exeinto "${app_home}/bin"
+	doexe bin/*
+
+	local -a exes=(
+		kapt
+		kotlin
+		kotlinc
+		kotlinc-js
+		kotlinc-jvm
+		kotlin-dce-js
+	)
+	local exe
+	for exe in "${exes[@]}" ; do
+		make_wrapper "${exe}" "${app_home}/bin/${exe}"
+	done
+}
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index cc08aa744d57..4e67b9baca3f 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -15,5 +15,5 @@ EBUILD php-8.1.26-r1.ebuild 21992 BLAKE2B 6a2d19aefc689f44603bf95a14b21e345ae739
 EBUILD php-8.1.27-r2.ebuild 22481 BLAKE2B c676a47d00bfe59a69272f5a4cc5dba1a95c778353777f666d20cdf9f998cf90122978aa98a6739e24879f0d778645e8a15123308f79240aaa69fecb6cf262cc SHA512 86e7528fa4a7f6bf698b960bdda0a0db0439d50c3bb44d756940a41f43a747259d1dd6b51206b86f72296d86955721ad69c0cecd8a284bea43c5d282767d8c67
 EBUILD php-8.2.15.ebuild 25068 BLAKE2B d5cbab3d9abcddd66811cfc7b023870c414a87d0b5f5597006f0b224661ce1424699f6eaf9c83e18377ea43cd38f3baf0d47403225a5fbaa862c57238801a601 SHA512 4d30ea5da9b2b8003723d7b93db2030422693ade3f4817c69002d05ee436e890a9bbfdae9f4a5221361520352870454e3de6a76a592c364fa27c85665b3734c1
 EBUILD php-8.2.16-r1.ebuild 25342 BLAKE2B 98557ae46d32c56661ea895a45280cb6982f09775726500f395e88204a417042dbf27b4b6392ef185200588be6a92eefeaa689c6546ee56f81a552ebb822107e SHA512 741725821c9bf40edadf676745c3eca5add0127c452f2d5cb8047f30fedeb4dbab840ea5b9012b84ef0652d340d9e57df94a36f9e0ca5796b370742dc050531b
-EBUILD php-8.3.3.ebuild 24009 BLAKE2B 777d6bf3fb938135e9e5bde90e49813eca2cd95896785a02b42a84179505150c87211877582e4012a6f29fb67fc0bdad1a3607f1c0a4bc7bf70ae68cea36a5d1 SHA512 b5218ec48794ead1467a114df8e5a5251453834a974fceb99e6c7a947239fb32c8ca2a34e28dc3d84b05d55364503fb640838924d26fce6e417b65d1eefff41a
+EBUILD php-8.3.3-r1.ebuild 23724 BLAKE2B 6938c0c76366ac47b51f067f99a0c6950c4885b18f557053dd97b43225d3b0f1deede42a0aaa7cae03815297427463822ccbf7e4f4f4dbca7c84d88905c4a838 SHA512 5dde714a61199cddbf6830f2d9edd536918afd33e59119f098c49e69fd814e6a0e4f5f6e1482680ab7c8cd98d1f39dabdb82838d441df39cd0ef80b503dd9041
 MISC metadata.xml 4134 BLAKE2B 62c1c5052c50db537586edc1db639fa94e24609ea027208177566ae7f7f9199103bb3ef5b636766508027e8e7aacb8451d25b57e981b582bc42299e199696a68 SHA512 b059c7552c18dfcabe82170c1ae5978421284f3ea9ea9505359c1441ccc76b668a5555919251c6ca55f1f450da9363a8ac7b30c393a8506921f790e0f4197dbb
diff --git a/dev-lang/php/php-8.3.3.ebuild b/dev-lang/php/php-8.3.3-r1.ebuild
index 488c1dbec923..8fe4000652a6 100644
--- a/dev-lang/php/php-8.3.3.ebuild
+++ b/dev-lang/php/php-8.3.3-r1.ebuild
@@ -174,10 +174,6 @@ php_install_ini() {
 	local phpinisrc="php.ini-production-${phpsapi}"
 	cp php.ini-production "${phpinisrc}" || die
 
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-		-i "${phpinisrc}" || die
-
 	# Set the include path to point to where we want to find PEAR
 	# packages
 	local sed_src='^;include_path = ".:/php.*'
@@ -198,7 +194,7 @@ php_install_ini() {
 
 	if use opcache; then
 		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+		echo "zend_extension = opcache.so" >> \
 			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
 		dosym "../ext/opcache.ini" \
 			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
@@ -508,6 +504,10 @@ src_configure() {
 	# in main/build-defs.h which is included in main/php.h which is
 	# included by basically everything; so, avoiding a rebuild after
 	# changing it is not an easy job.
+	#
+	# The upstream build system also does not support building the
+	# apache2 and embed SAPIs at the same time, presumably because they
+	# both produce a libphp.so.
 	local one_sapi
 	local sapi
 	mkdir "${WORKDIR}/sapis-build" || die
@@ -599,20 +599,15 @@ src_install() {
 		fi
 	done
 
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
+	# Install SAPI-independent targets
 	cd "${WORKDIR}/sapis-build/$first_sapi" || die
 	emake INSTALL_ROOT="${D}" \
 		install-build install-headers install-programs
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+	use opcache && emake INSTALL_ROOT="${D}" install-modules
 
 	# Create the directory where we'll put version-specific php scripts
 	keepdir "/usr/share/php${PHP_MV}"
 
-	local file=""
 	local sapi_list=""
 
 	for sapi in ${SAPIS}; do
@@ -678,12 +673,6 @@ src_install() {
 		fi
 	done
 
-	# Installing opcache module
-	if use opcache ; then
-		into "${PHP_DESTDIR#${EPREFIX}}"
-		dolib.so "modules/opcache$(get_libname)"
-	fi
-
 	# Install env.d files
 	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
 	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest
index f627027ddb05..0d08bd69cf8d 100644
--- a/dev-lang/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@@ -10,5 +10,5 @@ DIST tcl-core8.6.14-src.tar.gz 7081644 BLAKE2B 7148c889954d78774c4352ceae5d81449
 EBUILD tcl-8.6.11.ebuild 3984 BLAKE2B 55360b19bfb0e73387124a3a651b55af1ddd2e1bdf37a3b6dc92760df2a6e16c56f372181074889585df178fa4acde35869ef581cbdfbb552f791e1af4be9379 SHA512 399d965189cef511c14dfb141bb0820a853791640e6be9aba3b971064848c3c9214dd7a1e1656538cdad49fad2655e112468a11317dab5d0b83a2e50635b35fa
 EBUILD tcl-8.6.12-r1.ebuild 3550 BLAKE2B 4cc84a86368405c82f00eed44bf9a35ba0a6f0f783ee0ea15a61cbfdba8352573ca4c099676dd9d1bdc34cc583872cc21bf33db9e68828256afd4e13fc99cfd8 SHA512 307800fce482cae3581c17b05aa2c5879b03ece36d856704087d7c3f922857a15179148c28d05b297fee49ffce944eb56bb968211fca49844329d92e2da4275e
 EBUILD tcl-8.6.13-r1.ebuild 3830 BLAKE2B 65cdb68e2af463a8e1dee7e41f9ff6fd6b1c7377ba6490e248e15ef6b32975caacb5d5d43ff7bb6dd6601552ce7e5bc50b96070a8c561feb6f0538891da9ea41 SHA512 69a1ea06725f9cd88b9cd136e16d3cad113756326a39e5736bdf449f8197fabe9d528a391d4a2e39225f302ae9dcdf99862eb036b9df22b28540d0efa5907055
-EBUILD tcl-8.6.14.ebuild 3838 BLAKE2B b38f45329aa7f646ff6dc7c9b822709ff19366aab4e862b760a78231a78ff4e7c5ae7e47e3ef71cc7023426be027aefccbd510e88f3628dbd9e1cf770f8ca87f SHA512 35d3947efe714eb44b8efd8b4de2469e0a9b769a7dacccb84d29fd7d79395f230284c0e7b3f0d01e7c3ad35e96918d6db4551fe1aec255b4b2984885292f7979
+EBUILD tcl-8.6.14.ebuild 3920 BLAKE2B 9d98cb6590c3b1a614b18bd370e485712d90ab77ea783da8e28d2990766cd84ddd8694fea0be753d4d398362daec491539585a1bb88dcf6407e1869b08f8ae56 SHA512 5fae0dc34cd71140b3e04712d5ee9e4dbe6aa5f86ad8d660a1427c9909b2846ad121db4c2c417d57bb51280ea63dd3575c2fa873d904205df671fdac45ea84c4
 MISC metadata.xml 421 BLAKE2B c056a7ae8f2deaddda9bb329d46ec4f322548f4d031479ba522f5d93add46bd47cc783e9876b398579898af2cbdedb053c6328433eacfd02df4bb6dcf0185766 SHA512 0e77b876a127d68c7b193db874b9d3ab38f8475abafec1d866f2a4158ea4334ae04fbd6cb1d9acc23c81e13e584fe667503e4d9352873e1880a2d6acf7dec59c
diff --git a/dev-lang/tcl/tcl-8.6.14.ebuild b/dev-lang/tcl/tcl-8.6.14.ebuild
index 58692642a27e..fd315cf5d239 100644
--- a/dev-lang/tcl/tcl-8.6.14.ebuild
+++ b/dev-lang/tcl/tcl-8.6.14.ebuild
@@ -43,6 +43,12 @@ src_prepare() {
 		"${SPARENT}"/doc/try.n \
 		-delete || die
 
+	# Drop -Werror
+	sed -i \
+		-e "s: -Werror::g" \
+		dltest/Makefile.in \
+		|| die
+
 	pushd "${SPARENT}" &>/dev/null || die
 	default
 	popd &>/dev/null || die