5 files changed, 138 insertions, 37 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index b7992ceb7bad..73803e80b6ab 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/lockfile-progs/Manifest b/app-misc/lockfile-progs/Manifest
index a49484790a54..026e25fed8a1 100644
--- a/app-misc/lockfile-progs/Manifest
+++ b/app-misc/lockfile-progs/Manifest
@@ -1,6 +1,4 @@
 AUX Makefile 1906 BLAKE2B 9c294471555a7dbe6d4342e8af7c744731c05ab22adc2192eb94da5e166c5a94705e328ca600055e722d8610869d20246fab741ef494f6e68d987c913e8054cb SHA512 c3ebd2f737fc664b37e235a0a68f50ebe80f00dbc522566520edb9827771344d022531c50283be5eaddd26d72295faae2676ef58838dd65797c74059719d826d
-DIST lockfile-progs_0.1.17.tar.gz 14833 BLAKE2B 3e67aee40a8700c330eb8dd1f9ae3973d50f733333825a3e176434586357e9bbb3db9d480f6a778d383c5dbaca03d3cde90291c7668e3b9bc425b93a0b53fa2b SHA512 9d912e1a518fe9c02054beb25c4591df6db55cc2fe9b7049fb85368465bd9ced9660bb0a809ee60a7effbdc6524613c40fa69d9d27fc2cfc964f41b7486c3596
 DIST lockfile-progs_0.1.19.tar.gz 104345 BLAKE2B 1ef1cc1d26c37b7dbe6e1e7245820f20e13fed995127ec7b17dc9464c379ac47e46beef765e4aa37379303a3c1baa3cfd9ec1fa0d272d4cf56132953d158e82b SHA512 7ec20466bee9278562ad764d07048fa5ed14003e18a0147f201020a3eb14e3d14aad5a3a89682ce358c80770dc2b944fc5b453d6afae2dbf2f58d1b756d80303
-EBUILD lockfile-progs-0.1.17.ebuild 755 BLAKE2B bdf66bc97da6b91d02550ad7833453bd6e71c39033dac98b0cdee1415ce2e5e36ef7bf304c2163794cb3954a2f5bccd29d72f2282b6b7f831df1769488d88a7c SHA512 f7e8f099ae7e52ae573dbd90d428ed82a9047541097b1e7515160edfd8e21fa6a66cdde00095e15f39b8cd3eae307d337b70168a3d2ed3ee992736e0bc9119a7
 EBUILD lockfile-progs-0.1.19.ebuild 755 BLAKE2B 8f6b0d3baecfa4e00c90e4b4a215a1116ecff9065e5fe15313328b31fc0abc4ae1dc61ea937bb43519280ccdfecff5e88ca3019be6d286f0d6b3d5fecdd42565 SHA512 49e718ab48aeb753d982bb14e28e8159c6273cfe79262d3a5fdf4d8150658eed00f07ce3aa546f2f752f9cf41c11af21ea1b1a6446d4af3ae3a010aff90dd845
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild b/app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild
deleted file mode 100644
index 98f2ac3db112..000000000000
--- a/app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Programs to safely lock/unlock files and mailboxes"
-HOMEPAGE="https://packages.debian.org/sid/lockfile-progs"
-SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ~s390 sparc x86"
-
-DEPEND="net-libs/liblockfile"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	# Provide better Makefile, with clear separation between compilation
-	# and installation.
-	cp "${FILESDIR}/Makefile" . || die
-}
-
-src_compile() {
-	tc-export CC
-	default
-}
-
-src_install() {
-	# Makefile has no notion of PREFIX, bindir, and the like
-	emake DESTDIR="${ED}" install
-}
diff --git a/app-misc/openhab-bin/Manifest b/app-misc/openhab-bin/Manifest
index ba52d064fb24..98f98e2d5e56 100644
--- a/app-misc/openhab-bin/Manifest
+++ b/app-misc/openhab-bin/Manifest
@@ -5,8 +5,10 @@ AUX openhab.tmpfiles 352 BLAKE2B 23bab4c007c924cdfaa602654f19030d702b855f3baf62a
 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-4.3.0.tar.gz 111158533 BLAKE2B d270e0c4b1c9035ccfef2d6742e5cfdacda40c29bf4285437653f6b4870ec3567473752a426a4ab2a4fe5d87e240265009292dd9ebe0cd656a4c7cd1995ef286 SHA512 2701c987ff3020699de4d6feb16aeded53d71b31e93428cc7ca1aea6b8c442f4ed810c4785eb2c8e5f3fa10c511eeb7ab43cddd10d9d4b0afe3c1157e7af4b06
 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
 EBUILD openhab-bin-4.2.3.ebuild 3204 BLAKE2B 7a0ece2883a709214845bad36f725bb8152fb9a56fa77966b0331d4a1b537f3d8219ccc4a24a6cb503dc3ee0251ec114d2133476ea90bfd26dabc4f6a30d66ea SHA512 39ff168e348b59598aa89284fb0eab01f82383334a0c85b10dddf5a4ae17f401be08991f98a042b1cd54c4b0f2b66e0b39f5e3d361c1b11f4fc7b0d314431cc5
+EBUILD openhab-bin-4.3.0.ebuild 3204 BLAKE2B 7a0ece2883a709214845bad36f725bb8152fb9a56fa77966b0331d4a1b537f3d8219ccc4a24a6cb503dc3ee0251ec114d2133476ea90bfd26dabc4f6a30d66ea SHA512 39ff168e348b59598aa89284fb0eab01f82383334a0c85b10dddf5a4ae17f401be08991f98a042b1cd54c4b0f2b66e0b39f5e3d361c1b11f4fc7b0d314431cc5
 MISC metadata.xml 432 BLAKE2B a7c9f6511d33dbe366c9ea95ed7dd79af7904ca31058e3f0fbf7549d375f9ab998cb85576b1d9e0dd879dcc44ee7e91ee1067c3846b654f7e40c8779f913b964 SHA512 afaa6a0c68e275a103e597e4a66674a2de465887e7c919178d0ce4ba29b04c3e6722f7c7148763b6ffbf85be73db6e3c80ddd68e87f8d0ee4a7d4a05745aa6e0
diff --git a/app-misc/openhab-bin/openhab-bin-4.3.0.ebuild b/app-misc/openhab-bin/openhab-bin-4.3.0.ebuild
new file mode 100644
index 000000000000..751af46f93e1
--- /dev/null
+++ b/app-misc/openhab-bin/openhab-bin-4.3.0.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
+}