6 files changed, 16 insertions, 13 deletions
diff --git a/dev-texlive/Manifest.gz b/dev-texlive/Manifest.gz
index 81df11cfd10e..8ce7d4077243 100644
--- a/dev-texlive/Manifest.gz
+++ b/dev-texlive/Manifest.gz
diff --git a/dev-texlive/texlive-basic/Manifest b/dev-texlive/texlive-basic/Manifest
index ace283c630f3..aee2a5d28b39 100644
--- a/dev-texlive/texlive-basic/Manifest
+++ b/dev-texlive/texlive-basic/Manifest
@@ -34,6 +34,8 @@ DIST lua-alt-getopt.doc.r56414.tar.xz 3320 BLAKE2B 5c165fe265ef36b12f4e4552fcde5
 DIST lua-alt-getopt.r56414.tar.xz 2008 BLAKE2B 9fe768e1070b66d076b6083b0f8a5f4c6320b5081d2218584dc5acbaa3c1f5978cd75215866d68bc933b933dd07c6fd29b376c1676369bb2fee64395790b5eed SHA512 60ad4731ac61f9b5c4360bb3d0c6475e2abd358418e20bed29cc94761fdfb97fcf02829b9785e559ca6052a1e82ee7f0b104b166592b9fd87237679ac3caa2e6
 DIST luahbtex.doc.r66186.tar.xz 30240 BLAKE2B 9f34b53e124b27e90a0fb68dcdfb9cfd0c365941cf21bfc6d9a3ec3f623ca27d4435627c1a0eb5402527b8434afb5e72651f3fca3553fc1ea4242945fb563efe SHA512 3016c12de8386af715932819701a6da1b106c504a7d13ba9bb5a04999737709f474b50c08311c1d4c23b5532ba7c1546cb0585e5375babbcd2091adf52d05664
 DIST luahbtex.r66186.tar.xz 460 BLAKE2B 968bc635fb4bfe101aea1d13a32dd259b77e2e15a3a1d81b9e7ca81699b1d40d393085ae1031ca57e906d159409f441c748396a8f5ebdef0a30d9415a2a7b8cc SHA512 30b1fcd361cff27688c65ecffbcffc65053696200abfccd543a14253b53a35de2af53b37f7ed1580510a8c63293d2d002cf4d9fd2d44f86678e2ecb09f02e4b8
+DIST luajittex.doc.r66186.tar.xz 30360 BLAKE2B 9011b987bee46fa3fd857c4a7c122911e5e614857a74ba6fafc18a768bd99c5c87a6255438c5cf5841e4a2f0aeb53137244313326d3276408591d90259c9b078 SHA512 7637835fae934f4fb1aea954270281a986733d0e0592204346edc290f2cd7d5200ee2fa0d9e15a27be8221c3c990a8c3d4654e314f96441a65c197d3bd259129
+DIST luajittex.r66186.tar.xz 484 BLAKE2B 9832037e5fc311ffa73cf68b63b5c462d9619c3351d8c0801c83d949c163321886d3ce1c9cca8158f288d63d169015e734a92d7ab20d2365c6a2cc21e22dcfcc SHA512 21313a5786f2bea08ce55db3a7beedabaf66f3331bd0eac1f8f3d7b926f68e103b14b1a5beaa271c37b60fc56735cc180e424f91db62f6e740530a65495d8e82
 DIST luatex.doc.r69182.tar.xz 1956816 BLAKE2B 43dea0a99a1db57b98447a8ad58a7c4e2dcee975230d1ba54b5fa700bfd6ac9eb80dc1136e8a71266c35b350650aaef48aa73edd1b9557f9a7a7ef79f48ffaf7 SHA512 36a5dfb6b7ca09adad807d2fa74df854363107eb3fb514977e3ed8c69eeb1181a19a55a49eb8c001a3532601c0a222a3ae9d130827caa19864df03705af7271c
 DIST luatex.r69182.tar.xz 13432 BLAKE2B cebbf54237e3d908746ad7510675ab6b98576ebb61302edcaf360c4cbfd039c7b5f422adc123e21cd2656d975484922d0e0d577326a518f7c87beafd8f5eda77 SHA512 5ddb75ca2e358bea261363cc19d39a37a9e467f9cbf4f8006f036a96fea61cb00f86c4000c09d7dd07f71f9b9a01ec165ddefb862aa84f0bc3da6a387ca1f42b
 DIST metafont.doc.r66186.tar.xz 53096 BLAKE2B 46b3696de3af1c116894bea54cedd035904cd31dcfa7724a55e4bd37ccb3541cb9ed92d2f392743baafb94004a9b4a1c26d48d054b537e20149bc9d2d53da474 SHA512 48b1def32bfba5ab1123712fe41d69f979e33a77456801c21f030de8a39b37fcae179db44a517d7b194d7e6e6eb93d770e179ca49db9014cd433c86ef91b07d0
