6 files changed, 223 insertions, 0 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 29af2798a2cb..e102bfbf04ff 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index c68ed18692e0..6686b30ab5c6 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,5 +1,8 @@
 AUX gramps-5.1.3-test_locale.patch 1195 BLAKE2B 1b1aeb08b90bff9db9d028499428efa60a16b48597bcf466c07a77e3f658c8550eca84b899047d1bc6e20eb26e8dfab9637ae7aced1b99167466ea6c51707132 SHA512 70daee9afdce0f939ad3cec094fb4004f5c162e6b49849f83486db5baec074a8673d7a6096a367279019712a11f0b40e827f6cb3019e7dc3cc6bad327fee35ec
 AUX gramps-5.1.6-pep517_setup.patch 5873 BLAKE2B 62b8ca02f318c318e019366f35e39bda53fd000c8389cf1c4edfc673df008029d475c8667e69e25e3f27edbcce2f64e71d21fad43657bcfeb449b00ac7d9f2c0 SHA512 98a3807916f624b81f92cdbac1296fa9e91dd796b73d206da8561c61d45ead48bb178894cf0793471bb798f82d114a9fb3de1f0f0252cff7356402d0ba6111cb
+AUX gramps-5.2.1-test_locale.patch 1192 BLAKE2B 74c870c893a5187e5f73cd5f7fd4e5b667d6dc07984ce573ac4b1e3235f5ddc525ebe69e52edf49e9b884668e6ad5ad48f17b3b687cc5a3862a673ad3b057044 SHA512 5266e3fffde071f345e191c3c47dc74683ea645973e7a3863ab2e27d44ac7de12d5d075e67b6dcd44c7f8397dc1f11ee79515ef2903c76edab233c76bc907f21
 DIST gramps-5.1.6.tar.gz 17429153 BLAKE2B fe94d80ff209e1f27ec1cfa533e916514336c1d367435e0a9da4b8309efbc9c047302a67ec24e28237eaead67ff63e76bd1384ac1e3df10e08ae98aca126566b SHA512 419bbfa54ca3bf33e71fd579c84a56eebe4afc78ccd50c23b2d62869684709ccbf373e8da0e65835d9fc21a29d2d144597d6cf8c425e14c91574535d4b1ab64d
+DIST gramps-5.2.1.tar.gz 21059645 BLAKE2B 0fda7a637abe4f7f8019d113cc62b353f4e3628274e614cf8778b4c8303f68951ccb5ca7356faf7bce58ee399da1aa33f70ac482d995c60c9103eed9bae3b490 SHA512 ac7b9bd1bccf1094ccf91d3fec5cf1ed7327911d314c05b544c15aaf7681c0b5acd4088411200e23a70bcd965297107ea5deaf5c200b6b144b24d16e085c613e
 EBUILD gramps-5.1.6-r3.ebuild 2425 BLAKE2B d66caf7c462d2be3d243423094937cedb34517baf7991d9ede070f608fe8122172d095c08ea95e5f2e0fc468fddebc1fd4a27a7601995107ea1868cf769f934a SHA512 07996daac28aa12585ae5699e6a89f5e591967b8d0c89ae7c27a326cee17062284a39e14144ea236d9726aa9f6ec594f4664e893532f04a98205a7b859f21dff
+EBUILD gramps-5.2.1.ebuild 2135 BLAKE2B fa5da654fa64905402136b33965f9e635e64b5e7e91b90f4adc4318ab98372dd2783dfc608f5085af4d0b65a04c6ef139f981093758d528848e7e409975aa707 SHA512 8b7e627ed422d557a9fc062f7fab5326bcfa26955ea72341aefcc0e96ffa61b5e923088313166cc1d28d10448e109d955c4e131ee97244f35960d604e2eaf88f
 MISC metadata.xml 5599 BLAKE2B a7156f87c83c95d4205c25274e04ca063a8f2246301e62c6f7854a6bb585fc895481d9accb9c6c48e30c09ccc472c81193b2d1b514fe0b53a3681f182c9922ba SHA512 41089a951759e1a3aa67009681b9f1da3ecfb92d71afe003a6560ebe268b670b9ca58b5adb397830b6538d722a31771d5b2ad1ec015f154c7739870821257cc7
