gentoo auto-resync : 20:09:2022 - 23:24:40

5 files changed, 31 insertions, 7 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 4ef9a6decc4c..e3973833d1b2 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/paperwork-backend/Manifest b/app-text/paperwork-backend/Manifest
index 6addeab28d47..74ae0a83b9ba 100644
--- a/app-text/paperwork-backend/Manifest
+++ b/app-text/paperwork-backend/Manifest
@@ -1,5 +1,5 @@
 DIST paperwork-backend-2.1.0.tar.gz 1352553 BLAKE2B 84bf9f34be50c2cd762c1afb496e4625bed50018242e94925ad4d5428228fadc9ac8d3866f8fbb9f0a78d049599048db62c6d7201852638cc5ad0674ebc791f0 SHA512 72cf3176091d899433a50d8a166a2505f0be9e5917df311a6f5139af472363df427102dcde99e6097b11f6aa26571bdaba06047fafd2365b4dedec0d3a47da7a
 DIST paperwork-backend-2.1.1.tar.gz 1383107 BLAKE2B 0e814a829581fe6322cc0ae44e9e3a20a2fc066e9be5de038c4d08b9d85218961ca87777271ebc646b03425e78017109ddf35c05a4b11e8fcc3bb4b6d10a6273 SHA512 ab75aaf01571eaa52a283ac6e1b9ff080d09e2514e1efb98bc96e9986acf85ec2ab2d94fc27ba15230370c642e39fddf6e11922a3d18b16af38f4281ff9c628f
 EBUILD paperwork-backend-2.1.0.ebuild 959 BLAKE2B b46571e2a34860e07c796aed27ba420ecedcf7dbcf908fb969b51544acf3cef45c96b54c96de717d8adc843413d7677c58b4ebf5a2c28f4712194f5230718c10 SHA512 1ef2da67bc7e325ffc22b216f01f78dd561fe7de4c1a43d6b7b48ca92683fcac55a91cff3d3be5ec1833f9ccf58996ee42567760c0d51514fd3cbd9e0dd719b7
-EBUILD paperwork-backend-2.1.1.ebuild 991 BLAKE2B ffcd34b4d13a58423a09a3d0bb9cfa54b461d9b8c19056a6a1853dd7ad3e6fb630ebc1f81ea017ee2385d0a95768dcff32ee44bcf7081044594a3e28237a0297 SHA512 bf4275a578eae3f93975022e5f84e46516bd508b33ca361b03ca4dcab27a234fc88ac274ec2d711d5b93548eef2d6b3f73f46f7de7ef80bd1eaf5fa88699ea22
+EBUILD paperwork-backend-2.1.1-r1.ebuild 1312 BLAKE2B b34d88703fd385d884d583401cf0ae4b53fa260e800aa5e634d5e4f7a972f37158e788118a07a4b0495b1c1dc070296c2f1871d8386a8bb8e15b26d409f0bc6c SHA512 51c39ff116fc98d61b080e4ec8f9786c2e21f8634dbb0bfdee062c2d343092e1deff6b58cddd968ed42bb7fc83fbc97629abced3c49a2305d87ac789347878f8
 MISC metadata.xml 343 BLAKE2B c205d91c4a58119baa58d40a20915a1cbf44ee65b05d2e42150b45010c0802512008c53c487b1622f6370c46f741082347ec6241290ff1ec93142ad8fb4a9081 SHA512 e0b32b862f07314143878a643d0c8475b1d17ccf7eaddeb9cf77a787e68ebd231ccb4176c71a65ac47eefa97af2a04fedce0cb4efda24c08452c63d390a4dd8f
diff --git a/app-text/paperwork-backend/paperwork-backend-2.1.1.ebuild b/app-text/paperwork-backend/paperwork-backend-2.1.1-r1.ebuild
index f5bcf8a9e058..fc9f7013f9c4 100644
--- a/app-text/paperwork-backend/paperwork-backend-2.1.1.ebuild
+++ b/app-text/paperwork-backend/paperwork-backend-2.1.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-DISTUTILS_USE_SETUPTOOLS=bdepend
+
 PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
@@ -14,9 +14,11 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND="app-text/poppler[introspection]
+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}]
@@ -28,6 +30,21 @@ RDEPEND="app-text/poppler[introspection]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	dev-python/termcolor[${PYTHON_USEDEP}]
 	dev-python/whoosh[${PYTHON_USEDEP}]