@@ -127,5 +129,5 @@ DIST tlshell.r66771.tar.xz 33104 BLAKE2B 2abef9f4ffb38d591930a407078e3be3c13a85f
 DIST unicode-data.doc.r68311.tar.xz 3864 BLAKE2B 9a7b3122e02dd004c8199cc7636bc9c37f952e98b4980579a538ed859a6d5cf4879f6928046a270433fcac2aacb50ff2498d046818cf18ca1b167d82f2eb7590 SHA512 a8e147ba4d30bf80e1c1bdfba67bb3a0ff9f765c5d41734aca1708adb58c5c357a17401383faab827477fc837ac1dbbdcb55ee0b3146acc737c094d6984709d4
 DIST unicode-data.r68311.tar.xz 304228 BLAKE2B 59c072cdbaea633cade9996cd992b2495ab61f8d40b7c32d3f7c0cb8cbbc3ec4ba055aecf48a547f0770b5e4655312d1ce9a31e6671f8199e3335f20305e60ed SHA512 9e74ad2fd167a913e004aa77c705f0f8b3ab3d8e717384ee150db076660bda4e2651bea97292ef9e747d4e2519d9ffaa113947dd5241f830c3e4d653ee061d71
 EBUILD texlive-basic-2021-r1.ebuild 1535 BLAKE2B da645c1ca5cdf1c8e1ff90ee9e2494f0370bd38ad5c32a6b1f27ba748aef6baac250a68431ef8c034f71341ab1e3224403f53c7232ecb3a65131a90e1db9a784 SHA512 21abb5ca7ea857722c090005cecf9aa3165766f6c8305d6d13a1aa830d1343bb8ce67a5c2081ba549acd45c17cf26efce8e3e66ed4b8fd019b32388b616def4c
-EBUILD texlive-basic-2023_p59159-r3.ebuild 1963 BLAKE2B 447524f6fb523f2d9383674441dff5f85d2b1099cba57de8b41450e3dd6cd492757dbcedd6d1e25d47ef2ca5522c127240ade5bf1b072c864f75e0117e5863a8 SHA512 288e5041884d43d69e2a3d1270b7fa4df80b819b62f8b3b0ec0c4d0718b25b9aaf3033b5e491630db145d1b13d0fe4f9a3e1e98e0c8a825ed4fd68e6d2fd432a
+EBUILD texlive-basic-2023_p59159-r4.ebuild 2143 BLAKE2B 43a12bb25e86151918494531049b7f77cf781b06d937cc764ec77c4be389abc028d8ce0d48dd69bf89ad8d84b2be1c302ada3312ec1235a8885bbedeaf0e3808 SHA512 93cf293056178ddac2e849b90806787167d4143e73fc89700fc8ca754fd1ac508ecfd88d7e4a653308b36a41e21ca1448bfe018971091142927a84c98de2978d
 MISC metadata.xml 689 BLAKE2B a38d105c0e20629e4bfd6a9d8e6262ce4fb6ed3048a3e813ccdf7471b1a3f64a043e7033779d24c4d88b51c47a362c09a4de9828897a31b8a601ffc1245bcca2 SHA512 5b5c99a3cbd1290b661618067b97fe767c2695dfa1c26188ecc7c4c4af48405d60927dc70588ea79ccf35828fd5ff968e9826a52ad1c45ade2a6aecca71845f5
