gentoo auto-resync : 17:04:2025 - 08:45:48

11 files changed, 323 insertions, 21 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index e110eb6a2b26..cbb7deedcd31 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/broot/Manifest b/app-misc/broot/Manifest
index adec40f86edc..f9e02d971ed9 100644
--- a/app-misc/broot/Manifest
+++ b/app-misc/broot/Manifest
@@ -3,8 +3,11 @@ DIST broot-1.45.0-crates.tar.xz 39582336 BLAKE2B 89ae02cd9c7e9c3b6c59b047f31937c
 DIST broot-1.45.0.tar.gz 15295901 BLAKE2B 3fa45087a128e12dc62b4bd359d4513d96148e0bbd1b12244799d73dd724889d91a6707b64861d6d527288474d99491098fc3015c453357df8430c627cc7b5a6 SHA512 aaa1b5fa26fcb29939e74e37f9eb831d4d3f26399e91d84a1e8c1b346ccfed7d4726b209a881c6ba734817b6dc7dffebf5d2d4636bd145dff7ecd5ca47a6025c
 DIST broot-1.45.1-crates.tar.xz 39917872 BLAKE2B 4aeb1c9e0c3ea4fb737c54e8f2c7d072edde0df8fda6d748a55c6f17b8c79d289e8466ec10339ddfce0d2e7621957b973292338cb2699b6bb99c1db3493f5eda SHA512 0d9be02646778763898f883c3cd8d1bb96ac213554578507543f8390f5477aa2824ebe4e850ca3cf715cc522de29e4045b1447f724c348b6c68160b9d241b545
 DIST broot-1.45.1.tar.gz 15294917 BLAKE2B a1ea6c9b84ddd163f2ce1e36246913b1d23e2007664449b2fd8a4d02344e3fa0b1e469588cc81e554f6633f62c550ea7c9b828e9c6f81422e94253c29df9b589 SHA512 f74f5b37b11ab1f74d1f17f9b9f9d243106527b134251fc1ebbf7e73fbfd1b2fcac990f2326357f8778e469ba47146efa2baa57711481bdada65c797dc08c377
+DIST broot-1.46.0-crates.tar.xz 39940716 BLAKE2B 6386475dd222b2d8e55dad5f209e93e95298dc0dbc6762a217e58dae7fb22ad2695b5183682ed465c19ca42c05902ec5323619b8d2d5890675f4ab43d6ad35d6 SHA512 6b12f3132da6ec7be9ae207062ab103da2fbde45866e04a0bab6d6a775751d848adae3a279ba97f7cc876646657a0e52e1df9207283b5e4e17b28da2a320cc81
+DIST broot-1.46.0.tar.gz 15296432 BLAKE2B afcaadd0978dd7ed03f1f8daf7abd3df0cb996b960addd63f854495db94ebee658890d9cdfc187d59fbb959c89fce9c89c236a29543fe21e0d7da69fae9a8972 SHA512 0adc37d03ddeda845b3ddfc7b8bf9bd2da3b75b6bdaf73c9c20ef5487bc573b72447b6857056010ae67bdff6017a7afad2c99ef0b390d02e62ac6daed537d5a6
 DIST broot-v1.44.7-crates.tar.xz 39582336 BLAKE2B 89ae02cd9c7e9c3b6c59b047f31937c47dfc7c4ac78142e5450c7344f31befbe6b06ebd0fd46862fd999ff5d7f0e44f05fb14b74124f8161b357911247efac6a SHA512 4c38004278753a0acfb1335849fe933c1b1bf58edc90b8669d49f1d8fe9e972382575f8ba67fb6d4f936da0957c4208ca98a7adc09618fc55d5a1ec0fafd829b
 EBUILD broot-1.44.7.ebuild 1465 BLAKE2B 1f8d6b70407729645edb030e10f44e80ec641d3fd2514cd93fc30ba2a38290723c391ca1872f65a6ddb75fae15bc4fa3b0ea7ddf832cb343e28598ca5a48cb5a SHA512 385d779175fe33d2297cec25ff6a267447857f94c0072953cd7e383d610fe7ea3bed26aee7df0a6294d108628d0a9270bb091963aa591dacd839b6ee4cb7079d
 EBUILD broot-1.45.0.ebuild 1469 BLAKE2B 4e280bf2b3983fd039e5b78f9a12b97b014dc551d21a99581972c72ac27d370f29b265a8d53b5559974811ab62fc1a77aac4f920eb9b7b65956f738677a578e5 SHA512 ee84cfefba33f666db12a9ad16b2cb898ec8e55911bc9b513744d4e9f5de2bc292883c4793c5756db83f50b955eca91e7911c3d53dfde48237cc9bcec835988d
 EBUILD broot-1.45.1.ebuild 1469 BLAKE2B 4e280bf2b3983fd039e5b78f9a12b97b014dc551d21a99581972c72ac27d370f29b265a8d53b5559974811ab62fc1a77aac4f920eb9b7b65956f738677a578e5 SHA512 ee84cfefba33f666db12a9ad16b2cb898ec8e55911bc9b513744d4e9f5de2bc292883c4793c5756db83f50b955eca91e7911c3d53dfde48237cc9bcec835988d
