6 files changed, 218 insertions, 5 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index efde99b97c7a..6060d93ddb95 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index 9a5d00fcca54..3048dbcdeeca 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -1,3 +1,5 @@
 DIST gnote-45.2.tar.xz 3248256 BLAKE2B ab687802aa6046556c579f1a11fb807398e69f2a256a8a63f50ea76bbcdfc8708ead603f25274b678912bb567c45e96bfe708ea2d56f9733ee1e6061195826bf SHA512 5380a50cfbf235b0007c47c3a1f4860ade599789e1746a7741fc672265698bb0717858bb39e5c0612d4d4e13040f1865674ddeda1427a4818aff508ba5ce8059
+DIST gnote-46.0.tar.xz 3414728 BLAKE2B c53c4f1b5fa1c1dc0105f52736913ef3562a95e324fe4693e4b2729d5cc3ce47ab97ab8c22e2edb124a7cdd94c735b2b8417a02f88a9c23a310a027452fe8c3d SHA512 a56557ed1d5adb3d5416d8032218c953204737dd813e09c13875a084fd579145f94470b61d8c2322d01dba06ad0bb26d553e5009f5d3e10db284afc8b42e0b79
 EBUILD gnote-45.2.ebuild 1439 BLAKE2B 91c1ac5e65a8ace5485af39981af020d3a948aa2e848b2f4b0b6ea25a978523706c0fe92add93bd4391b0d09dd923a34a0039570fdd009e51a1937b2404199ae SHA512 8a333602a7693217dad23efc085f459fcddd4832d58d17e1a7b3655d8d947320731ddb4861185b6cb2632643c3eda439e232b537d507151257bd9dbf774b5482
+EBUILD gnote-46.0.ebuild 1470 BLAKE2B 6d7156980e5005a47cd6b81100d2a4e820ae5478f212b6018a6bcf22387527c15b6df6be7e913a49a8d7447d492ac3d50fc81070336adfa6a6c6408b48272775 SHA512 5ab134dfa4e35a630d517cf2fe99cc82035de271c27db93485578349f66af2275ef1fbb5e47d8cf2499f7eb22001d56a33a63967517856eac4871ebd152e87f9
 MISC metadata.xml 346 BLAKE2B dd5d67f5f5f2bd3205f8087ee8abab196289213b451493bcb0e059f902482449329bf03e9cd44e13cb72a347b4ee97f6b1cdf771c0723bcb93b06dcda9a3cb00 SHA512 0f177f3c20fb7215c21a2df360abfdab37bac8cc8b1405d31cd76d552d65661762a929972b0bed0a4c46b7f9c4b053b9a544209282db688699208b5ba0ccec64
