public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-misc/openhab-bin/
@ 2024-08-22  9:51 Florian Schmaus
  0 siblings, 0 replies; 12+ messages in thread
From: Florian Schmaus @ 2024-08-22  9:51 UTC (permalink / raw
  To: gentoo-commits

commit:     6176342abc16192a98a451864db8d240e2c07f1e
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 22 09:35:33 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Aug 22 09:51:23 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6176342a

app-misc/openhab-bin: add 4.2.1

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 app-misc/openhab-bin/Manifest                 |   1 +
 app-misc/openhab-bin/openhab-bin-4.2.1.ebuild | 135 ++++++++++++++++++++++++++
 2 files changed, 136 insertions(+)

diff --git a/app-misc/openhab-bin/Manifest b/app-misc/openhab-bin/Manifest
index 2172c7bf4447..837cb4dc3d59 100644
--- a/app-misc/openhab-bin/Manifest
+++ b/app-misc/openhab-bin/Manifest
@@ -1,4 +1,5 @@
 DIST openhab-4.1.1.zip 110909555 BLAKE2B df89e2391e8abe926635fc1e0fbb5c7b1f6a03a87ba643d68a3c8bf1ef52f8b6ca862d8655112a225e1ec2f2d9cc90e0906c40a5dc00f52b53fcb4bac8059378 SHA512 50125e025e4ed8f3ea93359a777e0944150cf157b853bc3f6e777c04956c59346d77d4f3680756241d3d71b8c57014f777601cb5ca836b8e80046ce5a5aac770
 DIST openhab-4.1.2.tar.gz 110558399 BLAKE2B b77800898d5358caaadf31e921351d5431a09cf97ad881e091c0f7f7ca6efa13439f39075e15d4887df3b28d2548b10cbf44176328570cf2b8df8fc15bc25ecd SHA512 ccad90d1905f2190cd54284353981453d4d38f1206a427b91094dfd8e8a25e31cc15921544ac883f501ee33d018226b07e12e04bfd5c928771ff090826de3cba
 DIST openhab-4.2.0.tar.gz 110566875 BLAKE2B 25f07801258b958d3845cc43360eac9707416c424d61a8a2eeda55d522735bbf2690c989588cd40dee09ce72aee7aa53e2704d048645190981101cd293c5090b SHA512 83cc0c171de303bcc01198a94963933a7fde93f84a8ccf3cb27511de680576e14d03482d13abc0c0fdcbda6069a6d6f46dee44cb85f597aea2a8641c6693337a
+DIST openhab-4.2.1.tar.gz 110592664 BLAKE2B 6c1ef4ff6a25904a6bd56c5bbb5d6c08163e14723a61966930ffb96183a5890f86ddc73d316d8b48712b262eae80b7e086cdf53510d5a1a09a596b591fe3d037 SHA512 1d8b4b6b7ef4f76ecaee0355842b5bbfce9c422915bdc345e974bfe7d1c275dc4f8bc317f3e53ed6778d7875c7e7757bb3d26e68e016c1d3fbf1009a6a1e070d
 DIST openhab-cli-2024-01-14 8633 BLAKE2B 0b0999abcb884b779087b92f9f3e08fee3662753692392fbb30d218d0fc25fd1fca613c32b8193a3365764c55ac3525f8369aeea4edbf61223cd0219209c4cbf SHA512 bf24ae776d4362e8a60a0c71cb025834e5f645a24377a87484477f544026f2fdd996a1781f1082e62197fce33a9dadb5972df22ce3e4cd9f73d3088ec5bc0a98

diff --git a/app-misc/openhab-bin/openhab-bin-4.2.1.ebuild b/app-misc/openhab-bin/openhab-bin-4.2.1.ebuild
new file mode 100644
index 000000000000..6625624aba64
--- /dev/null
+++ b/app-misc/openhab-bin/openhab-bin-4.2.1.ebuild
@@ -0,0 +1,135 @@
+# 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}
+
+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-2024-01-14
+"
+
+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-2024-01-14 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
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/openhab-bin/
@ 2024-11-10 10:10 Florian Schmaus
  0 siblings, 0 replies; 12+ messages in thread
From: Florian Schmaus @ 2024-11-10 10:10 UTC (permalink / raw
  To: gentoo-commits

commit:     6d2f43d61f933342eca4490bed95ea7b845b23c3
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 10 10:08:26 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Nov 10 10:10:27 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d2f43d6

app-misc/openhab-bin: stabilize 4.2.2 for ALLARCHES

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 app-misc/openhab-bin/openhab-bin-4.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/openhab-bin/openhab-bin-4.2.2.ebuild b/app-misc/openhab-bin/openhab-bin-4.2.2.ebuild
index 751af46f93e1..6d3cd9cf94c1 100644
--- a/app-misc/openhab-bin/openhab-bin-4.2.2.ebuild
+++ b/app-misc/openhab-bin/openhab-bin-4.2.2.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}"
 LICENSE="EPL-2.0"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 
 MY_JAVA_DEPEND=">=virtual/jre-17"
 


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/openhab-bin/
@ 2024-11-10 10:10 Florian Schmaus
  0 siblings, 0 replies; 12+ messages in thread
From: Florian Schmaus @ 2024-11-10 10:10 UTC (permalink / raw
  To: gentoo-commits

commit:     01863bafc3e0a88896ce33a011c461a78b905b66
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 10 10:10:08 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Nov 10 10:10:27 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01863baf

app-misc/openhab-bin: drop 4.2.0-r1

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 app-misc/openhab-bin/Manifest                    |   1 -
 app-misc/openhab-bin/openhab-bin-4.2.0-r1.ebuild | 135 -----------------------
 2 files changed, 136 deletions(-)

diff --git a/app-misc/openhab-bin/Manifest b/app-misc/openhab-bin/Manifest
index 224064b85b6b..dca40a358c91 100644
--- a/app-misc/openhab-bin/Manifest
+++ b/app-misc/openhab-bin/Manifest
@@ -1,4 +1,3 @@
-DIST openhab-4.2.0.tar.gz 110566875 BLAKE2B 25f07801258b958d3845cc43360eac9707416c424d61a8a2eeda55d522735bbf2690c989588cd40dee09ce72aee7aa53e2704d048645190981101cd293c5090b SHA512 83cc0c171de303bcc01198a94963933a7fde93f84a8ccf3cb27511de680576e14d03482d13abc0c0fdcbda6069a6d6f46dee44cb85f597aea2a8641c6693337a
 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-cli-2024-01-14 8633 BLAKE2B 0b0999abcb884b779087b92f9f3e08fee3662753692392fbb30d218d0fc25fd1fca613c32b8193a3365764c55ac3525f8369aeea4edbf61223cd0219209c4cbf SHA512 bf24ae776d4362e8a60a0c71cb025834e5f645a24377a87484477f544026f2fdd996a1781f1082e62197fce33a9dadb5972df22ce3e4cd9f73d3088ec5bc0a98

diff --git a/app-misc/openhab-bin/openhab-bin-4.2.0-r1.ebuild b/app-misc/openhab-bin/openhab-bin-4.2.0-r1.ebuild
deleted file mode 100644
index 683f79d8f3fa..000000000000
--- a/app-misc/openhab-bin/openhab-bin-4.2.0-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# 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}
-
-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-2024-01-14
-"
-
-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-2024-01-14 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
-}


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/openhab-bin/
@ 2024-10-11 13:27 Florian Schmaus
  0 siblings, 0 replies; 12+ messages in thread
From: Florian Schmaus @ 2024-10-11 13:27 UTC (permalink / raw
  To: gentoo-commits

commit:     107e7393ad869e17db2eaab25eabc9c45f3459fd
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 11 13:25:50 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Oct 11 13:27:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=107e7393

app-misc/openhab-bin: drop 4.1.1, 4.1.2

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 app-misc/openhab-bin/Manifest                 |   2 -
 app-misc/openhab-bin/openhab-bin-4.1.1.ebuild | 103 ---------------------
 app-misc/openhab-bin/openhab-bin-4.1.2.ebuild | 124 --------------------------
 3 files changed, 229 deletions(-)

diff --git a/app-misc/openhab-bin/Manifest b/app-misc/openhab-bin/Manifest
index 837cb4dc3d59..d126cdd735dc 100644
--- a/app-misc/openhab-bin/Manifest
+++ b/app-misc/openhab-bin/Manifest
@@ -1,5 +1,3 @@
-DIST openhab-4.1.1.zip 110909555 BLAKE2B df89e2391e8abe926635fc1e0fbb5c7b1f6a03a87ba643d68a3c8bf1ef52f8b6ca862d8655112a225e1ec2f2d9cc90e0906c40a5dc00f52b53fcb4bac8059378 SHA512 50125e025e4ed8f3ea93359a777e0944150cf157b853bc3f6e777c04956c59346d77d4f3680756241d3d71b8c57014f777601cb5ca836b8e80046ce5a5aac770
-DIST openhab-4.1.2.tar.gz 110558399 BLAKE2B b77800898d5358caaadf31e921351d5431a09cf97ad881e091c0f7f7ca6efa13439f39075e15d4887df3b28d2548b10cbf44176328570cf2b8df8fc15bc25ecd SHA512 ccad90d1905f2190cd54284353981453d4d38f1206a427b91094dfd8e8a25e31cc15921544ac883f501ee33d018226b07e12e04bfd5c928771ff090826de3cba
 DIST openhab-4.2.0.tar.gz 110566875 BLAKE2B 25f07801258b958d3845cc43360eac9707416c424d61a8a2eeda55d522735bbf2690c989588cd40dee09ce72aee7aa53e2704d048645190981101cd293c5090b SHA512 83cc0c171de303bcc01198a94963933a7fde93f84a8ccf3cb27511de680576e14d03482d13abc0c0fdcbda6069a6d6f46dee44cb85f597aea2a8641c6693337a
 DIST openhab-4.2.1.tar.gz 110592664 BLAKE2B 6c1ef4ff6a25904a6bd56c5bbb5d6c08163e14723a61966930ffb96183a5890f86ddc73d316d8b48712b262eae80b7e086cdf53510d5a1a09a596b591fe3d037 SHA512 1d8b4b6b7ef4f76ecaee0355842b5bbfce9c422915bdc345e974bfe7d1c275dc4f8bc317f3e53ed6778d7875c7e7757bb3d26e68e016c1d3fbf1009a6a1e070d
 DIST openhab-cli-2024-01-14 8633 BLAKE2B 0b0999abcb884b779087b92f9f3e08fee3662753692392fbb30d218d0fc25fd1fca613c32b8193a3365764c55ac3525f8369aeea4edbf61223cd0219209c4cbf SHA512 bf24ae776d4362e8a60a0c71cb025834e5f645a24377a87484477f544026f2fdd996a1781f1082e62197fce33a9dadb5972df22ce3e4cd9f73d3088ec5bc0a98

diff --git a/app-misc/openhab-bin/openhab-bin-4.1.1.ebuild b/app-misc/openhab-bin/openhab-bin-4.1.1.ebuild
deleted file mode 100644
index 633b026c41d4..000000000000
--- a/app-misc/openhab-bin/openhab-bin-4.1.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd tmpfiles
-
-MY_PN=${PN%-bin}
-MY_P=${MY_PN}-${PV}
-
-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}.zip
-	https://raw.githubusercontent.com/openhab/openhab-linuxpkg/10061acd36524afb12a033fea6dcf142b399bf56/resources/usr/bin/openhab-cli
-		 -> openhab-cli-2024-01-14
-"
-KEYWORDS="amd64 arm64"
-
-LICENSE="EPL-2.0"
-SLOT="0"
-
-MY_JAVA_DEPEND=">=virtual/jre-17"
-
-# app-arch/zip: openhab-cli backup
-RDEPEND="
-	${MY_JAVA_DEPEND}
-	acct-user/openhab
-	app-arch/zip
-	dev-java/java-config
-"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-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-2024-01-14 openhab-cli
-}
-
-pkg_postinst() {
-	tmpfiles_process openhab.conf
-}