+EBUILD broot-1.46.0.ebuild 1469 BLAKE2B 4e280bf2b3983fd039e5b78f9a12b97b014dc551d21a99581972c72ac27d370f29b265a8d53b5559974811ab62fc1a77aac4f920eb9b7b65956f738677a578e5 SHA512 ee84cfefba33f666db12a9ad16b2cb898ec8e55911bc9b513744d4e9f5de2bc292883c4793c5756db83f50b955eca91e7911c3d53dfde48237cc9bcec835988d
 MISC metadata.xml 564 BLAKE2B 0c694d4996ceefd6b05c3ff74f313d775c820d3eb0ae327cc2c130a608fd8595c64aa1217599d61952c6ade05415eaac53056c3fad30ccb5347df134715bb573 SHA512 5533ba0526ff6cbb801696c8ddba2dc393b158bdc2cf5dedc3b245362d924172e4bd321412cd6976735bcabe01d5e7e191e11b2718412b5e389e9251ca5ea695
diff --git a/app-misc/broot/broot-1.46.0.ebuild b/app-misc/broot/broot-1.46.0.ebuild
new file mode 100644
index 000000000000..724f7228de57
--- /dev/null
+++ b/app-misc/broot/broot-1.46.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+RUST_MIN_VER="1.79.0"
+inherit cargo shell-completion
+
+DESCRIPTION="A new way to see and navigate directory trees"
+HOMEPAGE="https://dystroy.org/broot/ https://github.com/Canop/broot"
+SRC_URI="https://github.com/Canop/broot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://github.com/gentoo-crate-dist/broot/releases/download/v${PV}/${P}-crates.tar.xz"
+
+LICENSE="Apache-2.0"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD Boost-1.0
+	LGPL-3+ MIT MPL-2.0 UoI-NCSA Unicode-3.0 ZLIB
+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="X"
+
+DEPEND="
+	dev-db/sqlite:3
+	dev-libs/libgit2:=
+	sys-libs/zlib
+	X? ( x11-libs/libxcb:= )
+"
+RDEPEND="${DEPEND}"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_prepare() {
+	default
+
+	local mandate=$(date -r man/page +'%Y/%m/%d' || die)
+	sed -e "s|#version|${PV}|" \
+		-e "s|#date|${mandate}|" \
+		man/page > "${T}"/${PN}.1 || die
+}
+
+src_configure() {
+	export LIBSQLITE3_SYS_USE_PKG_CONFIG=1
+	export RUSTFLAGS="-Cstrip=none ${RUSTFLAGS}" #835400
+	local myfeatures=( $(usev X clipboard) trash )
+
+	cargo_src_configure --no-default-features
+}
+
+src_install() {
+	cargo_src_install
+
+	doman "${T}"/${PN}.1
+
+	local build_dir=( "$(cargo_target_dir)"/build/${PN}-*/out )
+	cd ${build_dir[0]} || die
+
+	newbashcomp ${PN}.bash ${PN}
+	newbashcomp br.bash br
+
+	dozshcomp _${PN} _br
+	dofishcomp ${PN}.fish br.fish
+}
diff --git a/app-misc/ebusd/Manifest b/app-misc/ebusd/Manifest
index c70ee8deeedb..33c97f44e4d1 100644
--- a/app-misc/ebusd/Manifest
+++ b/app-misc/ebusd/Manifest
@@ -4,5 +4,7 @@ AUX ebusd.confd 193 BLAKE2B a5560507305e5afecc9b127ede67592ff7d3a1751ba27f3a3c43
 AUX ebusd.initd-r1 552 BLAKE2B 8f40a1d684ddd054153a6b0562d06896253a407eb9497c6080f0e51c6fc5e01a3fe1529cf5568085107191893ad539a2dc21da7a71bbe6fd2e319b62da6af656 SHA512 4b29fca333c5f3bcc676c6a0e9b9a7c0c309b81bbed55b4d863a86b11ef59e051679919393efb8c396b3f2124e772aae9005f7f12642037301e1907f118eee1a
 AUX ebusd.service-r1 175 BLAKE2B b6b1ba670dc27a525fbbb4ce8d74c10cfd9e093da2602ca41afbc54f8a89ff8ff8c2c0cf6671edc2a0fed9a3b2cccebfee74209b415f75792bd02c29d0815315 SHA512 9ccbadf5b15c4b85921db7780e0b99e352c1020d5bc457f6290d7c6d6fb1371bd92ffbbbdef3c32fad89b751a4d4baae5f8582dd3405f4deb74fc716b6a3351a
 DIST ebusd-24.1.tar.gz 595318 BLAKE2B 40bbedf1af983c8bbb123b8774b013d02e8f49d653e729d5b6bf78cda50d70ff5b09bfe5993714cf311d5b90777bf6e6616557cef881120b0cad56fc7a5ac0e9 SHA512 a4ab5e21f345894c29b7af84f46f93ac4a3ee658d69ca7fb002d52233e8c041043df328212cbeae4f01220e7a6bf4ec8a26ad3757eb0cf6da157d237f5b6b0b6
