[gentoo-commits] repo/proj/guru:dev commit in: app-text/OCRmyPDF/

["Anna Vyalkova" <cyber+gentoo@sysrq.in>]

commit:     0fc85fbf71ff1ca32e749c9beba2cdf7780f91b0
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Tue Nov 26 20:14:44 2024 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Tue Nov 26 20:22:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0fc85fbf

app-text/OCRmyPDF: add 16.6.2, drop 16.3.1

Closes: https://bugs.gentoo.org/927724 (obsolete)
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 app-text/OCRmyPDF/Manifest                         |  2 +-
 ...RmyPDF-16.3.1.ebuild => OCRmyPDF-16.6.2.ebuild} | 44 ++++++++++------------
 app-text/OCRmyPDF/metadata.xml                     |  9 ++++-
 3 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/app-text/OCRmyPDF/Manifest b/app-text/OCRmyPDF/Manifest
index bf53a2d84..b40d48a5a 100644
--- a/app-text/OCRmyPDF/Manifest
+++ b/app-text/OCRmyPDF/Manifest
@@ -1,2 +1,2 @@
-DIST OCRmyPDF-16.3.1.tar.gz 6692005 BLAKE2B f884cfbf0f69b09c5e6fcf7c35922ee85ca1df2b6a7644def5f923777d58f85a221e368df5f870519788f9ee5296c81dfaa491703ab0bb67407fa4f04293a3d3 SHA512 2e7db0cc236475a4bb95695e0d2fb9617a74342ba45f10ed016a263237360f6053ee74fd78a2fc2a7f9c135e104413d886646c147e63cfa461e2321ba472cbd9
 DIST OCRmyPDF-16.5.0.tar.gz 6693450 BLAKE2B b817059fa49ba26a5887cd3525a58d168c2d265a90221071dd56f4de1d4130080ecb347edc7bd66fad6f8aee8b0e1c8bbf2b0d2297df761b76cc603deacd39bb SHA512 dfa30ae49a02c477423a5749718f73fa056ec759d8c1e835d04ede31a94f61c42ff8009e9ec7d06022685ef5c5469c52df00eb66b5717b3ec5cc4df935ac16cf
+DIST OCRmyPDF-16.6.2.tar.gz 6696758 BLAKE2B 194e68eb473aae267204b5a791468e33e5c64da75cacf320ac11d6289b16fc2c407abd29b53f13f51dd1cc208508fdd1083b3962947aca1d61442dfffcf52569 SHA512 02455fb57f73cc9957c655d57c76b63238ce336e7bcf66925caa229823be4be90f05cd8ad3677f2114e0248402ce0e895eec3ae5d5fb46027418a0dccb8debd5

diff --git a/app-text/OCRmyPDF/OCRmyPDF-16.3.1.ebuild b/app-text/OCRmyPDF/OCRmyPDF-16.6.2.ebuild
similarity index 67%
rename from app-text/OCRmyPDF/OCRmyPDF-16.3.1.ebuild
rename to app-text/OCRmyPDF/OCRmyPDF-16.6.2.ebuild
index bdc1a8b12..9792b76ba 100644
--- a/app-text/OCRmyPDF/OCRmyPDF-16.3.1.ebuild
+++ b/app-text/OCRmyPDF/OCRmyPDF-16.6.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_USE_PEP517=hatchling
 PYTHON_COMPAT=( python3_{11..12} )
 
 inherit distutils-r1 optfeature shell-completion
@@ -15,48 +15,42 @@ SRC_URI="https://github.com/ocrmypdf/ocrmypdf/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="CC-BY-SA-2.5 CC-BY-SA-4.0 MIT MPL-2.0 ZLIB"
 SLOT="0"
 KEYWORDS="~amd64"
-RESTRICT="test"
 
 RDEPEND="
 	>=app-text/ghostscript-gpl-10.01.2
 	>=app-text/pdfminer-20220319[${PYTHON_USEDEP}]
 	>=app-text/tesseract-4.1.1[jpeg,tiff,png,webp]
