5 files changed, 137 insertions, 112 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index e3fdde08bd9b..22e67b2fa8af 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/fastfetch/Manifest b/app-misc/fastfetch/Manifest
index d6468386641b..9886b9a3d643 100644
--- a/app-misc/fastfetch/Manifest
+++ b/app-misc/fastfetch/Manifest
@@ -1,11 +1,9 @@
 DIST fastfetch-2.18.1.tar.gz 1067696 BLAKE2B 96d4ab7d1ee455029c846690eed65a2ae31f6e4f659c9e609c4c0f3cdd3703af0d8b45e1ce12d7399305f9c3a186958037adfbd9c52b399d15bc3bbb074a2cd5 SHA512 f30e2123cc1f98453bb01ae8291d57f8678a1cfd7348f3046de3735d214a7f965240d6e3cf4983c1933531e6bab1e35632af5399fcb6ca0ebf0592b7a929efba
-DIST fastfetch-2.19.1.tar.gz 1075300 BLAKE2B 66cc78bdda56c59abf5adf626159493c0e36d9519b59ad5fc4aeba6af24a5d82a14ad234820a4b548511e935191cbaeb64a3e7c77d29fe2c2d9fe39601229dc1 SHA512 ea45f42c016a5a32f2fc6255eac1076adb3a5f223a27cae3304d76f9df10a5043ccfbbc63ae7f7da2188462ceacb5fc65e9884749de7c4f75afdbcb8a102fca0
 DIST fastfetch-2.20.0.tar.gz 1076860 BLAKE2B 61c50a4c96962063f18ae895d2f7cbe505c9276fcba8fb5a3d7e9cc6b6854709cdb955681a868b23421f172f5cecfa51fb526f17d6800e072d96698efe7758bb SHA512 96b02688d8817ef84bb926ffa3c77ee95c8d402a6f1e5daeb8170484e6092f953f05a5ab463cdce544adb052a1e89b4ee530cc9f09e54223d5f666099e0ad6dc
 DIST fastfetch-2.21.3.tar.gz 1093534 BLAKE2B dca99e337e1239958add6323c159f58de5f38fe92c9a7c778d04b127e1467066948e4bc5503afb1054ccbab914eb35d8f35cd2a3cb88bf2ba595255fac5f2ece SHA512 e097d9360b7c5b93b30ad117e47ae5375c48c7e941eaaa56ee5f39b7757374c1ecfe321bec0999ee81aa52deff1be001ff057b621d34a90e95ec6ea83bf9f0b6
 EBUILD fastfetch-0.1.9999.ebuild 3071 BLAKE2B 51b348d9d27d50695ccafb160664ce89b0d35a78f0bd07033e834292fe7208c3af4ca444eecf32943b9f326eab42a6b1fdc063429b982c29afa68c19056ac986 SHA512 ad27632d45a755b34f920171f2a51b120eabc733a60842ed778ebc3c7808013baddd3bf64ac0bdb44940c66bb2c9b955b6f662678a7d8e6a2625fa9739bf1b77
 EBUILD fastfetch-0.2.9999.ebuild 3071 BLAKE2B 51b348d9d27d50695ccafb160664ce89b0d35a78f0bd07033e834292fe7208c3af4ca444eecf32943b9f326eab42a6b1fdc063429b982c29afa68c19056ac986 SHA512 ad27632d45a755b34f920171f2a51b120eabc733a60842ed778ebc3c7808013baddd3bf64ac0bdb44940c66bb2c9b955b6f662678a7d8e6a2625fa9739bf1b77
 EBUILD fastfetch-2.18.1.ebuild 3168 BLAKE2B d5e654ba70033325acdb83737599a0fee28e5b2249be9153ae6692aedee291f175e538e9d4bf24f9bc3104cbe5d59450fba0a40ce834b2e407a68bf0aee17bda SHA512 8fc41ddf206bd85a4fee1e13e841150de726055203c157cea21244306b86badab8a1cfd429cfd0fd2c0f4d22176242203ff9b75d56441acbb1f2a3aae0b8b2ac