diff --git a/app-misc/openhab-bin/openhab-bin-4.1.2.ebuild b/app-misc/openhab-bin/openhab-bin-4.1.2.ebuild
deleted file mode 100644
index 9b1c384fe722..000000000000
--- a/app-misc/openhab-bin/openhab-bin-4.1.2.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# 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}
-
-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-2024-01-14
-"
-
-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-2024-01-14 openhab-cli
-}
-
-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
-	fi
-}


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/openhab-bin/
@ 2024-10-11 13:27 Florian Schmaus
  0 siblings, 0 replies; 12+ messages in thread
From: Florian Schmaus @ 2024-10-11 13:27 UTC (permalink / raw
  To: gentoo-commits

commit:     d282c0a1eab4676174b80e670ad0e2542df00b3c
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 11 13:26:38 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Oct 11 13:27:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d282c0a1

app-misc/openhab-bin: add 4.2.2

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 app-misc/openhab-bin/Manifest                 |   1 +
 app-misc/openhab-bin/openhab-bin-4.2.2.ebuild | 136 ++++++++++++++++++++++++++
 2 files changed, 137 insertions(+)

diff --git a/app-misc/openhab-bin/Manifest b/app-misc/openhab-bin/Manifest
index d126cdd735dc..224064b85b6b 100644
--- a/app-misc/openhab-bin/Manifest
+++ b/app-misc/openhab-bin/Manifest
@@ -1,3 +1,4 @@
 DIST openhab-4.2.0.tar.gz 110566875 BLAKE2B 25f07801258b958d3845cc43360eac9707416c424d61a8a2eeda55d522735bbf2690c989588cd40dee09ce72aee7aa53e2704d048645190981101cd293c5090b SHA512 83cc0c171de303bcc01198a94963933a7fde93f84a8ccf3cb27511de680576e14d03482d13abc0c0fdcbda6069a6d6f46dee44cb85f597aea2a8641c6693337a
 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-cli-2024-01-14 8633 BLAKE2B 0b0999abcb884b779087b92f9f3e08fee3662753692392fbb30d218d0fc25fd1fca613c32b8193a3365764c55ac3525f8369aeea4edbf61223cd0219209c4cbf SHA512 bf24ae776d4362e8a60a0c71cb025834e5f645a24377a87484477f544026f2fdd996a1781f1082e62197fce33a9dadb5972df22ce3e4cd9f73d3088ec5bc0a98

diff --git a/app-misc/openhab-bin/openhab-bin-4.2.2.ebuild b/app-misc/openhab-bin/openhab-bin-4.2.2.ebuild
new file mode 100644
index 000000000000..751af46f93e1
--- /dev/null
+++ b/app-misc/openhab-bin/openhab-bin-4.2.2.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
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/openhab-bin/
@ 2024-10-11 13:27 Florian Schmaus
  0 siblings, 0 replies; 12+ messages in thread
From: Florian Schmaus @ 2024-10-11 13:27 UTC (permalink / raw
  To: gentoo-commits

commit:     bbbfb1dce2e2137cbc5c779c52e35176596eca83
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 11 13:25:33 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Oct 11 13:27:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbbfb1dc

app-misc/openhab-bin: stabilize 4.2.1 for ALLARCHES

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 app-misc/openhab-bin/openhab-bin-4.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/openhab-bin/openhab-bin-4.2.1.ebuild b/app-misc/openhab-bin/openhab-bin-4.2.1.ebuild
index 6625624aba64..683f79d8f3fa 100644
--- a/app-misc/openhab-bin/openhab-bin-4.2.1.ebuild
+++ b/app-misc/openhab-bin/openhab-bin-4.2.1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}"
 LICENSE="EPL-2.0"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 
 MY_JAVA_DEPEND=">=virtual/jre-17"
 


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/openhab-bin/
@ 2024-08-22 12:13 Jakov Smolić
  0 siblings, 0 replies; 12+ messages in thread
From: Jakov Smolić @ 2024-08-22 12:13 UTC (permalink / raw
  To: gentoo-commits

commit:     a05c1a94b5ac79caccd98a69b1c1c3dd34bb0c93
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 22 12:13:17 2024 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Thu Aug 22 12:13:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a05c1a94

app-misc/openhab-bin: Stabilize 4.2.0-r1 ALLARCHES, #938307

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 app-misc/openhab-bin/openhab-bin-4.2.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/openhab-bin/openhab-bin-4.2.0-r1.ebuild b/app-misc/openhab-bin/openhab-bin-4.2.0-r1.ebuild
index 6625624aba64..683f79d8f3fa 100644
--- a/app-misc/openhab-bin/openhab-bin-4.2.0-r1.ebuild
+++ b/app-misc/openhab-bin/openhab-bin-4.2.0-r1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}"
 LICENSE="EPL-2.0"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 
 MY_JAVA_DEPEND=">=virtual/jre-17"
 


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/openhab-bin/
@ 2024-07-15 19:39 Florian Schmaus
  0 siblings, 0 replies; 12+ messages in thread
From: Florian Schmaus @ 2024-07-15 19:39 UTC (permalink / raw
  To: gentoo-commits

commit:     9202180ebae8503530b64581707584f4834eaf2b
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 19:38:50 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 19:38:50 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9202180e

app-misc/openhab-bin: add 4.2.0

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 app-misc/openhab-bin/Manifest                 |   1 +
 app-misc/openhab-bin/openhab-bin-4.2.0.ebuild | 124 ++++++++++++++++++++++++++
 2 files changed, 125 insertions(+)

diff --git a/app-misc/openhab-bin/Manifest b/app-misc/openhab-bin/Manifest
index 3a246139f423..2172c7bf4447 100644
--- a/app-misc/openhab-bin/Manifest
+++ b/app-misc/openhab-bin/Manifest
@@ -1,3 +1,4 @@
 DIST openhab-4.1.1.zip 110909555 BLAKE2B df89e2391e8abe926635fc1e0fbb5c7b1f6a03a87ba643d68a3c8bf1ef52f8b6ca862d8655112a225e1ec2f2d9cc90e0906c40a5dc00f52b53fcb4bac8059378 SHA512 50125e025e4ed8f3ea93359a777e0944150cf157b853bc3f6e777c04956c59346d77d4f3680756241d3d71b8c57014f777601cb5ca836b8e80046ce5a5aac770
 DIST openhab-4.1.2.tar.gz 110558399 BLAKE2B b77800898d5358caaadf31e921351d5431a09cf97ad881e091c0f7f7ca6efa13439f39075e15d4887df3b28d2548b10cbf44176328570cf2b8df8fc15bc25ecd SHA512 ccad90d1905f2190cd54284353981453d4d38f1206a427b91094dfd8e8a25e31cc15921544ac883f501ee33d018226b07e12e04bfd5c928771ff090826de3cba
+DIST openhab-4.2.0.tar.gz 110566875 BLAKE2B 25f07801258b958d3845cc43360eac9707416c424d61a8a2eeda55d522735bbf2690c989588cd40dee09ce72aee7aa53e2704d048645190981101cd293c5090b SHA512 83cc0c171de303bcc01198a94963933a7fde93f84a8ccf3cb27511de680576e14d03482d13abc0c0fdcbda6069a6d6f46dee44cb85f597aea2a8641c6693337a
 DIST openhab-cli-2024-01-14 8633 BLAKE2B 0b0999abcb884b779087b92f9f3e08fee3662753692392fbb30d218d0fc25fd1fca613c32b8193a3365764c55ac3525f8369aeea4edbf61223cd0219209c4cbf SHA512 bf24ae776d4362e8a60a0c71cb025834e5f645a24377a87484477f544026f2fdd996a1781f1082e62197fce33a9dadb5972df22ce3e4cd9f73d3088ec5bc0a98

diff --git a/app-misc/openhab-bin/openhab-bin-4.2.0.ebuild b/app-misc/openhab-bin/openhab-bin-4.2.0.ebuild
new file mode 100644
index 000000000000..9b1c384fe722
--- /dev/null
+++ b/app-misc/openhab-bin/openhab-bin-4.2.0.ebuild
@@ -0,0 +1,124 @@
+# 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}
+
+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-2024-01-14
+"
+
+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-2024-01-14 openhab-cli
+}
+
+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
+	fi
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/openhab-bin/
@ 2024-07-15 19:39 Florian Schmaus
  0 siblings, 0 replies; 12+ messages in thread
From: Florian Schmaus @ 2024-07-15 19:39 UTC (permalink / raw
  To: gentoo-commits

commit:     a4c3e76f042074370e93beb05796a25da93574a1
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 19:38:15 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 19:38:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4c3e76f

app-misc/openhab-bin: add update logic

Closes: https://bugs.gentoo.org/935737
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 app-misc/openhab-bin/openhab-bin-4.1.2.ebuild | 29 +++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/app-misc/openhab-bin/openhab-bin-4.1.2.ebuild b/app-misc/openhab-bin/openhab-bin-4.1.2.ebuild
index 9c559963aaa1..9b1c384fe722 100644
--- a/app-misc/openhab-bin/openhab-bin-4.1.2.ebuild
+++ b/app-misc/openhab-bin/openhab-bin-4.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit systemd tmpfiles
+inherit edo systemd tmpfiles
 
 MY_PN=${PN%-bin}
 MY_P=${MY_PN}-${PV}
@@ -15,11 +15,13 @@ SRC_URI="
 	https://raw.githubusercontent.com/openhab/openhab-linuxpkg/10061acd36524afb12a033fea6dcf142b399bf56/resources/usr/bin/openhab-cli
 		 -> openhab-cli-2024-01-14
 "
-KEYWORDS="~amd64 ~arm64"
 
+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"
@@ -32,8 +34,6 @@ RDEPEND="
 
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}"
-
 src_compile() {
 	:
 }
@@ -100,4 +100,25 @@ EOF
 
 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
+	fi
 }


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/openhab-bin/
@ 2024-03-29  9:29 Florian Schmaus
  0 siblings, 0 replies; 12+ messages in thread