diff --git a/app-misc/gramps/files/gramps-5.2.1-test_locale.patch b/app-misc/gramps/files/gramps-5.2.1-test_locale.patch
new file mode 100644
index 000000000000..e1e0b7997075
--- /dev/null
+++ b/app-misc/gramps/files/gramps-5.2.1-test_locale.patch
@@ -0,0 +1,30 @@
+GEDCOM-import tests explicitly set the locale to en_US.UTF8 because they
+assume a US date and time format. That locale is not guaranteed to be
+present and checking that in ebuild is a hassle, therefore use C.UTF8
+instead - it's similar enough.
+
+--- a/data/tests/imp_sample.gramps
++++ b/data/tests/imp_sample.gramps
+@@ -1719,7 +1719,7 @@
+       </style>
+     </note>
+     <note handle="_000000fa000000fa" change="1695230065" id="N0037" type="General">
+-      <text>Objects referenced by this note were missing in a file imported on 12/25/1999 12:00:00 AM.</text>
++      <text>Objects referenced by this note were missing in a file imported on 12/25/99 00:00:00.</text>
+     </note>
+   </notes>
+ </database>
+--- a/gramps/plugins/test/imports_test.py
++++ b/gramps/plugins/test/imports_test.py
+@@ -54,10 +54,7 @@
+ # ------------------------------------------------------------------
+ 
+ # These tests assume a US date and time format.
+-try:
+-    locale.setlocale(locale.LC_ALL, "en_US.utf8")
+-except locale.Error:  # seems to fail on Windows system for some reason
+-    locale.setlocale(locale.LC_ALL, "English_United States")
++locale.setlocale(locale.LC_ALL, "C.utf8")
+ 
+ 
+ def mock_time(*args):
diff --git a/app-misc/gramps/gramps-5.2.1.ebuild b/app-misc/gramps/gramps-5.2.1.ebuild
new file mode 100644
index 000000000000..302a27877ada
--- /dev/null
+++ b/app-misc/gramps/gramps-5.2.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 2001-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Community genealogy program aiming to be both intuitive and feature-complete"
+HOMEPAGE="https://gramps-project.org/"
+SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="exif geo postscript +rcs +reports spell test"
+
+# Many tests fail unless the deprecated BerkeleyDB back-end is enabled.
+RESTRICT="test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
+		dev-python/pyicu[${PYTHON_USEDEP}]
+		exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
+	')
+	gnome-base/librsvg:2
+	>x11-libs/gtk+-3.14.8:3[introspection]
+	x11-libs/pango[introspection]
+	x11-misc/xdg-utils
+	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+	spell? ( app-text/gtkspell:3[introspection] )
+	rcs? ( dev-vcs/rcs )
+	reports? ( media-gfx/graphviz[postscript?] )
+"
+BDEPEND="test? (
+	$(python_gen_cond_dep '
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	')
+)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.2.1-test_locale.patch
+)
+
+DISTUTILS_ARGS=(
+	--no-compress-manpages
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# Install documentation to the proper location. This can't be done
+	# easily with a patch because we substitute in the ${PF} variable,
+	# and that changes with every revision.
+	sed -i -e "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
+
+	default
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# setup.py option --resourcepath appears to have problems at the moment
+	echo -n "/usr/share" > "${ED}"$(python_get_sitedir)/${PN}/gen/utils/resource-path || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-misc/openhab-bin/Manifest b/app-misc/openhab-bin/Manifest
index 82793b82186c..55cd1f315360 100644
--- a/app-misc/openhab-bin/Manifest
+++ b/app-misc/openhab-bin/Manifest
@@ -2,6 +2,8 @@ AUX openhab.env 167 BLAKE2B 6e67342c7eb05fb4f3b2e57769ad51d0db195ad707719caa4adf
 AUX openhab.service 518 BLAKE2B f00b13946a588b1b2b9f94775d5ef281cac777888426bd97a87b72eed39fe23a609a51e819e690ebaae1c5ca5c4a37bb7874a64a52d39a305012602905be9e52 SHA512 e07cc1465bb8eee24cd1435b468279fcb2f95acbf44866306b0637e2d7e46c0aef50bb3ce9e22cafe5140d4b534df77bfcbdc7d7e697def9db94a0207f2e1dd3
 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-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
 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
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
+}