-EBUILD fastfetch-2.19.1.ebuild 3171 BLAKE2B 5031d992b8479b0f0c63eb04ead13a539cd8742b871e5ed3c5715655a875be907b4ad918ca668e655e84ab74b61865cdff2bec645d85d5f5e6cc81db2d913827 SHA512 09b9f5e5e3fdd58030cb6e15d4b2a671988655a6962e7568af146001d3c0a80250d6d498fcf4b4f8bcfa72946d94b4d212c7f5afb65f6b72def174bba1cf7d73
 EBUILD fastfetch-2.20.0.ebuild 3171 BLAKE2B 5031d992b8479b0f0c63eb04ead13a539cd8742b871e5ed3c5715655a875be907b4ad918ca668e655e84ab74b61865cdff2bec645d85d5f5e6cc81db2d913827 SHA512 09b9f5e5e3fdd58030cb6e15d4b2a671988655a6962e7568af146001d3c0a80250d6d498fcf4b4f8bcfa72946d94b4d212c7f5afb65f6b72def174bba1cf7d73
 EBUILD fastfetch-2.21.3.ebuild 3129 BLAKE2B 26aeadd80187f54529aa4e622340e0e1fbe0e14a0f6cfaa2a880f6d8e8498619e8c259f0d78ce105501545bc8d3526be5b7f2e3888bc1da55c59d3eb8d82f2f7 SHA512 24218099828cda2889310d74ff9e0b32dfa9dfd3e3d1f231ef0e17fb16439d9a0256a675a9d2713487c177465ec0e8684664b954f88255716320e7fd59ae956f
 MISC metadata.xml 1179 BLAKE2B 8d17b388fd4cec14661b39e56997c818a1aaff73b52de225f5697d85e1042a50a0cef77d7b1636dd3caa852ae459d5bb00b0d0e3072769b4aa2db3d58366edf1 SHA512 bb2c646dcd7196406c2c16ea12c51f029c3f31b6a50e9c5cd7c2877650d50f5e03802d67006422b7e8fb2fafa241db5fd01d29321cdd1726bd5210f532b3b77d
