gentoo auto-resync : 20:01:2024 - 20:08:51

12 files changed, 644 insertions, 114 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 932b7911db96..f1125647e009 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/ebusd/Manifest b/app-misc/ebusd/Manifest
index a9dd4eb69a4a..065ba85c44ed 100644
--- a/app-misc/ebusd/Manifest
+++ b/app-misc/ebusd/Manifest
@@ -4,8 +4,8 @@ AUX ebusd-23.3-gcc13.patch 1678 BLAKE2B 6eaff01ff919c9b8db4f522fcc9ad226648cf18f
 AUX ebusd-23.3-gentoo.patch 1048 BLAKE2B eb46d46aa473fc36b3e7e7ec7b61131659f1c99f53fc5511a15baf91a4a7ac4f1686c4a1e88abaa832c4ab8bffd029457284d4fdf64a843f08b19a8f065a9636 SHA512 f242ddbbe06e14ae88072331a17776a78110d0b74bb21b74e1b21c51ec5c6325687d86cba8e1e7e7dc2961b08fbc98dc8f640bb84a77020ebe48506d93616c0b
 AUX ebusd-23.3-htmlpath.patch 1006 BLAKE2B fdbc318454ee743eb2343caa0f16cf21f868ac60a634c2e8acc5dd4a3a4aa9eae0c04d11b803cca6987306412f2807f31a3032cc5db45fe3e6de0b4f89d92a39 SHA512 eaf5f423ee04e3d58f6d927c7b7d6316ac93594b0ff2dbb7ab17406a1c10d1b8ac07e582692c983fe4c360c65d57bf67d5f095d3e8f32df7ae1a764b3dff1086
 AUX ebusd.confd 193 BLAKE2B a5560507305e5afecc9b127ede67592ff7d3a1751ba27f3a3c43664fe30f2e7946b0bfa059b918865ee4244d2a89f3d7c5e0227f177a48dca98bff1666bd9c6d SHA512 ed2d38d4b3ff39fd5954dc7ac4d5e724c80b26f6c85a48b6a2ddbdea029f01b5e6b19909c7925e5ec879453204e28e40917c15b07e798bbc60950467314cd8f3
-AUX ebusd.initd 552 BLAKE2B b5e4c7ad3e76a9269949b01b7084f58dd4bfbaac56e485f3b7d5c423922abfe9b42480f9111035ed2b783cc151a5c6bca19d2c1f32b20c7ae041096f1e39c0e1 SHA512 0bbd80708dd7b28146e8db07a96bef8c8a2914befcf4f80ca4d60a3c315b26de582ddda6748b355e36d56d0dddd5fb8468cdb2c7ffa50370206d96762276802f
+AUX ebusd.initd-r1 552 BLAKE2B 8f40a1d684ddd054153a6b0562d06896253a407eb9497c6080f0e51c6fc5e01a3fe1529cf5568085107191893ad539a2dc21da7a71bbe6fd2e319b62da6af656 SHA512 4b29fca333c5f3bcc676c6a0e9b9a7c0c309b81bbed55b4d863a86b11ef59e051679919393efb8c396b3f2124e772aae9005f7f12642037301e1907f118eee1a
 AUX ebusd.service-r1 175 BLAKE2B b6b1ba670dc27a525fbbb4ce8d74c10cfd9e093da2602ca41afbc54f8a89ff8ff8c2c0cf6671edc2a0fed9a3b2cccebfee74209b415f75792bd02c29d0815315 SHA512 9ccbadf5b15c4b85921db7780e0b99e352c1020d5bc457f6290d7c6d6fb1371bd92ffbbbdef3c32fad89b751a4d4baae5f8582dd3405f4deb74fc716b6a3351a
 DIST ebusd-23.3.tar.gz 583788 BLAKE2B c61bf76e0c451672432689aeaf10b317adb52729ea0872cb01dca22e1f7ac12091d287dd082b87361ce37846b1d74c869588964f3dc71e82ffd00c4555e27150 SHA512 acf155d36e99db1c9c2ff04eabbfddba8493f2566b6691f609c86af0e42e3cb0594618fd51e874e475cfc7b9c742d1e010099f38e19c21f52c953ebcfb0f2ea2
-EBUILD ebusd-23.3-r1.ebuild 1913 BLAKE2B 95bfa4c95603efe5d2437909a4356bcb4b3d24ba6e0cc9871de0c7abf5c347a1d014f0d4cdc689cd5fc8dfcab7b3e3d56ce9ae8ac1b8e8e329c5762588fc9120 SHA512 558eec656f1db5111cda9d68a960c6a7b0bfc31caf32a41a40c989df458e99db97d0ea023caf5174b9315205114484c64f95746437c7c1bda081d2c0a15f1326
+EBUILD ebusd-23.3-r2.ebuild 1916 BLAKE2B 48246047bd01809771623f65f39b240eaab560a439edd0fdf5066774264f27416d69bfd1e3e9cd928d5a95d33a9bab04dcb034bb04d22d5744ecbfee04880ea1 SHA512 1c4c1e6932276077e1e1db5f3a9b6c18b998af0e96a14b35a392e2e56fa328f84c32a63d86ad06b056bc43263185294d22eceb1c581aee345c0cda8517549826
 MISC metadata.xml 815 BLAKE2B d6c87cb6506a61d1b502ab233fcb9cb878e4e315d1cd2a09ecf36121de19a06d9aee77925b19d6fc24ed274ac220c22a011dec01704f61676583697647506417 SHA512 cdcbc39babc7f6dd6a5f3f1ca713a54b44e80cf0a57eb9bdb4f6989c7425fe30eee73dd8e893f7d82e681e32e03a4089e94630ebe77686c6a0bb056e6c92c7a4