diff --git a/dev-texlive/texlive-basic/texlive-basic-2023_p59159-r3.ebuild b/dev-texlive/texlive-basic/texlive-basic-2023_p59159-r4.ebuild
index cdfc7df84292..4cc55a415891 100644
--- a/dev-texlive/texlive-basic/texlive-basic-2023_p59159-r3.ebuild
+++ b/dev-texlive/texlive-basic/texlive-basic-2023_p59159-r4.ebuild
@@ -22,6 +22,7 @@ TEXLIVE_MODULE_CONTENTS="
 	knuth-local.r57963
 	lua-alt-getopt.r56414
 	luahbtex.r66186
+	luajittex.r66186
 	luatex.r69182
 	metafont.r66186
 	mflogo.r42428
@@ -50,6 +51,7 @@ TEXLIVE_MODULE_DOC_CONTENTS="
 	iftex.doc.r61910
 	lua-alt-getopt.doc.r56414
 	luahbtex.doc.r66186
+	luajittex.doc.r66186
 	luatex.doc.r69182
 	metafont.doc.r66186
 	mflogo.doc.r42428
@@ -95,3 +97,11 @@ TEXLIVE_MODULE_BINSCRIPTS="
 	texmf-dist/scripts/simpdftex/simpdftex
 	texmf-dist/scripts/tlshell/tlshell.tcl
 "
+
+src_prepare() {
+	default
+	if ! use luajittex; then
+		rm -rf texmf-dist/{,scripts,doc}/luajittex
+		rm tlpkg/tlpobj/luajittex.* || die
+	fi
+}
diff --git a/dev-texlive/texlive-context/Manifest b/dev-texlive/texlive-context/Manifest
index e5416a1fdb7c..c74aaf5466bd 100644
--- a/dev-texlive/texlive-context/Manifest
+++ b/dev-texlive/texlive-context/Manifest
@@ -39,8 +39,6 @@ DIST context-visualcounter.source.r47085.tar.xz 6744 BLAKE2B f8b6822fe8a488888f8
 DIST context.doc.r69665.tar.xz 84867548 BLAKE2B bd7a8817a865c9d3bf7ccad0de4f13333760592a615791c58b7344edeae4bf3ae0cf1394097e81d290f3f4d4752599aaee0d5178f4c399dccc1edce52f47b1c3 SHA512 b2558db5417c5c1ca10dd80be258fca33d9e5fd1b16c3f1baa7c871bb4d65e42a75c95336ae988864e7c4dd350c722eaa96c446839ca6d147949b38fa78461d9
 DIST context.r69665.tar.xz 8275472 BLAKE2B 04d8bb1c999639276a5637df82ca074b1982816e7aac30d407b4d1623ed5678ad175724450a5e9dc3de3f95c142614761383c1c297a3b20cb8f50546153b516b SHA512 8951a79ae04a0bbcf7ec5f4d5f68e0f6ad3f79cfcce7379523b9bc74dc6ce3d0f07f628f3e182198ff37d313ca549b7b2512eeb28ce4a9c5460ec20ed7f2d2e7
 DIST jmn.r45751.tar.xz 40048 BLAKE2B e3f6d9bff7a3a5d438a688baf76c0bdd58797461c0020929031b07f47d49b59359d791ac237165284e48951075c4512619be880e2b3dc1bca761e4703a3050dc SHA512 2e250c3f115911c56f9b8d46d358fdef289c624a5b24c9b4213bbf7818bf42c7b778df55d4bf181bce115b388915cedc90ef7cfa99ee6ad8dd621e7853fc7c29
