gentoo auto-resync : 08:05:2024 - 00:00:57

21 files changed, 203 insertions, 121 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index ca32fba513cd..ad79772fa315 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index f595ddc3a28c..d36bc606e73e 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -2,5 +2,5 @@ AUX all-completions.patch 2037 BLAKE2B 92a706e0dce6a6dd316b168fd4a93a8d6e52f80ce
 DIST lesspipe-2.11.tar.gz 171212 BLAKE2B aa7cf35f00d9db4ad7cb48ae89089a4d0c5d6c6e41ec902bc7ba6d4fd218f8ea90e1fdf3d6fcbac1dd1f86eb841a0daa6838b0086905fd4b0535d91040ef85aa SHA512 ed75d8529bd24876b11a50d0ada476299569d0fe716c390de84a0630ae475594f96370ffbed64fc5d9e2417dcbaa7b2f68630e32f665dff799667c2653b0265f
 DIST lesspipe-2.12.tar.gz 171915 BLAKE2B b1181cc5ca6ec8ca918bff31def6d6fde5f6bcfde9d48e0a23a088ee9ff178e3e9ff330b1c27a3d74b63d227c94292141414bec8c25d0035f9fec01c6760b8b9 SHA512 9c6945b0f5a5672e3b9b0035ebc63ab3197c1b3d1dfc3d4a2280c1f11421d98ccc5c016273a308a96f61a47f4da6d6658502534284fff81fd75365a4ba91c27e
 EBUILD lesspipe-2.11-r1.ebuild 1925 BLAKE2B e63508fc246a9848ccdb92429790c6bf6dce42b3325815f33e771ab3040bfd0510ed64b3fe8b2efe65d8bf1d3c4fa775eaffa636805fab8704be4bdace3e5450 SHA512 afe904b57613c25d56b5d2632341da27b45fee8a38637d0ccbd66b4a26c3091588ae0e367d6faa23f80f97a490912eceb3021269eedfd7d3ac7bc4e5046fb8e9
-EBUILD lesspipe-2.12.ebuild 1752 BLAKE2B 840da476a00f967a73b6d847da6f52d1eb6b352427a2ee236386dd19a5549b140af1547f97085bbfa1b20851ca05a13020e4087df6fbb8d45bc8f40309364131 SHA512 12779152e92fe440834a397ea4830ad2863ade93ef09804a752e3019aa22600118ec74ae8ca5c21f22b9842952aa2cb4ec76bf5f412a7179ecd089463a0ee368
+EBUILD lesspipe-2.12.ebuild 1758 BLAKE2B ca5ecd566c8bcf89a6690a30d6946d73a3a6fff0371ff5959b93e3c06c59af3ea1304cf12d9a8046af542396700f5f0bdcb8c5ee065b02d587d6d28a4f9c3769 SHA512 c5eaca6e2ac1138f4d7986bf6278377109d4135506fa9cf687457284f6d902377fd675b5b95082e434093e1d7275406146b97e45fa7078719bb4ef1af88233f9
 MISC metadata.xml 304 BLAKE2B bb5be96b5fd22ce82d800f6bd5ed3ceb04b955182eaadc1f34b6f4b633c21efd6148013fc29b5567f7ada4da5de6efd7e0e420fa63a2976a5cf6bcf719c34f2e SHA512 2c217e67c6c487f7f7f98588a50086daf434bc25ad229b68d37bc12f7ecc4f904b5bc4a3b7b6db4a1daa0267c7e13fde8538de1c16d11e95be6b8071ee675105
diff --git a/app-text/lesspipe/lesspipe-2.12.ebuild b/app-text/lesspipe/lesspipe-2.12.ebuild
index 9e0fa293f993..9b06994b07f0 100644
--- a/app-text/lesspipe/lesspipe-2.12.ebuild
+++ b/app-text/lesspipe/lesspipe-2.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wofr06/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 # Please check again on bumps! (bug #734896)
diff --git a/app-text/namazu/Manifest b/app-text/namazu/Manifest
index 57fa8a731f2e..5598c369b8a7 100644
--- a/app-text/namazu/Manifest
+++ b/app-text/namazu/Manifest
@@ -1,11 +1,14 @@
 AUX 50namazu-gentoo.el 72 BLAKE2B 1047f37bcd89dd27714342af9e88ef186860efe6de8be767f37a81164b8d6b821bba292a1785617b1da249f76171d449485b107a315ea4ef0342173d0ec74a65 SHA512 8e316add3dbe93049fd879bc93829b2c141a752133d065c2ee724e180b38f171f5b11dfa72b8651d7721e825e3ff35439c6afc33c6043ce42738739ff4988e8c
 AUX namazu-2.0.21-memmove.patch 2050 BLAKE2B d5a12989489c4db9a6a7c6288ce29ecbe654731bfd84e3baa40c02ad802aa975704dbab2b05dc8f496e30cc76a1cb7bfaf9f2d8a2f0484160465fbb1f41af9c9 SHA512 d445d77c45a30d4e71dd9129ebf7938f48058f89627e4130e0f921ca719918fdd654f8369d0ae24edcbfb5d3801d68eeeaee4b55c887b9d208e0d8df00effae5