diff --git a/app-misc/ebusd/ebusd-23.3-r1.ebuild b/app-misc/ebusd/ebusd-23.3-r2.ebuild
index 73da1aaa3d9c..11e0b4122ec6 100644
--- a/app-misc/ebusd/ebusd-23.3-r1.ebuild
+++ b/app-misc/ebusd/ebusd-23.3-r2.ebuild
@@ -94,7 +94,7 @@ src_test() {
 src_install() {
 	default
 	use doc && dodoc -r docs/html
-	newinitd "${FILESDIR}"/ebusd.initd ebusd
+	newinitd "${FILESDIR}"/ebusd.initd-r1 ebusd
 	newconfd "${FILESDIR}"/ebusd.confd ebusd
 	systemd_newunit "${FILESDIR}"/ebusd.service-r1 ebusd.service
 }
diff --git a/app-misc/ebusd/files/ebusd.initd b/app-misc/ebusd/files/ebusd.initd-r1
index e0ef5fca9623..38bdb22d034e 100644
--- a/app-misc/ebusd/files/ebusd.initd
+++ b/app-misc/ebusd/files/ebusd.initd-r1
@@ -7,7 +7,7 @@ command_args="${EBUSD_OPTS}"
 ebusd_path="/var/lib/ebusd"
 html_path="${ebusd_path}/html"
 logfile_path="/var/log/ebusd"
-logfile="${pidfile_path}/ebusd.log"
+logfile="${logfile_path}/ebusd.log"
 name="eBUS daemon"
 pidfile_path="/run/ebusd"
 pidfile="${pidfile_path}/ebusd.pid"
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 9fe4d7cb504a..f80d541bdb26 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -8,12 +8,10 @@ AUX elasticsearch.service.4 1815 BLAKE2B 59fece95b40d45222c1c49aaae0ab3091e2a2d7
 AUX elasticsearch.service.conf 235 BLAKE2B 23ada111be21dff12323edbe981883cb1ed275b6c7a9f55e77fdcec1919d374818683403a2a7a7c2c2839db2b8afcd66f7667d5080ecb52cade853a400f972a6 SHA512 b300dbc1b3c341ebbcac68385c651133427f342dc0351501b47730b392cc176b7b8dc53877affc6ab384d2834d246a3d0c63b6015dddf2c90d4bcf41cee9968c
 AUX elasticsearch.sysctl.d 24 BLAKE2B 4012fbdbc98a8b28df11aed33cb82c113790c44721eae1d69e19c595bfbf329618b9cb67be9528f1994c546233cffd31b20eee39edc142bc86f7a7cf5e08903e SHA512 9f3d8238edff6704bea06b6535ee8915f4a3c9bdc8389d9d4943bcfa49161b61f9a1ca49dbcc415580438f4396fbc3d58eef301554f9426287606a755ada715c
 AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a7350de95ec2b32dfbe51cbf52fe5dcf68ebd4e3fba6cccba1cf252a16dee3b701c4c6692121745c41665cf3c972 SHA512 5cc722abcaae68afffde96e38b2c9572faf898178d3c291c945fe49fbf977e319322b99fb6fb5bf49cfb04e86f071dde0db621849288f712a56571b13af9a11a
-DIST elasticsearch-7.17.10-no-jdk-linux-x86_64.tar.gz 167971427 BLAKE2B 867f89a3a62d4dab813f9d1ae822dcbfb33b28fe945dd80693555c539b537ce70479c928820d5c4b65983ff9e58ff7d9e84c7320a462519d5bd4fae736ae0543 SHA512 9997a8ee7394db302ae4bc4b3cf644a29fb6a082c5a4e7700dce5f3783818363baf929a667a17e52a27c732d352c339bfeb4e8e7240385911ad096146a75f559
-DIST elasticsearch-7.17.12-no-jdk-linux-x86_64.tar.gz 168734453 BLAKE2B b99f4df4da2a3fd1e1ecbc126148e9e2f95111a1d34bc8b6a3cc8960c33937230058cdacfd0b3e56a50db1062b5aca87f1afd9055929ac39b660b5e3715f4fce SHA512 5b6c7614c2629fdfa6c9fe9866518cd38abad0244bf7c56d8fba3894bd0493403ded0f581783deded85287cf1e97b18f45f1ffb182d3dc5ca9c96471276d64d1
-DIST elasticsearch-7.17.9-no-jdk-linux-x86_64.tar.gz 167832902 BLAKE2B 9d0134fe397a5153da4936b5ac083c677a676d1a208f65a85c2c8db82cf0588d1180aeb039ed28c13161ff8fcf5bc11b0fc099f9f21d6da08e50fe0bb7f83565 SHA512 e2c6094377ed2ada0650864b7c30386467b920770b93e6f19d1448635f7f2024fbaebd619ba683ed4c1b5dc8e67f2396183d81598a5e610ca2879ea3cd8dba32
+DIST elasticsearch-7.17.16-no-jdk-linux-x86_64.tar.gz 168795535 BLAKE2B 642ae6f07db953e7fa783dcd63c6dcebab61e85ea600bede09e9596bf9dee2d71c43e5c28b80bd4c091d792ed3a95d10cc75ffb1074ad4b3cfceb081ed25027f SHA512 3755373f5068a08e4619b4e922bc2d3d97d41791dbf5aa84564574fc84abee9c567b16095cf0e11d48910627e3c183ff1193bf2d5ade59891bea2b3f994aa7df
 DIST elasticsearch-8.11.1-linux-x86_64.tar.gz 630398135 BLAKE2B 5118f995f3b53242898770ea2a0a8b2c3c23fa3a117453d505685903b7e00e44f081d7454f4198baa2e36f265e9c565cf3c41ffc04d2ffd214ac30dc6398ff5b SHA512 3d11f96a158e12d0a376867355f2ee1bd76b00a8b5e1aff97cac026631892544ccabeb8f2422e0347f8222b85784a98d1a893615547981f47403116baf2070ef
-EBUILD elasticsearch-7.17.10-r1.ebuild 2374 BLAKE2B d7162b56bd8a16de19772eb0c6458e061f81ed6a0a1d28f271c645d6c4aa196bbfd86c1d322f8e50ac88ccb81df5f23c94c8d472294a25cf8a2b37dd637bfd3e SHA512 0c6bf900b2e2dc231522a4c54ec583e9c03f98f208b45e6fbfe192db41a859bf86accf807e2cf43a51b7cac73ae341b726d2e13ccab413c6e01563502a6075b6
-EBUILD elasticsearch-7.17.12-r1.ebuild 2374 BLAKE2B d7162b56bd8a16de19772eb0c6458e061f81ed6a0a1d28f271c645d6c4aa196bbfd86c1d322f8e50ac88ccb81df5f23c94c8d472294a25cf8a2b37dd637bfd3e SHA512 0c6bf900b2e2dc231522a4c54ec583e9c03f98f208b45e6fbfe192db41a859bf86accf807e2cf43a51b7cac73ae341b726d2e13ccab413c6e01563502a6075b6
-EBUILD elasticsearch-7.17.9-r1.ebuild 2374 BLAKE2B d7162b56bd8a16de19772eb0c6458e061f81ed6a0a1d28f271c645d6c4aa196bbfd86c1d322f8e50ac88ccb81df5f23c94c8d472294a25cf8a2b37dd637bfd3e SHA512 0c6bf900b2e2dc231522a4c54ec583e9c03f98f208b45e6fbfe192db41a859bf86accf807e2cf43a51b7cac73ae341b726d2e13ccab413c6e01563502a6075b6
+DIST elasticsearch-8.11.3-linux-x86_64.tar.gz 630500349 BLAKE2B ab10c0db6a9df6352a33844c7dbee9f45bc93257904a5d0a0966352d4755f867fafad6858e7765ca88070806b553c46a7df5206078a66121a568921bdbe0d801 SHA512 63c724acbb756ebe8ad2c9d965a2828e1a5e08d215652ba8c876218a2beb1702c204e9199cf362514bcd3230bcb133e0449bb4da3473aac5008d35fa7a86c832
+EBUILD elasticsearch-7.17.16.ebuild 2374 BLAKE2B b8e8a2cfc8eb77cfa591ed73795bd923f12addbb101e2df852ee10fbe2ef1b3e74280e76fd13e03117b5dcecfce91b22b897839d014a22044b1a456413e6e878 SHA512 4f5fc0ada22ffad450a778bbbf248721f2fb52b8b9eaaa1cf44da897e65ee110a7eb4ea3cde3b625c9921c96a85729f0bc9994231a0df023f0e29b1b9f48eb74
 EBUILD elasticsearch-8.11.1.ebuild 3322 BLAKE2B 492164f422e2191ab812e604f0b2fd4631c75762438e58eceec379c4ac6a4211babe99c794fe93be009fe2abd5b8313ffce0337cf7eec48faa7a9ff4c8fb80aa SHA512 bb19bc22d523c3fb9e39f38a6239dd09fdfc4be3c3294867aa73a3ddd1edc71273df2dd2458a3919448fc108e1657820300ec9c8b1329d60fa4f60c9e4112795
+EBUILD elasticsearch-8.11.3.ebuild 3322 BLAKE2B 492164f422e2191ab812e604f0b2fd4631c75762438e58eceec379c4ac6a4211babe99c794fe93be009fe2abd5b8313ffce0337cf7eec48faa7a9ff4c8fb80aa SHA512 bb19bc22d523c3fb9e39f38a6239dd09fdfc4be3c3294867aa73a3ddd1edc71273df2dd2458a3919448fc108e1657820300ec9c8b1329d60fa4f60c9e4112795
 MISC metadata.xml 524 BLAKE2B 01fd6cd3b19c1e78ebad3d66fdfd58a5172c8e840799de41973dfb07afbad5cd5f574e7b1edff25bb64a828d2fb51169b741a453c53c9cd3c29347b0f9ab4b80 SHA512 5ef257de69e2a3bb06bc9a852957d8767ac9147579947b6a4eaf68a6a314cb1eb49e611a729f01a3b89e3271de377d3ab25276831b9a5d755a8bca7390fd6223
diff --git a/app-misc/elasticsearch/elasticsearch-7.17.12-r1.ebuild b/app-misc/elasticsearch/elasticsearch-7.17.12-r1.ebuild
deleted file mode 100644
index a11fb8cefcf8..000000000000
--- a/app-misc/elasticsearch/elasticsearch-7.17.12-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd tmpfiles
-
-DESCRIPTION="Free and Open, Distributed, RESTful Search Engine"
-HOMEPAGE="https://www.elastic.co/elasticsearch/"
-SRC_URI="https://artifacts.elastic.co/downloads/${PN}/${P}-no-jdk-linux-x86_64.tar.gz"
-LICENSE="Apache-2.0 BSD-2 Elastic-2.0 LGPL-3 MIT public-domain"
-SLOT="0/7"
-KEYWORDS="~amd64"
-
-RDEPEND="acct-group/elasticsearch
-	acct-user/elasticsearch
-	sys-libs/zlib
-	virtual/jre"
-
-QA_PREBUILT="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
-QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
-
-src_prepare() {
-	default
-
-	rm LICENSE.txt NOTICE.txt || die
-	rmdir logs || die
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	keepdir /etc/${PN}/scripts
-
-	insinto /etc/${PN}
-	doins -r config/.
-	rm -r config || die
-
-	fowners root:${PN} /etc/${PN}
-	fperms 2750 /etc/${PN}
-
-	insinto /usr/share/${PN}
-	doins -r .
-
-	exeinto /usr/share/${PN}/bin
-	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
-
-	fperms -R +x /usr/share/${PN}/bin
-	fperms -R +x /usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin
-
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-	fperms 0750 /var/{lib,log}/${PN}
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
-
-	newconfd "${FILESDIR}/${PN}.conf.4" ${PN}
-	newinitd "${FILESDIR}/${PN}.init.9" ${PN}
-
-	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
-	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
-
-	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.d ${PN}.conf
-}
-
-pkg_postinst() {
-	tmpfiles_process /usr/lib/tmpfiles.d/${PN}.conf
-
-	elog
-	elog "You may create multiple instances of ${PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
-	elog
-	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
-	elog "from /etc/${PN} into the configuration directory of the instance:"
-	elog "/etc/${PN}/instance"
-	elog
-	ewarn "Please make sure you have proper permissions on /etc/${PN}"
-	ewarn "prior to keystore generation or you may experience startup fails."
-	ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}"
-	ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore"
-}
diff --git a/app-misc/elasticsearch/elasticsearch-7.17.9-r1.ebuild b/app-misc/elasticsearch/elasticsearch-7.17.16.ebuild
index a11fb8cefcf8..d8370e7f9001 100644
--- a/app-misc/elasticsearch/elasticsearch-7.17.9-r1.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-7.17.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/app-misc/elasticsearch/elasticsearch-7.17.10-r1.ebuild b/app-misc/elasticsearch/elasticsearch-8.11.3.ebuild
index a11fb8cefcf8..bee839a3a00d 100644
--- a/app-misc/elasticsearch/elasticsearch-7.17.10-r1.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-8.11.3.ebuild
@@ -7,22 +7,36 @@ inherit systemd tmpfiles
 
 DESCRIPTION="Free and Open, Distributed, RESTful Search Engine"
 HOMEPAGE="https://www.elastic.co/elasticsearch/"