-	>=dev-python/coloredlogs-14.0[${PYTHON_USEDEP}]
 	>=dev-python/deprecation-2.1.0[${PYTHON_USEDEP}]
 	>=dev-python/packaging-20[${PYTHON_USEDEP}]
-	>dev-python/pikepdf-5.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pikepdf-8.10.1[${PYTHON_USEDEP}]
 	>=dev-python/pillow-10.0.1[lcms,${PYTHON_USEDEP}]
 	>=dev-python/pluggy-1.0[${PYTHON_USEDEP}]
-	>=dev-python/reportlab-3.5.66[${PYTHON_USEDEP}]
-	>=dev-python/tqdm-4[${PYTHON_USEDEP}]
-	>=media-gfx/img2pdf-0.3.0[${PYTHON_USEDEP}]
 	>=dev-python/rich-13.0[${PYTHON_USEDEP}]
+	>=media-gfx/img2pdf-0.5[${PYTHON_USEDEP}]
 "
+# TODO: package PyMuPDF for tests
 BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
 	test? (
 		app-text/tessdata_fast[l10n_de,l10n_en]
 		>=app-text/unpaper-6.1
 		>=dev-python/hypothesis-6.36.0[${PYTHON_USEDEP}]
-		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
 		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
-		media-libs/exempi:2
-		>=media-libs/jbig2enc-0.29
-		media-libs/libxmp
-		>=media-gfx/pngquant-2.5
-		>=dev-python/pytest-6.2.5[${PYTHON_USEDEP}]
-		>=dev-python/pytest-cov-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-2.5.0[${PYTHON_USEDEP}]
 		>=dev-python/reportlab-3.6.8[${PYTHON_USEDEP}]
-		>=dev-python/coverage-6.2[${PYTHON_USEDEP}]
-		dev-python/humanfriendly[${PYTHON_USEDEP}]
+		>=media-gfx/pngquant-2.5
+		>=media-libs/jbig2enc-0.29
 	)
 "
 
+EPYTEST_XDIST="yes"
 EPYTEST_IGNORE=(
-	# useless test
+	# Useless test
 	tests/test_completion.py
 )
+EPYTEST_DESELECT=(
+	# Fails if Tesseract was compiled with Clang
+	tests/test_rotation.py::test_rotate_deskew_ocr_timeout
+)
 
 distutils_enable_tests pytest
 
@@ -66,20 +60,22 @@ distutils_enable_sphinx docs \
 
 export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
 
-src_prepare() {
-	distutils-r1_src_prepare
-	sed -e "/-n auto/d" -i pyproject.toml || die
+python_test() {
+	epytest -o addopts=
 }
 
 src_install() {
 	distutils-r1_src_install
-	newbashcomp misc/completion/ocrmypdf.bash "${PN,,}"
 
+	newbashcomp misc/completion/ocrmypdf.bash ocrmypdf
 	dofishcomp misc/completion/ocrmypdf.fish
 }
 
 pkg_postinst() {
-	optfeature "JBIG2 optimization support" media-libs/jbig2enc
 	optfeature "image cleaning support" app-text/unpaper
+	optfeature "JBIG2 optimization support" media-libs/jbig2enc
 	optfeature "PNG optimization support" media-gfx/pngquant
+
+	# TODO: package pi-heif
+	#optfeature "HEIF image format support" dev-python/pi-heif
 }

diff --git a/app-text/OCRmyPDF/metadata.xml b/app-text/OCRmyPDF/metadata.xml
index 244554a0a..c55d39a67 100644
--- a/app-text/OCRmyPDF/metadata.xml
+++ b/app-text/OCRmyPDF/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -7,5 +7,12 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">ocrmypdf/OCRmyPDF</remote-id>
+		<maintainer>
+			<name>James R. Barlow</name>
+			<email>james@purplerock.ca</email>
+		</maintainer>
+		<doc>https://ocrmypdf.readthedocs.io/</doc>
+		<bugs-to>https://github.com/ocrmypdf/OCRmyPDF/issues</bugs-to>
+		<changelog>https://github.com/ocrmypdf/OCRmyPDF/docs/release_notes.rst</changelog>
 	</upstream>
 </pkgmetadata>