+AUX namazu-configure.patch 265 BLAKE2B fbce7f96e97885c2c91a44198ca2e1d2e0ac09eb91e397c31a086feed657ea3223265b7c6505f99a3e14b06ed5e1573a87a206284f156264456edab857ab29df SHA512 6064c68058c9b65e02baa5e76fab84c9c216fce1b3b9ef8f1945307c3ed7c908f29f13265f2bdf11965ca1b4841e6367c217c2858fcda246f01e0b0d7b39dac2
 AUX namazu-emacs-27.patch 422 BLAKE2B 613d43536da45a8f7df12b1e2eb0c7644702a0c2ba8a8f6b1a9806f343dc467b5c20b501a38e7abe732947ebe35c7ec47ae346003c26a8271f88709c62943105 SHA512 65456a1d4bc3a54ddda7360c370fe1c3847711e5e78858e7a35628148fa38a6e844df8bc2e1f1b963697eaedfa0354cedecdc24badeaffb3da02eab5fe241555
 AUX namazu-gentoo.patch 1471 BLAKE2B 949429187d765e37a3fcfbcb9c455d4b92e5d1af11a4b0550a40240523b3862de8cf3b2cbab85c15be9848d1614cdccbeb0df346a006f445eea35aad35a05bc1 SHA512 bdc4946197f48fe87fe1e2eacbefaaf775458e28a96f2c5af70c1264e883f29c89673feaffd71afff9d9744bb7b81c3b3ede3258f585dab3b7f117c8fa77f93e
 AUX namazu-perl-5.18.patch 1761 BLAKE2B 38941d15556c229de19592ba2660b9a79782588a79811d0a651599b0e4d22ff4a8a515aca2047684e988d6a434025aca40d744c2aabe310f20ebbbb4ff43af72 SHA512 4a5faf2a889f9eb02a57db80c834a60560bbe2df718f541a24fbfc137145121336055c157458b5d3c4d9c5f573cf3964329adc1ae1e2448c254531df4fee8267
 AUX namazu-perl-5.26.patch 632 BLAKE2B f6b4a0838d6ca529adb9330f7221ebb014e50f289be144920a24a6656fb3abc604a0dc39f6f618a02b25c1cbf2065331f57f80d4120fba69042692a3dcb8a673 SHA512 78c655dfb0bfee51e339a142e71685b0599a58786899a151279834b7e9523dcff8359df8addb2a1e40a162f2a412cbd10e178a8215f3a178527392c2a8fa7be7
+AUX namazu-tests.patch 188 BLAKE2B dd70d9a5f86eebf358183f4bc4b0ea153dd0ce79b05edd0eeb265bb182b550e6336727fd26eda22243fe1d46512c0bc1772f1e3a905175e7b80755e5b6c0e89a SHA512 bbe83bc46024a84227008d7e5132ba1eb5cccd191c58d44b0cebc18f5490df08b4ceca6cca67ba6ebc23753b478d0054583c04b7646970e0a5da40611c340900
+AUX namazu-underlinking.patch 278 BLAKE2B 24a21daf43263fef1d78770a9f2f42958908cb80b18376b4e6fafab76d3ced6c16a587adaee8c05c1e1428a43aee7dc3101d03cef0285a572d8bae194bbd839a SHA512 b4f395697da766c87bb96990288bf54b13616cc053da7079835ab79ab27bfcd86ca0f2d37639fdc47172e1a1f3604799e31418addcb24f4fdad42ebf55a0a764
 DIST namazu-2.0.21.tar.gz 1394048 BLAKE2B 86755fe2433bee1a1c7bf8239b38b3d9500eb20f720b031f349d968f173384f172d81eb0926265343b2c749fca527e6cd6c2940fbaa2be333830b41f8b7853a2 SHA512 c0ce1b8c8b8ce30ee7d28cfed790a9c8585d1b468eefe2ba4ac70976e09329ae04a3a3bbf0b86b9673cfdf206f2b103896daca2f053062f451884fa659b31ea6
 DIST namazu-2.0.22pre8.tar.gz 1975653 BLAKE2B 91e07e576fe7f8dc93db2754726f0fa286191dae44e885abafed5887d741f3291fd79665294dcae23770d2f42b5b35a323f7896209a62e802ac4253d729c3f23 SHA512 2d891cd2a4eae8246753511f3e2323093139be917edef9e2c3481ac7a0de9b9200906d7d56bbcd7bf1861ede44ae6bca72820b8086b2be93ad9d8f20cb56cae0
