gentoo auto-resync : 05:12:2024 - 02:07:17

6 files changed, 142 insertions, 3 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 5e67ef5e8ce4..2e493327a2b2 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 82c74f57c721..4276b54b3e7a 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -8,8 +8,8 @@ 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.16-no-jdk-linux-x86_64.tar.gz 168795535 BLAKE2B 642ae6f07db953e7fa783dcd63c6dcebab61e85ea600bede09e9596bf9dee2d71c43e5c28b80bd4c091d792ed3a95d10cc75ffb1074ad4b3cfceb081ed25027f SHA512 3755373f5068a08e4619b4e922bc2d3d97d41791dbf5aa84564574fc84abee9c567b16095cf0e11d48910627e3c183ff1193bf2d5ade59891bea2b3f994aa7df
+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
-EBUILD elasticsearch-7.17.16.ebuild 2374 BLAKE2B b8e8a2cfc8eb77cfa591ed73795bd923f12addbb101e2df852ee10fbe2ef1b3e74280e76fd13e03117b5dcecfce91b22b897839d014a22044b1a456413e6e878 SHA512 4f5fc0ada22ffad450a778bbbf248721f2fb52b8b9eaaa1cf44da897e65ee110a7eb4ea3cde3b625c9921c96a85729f0bc9994231a0df023f0e29b1b9f48eb74
+EBUILD elasticsearch-7.17.25.ebuild 2374 BLAKE2B b8e8a2cfc8eb77cfa591ed73795bd923f12addbb101e2df852ee10fbe2ef1b3e74280e76fd13e03117b5dcecfce91b22b897839d014a22044b1a456413e6e878 SHA512 4f5fc0ada22ffad450a778bbbf248721f2fb52b8b9eaaa1cf44da897e65ee110a7eb4ea3cde3b625c9921c96a85729f0bc9994231a0df023f0e29b1b9f48eb74
 EBUILD elasticsearch-8.15.1.ebuild 3505 BLAKE2B 5d08a9df6275aba8a2b21082a70b57ecbba1f231f3d9023fce4fb62beef1c03bb1387122e90c2b0d357eb41d50ea60de2ce317589a76def50f967c8f28f976b3 SHA512 bd1806e6b83d4f698327710fe5d17cc97dfc9e5bf4393cf565661a121a523c9bc2cea7147578e9dabd39f4fcc2a888b7071f7a74a0befaa4a1044c0f7e1e0702
 MISC metadata.xml 502 BLAKE2B d82165cdd8bbb6628c6e32ab0ff46d78561593b900267c8b39313266a148da06e999a6e28f4268232684f0b9e36f7c42f56be5efb9fd6520baea383d19e82c99 SHA512 612d2c4f19965c79d2b8d9cd0c2feb66436e6d2090759dcbacd61bcdc18c058f0ede17a7b283483e5dc91510134ddc2ee8d345fab3cb474e9b6b7a715e739b07
diff --git a/app-misc/elasticsearch/elasticsearch-7.17.16.ebuild b/app-misc/elasticsearch/elasticsearch-7.17.25.ebuild
index d8370e7f9001..d8370e7f9001 100644
--- a/app-misc/elasticsearch/elasticsearch-7.17.16.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-7.17.25.ebuild
diff --git a/app-misc/openhab-bin/Manifest b/app-misc/openhab-bin/Manifest
index 1a254b3c169d..ba52d064fb24 100644
--- a/app-misc/openhab-bin/Manifest
+++ b/app-misc/openhab-bin/Manifest
@@ -4,7 +4,9 @@ AUX openhab.service 518 BLAKE2B f00b13946a588b1b2b9f94775d5ef281cac777888426bd97
 AUX openhab.tmpfiles 352 BLAKE2B 23bab4c007c924cdfaa602654f19030d702b855f3baf62aaa016d944c8caf4f93252ae3ab9b3442ff6a8a528fcdd7a12f9767c29bfed7837c8f2cc2594955c26 SHA512 cb7cc7483915512f65664a9439b07c25b15c3066f321c8087cece2803e937392f9f0888a5c836949632c9b0974fb2d6cc577d8f785423cd42aa6ba575ba8fcc2
 DIST openhab-4.2.1.tar.gz 110592664 BLAKE2B 6c1ef4ff6a25904a6bd56c5bbb5d6c08163e14723a61966930ffb96183a5890f86ddc73d316d8b48712b262eae80b7e086cdf53510d5a1a09a596b591fe3d037 SHA512 1d8b4b6b7ef4f76ecaee0355842b5bbfce9c422915bdc345e974bfe7d1c275dc4f8bc317f3e53ed6778d7875c7e7757bb3d26e68e016c1d3fbf1009a6a1e070d
 DIST openhab-4.2.2.tar.gz 110594562 BLAKE2B de7f67f8891ede0eb197188740d1b8b040a8adcbcd8b505518aef9290debfa7f97a5a894fd22072fa46dbaae7e9286da2fa41afa56b54c1011f9640db171535b SHA512 0c9367780e34f8a59f74d8edf18e2a503c71cc3af0f17aaca75888243b02393eb2c6188b84e5a04c3ca63b88e80cc0eb5a6db3603e348e10ab09e9b922ac2a64