-DIST luajittex.doc.r66186.tar.xz 30360 BLAKE2B 9011b987bee46fa3fd857c4a7c122911e5e614857a74ba6fafc18a768bd99c5c87a6255438c5cf5841e4a2f0aeb53137244313326d3276408591d90259c9b078 SHA512 7637835fae934f4fb1aea954270281a986733d0e0592204346edc290f2cd7d5200ee2fa0d9e15a27be8221c3c990a8c3d4654e314f96441a65c197d3bd259129
-DIST luajittex.r66186.tar.xz 484 BLAKE2B 9832037e5fc311ffa73cf68b63b5c462d9619c3351d8c0801c83d949c163321886d3ce1c9cca8158f288d63d169015e734a92d7ab20d2365c6a2cc21e22dcfcc SHA512 21313a5786f2bea08ce55db3a7beedabaf66f3331bd0eac1f8f3d7b926f68e103b14b1a5beaa271c37b60fc56735cc180e424f91db62f6e740530a65495d8e82
 DIST tl-collection-context-2021.tar.xz 596 BLAKE2B 319e103a3568f2e4e6fd0ccbdae8b5ae97cf397fa97743bd2131a080c171c10fd20e3198676e6d419776a588241fe80ed122add0dd0352a188b5874d4e1bfdea SHA512 5bd74e1a434549cf31ce31777e9a32f90baa14148e6658633945508a46dbf6611644c4212b53812bb32a399e850517369e3d89bb0e495c89e6f2a979090ed765
 DIST tl-context-2021.tar.xz 8353772 BLAKE2B dfc11d25bff6a85cc780c047b5c6cf6b664dfc39063414910cc55ac6e4abee76dbb82ceb5cbadde8134cf5ab602fe513f564ab696d231166b4b8877e36def79c SHA512 3351a0da659954026a8ac4f25c246f82fda0f63ded2a8dd1dc463bc71b237977b4beffa3e44ee932f2e22e7fbc396ffee3c70ad5a85d153ba032ad46040b176a
 DIST tl-context-account-2021.tar.xz 6324 BLAKE2B 7a519311c1b35e1ead942a9198d60fa652b6cf1bfda03214546e45107f856825623a7ea213fb6ff82829016015163c3b1e73f9e112e3bca7bd77da1c2cd3e677 SHA512 755ddb4c62a496873d5362df01307163c79d2a6c3fabce6ea01b442c16dad2f23d72909df71dd44eb4fbbf5c57366e20eb49bfce240807c2e2a9a52cbd76680a
@@ -117,5 +115,5 @@ DIST tl-jmn-2021.tar.xz 40048 BLAKE2B e3f6d9bff7a3a5d438a688baf76c0bdd58797461c0
 DIST tl-npp-for-context-2021.tar.xz 664 BLAKE2B 5882669c85f04553ad8d5f1722f4f27b967367cfb109ef782a90b3fc1fe42c8a898129f296e61e6ab3825447e798544109e1556533aeecad01137396058649ac SHA512 6d5da8b6e2f2bb6b514d43e8b72157a81285b6c15cbe74891a94f21a09a313813ebcf9e3a0a12847875f13d5599436ada4e5febb694c0a480931dd62a23035c6
 DIST tl-npp-for-context.doc-2021.tar.xz 2136232 BLAKE2B 241dd233f3faec33222496aca1c6a9823772af68b2daff4256f532e2f5a28634bf0ded0c733524a053b6b985472009409fd99ac0daff719f8c54f9b181f632da SHA512 b3bddb0b9254ef9755628097ccb24ccbe86c25d3cba7a120c5d55da98a19061b716df1590a39323f57a8a698c5aafb5ecbe8b27d6505f2ba4acdf1ccdbcf82cd
 EBUILD texlive-context-2021.ebuild 3328 BLAKE2B 6e1bd326b502190278ce66a3fe5e6716d86e667baeb17ca72811b101f2891a57036707b03d9231905e3ec13587c30092c6c4df0c3b6a90ae5739da07441b4000 SHA512 ad0b3a2694e3deffd9555e987d261c5981304937c2a17463918a28b43093884f5db7eb2472a82fa39370e93b98ecd137cc87c0827362491a0243bdfdfae1ee37