+DIST ebusd-25.1.tar.gz 599008 BLAKE2B a4e0ed1202a460a34cdc33ae852ea5255abd2df6135cb430a7d3b57dca4c41628c500adf0a50dc814b26ed9ae037a1c54d842ca1c7ff49179b8f458ce64e19c7 SHA512 ff69ee0b36b0e2ad9e44d090ba9507f51430ebb66e79948a44f8c719dbaf00e03a47c791e8f9e305b7dcb8e4fe87a7f00fb8f05c8a7c89e9a1b524e257576d7c
 EBUILD ebusd-24.1.ebuild 1806 BLAKE2B b7149fcfad79b9cf4c6ff50e1bdff697f59ffa6200b930f1e20e8cae8e8fab19ea2489aa7365f9f2ee5aeffdcc9d2b162dabdc3f936a2589817b8c4f160106a6 SHA512 efb16fcaac9585bea440a8f0d9da09b0efbe3efd945e6b09d48f873c676257c37397430e6fcd625dc070a8167da659ccda8a7e7b72497d9e121297a32ef76865
+EBUILD ebusd-25.1.ebuild 1808 BLAKE2B 2349f8724025c50c791689cd8f7f8123b8b77e59eef93403dad20654c73226c68bed32240e8ca9db052393022e10c99ede04881d8e90beecdf04eaec9f6c0bbf SHA512 1097f105c0eda1166616ac4bdabb5cd8697f4fccfedf330f2c5e44e505650a6b33e925e08981de15d0a41b150cfab7fd8622677a61737306e78c67ded8c5eec5
 MISC metadata.xml 815 BLAKE2B d6c87cb6506a61d1b502ab233fcb9cb878e4e315d1cd2a09ecf36121de19a06d9aee77925b19d6fc24ed274ac220c22a011dec01704f61676583697647506417 SHA512 cdcbc39babc7f6dd6a5f3f1ca713a54b44e80cf0a57eb9bdb4f6989c7425fe30eee73dd8e893f7d82e681e32e03a4089e94630ebe77686c6a0bb056e6c92c7a4