+DIST openhab-4.2.3.tar.gz 110593514 BLAKE2B bcfc73b377d82e1c747623711328e67d736408662323034f24c6143f6eb1be107ed987a766d39fb53a0f7f540e4666558356c723b31f8c0b51e082df77a680d9 SHA512 5156e9d6d73424083c83551e426b8290cb595659d955ddee3e19c61be4e3caecb9f5a4556e5aaf40f608765f814d34ff7be3d649c850c55dac862d5e1dc649af
 DIST openhab-cli-2024-01-14 8633 BLAKE2B 0b0999abcb884b779087b92f9f3e08fee3662753692392fbb30d218d0fc25fd1fca613c32b8193a3365764c55ac3525f8369aeea4edbf61223cd0219209c4cbf SHA512 bf24ae776d4362e8a60a0c71cb025834e5f645a24377a87484477f544026f2fdd996a1781f1082e62197fce33a9dadb5972df22ce3e4cd9f73d3088ec5bc0a98
 EBUILD openhab-bin-4.2.1.ebuild 3174 BLAKE2B eb4ea8c6d94eced9c31332fd7afc344a772c786bdafa12b144ec3fbb01fe6d0b6785411c487f3606052edd079e069e838c6961e5b72449c8147e055a110015c8 SHA512 20d13d2f21aa55d9f4d03a0c92093fc418ea8dddfde13d47b7932e9c1f9ca68565cb379c7071dfa50d0d35e3f9847e555b7b14c883f6ff731d5f88df8e048828
 EBUILD openhab-bin-4.2.2.ebuild 3202 BLAKE2B e4e676b483bdccd50f52511a1094ba64949d1f6b3af7309237fd5e47d018a73ac57f6a6d33b2e23bfabda8d8574b72c076aede54ab67e3924e583a7c7d638cd5 SHA512 8562b57955a394678757c03e20bc0143cefd1d81df4d5c7a8fa42b8841a655a65d26ff1949ca0a077d31c784d82e48c60f956754eb25b08efd42f05f7a537298
-MISC metadata.xml 356 BLAKE2B c21186f077dc0f799f5d65133e691fd2acc098326a19714e1561a83429bcd09df460e4ad0e7f168c374de12c0bfab51bb8da46877f8f2fb13565327a39d5fa7b SHA512 c9cd771ff2115a885331dd88a950288b540d8ca441f37946c405ead781292f7b4660d8f1ed98d66ae3c7350f7e98fb590b61d5290607dbfb754d554cc621ce6f
+EBUILD openhab-bin-4.2.3.ebuild 3204 BLAKE2B 7a0ece2883a709214845bad36f725bb8152fb9a56fa77966b0331d4a1b537f3d8219ccc4a24a6cb503dc3ee0251ec114d2133476ea90bfd26dabc4f6a30d66ea SHA512 39ff168e348b59598aa89284fb0eab01f82383334a0c85b10dddf5a4ae17f401be08991f98a042b1cd54c4b0f2b66e0b39f5e3d361c1b11f4fc7b0d314431cc5
+MISC metadata.xml 432 BLAKE2B a7c9f6511d33dbe366c9ea95ed7dd79af7904ca31058e3f0fbf7549d375f9ab998cb85576b1d9e0dd879dcc44ee7e91ee1067c3846b654f7e40c8779f913b964 SHA512 afaa6a0c68e275a103e597e4a66674a2de465887e7c919178d0ce4ba29b04c3e6722f7c7148763b6ffbf85be73db6e3c80ddd68e87f8d0ee4a7d4a05745aa6e0
diff --git a/app-misc/openhab-bin/metadata.xml b/app-misc/openhab-bin/metadata.xml
index 354e8e2baca4..75ed9a68ec1e 100644
--- a/app-misc/openhab-bin/metadata.xml
+++ b/app-misc/openhab-bin/metadata.xml
@@ -8,5 +8,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">openhab/openhab-core</remote-id>
+		<changelog>https://github.com/openhab/openhab-distro/releases</changelog>
 	</upstream>
 </pkgmetadata>