From: Florian Schmaus @ 2024-03-29  9:29 UTC (permalink / raw
  To: gentoo-commits

commit:     061ac696d02008d87fbfdcf40c04167f96f1126e
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 29 09:25:29 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Mar 29 09:29:37 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=061ac696

app-misc/openhab-bin: add 4.1.2

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 app-misc/openhab-bin/Manifest                 |   1 +
 app-misc/openhab-bin/openhab-bin-4.1.2.ebuild | 103 ++++++++++++++++++++++++++
 2 files changed, 104 insertions(+)

diff --git a/app-misc/openhab-bin/Manifest b/app-misc/openhab-bin/Manifest
index a1e936b40038..3a246139f423 100644
--- a/app-misc/openhab-bin/Manifest
+++ b/app-misc/openhab-bin/Manifest
@@ -1,2 +1,3 @@
 DIST openhab-4.1.1.zip 110909555 BLAKE2B df89e2391e8abe926635fc1e0fbb5c7b1f6a03a87ba643d68a3c8bf1ef52f8b6ca862d8655112a225e1ec2f2d9cc90e0906c40a5dc00f52b53fcb4bac8059378 SHA512 50125e025e4ed8f3ea93359a777e0944150cf157b853bc3f6e777c04956c59346d77d4f3680756241d3d71b8c57014f777601cb5ca836b8e80046ce5a5aac770
+DIST openhab-4.1.2.tar.gz 110558399 BLAKE2B b77800898d5358caaadf31e921351d5431a09cf97ad881e091c0f7f7ca6efa13439f39075e15d4887df3b28d2548b10cbf44176328570cf2b8df8fc15bc25ecd SHA512 ccad90d1905f2190cd54284353981453d4d38f1206a427b91094dfd8e8a25e31cc15921544ac883f501ee33d018226b07e12e04bfd5c928771ff090826de3cba
 DIST openhab-cli-2024-01-14 8633 BLAKE2B 0b0999abcb884b779087b92f9f3e08fee3662753692392fbb30d218d0fc25fd1fca613c32b8193a3365764c55ac3525f8369aeea4edbf61223cd0219209c4cbf SHA512 bf24ae776d4362e8a60a0c71cb025834e5f645a24377a87484477f544026f2fdd996a1781f1082e62197fce33a9dadb5972df22ce3e4cd9f73d3088ec5bc0a98

diff --git a/app-misc/openhab-bin/openhab-bin-4.1.2.ebuild b/app-misc/openhab-bin/openhab-bin-4.1.2.ebuild
new file mode 100644
index 000000000000..9c559963aaa1
--- /dev/null
+++ b/app-misc/openhab-bin/openhab-bin-4.1.2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd tmpfiles
+
+MY_PN=${PN%-bin}
+MY_P=${MY_PN}-${PV}
+
+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-2024-01-14
+"
+KEYWORDS="~amd64 ~arm64"
+
+LICENSE="EPL-2.0"
+SLOT="0"
+
+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"
+
+S="${WORKDIR}"
+
+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-2024-01-14 openhab-cli
+}
+
+pkg_postinst() {
+	tmpfiles_process openhab.conf
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/openhab-bin/
@ 2024-03-12 14:02 Florian Schmaus
  0 siblings, 0 replies; 12+ messages in thread
From: Florian Schmaus @ 2024-03-12 14:02 UTC (permalink / raw
  To: gentoo-commits

commit:     a695ebdf917fc63baab7f4a9abd7f1b0928179d6
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 12 14:01:23 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Mar 12 14:01:58 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a695ebdf

app-misc/openhab-bin: mark ALLARCHES

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 app-misc/openhab-bin/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-misc/openhab-bin/metadata.xml b/app-misc/openhab-bin/metadata.xml
index c25da2ef63e2..cf8ad5f41cdd 100644
--- a/app-misc/openhab-bin/metadata.xml
+++ b/app-misc/openhab-bin/metadata.xml
@@ -5,6 +5,7 @@
 		<name>Florian Schmaus</name>
 		<email>flow@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">openhab/openhab-core</remote-id>
 	</upstream>


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/openhab-bin/
@ 2024-03-12 14:02 Florian Schmaus
  0 siblings, 0 replies; 12+ messages in thread
From: Florian Schmaus @ 2024-03-12 14:02 UTC (permalink / raw
  To: gentoo-commits

commit:     2dc05839f77f0149159f4a764a56701afb4ed4ec
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 12 14:01:45 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Mar 12 14:01:58 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dc05839

app-misc/openhab-bin: stabilize 4.1.1 for ALLARCHES

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 app-misc/openhab-bin/openhab-bin-4.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-misc/openhab-bin/openhab-bin-4.1.1.ebuild b/app-misc/openhab-bin/openhab-bin-4.1.1.ebuild
index 9329ab0ccca3..633b026c41d4 100644
--- a/app-misc/openhab-bin/openhab-bin-4.1.1.ebuild
+++ b/app-misc/openhab-bin/openhab-bin-4.1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 	https://raw.githubusercontent.com/openhab/openhab-linuxpkg/10061acd36524afb12a033fea6dcf142b399bf56/resources/usr/bin/openhab-cli
 		 -> openhab-cli-2024-01-14
 "
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 
 LICENSE="EPL-2.0"
 SLOT="0"


^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2024-11-10 10:10 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-22  9:51 [gentoo-commits] repo/gentoo:master commit in: app-misc/openhab-bin/ Florian Schmaus
  -- strict thread matches above, loose matches on Subject: below --
2024-11-10 10:10 Florian Schmaus
2024-11-10 10:10 Florian Schmaus
2024-10-11 13:27 Florian Schmaus
2024-10-11 13:27 Florian Schmaus
2024-10-11 13:27 Florian Schmaus
2024-08-22 12:13 Jakov Smolić
2024-07-15 19:39 Florian Schmaus
2024-07-15 19:39 Florian Schmaus
2024-03-29  9:29 Florian Schmaus
2024-03-12 14:02 Florian Schmaus
2024-03-12 14:02 Florian Schmaus

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox