Merge updates from master

app-misc/openhab-bin/Manifest

@@ -1,4 +1,5 @@
 DIST openhab-5.0.3.tar.gz 115565086 BLAKE2B d4d660738539b8ff2bddaeb3cba04ebee999852efe2057d956df87fc7413b1c1ef1cb7f709698294ee07a578ba4c85e3db8d952668d76cc3bb44ba13ede5255c SHA512 2485f4f67c5d3ce608eed3f0d99230761f0452761a013f10ff856be0f731195f45bfeb660aa14e3eb921daed8b2dc2f18ff74f7609b50235467ca803dece5369
 DIST openhab-5.1.1.tar.gz 121148601 BLAKE2B 0f98afe583debeb61a42c7beeffd9c4637ebacc67dc5e19d70b27a3e79e41fa4732d788e2ddf898c5435ab25d3a45b41cc94264d569667dfc226bff428569a74 SHA512 cb171b63f9d35981466f603cd733bfb771f1f63b8e07a8f7e5f2775a05f50b309dd320564d52d684a89c1865def1b496a27acc23ac2298e17d1010f30ff0646c
 DIST openhab-5.1.2.tar.gz 121075742 BLAKE2B 4d88d8277ceb6ae3922b602d94e6626ae3a89a17580c682f469b218e6e283249350d9c24227358dca340ddf58fb52115e9485d98ab51d1c2cb4d16b87c54c252 SHA512 9c56fd1c14fb8be95a9a02331f7294ae29aa2bab33e7073a06c15c420d4b59dce614409625cc883fa67c16df42af6b68bb7de6c2b3c3650a927524ccaace60f2
+DIST openhab-5.1.3.tar.gz 121107971 BLAKE2B c2304ba9179b337670a8ec105948d0b4026cdfff1efa8169402b896945b0056d75361f160be7f32693e81d90befb5c4936191cd8c6804bf3881094c08edfd348 SHA512 bc3f15fffa01abee96aa7cc3e303a3bf35773ba1b9d72e81196f77055f9c269017e31975a6f4f9f6d6671a4eb6003b13c3832d796f7043525a94a01b71f876c2
 DIST openhab-cli-2024-01-14 8633 BLAKE2B 0b0999abcb884b779087b92f9f3e08fee3662753692392fbb30d218d0fc25fd1fca613c32b8193a3365764c55ac3525f8369aeea4edbf61223cd0219209c4cbf SHA512 bf24ae776d4362e8a60a0c71cb025834e5f645a24377a87484477f544026f2fdd996a1781f1082e62197fce33a9dadb5972df22ce3e4cd9f73d3088ec5bc0a98

app-misc/openhab-bin/openhab-bin-5.1.3.ebuild

@@ -0,0 +1,136 @@
+# Copyright 1999-2026 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:21"
+
+# 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
+}

dev-java/gradle-bin/Manifest

@@ -7,3 +7,4 @@ DIST gradle-bin-8.5.zip 218636663 BLAKE2B 0360f240f6183abec540f7755a966767a8dc17
 DIST gradle-bin-8.7.zip 224435312 BLAKE2B 1926765aea8931b25a9f0b7b9a224dd70756cfd337eecb364c6d288486187dd6311f888c7e1c36b1fc81b454c3514d2807884343e7782f1be45fce03e611496b SHA512 fc18863654cbe8dd2357f388c0fc5f699ca2d40ffd32c283f00cfd5bda94e1711ab7b7a3b154e7da66c17468f00c3c72fe6b6603c4a29617b33b0f292cbac3de
 DIST gradle-bin-9.0.0.zip 224774486 BLAKE2B 76b6565a272da36942511bfef37d3633efdb82f2a8edba24fee34e7eae4c5fd6c422906af7f7119d2f47896cb421bfcd7f40d36e428b91b46099737015213e62 SHA512 f859b5c2a8b223c904220a7c616584c696b8623294dc8ebbd1c030050c1050bd1517a02df2de9e272f9414eaa6d5979b0fc74c009c7b059597010a11383e00f8
 DIST gradle-bin-9.1.0.zip 232491070 BLAKE2B b211be91f0e0f34551d1d96496e05415861cdcdfb64539575443f7d4ff18f5b2b57260c11b0a30b3b5237679417821332d328e44e59dfb7d6036b541c338060d SHA512 65abab7397b32efc0337c210df4f0566b725ef55468a735bada026a7730220a8080c331ff996d594da6f393f8ebdd20a5673c123333bc74cf718931b71837720
+DIST gradle-bin-9.3.1.zip 234893460 BLAKE2B 310715e4a9eb51b63fea07de9bb1c76a1835bcc1f82d4f0a6c21ea619fcea52aacf07366a00478ab877d1034214c437833237002107279996f25c0364ad8f2d8 SHA512 40e5b5346e32aa732b2d87d9ebf98a6e718d80196c0aa08928933a4c4b68d3c5cd5ebadf32015d29f4bf46e4cabaf45e7a59837eb317b4343971e0606c83f111

dev-java/gradle-bin/gradle-bin-9.3.1.ebuild

@@ -0,0 +1,59 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2
+
+MY_PN=${PN%%-bin}
+MY_P="${MY_PN}-${PV/_rc/-rc-}"
+
+DESCRIPTION="A project automation and build tool with a Groovy based DSL"
+HOMEPAGE="https://gradle.org"
+SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip"
+
+S="${WORKDIR}/${MY_P}"
+LICENSE="Apache-2.0"
+SLOT="${PV}"
+KEYWORDS="~amd64"
+
+DEPEND="app-eselect/eselect-gradle"
+BDEPEND="app-arch/unzip"
+RDEPEND="
+	${DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local gradle_dir="/usr/share/${PN}-${SLOT}"
+
+	if use source; then
+		java-pkg_dosrc src
+	fi
+
+	docinto html
+	dodoc -r docs/release-notes.html
+	if use doc; then
+		dodoc -r docs/{dsl,userguide}
+		java-pkg_dojavadoc docs/javadoc
+	fi
+
+	insinto "${gradle_dir}"
+	doins -r bin/ lib/
+	fperms 755 "${gradle_dir}/bin/gradle"
+	dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}"
+}
+
+pkg_postinst() {
+	eselect gradle update ifunset
+}
+
+pkg_postrm() {
+	eselect gradle update ifunset
+}