-	sci-libs/scikit-learn[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
+	sci-libs/scikit-learn[${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/Manifest b/app-text/paperwork/Manifest
index f28cbd07597a..9b6f0fa62bc6 100644
--- a/app-text/paperwork/Manifest
+++ b/app-text/paperwork/Manifest
@@ -1,5 +1,5 @@
 DIST paperwork-2.1.0.tar.gz 5887310 BLAKE2B a28229c73342769fe004be38d5782c6e29d3893bf1fbdd8ccac9790057e2af0b01ef0ad6719310a40d609811efd6c13c7b3761bb9d5feab91a6127eca1526a3a SHA512 4362b7feba917017d5c04cbfaf3d77a2619b7431f2687800f112ecac2edc48604f8bca8d4e6defd09bae1c69c6dfc3e1f22327166aa3563eb6b2c575827e536c
 DIST paperwork-2.1.1.tar.gz 5886436 BLAKE2B 5fd5a8a5d45a39298d3bc905360544f695c8c1ffa6e4bac56f3ec7bb9f31842aa71e2dadf0c8f072da59065f15fe5e768e42b8a1574722dfb99f66cc24c5b038 SHA512 e2164dc54eacb6153182c073e15f0605ec2131e17fa1c508d4923d37c1848c286d36807994ce07de99fb9cc5da012c111d84768c2c7c876dfb163811995b10c0
 EBUILD paperwork-2.1.0.ebuild 1383 BLAKE2B 3c58775d9f6c5928b554e1e0480a7cb3109b6f2d3ad6b509b25502e9426efa316e26f4efb576b013aed5b0b73551b8482547c8e6686f48a037eaa518e5bd6fa8 SHA512 a99f27e99b439393b3f1508bb74dd91db04caf4963d2e8330ef64c2bb41eda0c6d677d5926fa3b0f9913a1721d868f0c90fcd5c29294da694f59c7645ea5409a
-EBUILD paperwork-2.1.1.ebuild 1337 BLAKE2B 752df624fec6347cb68c31fd835f98c90cbe26c545542ae66d948f0a2bda9f69647c48b8872845ef6c17e315cf0bf4678bea11fb984e28d7c8f4a3af358c2a12 SHA512 8caccdc35a651c4372b50f21e4df9373a3a983f40001b9dc155746216101648affb6849589ddaf0eb96581c57fefcd8a5b96adeec18307552693ed4163c66101
+EBUILD paperwork-2.1.1-r1.ebuild 1516 BLAKE2B 96ede9bba5a0ae46d71e1db2df289a32e5d8fc756e98b6b0d8b84ba89d24c1e566fc5979712b465c48dc3c486342680c11f63677dd116f93d806cf7a9f8d5057 SHA512 f0023c355abeb57f57f2dbc0eef5778d2e04f17899430c7cb4952e136856b324764653f9370d3d9dd840a725d0ca1431c4c79e3e1dedb7a72ba8aa9241fc6a01
 MISC metadata.xml 720 BLAKE2B e5c9fad4e92180e274b83e4add8480c987abf6b463dcf199d7d44eccde7c03beaa9ab8066d5db72b88e7644b6714ac57b8120cac128c1c132adaeccfc569e8d3 SHA512 4449763d4603c9b94be9f6abc2addee08143fc85d886c2b1ee0d2f0cdc552ebaec9941cbd91de6f76516ac71dd1a4c33f232301713bfaf28ce096229832422d9
diff --git a/app-text/paperwork/paperwork-2.1.1.ebuild b/app-text/paperwork/paperwork-2.1.1-r1.ebuild
index 5fb6e834f6a9..cd4fb6cfa7a0 100644
--- a/app-text/paperwork/paperwork-2.1.1.ebuild
+++ b/app-text/paperwork/paperwork-2.1.1-r1.ebuild
@@ -29,6 +29,13 @@ RDEPEND="~app-text/openpaperwork-core-${PV}[${PYTHON_USEDEP}]
 	x11-libs/libnotify[introspection]"
 DEPEND="${RDEPEND}"
 
+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
+}
+
 python_install_all() {
 	distutils-r1_python_install_all