-EBUILD texlive-context-2023_p69108-r2.ebuild 2929 BLAKE2B 23717473d9dc4d64b6583b07977fd55d554b669187ccdd42565fa452c69470e10960ec02025b3f4cdc2d3ef2ea3f79a0b01c1f6011dca579d51d258597855a28 SHA512 cf372349a2563ce9cbdd19ba2f5d50ebae3f0fb42678d1fe8aa86bffebb44680581e0c99587d5148ec92afb1523cdcf2b127fc782415e3dce51e5b2492157c99
-MISC metadata.xml 640 BLAKE2B df6206d129c39035f5a95f4e91613a5d1f87fa050e2f9b24836f0e540c9a7eae3e0448f98d4c5e2557f725a1797f6ba10053244ab61909e7e3ef8d362b6de486 SHA512 012bc4d22e234c3b666765b7d6430922350129d82fcc2b6ded7a24588d099ec74867304b8b4a5eb92b438dcdc6072a2900762c3cafa9075018426e57e1a5f8cc
+EBUILD texlive-context-2023_p69108-r3.ebuild 2834 BLAKE2B 50b5c79c5f1642a35746fee77d1f080e596dedc6ad83e78fc742331059b34a05aef365dae22c8d3cf8d140ba6ae914c83305cc7ad71d525fb8f4f50637f93fd4 SHA512 10916d28a67a2b20d0822650d68b7a8f69efcf6304b3aaf6a9308395d154652cf229e8a87e2ec08b631142b7363c37468bb7f9d76358a742ca4be133c14bee55
+MISC metadata.xml 518 BLAKE2B 4f1bb46596517c4ca589b5b42971521d7b32cb555a913db2739abe92e4eb4cf84ce1070f641105854ac4f82a6d9d40d07a4e76f1f8e79536ecaeeb38c4ca662f SHA512 1ca4088892a62994ed83929c8ba701a732dc46104d253469a4a6a98e183262ce010d2e7402fe181126c2b956690479e7b3f673cbb967c04cb86c15287636d58d
diff --git a/dev-texlive/texlive-context/metadata.xml b/dev-texlive/texlive-context/metadata.xml
index 631cd7535765..a91e8498da9f 100644
--- a/dev-texlive/texlive-context/metadata.xml
+++ b/dev-texlive/texlive-context/metadata.xml
@@ -13,7 +13,4 @@
 		Hans Hagen's powerful ConTeXt system, http://pragma-ade.com.
 		Also includes third-party ConTeXt packages.
 	</longdescription>
-	<use>
-		<flag name="luajittex">Add support for LuaJitTeX: LuaTeX based on LuaJIT which is usually faster.</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-texlive/texlive-context/texlive-context-2023_p69108-r2.ebuild b/dev-texlive/texlive-context/texlive-context-2023_p69108-r3.ebuild
index eef6029a8067..8115ed68681d 100644
--- a/dev-texlive/texlive-context/texlive-context-2023_p69108-r2.ebuild
+++ b/dev-texlive/texlive-context/texlive-context-2023_p69108-r3.ebuild
@@ -25,7 +25,6 @@ TEXLIVE_MODULE_CONTENTS="
 	context-vim.r62071
 	context-visualcounter.r47085
 	jmn.r45751
-	luajittex.r66186
 "
 TEXLIVE_MODULE_DOC_CONTENTS="
 	context.doc.r69665
@@ -47,14 +46,11 @@ TEXLIVE_MODULE_DOC_CONTENTS="
 	context-typescripts.doc.r60422
 	context-vim.doc.r62071
 	context-visualcounter.doc.r47085
-	luajittex.doc.r66186
 "
 TEXLIVE_MODULE_SRC_CONTENTS="
 	context-visualcounter.source.r47085
 "
 
-TEXLIVE_MODULE_OPTIONAL_ENGINE="luajittex"
-
 inherit texlive-module
 
 DESCRIPTION="TeXLive ConTeXt and packages"
@@ -71,7 +67,7 @@ RDEPEND="
 "
 DEPEND="
 	${COMMON_DEPEND}
-	>=app-text/texlive-core-2023[xetex,luajittex?]
+	>=app-text/texlive-core-2023[xetex]
 "
 
 TEXLIVE_MODULE_BINSCRIPTS="