-SRC_URI="https://artifacts.elastic.co/downloads/${PN}/${P}-no-jdk-linux-x86_64.tar.gz"
+SRC_URI="https://artifacts.elastic.co/downloads/${PN}/${P}-linux-x86_64.tar.gz"
+
 LICENSE="Apache-2.0 BSD-2 Elastic-2.0 LGPL-3 MIT public-domain"
-SLOT="0/7"
+SLOT="0/8"
 KEYWORDS="~amd64"
 
+DEPEND="acct-group/elasticsearch
+	acct-user/elasticsearch"
 RDEPEND="acct-group/elasticsearch
 	acct-user/elasticsearch
 	sys-libs/zlib
-	virtual/jre"
+	virtual/jre:17"
 
 QA_PREBUILT="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
 QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-env.patch"
+)
+
 src_prepare() {
 	default
 
+	rm -rf jdk || die
+	sed -i -e "s:logs/:${EPREFIX}/var/log/${PN}/:g" config/jvm.options || die "Unable to set Elasticsearch log location"
+	# elasticsearch-env sets the envvar for the config location if not specified elsewhere;
+	# certain utilities try and source this. Although we patch ES_JAVA_HOME for Gentoo slightly earlier,
+	# it's easier to respect EPREFIX for the config location using sed.
+	sed -i "s:ES_PATH_CONF=\"\$ES_HOME\"/config:ES_PATH_CONF=\"${EPREFIX}/etc/${PN}\":" bin/elasticsearch-env  \
+		|| die "Unable to set Elasticsearch config directory"
 	rm LICENSE.txt NOTICE.txt || die
 	rmdir logs || die
 }