diff --git a/app-misc/openhab-bin/openhab-bin-4.2.3.ebuild b/app-misc/openhab-bin/openhab-bin-4.2.3.ebuild
new file mode 100644
index 000000000000..751af46f93e1
--- /dev/null
+++ b/app-misc/openhab-bin/openhab-bin-4.2.3.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo systemd tmpfiles
+
+MY_PN=${PN%-bin}
+MY_P=${MY_PN}-${PV}
+MY_CLI_VER=2024-01-14
+
+DESCRIPTION="An open-source automation software for your home"
+HOMEPAGE="https://www.openhab.org/"
+SRC_URI="
+	https://github.com/openhab/openhab-distro/releases/download/${PV}/${MY_P}.tar.gz
+	https://raw.githubusercontent.com/openhab/openhab-linuxpkg/10061acd36524afb12a033fea6dcf142b399bf56/resources/usr/bin/openhab-cli
+		 -> openhab-cli-${MY_CLI_VER}
+"
+
+S="${WORKDIR}"
+LICENSE="EPL-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm64"
+
+MY_JAVA_DEPEND=">=virtual/jre-17"
+
+# app-arch/zip: used by "openhab-cli backup"
+RDEPEND="
+	${MY_JAVA_DEPEND}
+	acct-user/openhab
+	app-arch/zip
+	dev-java/java-config
+"
+
+BDEPEND="app-arch/unzip"
+
+src_compile() {
+	:
+}
+
+src_install() {
+	# We use move here to preserve the executable bit on the files under
+	# openhab/runtime/bin.
+	domove() {
+		local source="${1}"
+		local target="${2}"
+
+		local dest="${ED}/${target}"
+
+		mkdir -p "${dest}" || die "Failed to create ${dest}"
+		mv "${source}"/* "${dest}" || die "Failed to move"
+	}
+
+	domove runtime /usr/share/openhab/runtime
+	domove conf /etc/openhab
+
+	domove userdata /var/lib/openhab
+	fowners -R openhab:openhab /var/lib/openhab
+
+	local dirs=(
+		/usr/share/openhab/addons
+		/var/log/openhab
+	)
+	local d
+	for d in "${dirs[@]}"; do
+		keepdir "${d}"
+		fowners openhab:openhab "${d}"
+	done
+
+	newenvd "${FILESDIR}"/openhab.env 50openhab
+
+	systemd_dounit "${FILESDIR}"/openhab.service
+	newtmpfiles "${FILESDIR}"/openhab.tmpfiles openhab.conf
+
+	newbin - openhab <<EOF
+#!/usr/bin/env bash
+set -eu
+
+if [[ -v JAVA_HOME_OVERRIDE ]]; then
+	JAVA_HOME="\${JAVA_HOME_OVERRIDE}"
+else
+	if ! GENTOO_JAVA_VM="\$(depend-java-query --get-vm '${MY_JAVA_DEPEND}')"; then
+		>&2 echo "Could not find Java VM for ${MY_JAVA_DEPEND}"
+	exit 1
+	fi
+
+	if ! JAVA_HOME_ASSIGNMENT=\$(java-config -P \${GENTOO_JAVA_VM} | grep JAVA_HOME); then
+		>&2 echo "Could not retrieve JAVA_HOME of \${GENTOO_JAVA_VM}"
+		exit 1
+	fi
+
+	eval \${JAVA_HOME_ASSIGNMENT}
+fi
+
+export JAVA_HOME
+exec /usr/share/openhab/runtime/bin/karaf "\$@"
+EOF
+	newbin "${DISTDIR}"/openhab-cli-${MY_CLI_VER} openhab-cli
+
+	newinitd "${FILESDIR}"/openhab.initd openhab
+}
+
+pkg_postinst() {
+	tmpfiles_process openhab.conf
+
+	if [[ -z ${REPLACING_VERSIONS} && -z ${OPENHAB_POSTINST_UPDATE} ]]; then
+	   return
+	fi
+
+	if [[ -d "${EROOT}"/run/systemd/system ]]; then
+		if systemctl is-active --quiet openhab; then
+			local openhab_service_active=1
+			einfo "Restarting OpenHAB service due to version update"
+			edob systemctl daemon-reload
+			edob systemctl stop openhab
+		fi
+
+		echo y | edob -m "Cleaning OpenHAB cache" \
+					  openhab-cli clean-cache
+		assert "Failed to clean OpenHAB cache"
+
+		if [[ -v openhab_service_active ]]; then
+			edob systemctl start openhab
+		fi
+	elif [[ -d /run/openrc ]]; then
+		einfo "Follow these steps to complete the update of OpenHAB:"
+		einfo
+		einfo "1. Stop the OpenHAB's service"
+		einfo "$ rc-service openhab stop"
+		einfo "2. Clean OpenHAB's cache"
+		einfo "$ openahb-cli clean-cache"
+		einfo "3. Restart OpenHAB's service"
+		einfo "$ rc-service openhab start"
+	fi
+}