diff --git a/app-misc/fastfetch/fastfetch-2.19.1.ebuild b/app-misc/fastfetch/fastfetch-2.19.1.ebuild
deleted file mode 100644
index ffccfb73cae0..000000000000
--- a/app-misc/fastfetch/fastfetch-2.19.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Fast neofetch-like system information tool"
-HOMEPAGE="https://github.com/fastfetch-cli/fastfetch"
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/fastfetch-cli/fastfetch.git"
-	[[ ${PV} == *0.1.9999 ]] && EGIT_BRANCH=master
-	[[ ${PV} == *0.2.9999 ]] && EGIT_BRANCH=dev
-	[[ "${EGIT_BRANCH}" == "" ]] && die "Please set a git branch"
-else
-	SRC_URI="https://github.com/fastfetch-cli/fastfetch/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="X chafa dbus ddcutil drm gnome imagemagick networkmanager opencl opengl osmesa pulseaudio sqlite test vulkan wayland xcb xfce xrandr"
-RESTRICT="!test? ( test )"
-
-# note - qa-vdb will always report errors because fastfetch loads the libs dynamically
-# make sure to crank yyjson minimum version to match bundled version
-RDEPEND="
-	>=dev-libs/yyjson-0.10.0
-	sys-libs/zlib
-	X? ( x11-libs/libX11 )
-	chafa? ( media-gfx/chafa )
-	dbus? ( sys-apps/dbus )
-	ddcutil? ( app-misc/ddcutil:= )
-	drm? ( x11-libs/libdrm )
-	gnome? (
-		dev-libs/glib
-		gnome-base/dconf
-	)
-	imagemagick? ( media-gfx/imagemagick:= )
-	networkmanager? ( net-misc/networkmanager )
-	opencl? ( virtual/opencl )
-	opengl? ( media-libs/libglvnd[X] )
-	osmesa? ( media-libs/mesa[osmesa] )
-	pulseaudio? ( media-libs/libpulse )
-	sqlite? ( dev-db/sqlite:3 )
-	vulkan? (
-		media-libs/vulkan-loader
-		sys-apps/pciutils
-	)
-	wayland? ( dev-libs/wayland )
-	xcb? ( x11-libs/libxcb )
-	xfce? ( xfce-base/xfconf )
-	xrandr? ( x11-libs/libXrandr )
-"
-DEPEND="
-	${RDEPEND}
-	vulkan? ( dev-util/vulkan-headers )
-"
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="
-	xrandr? ( X )
-	chafa? ( imagemagick )
-"
-
-src_configure() {
-	local fastfetch_enable_imagemagick7=no
-	local fastfetch_enable_imagemagick6=no
-	if use imagemagick; then
-		fastfetch_enable_imagemagick7=$(has_version '>=media-gfx/imagemagick-7.0.0' && echo yes || echo no)
-		fastfetch_enable_imagemagick6=$(has_version '<media-gfx/imagemagick-7.0.0' && echo yes || echo no)
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_RPM=no
-		-DENABLE_ZLIB=yes
-		-DENABLE_SYSTEM_YYJSON=yes
-		-DIS_MUSL=$(usex elibc_musl)
-		-DINSTALL_LICENSE=no
-
-		-DENABLE_CHAFA=$(usex chafa)
-		-DENABLE_DBUS=$(usex dbus)
-		-DENABLE_DCONF=$(usex gnome)
-		-DENABLE_DDCUTIL=$(usex ddcutil)
-		-DENABLE_DRM=$(usex drm)
-		-DENABLE_EGL=$(usex opengl)
-		-DENABLE_GIO=$(usex gnome)
-		-DENABLE_GLX=$(usex opengl)
-		-DENABLE_IMAGEMAGICK6=${fastfetch_enable_imagemagick6}
-		-DENABLE_IMAGEMAGICK7=${fastfetch_enable_imagemagick7}
-		-DENABLE_LIBNM=$(usex networkmanager)
-		-DENABLE_OPENCL=$(usex opencl)
-		-DENABLE_OSMESA=$(usex osmesa)
-		-DENABLE_PULSE=$(usex pulseaudio)
-		-DENABLE_SQLITE3=$(usex sqlite)
-		-DENABLE_VULKAN=$(usex vulkan)
-		-DENABLE_WAYLAND=$(usex wayland)
-		-DENABLE_X11=$(usex X)
-		-DENABLE_XCB=$(usex xcb)
-		-DENABLE_XCB_RANDR=$(usex xcb)
-		-DENABLE_XFCONF=$(usex xfce)
-		-DENABLE_XRANDR=$(usex xrandr)
-		-DBUILD_TESTS=$(usex test)
-	)
-
-	append-cppflags -DNDEBUG
-
-	cmake_src_configure
-}
diff --git a/app-misc/openhab-bin/Manifest b/app-misc/openhab-bin/Manifest
index f416a13e71a1..28368ee1aac2 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.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
 EBUILD openhab-bin-4.1.1.ebuild 2229 BLAKE2B 378e56fb29a89c02be2c61eaa6d9e1bd5389d06b82ddb3409419b528c96f33f492485723ce5358d28cf9313862462ced24418f172bd1868a4e0974b877bec665 SHA512 6fecb3a02da8a16c51b8a17e0acb441f8aa21d214e0ac8d52c47d2b9e3550638c4e34515ea54bac666b0612664afd100ebd4cf59363161aa8078b6c0a261a54e
 EBUILD openhab-bin-4.1.2.ebuild 2801 BLAKE2B d6d1f91d0b2838b4d9e4591631cd9b94a38ae21c1638dd61762ff5211ceb2adceee4ed43baf2db0872aa3aa7a77afa999e0c6af254eaf0b07b2c4edfc4bf7e77 SHA512 5a705405daa98005bc7cef3984cca7194231d67a8f8ae298882929cbd5778088faf627331c7866994ab58d35a2c977671ce9b6c81661811de1f8e013c2bdbdbf
 EBUILD openhab-bin-4.2.0-r1.ebuild 3176 BLAKE2B 5d59ee97a386952137cf9c391dc99160977efc70e30f5261149c7e9bd625c923198c65532f8d8398cdb2c6fb5fb9d5b80e88ea299675b72b5db498e44ea02193 SHA512 64ca9c1e4e079d026b8dc51cd997010735b690e9666b3d2fb898de01b2c18b3f8cb862dc15d0aeb7b138990f63b9c430ee3082cf5358d8f8bbf9de0984e1b86d
+EBUILD openhab-bin-4.2.1.ebuild 3176 BLAKE2B 5d59ee97a386952137cf9c391dc99160977efc70e30f5261149c7e9bd625c923198c65532f8d8398cdb2c6fb5fb9d5b80e88ea299675b72b5db498e44ea02193 SHA512 64ca9c1e4e079d026b8dc51cd997010735b690e9666b3d2fb898de01b2c18b3f8cb862dc15d0aeb7b138990f63b9c430ee3082cf5358d8f8bbf9de0984e1b86d
 MISC metadata.xml 355 BLAKE2B 36aabcc2d06a2d16b5ebe20ac5d7a9edbbe1121e5b7ea65206142dc56ef2258141d4618883aa5121acb73b7a275d955dffa44219b2fcc0fc77d3ca5eaf79225e SHA512 09a9f603096ad6b0f806d53b4454a899a8692b98ff2b8721d4095c382ff09c928236f1c7400a2132d33a4b5949d6f18e48325dccb49b51eb662c0447845d2862
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
+}