@@ -35,14 +49,16 @@ src_install() {
 	doins -r config/.
 	rm -r config || die
 
-	fowners root:${PN} /etc/${PN}
-	fperms 2750 /etc/${PN}
+	fowners -R root:${PN} /etc/${PN}
+	fperms -R 2750 /etc/${PN}
 
 	insinto /usr/share/${PN}
 	doins -r .
 
+	keepdir /usr/share/${PN}/plugins
+
 	exeinto /usr/share/${PN}/bin
-	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
+	doexe "${FILESDIR}"/elasticsearch-systemd-pre-exec
 
 	fperms -R +x /usr/share/${PN}/bin
 	fperms -R +x /usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin
@@ -55,28 +71,32 @@ src_install() {
 	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
 
 	newconfd "${FILESDIR}/${PN}.conf.4" ${PN}
-	newinitd "${FILESDIR}/${PN}.init.9" ${PN}
+	newinitd "${FILESDIR}/${PN}.init.8" ${PN}
 
 	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
-	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
+	systemd_newunit "${FILESDIR}"/${PN}.service.4 ${PN}.service
 
 	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.d ${PN}.conf
 }
 
 pkg_postinst() {
+	# Elasticsearch will choke on our keep file and dodir will not preserve the empty dir
+	local KEEPFILE
+	KEEPFILE=$(find "${EROOT}/usr/share/${PN}/plugins/" -type f -name '.keep*')
+	rm "${KEEPFILE}" || die
 	tmpfiles_process /usr/lib/tmpfiles.d/${PN}.conf
-
-	elog
-	elog "You may create multiple instances of ${PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
-	elog
-	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
-	elog "from /etc/${PN} into the configuration directory of the instance:"
-	elog "/etc/${PN}/instance"
-	elog
+	if ! systemd_is_booted ; then
+		elog "You may create multiple instances of ${PN} by"
+		elog "symlinking the init script:"
+		elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
+		elog
+		elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
+		elog "from /etc/${PN} into the configuration directory of the instance:"
+		elog "/etc/${PN}/instance"
+		elog
+	fi
 	ewarn "Please make sure you have proper permissions on /etc/${PN}"
-	ewarn "prior to keystore generation or you may experience startup fails."
+	ewarn "prior to keystore generation or you may experience startup failures."
 	ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}"
 	ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore"
 }
diff --git a/app-misc/fastfetch/Manifest b/app-misc/fastfetch/Manifest
index 08e8a4c75a28..99df893b25bd 100644
--- a/app-misc/fastfetch/Manifest
+++ b/app-misc/fastfetch/Manifest
@@ -1,7 +1,7 @@
 DIST fastfetch-2.2.3.tar.gz 901203 BLAKE2B d6d097b72ce2f252e42b3e59cbd26b43a4f17ae974382f986270fbf91b457cf3c49e78a3c775e713d9302d536fb5a363e809005b9174d1a27622e6b6ed666709 SHA512 81e051b7555d56415c723606c0b6dfc3ad7ed91fb2c7b36c07465f4dfbdb91da5c8d216e46df36863888448de0a7bd63e28c6aa701995bf1165e0d7c33c4f724
-DIST fastfetch-2.6.0.tar.gz 992987 BLAKE2B 07f33a1e0c272350128e5d0fdf69200af773260c3c83f08028289b6b0f9bd460b2916108818915e2cc7c226ce584e7096d297b53551a5354e7b8b8ea787baf7e SHA512 9a09d6f85948778413f5a82f44b42b925c7c5ce0920f99248003d3be8697d1ec934d1e2c21375bf3a99ce874c1cc25d01055e56ad5e3f1af70f8f93beebda702
+DIST fastfetch-2.6.1.tar.gz 996318 BLAKE2B 88cfb756a6898b1e007e0a45a94b8746af6f0dccb2c5d1f39a10b08e838b5d8261d77ea25f003dd1c8b9e0364b4d5db4177777f5c635fb50965a1612f8d2da7d SHA512 164720061f1949d673296db684b6d3674e02788c916d52a73a0a646bcd8c1fffcd2862a5860bc8dd8eace56bcc8b2d48cf938cf67f6dcdbe7476d1359dfb08e9
 EBUILD fastfetch-0.1.9999.ebuild 3286 BLAKE2B 1053ae09434fc4607b709b00d07d46327e098985021925956e84ed69378925859afc0d84a970dba5a11bbbf2ebe76b0db89ba08ab155d2633583fdc8bbfc8216 SHA512 1072af3c2abd7241af57471b3e9df0add0029df2e3f43c26fbb31d05e71a3d2c221db3d65f160fb4aa934d74385c0b65d83d4ac7c1a0f690fccf32567c901d90
 EBUILD fastfetch-0.2.9999.ebuild 3343 BLAKE2B 1b3c20d502d08eac2f2e63df6f755878b94a103e6d54a03171b8f8482c77dac3fd28d4eea9dd0b01e1d25c6259e2a3eb1ae6edfa33e8537f8598e8f7dc2934a3 SHA512 593e23e2363cc8a5cde69108e711b55f45a8541b1317ca5b12bf9b55fd8faea1c7d69902aef04eaf0030aacf3abd16391aabb0a07b1c9066581301d72b783d83
 EBUILD fastfetch-2.2.3-r1.ebuild 3190 BLAKE2B f98df2430184abc34138f6fdb0be1efc43ab2805bc8cb78ced628cb52d33ca24c726312a4e5ce8e9439cd98b188028feab88850f58aa1e37cfca0bdf09740b50 SHA512 646f925ff00be6c2a248663d2c2a5cd758568f3e5c622a7553d1c94bd6c5fea471dccba24b9ebbfa98ef5826c50335cb13cbc775c5c8771dff230031a3e0880d