diff --git a/app-misc/gnote/gnote-46.0.ebuild b/app-misc/gnote/gnote-46.0.ebuild
new file mode 100644
index 000000000000..80e0527a52d9
--- /dev/null
+++ b/app-misc/gnote/gnote-46.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2 meson readme.gentoo-r1
+
+DESCRIPTION="Desktop note-taking application"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnote"
+
+LICENSE="GPL-3+ FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/glib-2.74:2[dbus]
+	>=dev-cpp/glibmm-2.74:2.68
+	>=dev-cpp/gtkmm-4.10.0:4.0
+	>=gui-libs/libadwaita-1
+	>=app-crypt/libsecret-0.8
+	>=dev-libs/libxml2-2:2
+	dev-libs/libxslt
+	>=sys-apps/util-linux-2.16
+	test? ( dev-libs/unittest++ )
+"
+RDEPEND="${DEPEND}
+	gnome-base/gsettings-desktop-schemas
+"
+BDEPEND="
+	dev-util/itstool
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	# Build system requires UnitTest++ >=1.5.1, but the .pc file doesn't
+	# specify a version
+	sed -i -e "/UnitTest++/ s/version: [^,]*,//" meson.build || die
+	if ! use test; then
+		sed -i -e "/unit_test_pp/ s/ = .*/ = disabler()/" meson.build || die
+	fi
+
+	if has_version net-fs/wdfs; then
+		DOC_CONTENTS="You have net-fs/wdfs installed. app-misc/gnote will use it to
+		synchronize notes."
+	else
+		DOC_CONTENTS="Gnote can use net-fs/wdfs to synchronize notes.
+		If you want to use that functionality just emerge net-fs/wdfs.
+		Gnote will automatically detect that you did and let you use it."
+	fi
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/app-misc/openhab-bin/Manifest b/app-misc/openhab-bin/Manifest
index 55cd1f315360..2313bc55a76d 100644
--- a/app-misc/openhab-bin/Manifest
+++ b/app-misc/openhab-bin/Manifest
@@ -3,7 +3,9 @@ AUX openhab.service 518 BLAKE2B f00b13946a588b1b2b9f94775d5ef281cac777888426bd97
 AUX openhab.tmpfiles 352 BLAKE2B 23bab4c007c924cdfaa602654f19030d702b855f3baf62aaa016d944c8caf4f93252ae3ab9b3442ff6a8a528fcdd7a12f9767c29bfed7837c8f2cc2594955c26 SHA512 cb7cc7483915512f65664a9439b07c25b15c3066f321c8087cece2803e937392f9f0888a5c836949632c9b0974fb2d6cc577d8f785423cd42aa6ba575ba8fcc2
 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
 EBUILD openhab-bin-4.1.1.ebuild 2229 BLAKE2B 378e56fb29a89c02be2c61eaa6d9e1bd5389d06b82ddb3409419b528c96f33f492485723ce5358d28cf9313862462ced24418f172bd1868a4e0974b877bec665 SHA512 6fecb3a02da8a16c51b8a17e0acb441f8aa21d214e0ac8d52c47d2b9e3550638c4e34515ea54bac666b0612664afd100ebd4cf59363161aa8078b6c0a261a54e
-EBUILD openhab-bin-4.1.2.ebuild 2244 BLAKE2B 9e6f9c61937fe32523066b01953f62e7d2249f3d05a5aa3e034f4950cec32828490f10ffff41dd2f0381f8967d4bd924b3255ec663f49a4910c384756ec1701a SHA512 34f7258cfea7fd1bcd8647e76bf956fb776a53b7701bd036116b59dabc9ce3e2a3408e1ea79d9744ab730fc19de8dca6e96cf1da089e77bbadf99bdebb10deb7
+EBUILD openhab-bin-4.1.2.ebuild 2801 BLAKE2B d6d1f91d0b2838b4d9e4591631cd9b94a38ae21c1638dd61762ff5211ceb2adceee4ed43baf2db0872aa3aa7a77afa999e0c6af254eaf0b07b2c4edfc4bf7e77 SHA512 5a705405daa98005bc7cef3984cca7194231d67a8f8ae298882929cbd5778088faf627331c7866994ab58d35a2c977671ce9b6c81661811de1f8e013c2bdbdbf
+EBUILD openhab-bin-4.2.0.ebuild 2801 BLAKE2B d6d1f91d0b2838b4d9e4591631cd9b94a38ae21c1638dd61762ff5211ceb2adceee4ed43baf2db0872aa3aa7a77afa999e0c6af254eaf0b07b2c4edfc4bf7e77 SHA512 5a705405daa98005bc7cef3984cca7194231d67a8f8ae298882929cbd5778088faf627331c7866994ab58d35a2c977671ce9b6c81661811de1f8e013c2bdbdbf
 MISC metadata.xml 355 BLAKE2B 36aabcc2d06a2d16b5ebe20ac5d7a9edbbe1121e5b7ea65206142dc56ef2258141d4618883aa5121acb73b7a275d955dffa44219b2fcc0fc77d3ca5eaf79225e SHA512 09a9f603096ad6b0f806d53b4454a899a8692b98ff2b8721d4095c382ff09c928236f1c7400a2132d33a4b5949d6f18e48325dccb49b51eb662c0447845d2862
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
 }
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
+}