-EBUILD namazu-2.0.21.ebuild 1763 BLAKE2B cc3fcd4711e10d41f92a80293d6393af310fd0a95ac51f3b0444aa7ae7242a25ecce511d461de74ba88763ff232d50337320b1cfb9be1aab45a2b0d9dad327ca SHA512 72068431e7a77021767dc3a72556e1fdd1d789d43f6428ddcedfbbba90569dfa78d7a817b70733bc0d08a73304543257df6f1c9c962c9428c940a8a7f449dfe9
-EBUILD namazu-2.0.22_pre8.ebuild 1643 BLAKE2B b87f7691dbc8ab191751d5b66819cdc9c409d4f35d312f0f94ca9a2e65d80ba94a391853135601242cfbbb73ce18feff71b8edfbacede7c1275e0a41c4869858 SHA512 3274b729bb781e93cd8fb692ed36e15350a0a6386bff264be2da11512c69290e54c5229b9a0a1867b16a48668fbdc32426d3da70053e8d8bd084b2d3ca714d22
-MISC metadata.xml 241 BLAKE2B d06d8c9218cb9736ecc414504678e9bff30ba6bffbd2b357e9a2ea990df4e73a21b8ad4db267eddfdbf73e8501dabe5a748c4ea9d26906d39425ab744b320216 SHA512 cff6b46a252b531091d1ef597e3f714f98d2ef4aa621662d8c2ec15e4f990cd811300d3439e1be003bd307d0c8d12e78f34cf7fd49f6d006d9362f0e6ccf6252
+EBUILD namazu-2.0.21.ebuild 1871 BLAKE2B 44538739b1ad4a638a08bf182fe4bbae67b23635a19f4d8f58b63b4b03ae33ec1905a5c18dd102eef1877647011e838cfd9ef2b2fa818c107ea8e7f9d6730ba0 SHA512 d89c6ffd2e24738be67f85651b8dd0aabc0b637cd80090a174c75d16e70d2b2f3494c71549f39c642d7765b8d279fb9d18139455c8bfef46a54d9e57c968baf7
+EBUILD namazu-2.0.22_pre8.ebuild 1752 BLAKE2B b06ab1d0e67c311da4cfe73e9f1a95f58483d5e7be6c1352051768201144f7063b45a12ffbb977f06c72ecb26dd9b642d66ad1f9519460874bdd7b5b18f62705 SHA512 32673b8ea656fb19b6a73e4905e6d722a7fe0e896881786df9f3c058d387686326dd8c35fa687db48823fa3607d83a24902f2b301858208ddcc2884637bc3fe8
+MISC metadata.xml 235 BLAKE2B a3e5a3109b59e3f97ef14f8d55ba13b16dc5371a1b7d6f238230aa4494db32dd4a42e3ee012ec8b18fae394feb2b1b56882bc70504aa7c6b969c1b20140f0ece SHA512 7c4e5f5dea465e45c662f5f53513626088aff514e1326593426af227d77e63d8a00d8af05aa208881a399f83dd41e73cd2ef81c8b7f275a2fa891f295231d67c
diff --git a/app-text/namazu/files/namazu-configure.patch b/app-text/namazu/files/namazu-configure.patch
new file mode 100644
index 000000000000..02b6fcde8dc6
--- /dev/null
+++ b/app-text/namazu/files/namazu-configure.patch
@@ -0,0 +1,13 @@
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -165,7 +165,9 @@
+ [AC_TRY_RUN(
+ changequote(<<, >>)dnl
+ <<
+-main()
++#include <stdlib.h>
++#include <string.h>
++int main(void)
+ {
+   /* Some versions of memcmp are not 8-bit clean.  */
+   char c0 = 0x40, c1 = 0x80, c2 = 0x81;
diff --git a/app-text/namazu/files/namazu-tests.patch b/app-text/namazu/files/namazu-tests.patch
new file mode 100644
index 000000000000..c79f8aade6f3
--- /dev/null
+++ b/app-text/namazu/files/namazu-tests.patch
@@ -0,0 +1,8 @@
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -26,3 +26,5 @@
+ 	rm -rf test-log tmp-data tmp.* idx[0-9]* ja-idx[0-9]*
+ 
+ EXTRA_DIST = $(TESTS) select-data commonfuncs
++
++.NOTPARALLEL:
diff --git a/app-text/namazu/files/namazu-underlinking.patch b/app-text/namazu/files/namazu-underlinking.patch
new file mode 100644
index 000000000000..04af7c21d998
--- /dev/null
+++ b/app-text/namazu/files/namazu-underlinking.patch
@@ -0,0 +1,11 @@
+--- a/nmz/Makefile.am
++++ b/nmz/Makefile.am
+@@ -47,7 +47,7 @@
+ 	nmzversion.c
+ 
+ libnmz_la_DEPENDENCIES = @NMZ_LIBOBJS@
+-libnmz_la_LIBADD = @LTLIBINTL@
++libnmz_la_LIBADD = @LTLIBINTL@ @NMZ_LIBOBJS@
+ libnmz_la_LDFLAGS = -version-info $(LTVERSION)
+ 
+ nmzversion.c: nmzversion.c.in
diff --git a/app-text/namazu/metadata.xml b/app-text/namazu/metadata.xml
index 491c88b3a31f..a94766977fa6 100644
--- a/app-text/namazu/metadata.xml
+++ b/app-text/namazu/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/namazu/namazu-2.0.21.ebuild b/app-text/namazu/namazu-2.0.21.ebuild
index ef46e76118df..866e3923c180 100644
--- a/app-text/namazu/namazu-2.0.21.ebuild
+++ b/app-text/namazu/namazu-2.0.21.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 inherit autotools elisp-common
 
@@ -35,9 +35,12 @@ BDEPEND="nls? ( sys-devel/gettext )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-configure.patch
 	"${FILESDIR}"/${PN}-emacs-27.patch
 	"${FILESDIR}"/${PN}-perl-5.18.patch
 	"${FILESDIR}"/${PN}-perl-5.26.patch
+	"${FILESDIR}"/${PN}-tests.patch
+	"${FILESDIR}"/${PN}-underlinking.patch
 	"${FILESDIR}"/${P}-memmove.patch
 )
 
@@ -74,14 +77,12 @@ src_compile() {
 	fi
 }
 
-src_test() {
-	emake -j1 check
-}
-
 src_install() {
 	default
 	find "${ED}" -name '*.la' -delete || die
 
+	keepdir /var/lib/${PN}/index
+
 	if use emacs; then
 		elisp-install ${PN} lisp/*.el*
 		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
diff --git a/app-text/namazu/namazu-2.0.22_pre8.ebuild b/app-text/namazu/namazu-2.0.22_pre8.ebuild
index 4c8146e3b313..d902b8bc9dbe 100644
--- a/app-text/namazu/namazu-2.0.22_pre8.ebuild
+++ b/app-text/namazu/namazu-2.0.22_pre8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 inherit autotools elisp-common
 
@@ -36,7 +36,12 @@ DEPEND="${RDEPEND}"
 BDEPEND="nls? ( sys-devel/gettext )"
 S="${WORKDIR}"/${MY_P}
 
-PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-configure.patch
+	"${FILESDIR}"/${PN}-tests.patch
+	"${FILESDIR}"/${PN}-underlinking.patch
+)
 
 src_prepare() {
 	default
@@ -71,14 +76,12 @@ src_compile() {
 	fi
 }
 
-src_test() {
-	emake -j1 check
-}
-
 src_install() {
 	default
 	find "${ED}" -name '*.la' -delete || die
 
+	keepdir /var/lib/${PN}/index
+
 	if use emacs; then
 		elisp-install ${PN} lisp/*.el*
 		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
diff --git a/app-text/openpaperwork-core/Manifest b/app-text/openpaperwork-core/Manifest
index 3021439510c3..353a5253f111 100644
--- a/app-text/openpaperwork-core/Manifest
+++ b/app-text/openpaperwork-core/Manifest
@@ -1,5 +1,5 @@
-DIST openpaperwork-core-2.1.2.tar.gz 104694 BLAKE2B cf7cc132758662495d4b586efebccaa20c892cdca2ae3bb68d5fc45639c828b8441906c56067db079c12f1393adcd69d2edec19ca51fe5fcd5930ce2a7005c0c SHA512 88cb55b7b94e1e149042357d3a1c6c2a2184e4810b5895e02ef896554ae88ed0ebacd9c11e401da5e155aec857cd1b148328b1ffd0b760f939e4e97b96d1ce1a
 DIST paperwork-2.2.1.tar.bz2 2529505 BLAKE2B e5545d3fbb5e41d0ddd21a0358fae496d127b30a3f72e1438eef679c520a3152e4db006d9dc42023431907281452931e90aea187c4928309bde7add2d54b5844 SHA512 f96ddf3efe3b5021e612600fa2e3a9c83db7ec78b9637e434facefcc422700be1b67b74231b4738a7762905ac5267f412839ff9d43cb9dcf7f95a5f3d6f7091f
-EBUILD openpaperwork-core-2.1.2.ebuild 464 BLAKE2B 2fd7b5444a3f202bf3ebc74e7b59de5f1bdeb9a98e41a41a4bc662a72c93b5db926ef51820e8f3fa8ff9ed270b30ff011d2fbcb3a22182d881833f583195dea4 SHA512 7ebe9f6e6de60c9e72fb8ef830dc4102ac771e97c61d47cffbd09c070f2a2d0f6a8caa47166c325f71b2673511529403a93e8c67033fde848b523213d41b3c91
+DIST paperwork-2.2.2.tar.bz2 2531134 BLAKE2B 760d5fdc949ed44993c9845232e3f92b26b8dcb84ef82b08be7dbb0b262461feaf06f930f3fce0b94fdd8412a8264969bac117e3ea7aef70e1b47436a9dba3c0 SHA512 e0d3c24a0d611ffea231e129461d2925dc8318aaade185e83361bca8d1757e4601510db6122dc412863e617a387eb1c6008d0974c2b37be7ac4e4c3e68bc450b
 EBUILD openpaperwork-core-2.2.1.ebuild 778 BLAKE2B 586b05eaa77cc5356aca097768848ac461ce91a45f306f62530e768cb97511b43a547b9a8c68e8c060a6d2d3149f3380284abd3eb69e4709d2d251566a8ea943 SHA512 20b6333cee52dfee0e2a1ccd8241d53b98234374f84eb3c6b048261c8e12062b0643d7fe868111f0951f5b02a12c431181d3eb52b6f09835b3b3a16a35bcfcc7
+EBUILD openpaperwork-core-2.2.2.ebuild 777 BLAKE2B a43a4470e712e81d64ad23c26f0900d7382d56d5eba57302eb56219cf41e4f739eb0df8cc3a5d982f6f85d5df7ff7cd5b0cb57c9174ca4a4f14d4b90ba07a21e SHA512 c0f5d4ba3192a66a4902ec8042613633a409524736f16edbcbcb0b23b80ba958ad701c0042f27ea2a1ea41bb26133ca6c4b2e5276fc5463a79aab7919fef39cf
 MISC metadata.xml 411 BLAKE2B 3b2c93ec0ef42b0af9ef95f4ddaa408bccbcad56b10358ee781b828274e00fc309be763a3193e411ca0886f9a96450fb6a52a86bf796713408cc1fdccf743d59 SHA512 43487d9ab1dd7bf0076cbd43b55f3ac30c53ec05d16fd8250d344af06528be0bc9aae1099530c342239b795d98398c4154ce03b7f5354b09b2632db62e5a81b3
diff --git a/app-text/openpaperwork-core/openpaperwork-core-2.1.2.ebuild b/app-text/openpaperwork-core/openpaperwork-core-2.1.2.ebuild
deleted file mode 100644
index 58b64fac3c8c..000000000000
--- a/app-text/openpaperwork-core/openpaperwork-core-2.1.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Core part of Paperwork (plugin management)"
-HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/distro[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/app-text/openpaperwork-core/openpaperwork-core-2.2.2.ebuild b/app-text/openpaperwork-core/openpaperwork-core-2.2.2.ebuild
new file mode 100644
index 000000000000..f921425cccd0
--- /dev/null
+++ b/app-text/openpaperwork-core/openpaperwork-core-2.2.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Core part of Paperwork (plugin management)"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
+SRC_URI="https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/archive/${PV}/paperwork-${PV}.tar.bz2"
+S=${WORKDIR}/paperwork-${PV}/${PN}
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/distro[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	sys-apps/which
+	sys-devel/gettext"
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_compile() {
+	emake l10n_compile
+
+	distutils-r1_python_compile
+}
diff --git a/app-text/openpaperwork-gtk/Manifest b/app-text/openpaperwork-gtk/Manifest
index 209d91bc1f76..e900a1631d43 100644
--- a/app-text/openpaperwork-gtk/Manifest
+++ b/app-text/openpaperwork-gtk/Manifest
@@ -1,5 +1,5 @@
-DIST openpaperwork-gtk-2.1.2.tar.gz 59104 BLAKE2B 94782b0fbd29e749b68f277e5c48a8f194d4feafe2f1579615b51bed44855a9113631302e3ed0f8248683ba524e72147da7cdce76e54b266ae9d8dbaa5cba2a5 SHA512 9f11482e68ee01356644fc2a679044a835308f6591b1b3ef6fc079c26e87a5c8c7fa8ba23545e7bf7fc9d37d85151a70cd7bdf4c45c271f67f8a8dcf95a5c440
 DIST paperwork-2.2.1.tar.bz2 2529505 BLAKE2B e5545d3fbb5e41d0ddd21a0358fae496d127b30a3f72e1438eef679c520a3152e4db006d9dc42023431907281452931e90aea187c4928309bde7add2d54b5844 SHA512 f96ddf3efe3b5021e612600fa2e3a9c83db7ec78b9637e434facefcc422700be1b67b74231b4738a7762905ac5267f412839ff9d43cb9dcf7f95a5f3d6f7091f
-EBUILD openpaperwork-gtk-2.1.2.ebuild 617 BLAKE2B 103d453bad52d8a3915fb431898f0ff9406547bfb9951b7caabcb5fcd7e44fb818451529da5bf1cb5332bf3819fafcc6b999ecb32291d1e8dd05435216db100e SHA512 e3e1f4e27fe96b26a2e57036e359c5aa95bd6c1017c11cd6aaa8f4b0ddccc14ee3195b7b0533730db7072ff1df90472d0b3742a5b6bfd8443fa92eda7dcb2dd6
+DIST paperwork-2.2.2.tar.bz2 2531134 BLAKE2B 760d5fdc949ed44993c9845232e3f92b26b8dcb84ef82b08be7dbb0b262461feaf06f930f3fce0b94fdd8412a8264969bac117e3ea7aef70e1b47436a9dba3c0 SHA512 e0d3c24a0d611ffea231e129461d2925dc8318aaade185e83361bca8d1757e4601510db6122dc412863e617a387eb1c6008d0974c2b37be7ac4e4c3e68bc450b
 EBUILD openpaperwork-gtk-2.2.1.ebuild 931 BLAKE2B 69b154c0fbe055a245174e450fa47486bbd43fd31d1550a4532dceb0aee86d4ddef405176b25d38d81a855466730265c07a380aafe10fee84a13678e0e6dba25 SHA512 951ca95fc05c303bf703eb1607131b3bfc40ecadf937edb587fdea2413636e476c0ef62f0fd7f6d9fe51f83c208b10ae2496e4f64b5179d8bcf245d70f69bc8c
+EBUILD openpaperwork-gtk-2.2.2.ebuild 930 BLAKE2B 25f58dae5ab0922c3225be31d25f4388b96c70cf5ba482cdeaacdcdd77b7a3f7829d7bb66d042a819f3f68891e6128f3350fee2d19d5857f7b370316b4ad7be4 SHA512 54e221e1a6c9ae50d667d555e9b731a52a302e854fdcffcd5de438535f82daf36d7df97eb4250df63b5d34152d9497f5e61b3cfd0b88cafb5a2f4d9c80b16ed3
 MISC metadata.xml 410 BLAKE2B 13172be1299a64f5856e03791df45398d802340ece2eb41856623f3d5649efc0fe26aefda55ed180b5e042bd9d14ad88298e5c2383c3ea64a29c8748b74a18eb SHA512 90faa39c2bfe806ba21302a6daaa9a7a01f6489e1fb8756a3dcc0f47d4cfeef52b51d8eb785b61c1b734d691a15c55764590736ea1e56c8102139b7b72424baf
diff --git a/app-text/openpaperwork-gtk/openpaperwork-gtk-2.1.2.ebuild b/app-text/openpaperwork-gtk/openpaperwork-gtk-2.2.2.ebuild
index 7884f8b08f13..9537e32fc587 100644
--- a/app-text/openpaperwork-gtk/openpaperwork-gtk-2.1.2.ebuild
+++ b/app-text/openpaperwork-gtk/openpaperwork-gtk-2.2.2.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 
-inherit distutils-r1 pypi
+inherit distutils-r1
 
 DESCRIPTION="Paperwork plugins"
 HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
+SRC_URI="https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/archive/${PV}/paperwork-${PV}.tar.bz2"
+S=${WORKDIR}/paperwork-${PV}/${PN}
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="app-text/openpaperwork-core[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
@@ -24,3 +24,14 @@ RDEPEND="app-text/openpaperwork-core[${PYTHON_USEDEP}]
 	gui-libs/libhandy
 	x11-libs/gtk+:3[introspection]"
 DEPEND="${RDEPEND}"
+BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	sys-apps/which
+	sys-devel/gettext"
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_compile() {
+	emake l10n_compile
+
+	distutils-r1_python_compile
+}
diff --git a/app-text/paperwork-backend/Manifest b/app-text/paperwork-backend/Manifest
index bee9d38f82c6..d140717f97c4 100644
--- a/app-text/paperwork-backend/Manifest
+++ b/app-text/paperwork-backend/Manifest
@@ -1,8 +1,9 @@
 AUX paperwork-backend-2.2.1-cairo_workaround.patch 2028 BLAKE2B 4b7074165c3761427f667e81f843b4a680878406f5a79ebb8733b5bb9ff5ea45c5fe836531a742d303981c52eb3b122aec5dea07522226c48b969d8f0fde2327 SHA512 d5790b96c3745c769cc3296d24399c21f2a6a864beb188105fb27c407b3739661943aa9ef706ca95d97f08ecb6d6cb0e9b1ec1a8c00093434a96913f8eeb5849
+AUX paperwork-backend-2.2.2-scipy.patch 2408 BLAKE2B 6873642022f7757f30954e8e68fbd34e83bc12c80fa88ec394993d6fed28ba90cca440a06b32ee5e9de55cba0bb72e6cd47012e6acbf870208c32f8c52cb342f SHA512 ad6dea4df8f3cea3b465d7df2afbab17bccdafec3ca6555022487929626e01df4e0dab25a84e1cc5f7404189ca072011f9dc08a6ee1f07a978fb552410ba72ab
 DIST paperwork-2.2.1.tar.bz2 2529505 BLAKE2B e5545d3fbb5e41d0ddd21a0358fae496d127b30a3f72e1438eef679c520a3152e4db006d9dc42023431907281452931e90aea187c4928309bde7add2d54b5844 SHA512 f96ddf3efe3b5021e612600fa2e3a9c83db7ec78b9637e434facefcc422700be1b67b74231b4738a7762905ac5267f412839ff9d43cb9dcf7f95a5f3d6f7091f
-DIST paperwork-backend-2.1.2.tar.gz 1346499 BLAKE2B daf8c6dee97b0bdf814bcf7e9c83a80ab878250994a770f5fa6be4c0b4e23f0def51e22c0a8652a19e9294f3fab0b522b25c2a91c306ad760d568faf76a78610 SHA512 0156baa658a9fe26680bf6d146af3f03b98da307ee1cfaf4803f8b70a2ffdb0010fe23c4d4f9b5a572919c4be94a1aad4fd070220849248cdb18c5b1c4bc478b
+DIST paperwork-2.2.2.tar.bz2 2531134 BLAKE2B 760d5fdc949ed44993c9845232e3f92b26b8dcb84ef82b08be7dbb0b262461feaf06f930f3fce0b94fdd8412a8264969bac117e3ea7aef70e1b47436a9dba3c0 SHA512 e0d3c24a0d611ffea231e129461d2925dc8318aaade185e83361bca8d1757e4601510db6122dc412863e617a387eb1c6008d0974c2b37be7ac4e4c3e68bc450b
 DIST paperwork-data-2.2.1.tar.gz 5210355 BLAKE2B 48ee8f9828f7aed9b41c998c2cdc43a2b98c2a2482e388500b8d04867a450bbf3264ef5a87d7f215f1389943e4cbab452d3a7a6235d63cfdb27127ab56ad9c2f SHA512 cf663368f733f45dde8242c3ad9ba405361628bddb7e8aed9dffeb5bb86c1abac7a3485cb7e2042d65006f8f336390fa81ea182dad62f4259b79805ac7a0416b
-EBUILD paperwork-backend-2.1.2.ebuild 1320 BLAKE2B 84591b3c91e0214c424c4b5236968a34d4a3898c919eac1cd94d7d99dec535eba5c57907360c61c8648ad38c1627b45ca6954a664fadb01eedbb229c5e6528ac SHA512 1bd6ef41faa0544d78c72d54cf34d960a78d1c3ff7ac568e40ef24a0ab6a8d19c0f38ad0fe222278bbebbceb9189618c562e2d60f43ed37354ab995299ae99bf
+DIST paperwork-data-2.2.2.tar.gz 5206588 BLAKE2B 7dd15d31b0b3b59900556d78b271f36cc1cab533d273948a7d0eb364028ec0d1c26b2743a10565e2fc1d65786a11a1589c776c2ec1df6030efe8a79b2fba53a0 SHA512 aaf8e4174504eed7b33b2a0d3ad1b0af489d70bd9a425cf9363011fc6e24dd42a6822a5d078898279e78bbe15b4e36075c5a57a5ec74eabb3c2af7b9c3cc3e76
 EBUILD paperwork-backend-2.2.1-r1.ebuild 1676 BLAKE2B 3fb9be69fe474d0c15d4dc57dbaecdfee9d6576b9bc7f17021b5265e3542815e0a5f81c1054d6e36acc015f6e4bf2522243f5fb6f37f6df714e006a61ed387d4 SHA512 e262a289a794731424c6311076a4ec1a39e7f425df747de0228da5db527c151a729c0e35c1c69422592012e4f4bc26b90bdf13313464a3307d99775dba617801
-EBUILD paperwork-backend-2.2.1.ebuild 1642 BLAKE2B 4db236348edf67ffaf6296d59aa1968b79ec8b06de4f553f884b9178e8e8dd0dbd4cd84e77b957193ace413ca36e890877ea58a16b1e943b1df5d7df4242a89a SHA512 7683bb44bd1cf7ae8a70b6c9d6e1c02ddb5b23bbbbc63c0781e5118a8aabfbec1be3651be9eee8dba52dc32cf4a792f4a9a477488f06aeb00df42bb8c2e9faa5
+EBUILD paperwork-backend-2.2.2.ebuild 1665 BLAKE2B f633dc588a88838cda338225292cfcb3f7d38b2eba79340dcd93c70b5a7d30c0ff362195e3eda96a2336f3e858e7b702106f8d071db94193f09bbecdc71c3deb SHA512 33509abb778d1c577efb16e7d1e15327575501e269671e23eefbd3b8231565c986e588d4ebca8dbe97e69be46688a9c9d2dbdc7544e5ac66cedcdd9bb7928bc6
 MISC metadata.xml 410 BLAKE2B c6ed41347886699086f69694dbaa5134e9ebfb02cbc157909e02971cce01cc562e82f31c15bb5ae1ee261d79d6e5a9ece81c1cf7fa48a9839ddf467c06fab392 SHA512 01bf86e9c8fd1b9e1d514edca46992609eb8789fe95ea914914ef4fc43c7b3f0fcaffaa712bb5c72e3936679b44749837b0ba73c2b62c1b0bc52f318fcc8e31f
diff --git a/app-text/paperwork-backend/files/paperwork-backend-2.2.2-scipy.patch b/app-text/paperwork-backend/files/paperwork-backend-2.2.2-scipy.patch
new file mode 100644
index 000000000000..9add28626a23
--- /dev/null
+++ b/app-text/paperwork-backend/files/paperwork-backend-2.2.2-scipy.patch
@@ -0,0 +1,55 @@
+From abcebfe9714644d4e259e53b10e0e9417b5b864f Mon Sep 17 00:00:00 2001
+From: Jerome Flesch <jflesch@openpaper.work>
+Date: Sun, 21 Apr 2024 13:31:03 +0200
+Subject: [PATCH] backend/guesswork/labels/sklearn: fix use of
+ scipy.sparse.hstack() + numpy.zeros()
+
+Closes #1111
+---
+ .../paperwork_backend/guesswork/label/sklearn/__init__.py   | 5 +++--
+ paperwork-backend/src/paperwork_backend/model/fake.py       | 6 ++++++
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/paperwork-backend/src/paperwork_backend/guesswork/label/sklearn/__init__.py b/paperwork-backend/src/paperwork_backend/guesswork/label/sklearn/__init__.py
+index b2af4350..8633211f 100644
+--- a/paperwork-backend/src/paperwork_backend/guesswork/label/sklearn/__init__.py
++++ b/paperwork-backend/src/paperwork_backend/guesswork/label/sklearn/__init__.py
+@@ -191,7 +191,8 @@ class UpdatableVectorizer(object):
+             )
+             if required_padding > 0:
+                 doc_vector = numpy.hstack([
+-                    doc_vector, numpy.zeros((required_padding,))
++                    doc_vector,
++                    numpy.zeros((required_padding,))
+                 ])
+             if sum_features is None:
+                 sum_features = doc_vector
+@@ -339,7 +340,7 @@ class Corpus(object):
+             if required_padding > 0:
+                 doc_vector = scipy.sparse.hstack([
+                     scipy.sparse.csr_matrix(doc_vector),
+-                    numpy.zeros((required_padding,))
++                    numpy.zeros((1, required_padding))
+                 ])
+             else:
+                 doc_vector = scipy.sparse.csr_matrix(doc_vector)
+diff --git a/paperwork-backend/src/paperwork_backend/model/fake.py b/paperwork-backend/src/paperwork_backend/model/fake.py
+index 29beae97..f06fe18e 100644
+--- a/paperwork-backend/src/paperwork_backend/model/fake.py
++++ b/paperwork-backend/src/paperwork_backend/model/fake.py
+@@ -125,6 +125,12 @@ class Plugin(openpaperwork_core.PluginBase):
+             if doc['url'] == doc_url:
+                 out.update(doc['labels'])
+ 
++    def doc_has_labels_by_url(self, doc_url):
++        for doc in self.docs:
++            if doc['url'] == doc_url:
++                return True if len(doc["labels"]) > 0 else None
++        return None
++
+     def doc_add_label_by_url(self, doc_url, label, color=None):
+         if color is None:
+             all_labels = set()
+-- 
+GitLab
+
diff --git a/app-text/paperwork-backend/paperwork-backend-2.1.2.ebuild b/app-text/paperwork-backend/paperwork-backend-2.1.2.ebuild
deleted file mode 100644
index 6bfad6df712f..000000000000
--- a/app-text/paperwork-backend/paperwork-backend-2.1.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Backend part of Paperwork (Python API, no UI)"
-HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	app-text/openpaperwork-core[${PYTHON_USEDEP}]
-	app-text/openpaperwork-gtk[${PYTHON_USEDEP}]
-	app-text/poppler[introspection]
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/Levenshtein[${PYTHON_USEDEP}]
-	dev-python/natsort[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pycountry[${PYTHON_USEDEP}]
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/scikit-learn[${PYTHON_USEDEP}]
-	dev-python/termcolor[${PYTHON_USEDEP}]
-	dev-python/whoosh[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/libpillowfight[${PYTHON_USEDEP}]
-		media-libs/libinsane
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# remove dep to allow both old python-Levenshtein and new
-	# Levenshtein packages
-	sed -i -e '/python-Levenshtein/d' setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/app-text/paperwork-backend/paperwork-backend-2.2.1.ebuild b/app-text/paperwork-backend/paperwork-backend-2.2.2.ebuild
index 210c3d2fb541..738513e7b1a6 100644
--- a/app-text/paperwork-backend/paperwork-backend-2.2.1.ebuild
+++ b/app-text/paperwork-backend/paperwork-backend-2.2.2.ebuild
@@ -12,9 +12,10 @@ DESCRIPTION="Backend part of Paperwork (Python API, no UI)"
 HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
 # Update from release hash at:
 # https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/tags
-REL_HASH="0bea4054"
+REL_HASH="3f51346f"
 SRC_URI="https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/archive/${PV}/paperwork-${PV}.tar.bz2
 	https://download.openpaper.work/data/paperwork/master_${REL_HASH}/data.tar.gz -> paperwork-data-${PV}.tar.gz"
+S=${WORKDIR}/paperwork-${PV}/${PN}
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -44,7 +45,6 @@ BDEPEND="
 		media-libs/libinsane
 	)
 "
-S=${WORKDIR}/paperwork-${PV}/${PN}
 
 distutils_enable_tests unittest
 
@@ -52,7 +52,8 @@ export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
 
 src_prepare() {
 	default
-	cp -a "${WORKDIR}"/${PN} "${WORKDIR}"/paperwork-${PV}/
+	cd "${WORKDIR}"/paperwork-${PV} || die
+	eapply "${FILESDIR}"/${P}-scipy.patch
 }
 
 python_compile() {
diff --git a/app-text/paperwork/Manifest b/app-text/paperwork/Manifest
index d651f09282db..efdc13ff220a 100644
--- a/app-text/paperwork/Manifest
+++ b/app-text/paperwork/Manifest
@@ -1,6 +1,7 @@
-DIST paperwork-2.1.2.tar.gz 5907738 BLAKE2B 9b376e5ed13d69f0664c98d43a41cf876d21d46c31129b50c5c44e6d4279b04d302e7527906dad49b4416f698dfe9f5bafbc5130f41463efb5ca49fed0da308f SHA512 0f75fba66a0b9ed1b4b28caf9dbbcc4a0b7e68fa24f5faa40251c3f39c610be372f89a2f4e2e6807babd930bfeb45cc82216761f0da042deac991d779fdfdfbb
 DIST paperwork-2.2.1.tar.bz2 2529505 BLAKE2B e5545d3fbb5e41d0ddd21a0358fae496d127b30a3f72e1438eef679c520a3152e4db006d9dc42023431907281452931e90aea187c4928309bde7add2d54b5844 SHA512 f96ddf3efe3b5021e612600fa2e3a9c83db7ec78b9637e434facefcc422700be1b67b74231b4738a7762905ac5267f412839ff9d43cb9dcf7f95a5f3d6f7091f
+DIST paperwork-2.2.2.tar.bz2 2531134 BLAKE2B 760d5fdc949ed44993c9845232e3f92b26b8dcb84ef82b08be7dbb0b262461feaf06f930f3fce0b94fdd8412a8264969bac117e3ea7aef70e1b47436a9dba3c0 SHA512 e0d3c24a0d611ffea231e129461d2925dc8318aaade185e83361bca8d1757e4601510db6122dc412863e617a387eb1c6008d0974c2b37be7ac4e4c3e68bc450b
 DIST paperwork-data-2.2.1.tar.gz 5210355 BLAKE2B 48ee8f9828f7aed9b41c998c2cdc43a2b98c2a2482e388500b8d04867a450bbf3264ef5a87d7f215f1389943e4cbab452d3a7a6235d63cfdb27127ab56ad9c2f SHA512 cf663368f733f45dde8242c3ad9ba405361628bddb7e8aed9dffeb5bb86c1abac7a3485cb7e2042d65006f8f336390fa81ea182dad62f4259b79805ac7a0416b
-EBUILD paperwork-2.1.2.ebuild 1502 BLAKE2B 605398ebbd5a63ca9434d25f70207dbdfffbd9413f373dda6aba4e66b7018150ee22393a52169b8f2e193aaef557c3f931f596b11d4ccef3dadd647fa8e93ce7 SHA512 141455b2b92b89f33c43ffe9dbcf1cba27a89feb2aca4bc36ddcf8a3d488412f3c4378d4ceeb4adac865d99cce30876c231b67b77d55920e7ce80723df306d2c
+DIST paperwork-data-2.2.2.tar.gz 5206588 BLAKE2B 7dd15d31b0b3b59900556d78b271f36cc1cab533d273948a7d0eb364028ec0d1c26b2743a10565e2fc1d65786a11a1589c776c2ec1df6030efe8a79b2fba53a0 SHA512 aaf8e4174504eed7b33b2a0d3ad1b0af489d70bd9a425cf9363011fc6e24dd42a6822a5d078898279e78bbe15b4e36075c5a57a5ec74eabb3c2af7b9c3cc3e76
 EBUILD paperwork-2.2.1.ebuild 1941 BLAKE2B 32e084f86abdb8d9fc905ca6b7aa6e7e11f64a65b57850844186e21da53ab6fb2af525fe98872635d5a9ec6e178cf52a09c37b50756ee81a6d4045e3d9b53c34 SHA512 7a72ebd8ea05850e1490cef7adc3d91fbff4383a0f26295b341938ff02af2624985ac3a0dc5d04c85407ce7c070057be15aa53c8f9cbf233760ca84c21c1759c
+EBUILD paperwork-2.2.2.ebuild 1960 BLAKE2B 9cec28e8fd2991fc23dc6108fd2eea99f1f994a9ce2b5e5c503b8257dc3e0df790b33d453250bba8fef3a576fdd0011f1250552a67152bf5290e7ccdc7fa3b7a SHA512 fe6bad66315f668564a33ac348059140d4b4b6c450f100b4319d7d2f718703d7cbfd337cdc187739dce943fef74675d7b12f4265289830ec4f06382666984016
 MISC metadata.xml 795 BLAKE2B eaa7ea613cab3ed3e9d3a009b5fba74f1424ae26d68321ab6e2942a16ccf154e5ff8db1559e7ab97864b7b979b97215a553bf2be97a0d0049feae4156ef66803 SHA512 2fd9d23d6b951b3d993b4acc6a6107ed907cd2cad4bfe88b40e72eaf9bc69d85c60a3192628658db9d2dc7dc2bf94d61b09816b7343bf8f2d72ee310b66dcc12
diff --git a/app-text/paperwork/paperwork-2.1.2.ebuild b/app-text/paperwork/paperwork-2.2.2.ebuild
index 1e1cb20f2bb5..ee6ce4a56117 100644
--- a/app-text/paperwork/paperwork-2.1.2.ebuild
+++ b/app-text/paperwork/paperwork-2.2.2.ebuild
@@ -1,20 +1,26 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 
-inherit distutils-r1 xdg pypi
+inherit distutils-r1 xdg
 
 DESCRIPTION="a personal document manager for scanned documents (and PDFs)"
 HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
+# Update from release hash at:
+# https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/tags
+REL_HASH="3f51346f"
+REL_HASH="0bea4054"
+SRC_URI="https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/archive/${PV}/paperwork-${PV}.tar.bz2
+	https://download.openpaper.work/data/paperwork/master_${REL_HASH}/data.tar.gz -> paperwork-data-${PV}.tar.gz"
+S=${WORKDIR}/paperwork-${PV}/${PN}-gtk
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="~app-text/openpaperwork-core-${PV}[${PYTHON_USEDEP}]
 	~app-text/openpaperwork-gtk-${PV}[${PYTHON_USEDEP}]
@@ -22,19 +28,27 @@ RDEPEND="~app-text/openpaperwork-core-${PV}[${PYTHON_USEDEP}]
 	dev-python/libpillowfight[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pyenchant[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	>=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
+	>=dev-python/pyxdg-0.25[${PYTHON_USEDEP}]
 	media-libs/libinsane
 	x11-libs/libnotify[introspection]"
 DEPEND="${RDEPEND}"
+BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	sys-apps/which
+	sys-devel/gettext"
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
 
 src_prepare() {
-	# remove dep to allow both old python-Levenshtein and new
-	# Levenshtein packages
-	sed -i -e '/python-Levenshtein/d' setup.py || die
-	distutils-r1_src_prepare
+	default
+	cp -a "${WORKDIR}"/${PN}-gtk "${WORKDIR}"/paperwork-${PV}/
+}
+
+python_compile() {
+	emake l10n_compile
+
+	distutils-r1_python_compile
 }
 
 python_install_all() {