-EBUILD fastfetch-2.6.0.ebuild 3343 BLAKE2B 1b3c20d502d08eac2f2e63df6f755878b94a103e6d54a03171b8f8482c77dac3fd28d4eea9dd0b01e1d25c6259e2a3eb1ae6edfa33e8537f8598e8f7dc2934a3 SHA512 593e23e2363cc8a5cde69108e711b55f45a8541b1317ca5b12bf9b55fd8faea1c7d69902aef04eaf0030aacf3abd16391aabb0a07b1c9066581301d72b783d83
+EBUILD fastfetch-2.6.1.ebuild 3343 BLAKE2B 1b3c20d502d08eac2f2e63df6f755878b94a103e6d54a03171b8f8482c77dac3fd28d4eea9dd0b01e1d25c6259e2a3eb1ae6edfa33e8537f8598e8f7dc2934a3 SHA512 593e23e2363cc8a5cde69108e711b55f45a8541b1317ca5b12bf9b55fd8faea1c7d69902aef04eaf0030aacf3abd16391aabb0a07b1c9066581301d72b783d83
 MISC metadata.xml 1257 BLAKE2B 521e87300ee660b7285c28ed7987a4cc52565e1c6fec3a10e37509822f829f808d468bd119ace4bea96d441b82d2cdce598d9d3cd25bacda5fae05920818a4bb SHA512 461c8f2f48789fe2635bb419f7655389a190b5684b9e1367dfb8faa7b6650984b001c8ac76051c39040526d51c71ac2faf566f0fd5a2f2e75c0702885eefa32a
diff --git a/app-misc/fastfetch/fastfetch-2.6.0.ebuild b/app-misc/fastfetch/fastfetch-2.6.1.ebuild
index ff81f55971fe..ff81f55971fe 100644
--- a/app-misc/fastfetch/fastfetch-2.6.0.ebuild
+++ b/app-misc/fastfetch/fastfetch-2.6.1.ebuild
diff --git a/app-misc/zellij/Manifest b/app-misc/zellij/Manifest
index b30a99f3e536..5f88e99058cd 100644
--- a/app-misc/zellij/Manifest
+++ b/app-misc/zellij/Manifest
@@ -505,7 +505,9 @@ DIST xshell-macros-0.2.2.crate 2848 BLAKE2B 1adedea7dff653a2f781e0300582eb088545
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 DIST zellij-0.39.0.gh.tar.gz 8806613 BLAKE2B 76b82a90b14d5cae9cf75f39a36d3fb189dc42b84dc8258e9c62808c8f78d4b6bb227cf70e41a94fd22847eff223c221144c9cb194425e499139de7eb67180ff SHA512 06ae08e3a74a8657b7e1dbb9e6f00e639cd8cfa71386d0a7530e97e37f95b49f20666b9ced8fa1d8c1fd4d78abf642f2bfdba8f436080e165faeb200fe71e35e
 DIST zellij-0.39.1.gh.tar.gz 8815736 BLAKE2B a0b96992b468fce80cba8ed614cd061420be38ae3b8bfc3b8e233a0762ef645b17bbe72e0d4e7cc3732fa1eea83cf88324fc5e043df4089faf381e4d733efc61 SHA512 65055730159c08189f4bb95e5f5c9ef67f5cdc26f01d0e739279273fa0b978326c80a333e6f257cc9572a98e55c29ef4a2585227e61e9dd578a1e8111a39fbce
+DIST zellij-0.39.2.gh.tar.gz 8814618 BLAKE2B 9c009c44aed1e90c20d30a93a6e0af009440ec865147cca5078bcc5de9bb734f114bd7a32f770a27819c4da69c5293fdc8f9cf59e9ff068802ac4ade30871139 SHA512 4f77adfdad74fce1ece1abee6a354dc5fb2d81470ad798a76713b0c1c429d47d37f34a1e7c26949023c57d1ce57531f60df9f4bb1a5d5badd6fadcd62ffb4d30
 DIST zeroize-1.5.5.crate 18550 BLAKE2B c55736939d4da7a9e5d89c3d550ad739475013b585c9a0e7be87f03a168b2cf0841b3fa8f2520b009c9f03a4b9f185ea73db6159ddb24fb0745d7732865c8d8c SHA512 2f38a6382968c7d98f232a840b5e75800f8f48df49338196cab3af2c0ec1c3d4c0c8dba89f9ca79597551844f405c63317e72a56597c611eddc405ca5f6daf0c
 EBUILD zellij-0.39.0.ebuild 11370 BLAKE2B 90c083b3c2bc370538143fe24d1395689d54bded5f33d6f9286ab9f252220c98bc6b40a8cd186243dfc7d69b9a67206e80fd24c87064b5da19f429e49813bffd SHA512 288b011647d2da4f3cc3cfd0f036b7bb90e819eb87ec038276ce09c8a1aef358a53a0784fba95f7516ac67c6a712b0dda564001075a86628baddc0631860e397
 EBUILD zellij-0.39.1.ebuild 11370 BLAKE2B 90c083b3c2bc370538143fe24d1395689d54bded5f33d6f9286ab9f252220c98bc6b40a8cd186243dfc7d69b9a67206e80fd24c87064b5da19f429e49813bffd SHA512 288b011647d2da4f3cc3cfd0f036b7bb90e819eb87ec038276ce09c8a1aef358a53a0784fba95f7516ac67c6a712b0dda564001075a86628baddc0631860e397
+EBUILD zellij-0.39.2.ebuild 11370 BLAKE2B 90c083b3c2bc370538143fe24d1395689d54bded5f33d6f9286ab9f252220c98bc6b40a8cd186243dfc7d69b9a67206e80fd24c87064b5da19f429e49813bffd SHA512 288b011647d2da4f3cc3cfd0f036b7bb90e819eb87ec038276ce09c8a1aef358a53a0784fba95f7516ac67c6a712b0dda564001075a86628baddc0631860e397
 MISC metadata.xml 332 BLAKE2B d449dff7b11d9719d68a3bacc8ce55e3fe8251e9507bd068bde71a32d946ccab20d24590a2abb7f71b8528053d4ccd29f91ca3553dbcfd40328f65a3fc5f8936 SHA512 bfbc8351f5815a5a99620d65c55d4579710502be35090227bfde70e5ef1dd225d8207ad0243cb64388b66eb78ceab07d3302574df2a8389f41f4db51cc863f6e
