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

4 files changed, 63 insertions, 57 deletions

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() {