diff --git a/app-misc/ebusd/ebusd-25.1.ebuild b/app-misc/ebusd/ebusd-25.1.ebuild
new file mode 100644
index 000000000000..44dfb4c77df7
--- /dev/null
+++ b/app-misc/ebusd/ebusd-25.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+DESCRIPTION="Daemon for communication with eBUS heating systems"
+HOMEPAGE="
+	https://ebusd.de
+	https://github.com/john30/ebusd
+"
+SRC_URI="https://github.com/john30/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+contrib doc knx mqtt +ssl test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/openssl:0=
+	mqtt? ( app-misc/mosquitto )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	doc? (
+		app-text/doxygen
+		media-gfx/graphviz
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-23.3-gentoo.patch"
+	"${FILESDIR}/${PN}-23.3-htmlpath.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# KNXd is currently not packaged in Gentoo
+	local myeconfargs=(
+		$(use_with contrib)
+		$(usex doc '--with-docs' '')
+		$(use_with knx)
+		$(use_with mqtt)
+		$(use_with ssl)
+
+		--localstatedir="${EPREFIX}/var"
+		--without-knxd
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use test; then
+		pushd src/lib/ebus/test || die
+			emake
+		popd || die
+
+		if use contrib; then
+			pushd src/lib/ebus/contrib/test || die
+				emake
+			popd || die
+		fi
+	fi
+}
+
+src_test() {
+	pushd src/lib/ebus/test || die
+		./test_filereader >/dev/null && \
+		./test_data >/dev/null && \
+		./test_message >/dev/null && \
+		./test_symbol >/dev/null && \
+		einfo "standard: OK!" || die
+	popd || die
+
+	if use contrib; then
+		pushd src/lib/ebus/contrib/test || die
+			./test_contrib >/dev/null && einfo "contrib: OK!" || die
+		popd || die
+	fi
+}
+
+src_install() {
+	default
+	use doc && dodoc -r docs/html
+	newinitd "${FILESDIR}"/ebusd.initd-r1 ebusd
+	newconfd "${FILESDIR}"/ebusd.confd ebusd
+	systemd_newunit "${FILESDIR}"/ebusd.service-r1 ebusd.service
+}
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index e4fcff9793d7..67fe445f633e 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -1,4 +1,5 @@
-AUX elasticsearch-env.patch 976 BLAKE2B f639b40304e2f4ba8c1bd52b86ed0cd6dbda2198c6be73e38685639364951f5e719e16dbc6ecccccaf8495b17863c8b5f8a7cc8185bb6973dd559e93ecd22a7a SHA512 dd6defc471133fa21897976aab7010f060bbdd52fa2d54c1c7c3844998dfa3fedb28e584f0ab6be9abb502f12e9ed10cbb652be16ae77d5106f83c378aa573df
+AUX elasticsearch-env-2.patch 976 BLAKE2B c4b22e88596ab5ae9e406ebd436d8a82bc38de07429abbb8043044c6c4844292f0d9ab0e8dc450f80fbd8b1ee3f8134a71d492d27e055a1b761be95022a2c0d3 SHA512 7963f788c68f712f6e11b6809e18cee590318803d50bbb51b0cea27df852d6840ad3d08ca1e53e496416ce71f443ee63752da27cb60fe5c634fc974c50716196
+AUX elasticsearch-env-3.patch 976 BLAKE2B 633d07bd1480d93e790034d1f121b877f714d91d3789abcec663d6f80e8808011c0929a624438ec8d564515ea474a498182f55aee65610f437fd066ea95168bd SHA512 0720718ff1db56ba76e3fef0587e963fb66cbbfbbe0b464aaf3930b3761a6dfd5040679b9199eb13d5ca8278595d66c386feb707eefa3e9b54b481bd20ccb14d
 AUX elasticsearch-systemd-pre-exec 369 BLAKE2B 18fae13aa27931cfc3952309ab76847790f4f785d14efa93bb24cfa66b3b0fc655c19a17d5a7a1b431b6c037cf3596a04eed8f650cf51beb1917560e8817bd2d SHA512 fae1d6e4e52df7d0d3111d6d6bbddf12182de931d461669d8784b524e5671ad40fb645dc6a6cf3de0de08f032c0327da8b25d7cbc4c4a49e3e3a7a791c6cfcdd
 AUX elasticsearch.conf.4 2199 BLAKE2B 0cc66acdc8ce76c4eba04e5fdb745d740bca2a1941535be054e99c33a208e0229609c0106b7f91c9a9f28c22ae8ebb73951dfe36fe2ca0ae51732f5fa1707a34 SHA512 91af72bf5272ed6152835c5e34408fa9e7245b09864613cd59c08da977d9130dbfe664d6aa6f11eac2ce07ebfdb3599e9f27ff219595f6d515c2c06f11f637bd
 AUX elasticsearch.init.8 2150 BLAKE2B 6187331fba1933ddf5fc967d77e818305c6719a838fc6fdac5b821fb2dd659eef3993ca88105b2c30eabf5c2185f3cdae9a58000134c0599a8219ea8933ba532 SHA512 91e7fb2d2eb4a2c85246daa30a28a5eae48972eec5fbae52f16c58ef432c1fabc415e0690052869c70ccc4b6b2a75a228e5aef4b5ee934bc0fb4d00d48303fe3
@@ -9,9 +10,11 @@ AUX elasticsearch.service.conf 235 BLAKE2B 23ada111be21dff12323edbe981883cb1ed27
 AUX elasticsearch.sysctl.d 24 BLAKE2B 4012fbdbc98a8b28df11aed33cb82c113790c44721eae1d69e19c595bfbf329618b9cb67be9528f1994c546233cffd31b20eee39edc142bc86f7a7cf5e08903e SHA512 9f3d8238edff6704bea06b6535ee8915f4a3c9bdc8389d9d4943bcfa49161b61f9a1ca49dbcc415580438f4396fbc3d58eef301554f9426287606a755ada715c
 AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a7350de95ec2b32dfbe51cbf52fe5dcf68ebd4e3fba6cccba1cf252a16dee3b701c4c6692121745c41665cf3c972 SHA512 5cc722abcaae68afffde96e38b2c9572faf898178d3c291c945fe49fbf977e319322b99fb6fb5bf49cfb04e86f071dde0db621849288f712a56571b13af9a11a
 DIST elasticsearch-7.17.25-no-jdk-linux-x86_64.tar.gz 173127285 BLAKE2B c68b7fdd84c860c04eff7aad75fadf20ab97a9baef606a1a3c9cfa195f7d39591b9a35884f180a9509bdc4a04a68bc8ceba8d9ead03c1d5b684d85597ad9eb23 SHA512 dc0c68f2ee87d6445bd28ed60e3d615eefc106b0d28f648af01cf79a639661769d958fe3da04e20e81437e4a0385e3788fe785b494ce5320fba0f074d2c1ea49
-DIST elasticsearch-8.15.1-linux-x86_64.tar.gz 605974468 BLAKE2B 8fc2476cd2629cf8bcd9c2183763aba1880f76357809f661da9c3df6538bdf7bc21e897356cb4e35084ef1333120539e494893177fffe0aaa1e7ea4cc3f52fcd SHA512 3eced0f59446f60170b7ab3372f58bbda713e2166bb936ef0f74a027e579565b469d3f8888715638e6dfc3e98f88e1b73f7de8a6fc37be236ade4a099f9cc808
-DIST elasticsearch-8.17.3-linux-x86_64.tar.gz 636275047 BLAKE2B 61ede1d0e51bdfcde0b9f11c3416034adc62e80d3000be2ecd239be1c1674c2df947d4940b6a4b2f2ea5a2e69a3398541cf10c2a98d40cd8dd56063c57fcf153 SHA512 6aef4fc84ebbfc98e6662418c734ea89cae8e53a8d6c1fbd5352807bc427e040e62be568b502abdceb7a2f57534eae60e31712d0583d3752fd39b7b8a3632d3b
+DIST elasticsearch-8.17.4-linux-x86_64.tar.gz 636389207 BLAKE2B 567aa02c454e270befd2d28a7fefc674232b894476c2409f42faa7122272e1db7ccd6bc6ee6a3593987dccc22ce43ec75a7a476b26fe8e6b769adc74aa2a5bff SHA512 02e44da0cca804ba5593d63d90c20b0a8affedcd2d69a32303c6863f391bbcb31cc6b5dba6dfc53c7682b5c36825089f399a5d6cb8649fc829cfc6f1a7de02f1
+DIST elasticsearch-8.18.0-linux-x86_64.tar.gz 647601341 BLAKE2B 95ef3a4df917f065932c2bf8a6be9bc59dd7a6b229a48388779985cc3fda7134dc287fb8bb89062fbdd9c72d17926a3398a9ecb45fbba03f784a0330d711d4cb SHA512 ac3a17ab28450bcf1a9686f7e59913343c0a8c9079df6898e7691d420b981ac71ffd24bb05a1da795af4aa5678c3db45fc1da7801f8db53399af7fb579d77923
+DIST elasticsearch-9.0.0-linux-x86_64.tar.gz 649811730 BLAKE2B 746034dfd95a831a6c5d387030ff9a1517fd6194629fbe5ed53c0ff154f0be4e3a121cc19207c56d688ca370f1858808e65756cda0b270f79887041788b91141 SHA512 4a463db7351eeb6429d5a36eb05042c7585d12461d9122016b54cd0465828c5cefd643c113d0119dbabd850d22a992f1704f437bf2825a8aa61b5788c8116142
 EBUILD elasticsearch-7.17.25.ebuild 2374 BLAKE2B b8e8a2cfc8eb77cfa591ed73795bd923f12addbb101e2df852ee10fbe2ef1b3e74280e76fd13e03117b5dcecfce91b22b897839d014a22044b1a456413e6e878 SHA512 4f5fc0ada22ffad450a778bbbf248721f2fb52b8b9eaaa1cf44da897e65ee110a7eb4ea3cde3b625c9921c96a85729f0bc9994231a0df023f0e29b1b9f48eb74
-EBUILD elasticsearch-8.15.1.ebuild 3505 BLAKE2B 5d08a9df6275aba8a2b21082a70b57ecbba1f231f3d9023fce4fb62beef1c03bb1387122e90c2b0d357eb41d50ea60de2ce317589a76def50f967c8f28f976b3 SHA512 bd1806e6b83d4f698327710fe5d17cc97dfc9e5bf4393cf565661a121a523c9bc2cea7147578e9dabd39f4fcc2a888b7071f7a74a0befaa4a1044c0f7e1e0702
-EBUILD elasticsearch-8.17.3.ebuild 3505 BLAKE2B 247b138984b13f4f0e822060d4e1698d507e7e59fac9c040737203aede35dc34ea2d8b27ffbe155f87afea5c8481ece0be547058a98f7827cca752af6283ed4e SHA512 c85ddebf887f814e4b3e953d42724f4fb6f9b15371139eafb5c99e7f34c72f29ea9ab96556ee4dce7ba87ba58fb6bf9c66ea87983665d53ee55b8de9fb361452
+EBUILD elasticsearch-8.17.4.ebuild 3614 BLAKE2B abdee00f2676f4211dba6bf1957576d9f4e18289d9bb3e3f0d4b75dd978b3275a990c449ca628f557b10cd5d1e5e2e7ee9bd7eeee9a241b12fef6486cf749c3d SHA512 0e166e6fdaad723d5560839f0613f0e8b3c9e315963da5e97db92b63afd3014daddb2977877b79a998c3205b27b58f75debbd4b28bded83a246bd6117b52e406
+EBUILD elasticsearch-8.18.0.ebuild 3614 BLAKE2B abdee00f2676f4211dba6bf1957576d9f4e18289d9bb3e3f0d4b75dd978b3275a990c449ca628f557b10cd5d1e5e2e7ee9bd7eeee9a241b12fef6486cf749c3d SHA512 0e166e6fdaad723d5560839f0613f0e8b3c9e315963da5e97db92b63afd3014daddb2977877b79a998c3205b27b58f75debbd4b28bded83a246bd6117b52e406
+EBUILD elasticsearch-9.0.0.ebuild 3614 BLAKE2B da5b9101326b20377867668372f69f8ee53142b321296b3c487f716fea71dd18d32fc2fb4d4a721fab01cf587bde4bd2d2bba2f330ea5c0c0fad4e0494151047 SHA512 81be4d178903453b8a4d0540da5dedef3a9efaae210993a58ee59dded30c9eb039ac332529b94eadb534b59465b51f422e0a93f1135c1749d821acd6eefe2d41
 MISC metadata.xml 502 BLAKE2B d82165cdd8bbb6628c6e32ab0ff46d78561593b900267c8b39313266a148da06e999a6e28f4268232684f0b9e36f7c42f56be5efb9fd6520baea383d19e82c99 SHA512 612d2c4f19965c79d2b8d9cd0c2feb66436e6d2090759dcbacd61bcdc18c058f0ede17a7b283483e5dc91510134ddc2ee8d345fab3cb474e9b6b7a715e739b07
diff --git a/app-misc/elasticsearch/elasticsearch-8.17.3.ebuild b/app-misc/elasticsearch/elasticsearch-8.17.4.ebuild
index cc04359b9e63..54da0aa05bd7 100644
--- a/app-misc/elasticsearch/elasticsearch-8.17.3.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-8.17.4.ebuild
@@ -15,10 +15,11 @@ KEYWORDS="~amd64"
 
 DEPEND="acct-group/elasticsearch
 	acct-user/elasticsearch"
+# This package _actually does depend_ on JDK at runtime. #950962
 RDEPEND="acct-group/elasticsearch
 	acct-user/elasticsearch
 	sys-libs/zlib
-	virtual/jre:17"
+	virtual/jdk:17"
 
 QA_FLAGS_IGNORED="usr/share/elasticsearch/lib/platform/linux-x64/*.so"
 QA_PREBUILT="
@@ -31,7 +32,7 @@ QA_PRESTRIPPED="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-env.patch"
+	"${FILESDIR}/${PN}-env-2.patch"
 )
 
 src_prepare() {
@@ -62,8 +63,6 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins -r .
 
-	keepdir /usr/share/${PN}/plugins
-
 	exeinto /usr/share/${PN}/bin
 	doexe "${FILESDIR}"/elasticsearch-systemd-pre-exec
 
@@ -88,9 +87,10 @@ src_install() {
 
 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
+	# `equery check` complains that the keep file doesn't exist if we simply remove it
+	if [[ ! -d "${EROOT}/usr/share/${PN}/plugins" ]] ; then
+		mkdir "${EROOT}/usr/share/${PN}/plugins" || die
+	fi
 	tmpfiles_process /usr/lib/tmpfiles.d/${PN}.conf
 	if ! systemd_is_booted ; then
 		elog "You may create multiple instances of ${PN} by"
diff --git a/app-misc/elasticsearch/elasticsearch-8.15.1.ebuild b/app-misc/elasticsearch/elasticsearch-8.18.0.ebuild
index f024f4b1ce68..54da0aa05bd7 100644
--- a/app-misc/elasticsearch/elasticsearch-8.15.1.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-8.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,10 +15,11 @@ KEYWORDS="~amd64"
 
 DEPEND="acct-group/elasticsearch
 	acct-user/elasticsearch"
+# This package _actually does depend_ on JDK at runtime. #950962
 RDEPEND="acct-group/elasticsearch
 	acct-user/elasticsearch
 	sys-libs/zlib
-	virtual/jre:17"
+	virtual/jdk:17"
 
 QA_FLAGS_IGNORED="usr/share/elasticsearch/lib/platform/linux-x64/*.so"
 QA_PREBUILT="
@@ -31,7 +32,7 @@ QA_PRESTRIPPED="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-env.patch"
+	"${FILESDIR}/${PN}-env-2.patch"
 )
 
 src_prepare() {
@@ -62,8 +63,6 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins -r .
 
-	keepdir /usr/share/${PN}/plugins
-
 	exeinto /usr/share/${PN}/bin
 	doexe "${FILESDIR}"/elasticsearch-systemd-pre-exec
 
@@ -88,9 +87,10 @@ src_install() {
 
 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
+	# `equery check` complains that the keep file doesn't exist if we simply remove it
+	if [[ ! -d "${EROOT}/usr/share/${PN}/plugins" ]] ; then
+		mkdir "${EROOT}/usr/share/${PN}/plugins" || die
+	fi
 	tmpfiles_process /usr/lib/tmpfiles.d/${PN}.conf
 	if ! systemd_is_booted ; then
 		elog "You may create multiple instances of ${PN} by"
diff --git a/app-misc/elasticsearch/elasticsearch-9.0.0.ebuild b/app-misc/elasticsearch/elasticsearch-9.0.0.ebuild
new file mode 100644
index 000000000000..f7484448b012
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-9.0.0.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2025 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}-linux-x86_64.tar.gz"
+
+LICENSE="Apache-2.0 BSD-2 Elastic-2.0 LGPL-3 MIT public-domain"
+SLOT="0/9"
+KEYWORDS="~amd64"
+
+DEPEND="acct-group/elasticsearch
+	acct-user/elasticsearch"
+# This package _actually does depend_ on JDK at runtime. #950962
+RDEPEND="acct-group/elasticsearch
+	acct-user/elasticsearch
+	sys-libs/zlib
+	virtual/jdk:21"
+
+QA_FLAGS_IGNORED="usr/share/elasticsearch/lib/platform/linux-x64/*.so"
+QA_PREBUILT="
+	usr/share/elasticsearch/lib/platform/linux-x64/*.so
+	usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*
+"
+QA_PRESTRIPPED="
+	usr/share/elasticsearch/lib/platform/linux-x64/*.so
+	usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-env-3.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
+}
+
+src_install() {
+	keepdir /etc/${PN}
+	keepdir /etc/${PN}/scripts
+
+	insinto /etc/${PN}
+	doins -r config/.
+	rm -r config || die
+
+	fowners -R root:${PN} /etc/${PN}
+	fperms -R 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.8" ${PN}
+
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
+	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
+	# `equery check` complains that the keep file doesn't exist if we simply remove it
+	if [[ ! -d "${EROOT}/usr/share/${PN}/plugins" ]] ; then
+		mkdir "${EROOT}/usr/share/${PN}/plugins" || die
+	fi
+	tmpfiles_process /usr/lib/tmpfiles.d/${PN}.conf
+	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 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/elasticsearch/files/elasticsearch-env.patch b/app-misc/elasticsearch/files/elasticsearch-env-2.patch
index fb150bb51db3..f0d6ce0e3e4a 100644
--- a/app-misc/elasticsearch/files/elasticsearch-env.patch
+++ b/app-misc/elasticsearch/files/elasticsearch-env-2.patch
@@ -9,7 +9,7 @@ JDK that we unbundled and will not start.
  
 +# Set our JVM in a Gentoo-specific manner
 +if [ -z "$ES_JAVA_HOME" ]; then
-+  GENTOO_VM=$(depend-java-query --get-vm virtual/jre:17)
++  GENTOO_VM=$(depend-java-query --get-vm virtual/jdk:17)
 +  if [ ! -z "$GENTOO_VM" ]; then
 +    ES_JAVA_HOME=$(java-config-2 --select-vm=${GENTOO_VM} --jre-home)
 +  else
diff --git a/app-misc/elasticsearch/files/elasticsearch-env-3.patch b/app-misc/elasticsearch/files/elasticsearch-env-3.patch
new file mode 100644
index 000000000000..d459029c9958
--- /dev/null
+++ b/app-misc/elasticsearch/files/elasticsearch-env-3.patch
@@ -0,0 +1,24 @@
+Since ES 8.0.0 upstream stopped distributing a 'no-JDK' package.
+This requires us to set `ES_JAVA_HOME` else it fails to find the
+JDK that we unbundled and will not start.
+--- a/bin/elasticsearch-env
++++ b/bin/elasticsearch-env
+@@ -36,6 +36,18 @@ ES_HOME=`dirname "$ES_HOME"`
+ ES_CLASSPATH="$ES_HOME/lib/*"
+ LAUNCHERS_CLASSPATH="$ES_CLASSPATH:$ES_HOME/lib/launchers/*"
+ 
++# Set our JVM in a Gentoo-specific manner
++if [ -z "$ES_JAVA_HOME" ]; then
++  GENTOO_VM=$(depend-java-query --get-vm virtual/jdk:21)
++  if [ ! -z "$GENTOO_VM" ]; then
++    ES_JAVA_HOME=$(java-config-2 --select-vm=${GENTOO_VM} --jre-home)
++  else
++    echo "Unable to automatically detect a supported Java 21 VM. Elasticsearch is unlikely to launch."
++    echo "Please ensure that you have installed an appropriate Java VM using portage"
++    echo "OR pass the ES_JAVA_HOME environment variable."
++  fi
++fi
++
+ # now set the path to java
+ if [ ! -z "$ES_JAVA_HOME" ]; then
+   JAVA="$ES_JAVA_HOME/bin/java"