diff --git a/app-misc/zellij/zellij-0.39.2.ebuild b/app-misc/zellij/zellij-0.39.2.ebuild
new file mode 100644
index 000000000000..b8652accea48
--- /dev/null
+++ b/app-misc/zellij/zellij-0.39.2.ebuild
@@ -0,0 +1,592 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.10
+
+EAPI=8
+
+CRATES="
+	addr2line@0.17.0
+	adler@1.0.2
+	aead@0.3.2
+	aes-gcm@0.8.0
+	aes-soft@0.6.4
+	aes@0.6.0
+	aesni@0.10.0
+	ahash@0.7.6
+	aho-corasick@0.7.20
+	aho-corasick@1.0.1
+	ansi_term@0.12.1
+	anyhow@1.0.71
+	arc-swap@1.5.0
+	arrayvec@0.5.2
+	arrayvec@0.7.2
+	async-channel@1.8.0
+	async-executor@1.4.1
+	async-global-executor@2.3.1
+	async-io@1.13.0
+	async-lock@2.8.0
+	async-process@1.4.0
+	async-std@1.11.0
+	async-task@4.2.0
+	async-trait@0.1.56
+	atomic-waker@1.0.0
+	atty@0.2.14
+	autocfg@1.1.0
+	backtrace-ext@0.2.1
+	backtrace@0.3.65
+	base-x@0.2.11
+	base64@0.13.0
+	base64@0.21.0
+	bitflags@1.3.2
+	block-buffer@0.7.3
+	block-buffer@0.9.0
+	block-padding@0.1.5
+	blocking@1.2.0
+	boxfnonce@0.1.1
+	bstr@1.5.0
+	bumpalo@3.10.0
+	byte-tools@0.3.1
+	bytecheck@0.6.9
+	bytecheck_derive@0.6.9
+	byteorder@1.4.3
+	bytes@0.5.6
+	bytes@1.4.0
+	cache-padded@1.2.0
+	cassowary@0.3.0
+	cc@1.0.83
+	cfg-if@0.1.10
+	cfg-if@1.0.0
+	chrono@0.4.19
+	cipher@0.2.5
+	clap@3.2.4
+	clap_complete@3.2.1
+	clap_derive@3.2.4
+	clap_lex@0.2.2
+	close_fds@0.3.2
+	colored@2.0.0
+	colorsys@0.6.5
+	common-path@1.0.0
+	concurrent-queue@1.2.2
+	concurrent-queue@2.2.0
+	console@0.15.0
+	const_fn@0.4.9
+	cookie@0.14.4
+	core-foundation-sys@0.8.3
+	corosensei@0.1.3
+	cpufeatures@0.2.2
+	cpuid-bool@0.2.0
+	cranelift-bforest@0.86.1
+	cranelift-codegen-meta@0.86.1
+	cranelift-codegen-shared@0.86.1
+	cranelift-codegen@0.86.1
+	cranelift-entity@0.86.1
+	cranelift-frontend@0.86.1
+	cranelift-isle@0.86.1
+	crossbeam-channel@0.5.4
+	crossbeam-deque@0.8.1
+	crossbeam-epoch@0.9.8
+	crossbeam-queue@0.3.5
+	crossbeam-utils@0.8.15
+	crossbeam@0.8.1
+	crypto-mac@0.10.1
+	csscolorparser@0.6.2
+	ctor@0.1.22
+	ctr@0.6.0
+	curl-sys@0.4.68+curl-8.4.0
+	curl@0.4.44
+	daemonize@0.4.1
+	darling@0.13.4
+	darling_core@0.13.4
+	darling_macro@0.13.4
+	deltae@0.3.0
+	derivative@2.2.0
+	destructure_traitobject@0.2.0
+	dialoguer@0.10.4
+	digest@0.8.1
+	digest@0.9.0
+	directories@5.0.1
+	dirs-sys@0.3.7
+	dirs-sys@0.4.1
+	dirs@2.0.2
+	dirs@4.0.0
+	discard@1.0.4
+	dissimilar@1.0.6
+	dynasm@1.2.3
+	dynasmrt@1.2.3
+	either@1.6.1
+	encode_unicode@0.3.6
+	enum-iterator-derive@0.7.0
+	enum-iterator@0.7.0
+	enumset@1.0.11
+	enumset_derive@0.6.0
+	erased-serde@0.3.20
+	errno-dragonfly@0.1.2
+	errno@0.3.1
+	event-listener@2.5.2
+	expect-test@1.4.1
+	fake-simd@0.1.2
+	fallible-iterator@0.2.0
+	fastrand@1.7.0
+	file-id@0.1.0
+	filedescriptor@0.8.2
+	filetime@0.2.21
+	finl_unicode@1.2.0
+	fixedbitset@0.4.2
+	flume@0.9.2
+	fnv@1.0.7
+	form_urlencoded@1.0.1
+	fsevent-sys@4.1.0
+	futures-channel@0.3.28
+	futures-core@0.3.28
+	futures-executor@0.3.28
+	futures-io@0.3.28
+	futures-lite@1.13.0
+	futures-macro@0.3.28
+	futures-sink@0.3.28
+	futures-task@0.3.28
+	futures-util@0.3.28
+	futures@0.3.28
+	fuzzy-matcher@0.3.7
+	fxhash@0.2.1
+	generational-arena@0.2.8
+	generic-array@0.12.4
+	generic-array@0.14.5
+	getopts@0.2.21
+	getrandom@0.1.16
+	getrandom@0.2.10
+	ghash@0.3.1
+	ghost@0.1.4
+	gimli@0.26.1
+	globset@0.4.10
+	gloo-timers@0.2.4
+	hashbrown@0.11.2
+	hashbrown@0.12.3
+	heck@0.3.3
+	heck@0.4.0
+	hermit-abi@0.1.19
+	hermit-abi@0.3.1
+	hex@0.4.3
+	highway@0.6.4
+	hkdf@0.10.0
+	hmac@0.10.1
+	http-client@6.5.3
+	http-types@2.12.0
+	http@0.2.9
+	humantime@2.1.0
+	id-arena@2.2.1
+	ident_case@1.0.1
+	idna@0.2.3
+	ignore@0.4.20
+	include_dir@0.7.3
+	include_dir_macros@0.7.3
+	indexmap@1.8.2
+	infer@0.2.3
+	inotify-sys@0.1.5
+	inotify@0.9.6
+	insta@1.14.0
+	instant@0.1.12
+	interprocess@1.2.1
+	intmap@0.7.1
+	inventory@0.2.3
+	io-lifetimes@1.0.10
+	is-terminal@0.4.7
+	is_ci@1.1.1
+	isahc@0.9.14
+	itertools@0.10.5
+	itoa@1.0.2
+	js-sys@0.3.64
+	kdl@4.5.0
+	kqueue-sys@1.0.3
+	kqueue@1.0.7
+	kv-log-macro@1.0.7
+	lab@0.11.0
+	lazy_static@1.4.0
+	leb128@0.2.5
+	lev_distance@0.1.1
+	libc@0.2.149
+	libnghttp2-sys@0.1.8+1.55.1
+	libssh2-sys@0.2.23
+	libz-sys@1.1.8
+	linked-hash-map@0.5.4
+	linux-raw-sys@0.3.7
+	lock_api@0.4.11
+	log-mdc@0.1.0
+	log4rs@1.2.0
+	log@0.4.17
+	mach@0.3.2
+	maplit@1.0.2
+	matches@0.1.9
+	memchr@2.5.0
+	memmap2@0.5.7
+	memmem@0.1.1
+	memoffset@0.6.5
+	miette-derive@5.8.0
+	miette@5.8.0
+	mime@0.3.17
+	mime_guess@2.0.4
+	minimal-lexical@0.2.1
+	miniz_oxide@0.5.3
+	mio@0.7.14
+	mio@0.8.6
+	miow@0.3.7
+	more-asserts@0.2.2
+	multimap@0.8.3
+	names@0.14.0
+	nix@0.23.1
+	nix@0.24.2
+	nom@5.1.2
+	nom@7.1.1
+	notify-debouncer-full@0.1.0
+	notify@6.0.0
+	ntapi@0.3.7
+	num-derive@0.3.3
+	num-integer@0.1.45
+	num-traits@0.2.15
+	num_cpus@1.13.1
+	object@0.28.4
+	once_cell@1.18.0
+	opaque-debug@0.2.3
+	opaque-debug@0.3.0
+	openssl-probe@0.1.5
+	openssl-src@300.1.6+3.1.4
+	openssl-sys@0.9.93
+	option-ext@0.2.0
+	ordered-float@2.10.0
+	ordered-float@3.3.0
+	os_str_bytes@6.1.0
+	owo-colors@3.4.0
+	parking@2.0.0
+	parking_lot@0.11.2
+	parking_lot@0.12.1
+	parking_lot_core@0.8.5
+	parking_lot_core@0.9.9
+	paste@1.0.7
+	percent-encoding@2.1.0
+	pest@2.1.3
+	pest_derive@2.1.0
+	pest_generator@2.1.3
+	pest_meta@2.1.3
+	petgraph@0.6.3
+	phf@0.10.1
+	phf@0.11.1
+	phf@0.8.0
+	phf_codegen@0.8.0
+	phf_generator@0.11.1
+	phf_generator@0.8.0
+	phf_macros@0.11.1
+	phf_shared@0.10.0
+	phf_shared@0.11.1
+	phf_shared@0.8.0
+	pin-project-internal@1.1.3
+	pin-project-lite@0.2.9
+	pin-project@1.1.3
+	pin-utils@0.1.0
+	pkg-config@0.3.25
+	polling@2.2.0
+	polyval@0.4.5
+	ppv-lite86@0.2.16
+	pretty-bytes@0.2.2
+	prettyplease@0.1.25
+	proc-macro-error-attr@1.0.4
+	proc-macro-error@1.0.4
+	proc-macro-hack@0.5.19
+	proc-macro2@1.0.69
+	prost-build@0.11.9
+	prost-derive@0.11.9
+	prost-types@0.11.9
+	prost@0.11.9
+	ptr_meta@0.1.4
+	ptr_meta_derive@0.1.4
+	pulldown-cmark@0.8.0
+	quote@1.0.27
+	rand@0.7.3
+	rand@0.8.5
+	rand_chacha@0.2.2
+	rand_chacha@0.3.1
+	rand_core@0.5.1
+	rand_core@0.6.3
+	rand_hc@0.2.0
+	rand_pcg@0.2.1
+	rayon-core@1.9.3
+	rayon@1.5.3
+	redox_syscall@0.2.13
+	redox_syscall@0.4.1
+	redox_users@0.4.3
+	regalloc2@0.3.2
+	regex-syntax@0.7.1
+	regex@1.8.1
+	region@3.0.0
+	remove_dir_all@0.5.3
+	rend@0.3.6
+	rkyv@0.7.39
+	rkyv_derive@0.7.39
+	rmp-serde@1.1.0
+	rmp@0.8.11
+	rustc-demangle@0.1.21
+	rustc_version@0.2.3
+	rustc_version@0.4.0
+	rustix@0.37.7
+	ryu@1.0.10
+	same-file@1.0.6
+	schannel@0.1.22
+	scopeguard@1.1.0
+	seahash@4.1.0
+	semver-parser@0.10.2
+	semver-parser@0.7.0
+	semver@0.11.0
+	semver@0.9.0
+	semver@1.0.17
+	serde-value@0.7.0
+	serde-wasm-bindgen@0.4.5
+	serde@1.0.137
+	serde_derive@1.0.137
+	serde_json@1.0.81
+	serde_qs@0.8.5
+	serde_urlencoded@0.7.1
+	serde_yaml@0.8.24
+	sha-1@0.8.2
+	sha1@0.6.1
+	sha1_smol@1.0.0
+	sha2@0.9.9
+	shell-words@1.1.0
+	shellexpand@3.0.0
+	signal-hook-registry@1.4.0
+	signal-hook@0.1.17
+	signal-hook@0.3.14
+	similar@2.1.0
+	siphasher@0.3.10
+	sixel-image@0.1.0
+	sixel-tokenizer@0.1.0
+	slab@0.4.6
+	slice-group-by@0.3.1
+	sluice@0.5.5
+	smallvec@1.8.0
+	smawk@0.3.1
+	socket2@0.4.9
+	spinning@0.1.0
+	spinning_top@0.2.5
+	ssh2@0.9.3
+	stable_deref_trait@1.2.0
+	standback@0.2.17
+	stdweb-derive@0.5.3
+	stdweb-internal-macros@0.2.9
+	stdweb-internal-runtime@0.1.5
+	stdweb@0.4.20
+	strip-ansi-escapes@0.1.1
+	strsim@0.10.0
+	strum@0.20.0
+	strum_macros@0.20.1
+	subtle@2.4.1
+	suggest@0.4.0
+	supports-color@2.0.0
+	supports-hyperlinks@2.1.0
+	supports-unicode@2.0.0
+	surf@2.3.2
+	syn@1.0.96
+	syn@2.0.15
+	sysinfo@0.22.5
+	target-lexicon@0.12.5
+	tempfile@3.3.0
+	termcolor@1.1.3
+	terminal_size@0.1.17
+	terminfo@0.7.3
+	termios@0.3.3
+	termwiz@0.20.0
+	textwrap@0.15.0
+	thiserror-impl@1.0.40
+	thiserror@1.0.40
+	thread-id@4.0.0
+	thread_local@1.1.7
+	time-macros-impl@0.1.2
+	time-macros@0.1.1
+	time@0.1.44
+	time@0.2.27
+	tinyvec@1.6.0
+	tinyvec_macros@0.1.0
+	to_method@1.1.0
+	toml@0.5.10
+	tracing-attributes@0.1.21
+	tracing-core@0.1.27
+	tracing-futures@0.2.5
+	tracing@0.1.35
+	typemap-ors@1.0.0
+	typenum@1.15.0
+	typetag-impl@0.1.8
+	typetag@0.1.8
+	ucd-trie@0.1.3
+	unicase@2.6.0
+	unicode-bidi@0.3.8
+	unicode-ident@1.0.1
+	unicode-linebreak@0.1.2
+	unicode-normalization@0.1.19
+	unicode-segmentation@1.9.0
+	unicode-width@0.1.10
+	unicode-xid@0.2.4
+	universal-hash@0.4.1
+	unsafe-any-ors@1.0.0
+	url@2.2.2
+	utf8parse@0.2.0
+	uuid@1.4.1
+	value-bag@1.0.0-alpha.9
+	vcpkg@0.2.15
+	version_check@0.9.4
+	vte@0.10.1
+	vte@0.11.0
+	vte_generate_state_changes@0.1.1
+	vtparse@0.6.2
+	waker-fn@1.1.0
+	walkdir@2.3.3
+	wasi@0.10.0+wasi-snapshot-preview1
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasi@0.9.0+wasi-snapshot-preview1
+	wasm-bindgen-backend@0.2.87
+	wasm-bindgen-downcast-macros@0.1.1
+	wasm-bindgen-downcast@0.1.1
+	wasm-bindgen-futures@0.4.31
+	wasm-bindgen-macro-support@0.2.87
+	wasm-bindgen-macro@0.2.87
+	wasm-bindgen-shared@0.2.87
+	wasm-bindgen@0.2.87
+	wasm-encoder@0.13.0
+	wasmer-compiler-cranelift@3.1.1
+	wasmer-compiler-singlepass@3.1.1
+	wasmer-compiler@3.1.1
+	wasmer-derive@3.1.1
+	wasmer-types@3.1.1
+	wasmer-vbus@3.1.1
+	wasmer-vfs@3.1.1
+	wasmer-vm@3.1.1
+	wasmer-vnet@3.1.1
+	wasmer-wasi-local-networking@3.1.1
+	wasmer-wasi-types@3.1.1
+	wasmer-wasi@3.1.1
+	wasmer-wit-bindgen-gen-core@0.1.1
+	wasmer-wit-bindgen-gen-rust-wasm@0.1.1
+	wasmer-wit-bindgen-gen-rust@0.1.1
+	wasmer-wit-bindgen-rust-impl@0.1.1
+	wasmer-wit-bindgen-rust@0.1.1
+	wasmer-wit-parser@0.1.1
+	wasmer@3.1.1
+	wasmparser@0.83.0
+	wast@42.0.0
+	wat@1.0.44
+	web-sys@0.3.58
+	wepoll-ffi@0.1.2
+	wezterm-bidi@0.2.2
+	wezterm-color-types@0.2.0
+	wezterm-dynamic-derive@0.1.0
+	wezterm-dynamic@0.1.0
+	which@4.2.5
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.5
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows-sys@0.33.0
+	windows-sys@0.45.0
+	windows-sys@0.48.0
+	windows-targets@0.42.2
+	windows-targets@0.48.0
+	windows_aarch64_gnullvm@0.42.2
+	windows_aarch64_gnullvm@0.48.0
+	windows_aarch64_msvc@0.33.0
+	windows_aarch64_msvc@0.42.2
+	windows_aarch64_msvc@0.48.0
+	windows_i686_gnu@0.33.0
+	windows_i686_gnu@0.42.2
+	windows_i686_gnu@0.48.0
+	windows_i686_msvc@0.33.0
+	windows_i686_msvc@0.42.2
+	windows_i686_msvc@0.48.0
+	windows_x86_64_gnu@0.33.0
+	windows_x86_64_gnu@0.42.2
+	windows_x86_64_gnu@0.48.0
+	windows_x86_64_gnullvm@0.42.2
+	windows_x86_64_gnullvm@0.48.0
+	windows_x86_64_msvc@0.33.0
+	windows_x86_64_msvc@0.42.2
+	windows_x86_64_msvc@0.48.0
+	xflags-macros@0.3.1
+	xflags@0.3.1
+	xshell-macros@0.2.2
+	xshell@0.2.2
+	yaml-rust@0.4.5
+	zeroize@1.5.5
+"
+
+inherit desktop cargo
+
+DESCRIPTION="A terminal workspace with batteries included"
+HOMEPAGE="
+	https://zellij.dev/
+	https://github.com/zellij-org/zellij
+"
+SRC_URI="
+	https://github.com/zellij-org/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+="
+	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD CC0-1.0
+	ISC MIT MPL-2.0 Unicode-DFS-2016 WTFPL-2
+"
+
+# owo-colors
+LICENSE+="
+	MIT
+"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+BDEPEND="
+	doc? ( app-text/lowdown )
+"
+
+# rust does not use *FLAGS from make.conf, silence portage warning
+# update with proper path to binaries this crate installs, omit leading /
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+QA_PRESTRIPPED="usr/bin/${PN}"
+
+DOCS=(
+	CHANGELOG.md
+	CODE_OF_CONDUCT.md
+	CONTRIBUTING.md
+	GOVERNANCE.md
+	README.md
+	docs/
+)
+
+src_compile() {
+	cargo_src_compile
+	pushd ${PN}-utils 2>/dev/null || die
+	cargo_src_compile
+	popd 2>/dev/null || die
+
+	if use doc; then
+		lowdown -t man -o ${PN}.1 docs/MANPAGE.md || die
+	fi
+}
+
+src_install() {
+	cargo_src_install
+
+	dodoc example/*.*
+
+	insinto /usr/share/zellij
+	doins -r example/{themes,layouts}
+	doins -r ${PN}-utils/assets/{layouts,plugins,config,shell} \
+		${PN}-utils/assets/*.wasm ${PN}-utils/assets/README.md
+
+	use doc && doman ${PN}.1
+	domenu assets/zellij.desktop
+
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}-utils/assets/completions/comp.zsh _${PN}
+
+	insinto /usr/share/fish/vendor_completions.d
+	newins ${PN}-utils/assets/completions/comp.fish ${PN}.fish
+}