media-gfx/img2pdf Deselect tests instead of using the patch

3 files changed, 7 insertions, 90 deletions

diff --git a/media-gfx/img2pdf/Manifest b/media-gfx/img2pdf/Manifest
index c2800c2..7b0b648 100644
--- a/media-gfx/img2pdf/Manifest
+++ b/media-gfx/img2pdf/Manifest
@@ -1,4 +1,4 @@
 AUX remove-exact-cmyk8.patch 3347 BLAKE2B 61700badf3a9dac027d553554ce991c341a5cb869dc29033128c1557074e6b7a2bd3ecf7b9a0cd7d077ba038dee0f9e3a561f10211cbdb193b382e0ae449d7c2 SHA512 4a68d91eda35c5fe4933e84bc368e14d655a38312bea7fe5429685da52d45e18dbc21566db126b3830d35b4389fa7d45067a86aa8cbc3312e83b367ff9793077
 DIST img2pdf-0.5.1.tar.gz 104241 BLAKE2B 1ea89107654c91cea8b5f074c05c7376452dd2ebd40dafaadedb39ac3ee383c3c02c1375b130da73339e1f87eb1a6ffbe0553cdedf6ec997bc0731d1d100327f SHA512 e17a920929f6ab08f501b205c38f9cf2fd5a6bd8d41ac4819a5d7463a3cfbeb5376cd5bbee36ab303248610f1d5c8a71a38ff85b14be564e2f39c6eb537ffcaf
-EBUILD img2pdf-0.5.1.ebuild 1194 BLAKE2B 3b9530b6acdd98d0b18ab4f030d15fb6e9918804e14dcd09795ed070177bd1cf7d3f0c8b70e80f310ae23355c221d1a9b898d58858fda6adb8f4fb91e07cb3db SHA512 89909e9df8de3968ebcdb325f0d05c812fd5e22fad8b04e3cb6d2b1d423c040cb34f2be271e0ad2f7ea90e4c0353e2fbd818646798277fa41a06ece3b762b93b
+EBUILD img2pdf-0.5.1.ebuild 1271 BLAKE2B 2d6742a2f4a1ed3b0e63148f3aec2069dee7e99f0059db6af90a45e651ef49e57741b22e043b1847391f0df770094b26a046a8b987f8baf7cf9c636fa4caffde SHA512 6ca8bb8c12f60580133cbe39ac26c5d47f6b04ffb0150d73d35e1bef20557fc285c366f80188cc5209167ebf240523cff0e698c507b7eba8b259b543d7980f3a
 MISC metadata.xml 1019 BLAKE2B 5c6db1304339112586563d41c64ee3b89f3e714d6587d6a4a0bac2159fe57c7ebeaf9e2bb14f225c2a05dce11147c9a02b63961b47588bd5bb6dc9f2ebb265d0 SHA512 1b8b8c137f24b682c97944fa38997c86aaeba8cbb2c86fc20277c992f23d07a7382315287734ab37cf9bec3be0593181dd875ca8453351e37ac27a6d1ec5ae6f
diff --git a/media-gfx/img2pdf/files/remove-exact-cmyk8.patch b/media-gfx/img2pdf/files/remove-exact-cmyk8.patch
deleted file mode 100644
index a0f00de..0000000
--- a/media-gfx/img2pdf/files/remove-exact-cmyk8.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Subject: remove HAVE_EXACT_CMYK8
-From: Johannes Schauer Marin Rodrigues <josch@debian.org>
-
---- a/src/img2pdf_test.py
-+++ b/src/img2pdf_test.py
-@@ -85,7 +85,6 @@ for prog in ["convert", "compare", "iden
-         globals()[prog.upper()] = ["magick", prog]
- 
- HAVE_IMAGEMAGICK_MODERN = True
--HAVE_EXACT_CMYK8 = True
- try:
-     ver = subprocess.check_output(CONVERT + ["-version"], stderr=subprocess.STDOUT)
-     m = re.fullmatch(
-@@ -93,18 +92,13 @@ try:
-     )
-     if m is None:
-         HAVE_IMAGEMAGICK_MODERN = False
--        HAVE_EXACT_CMYK8 = False
-     else:
-         if parse_version(m.group(1)) < parse_version("6.9.10-12"):
-             HAVE_IMAGEMAGICK_MODERN = False
--        if parse_version(m.group(1)) < parse_version("7.1.0-48"):
--            HAVE_EXACT_CMYK8 = False
- except FileNotFoundError:
-     HAVE_IMAGEMAGICK_MODERN = False
--    HAVE_EXACT_CMYK8 = False
- except subprocess.CalledProcessError:
-     HAVE_IMAGEMAGICK_MODERN = False
--    HAVE_EXACT_CMYK8 = False
- 
- if not HAVE_IMAGEMAGICK_MODERN:
-     warnings.warn("imagemagick >= 6.9.10-12 not available, skipping certain checks...")
-@@ -351,9 +345,7 @@ def write_png(data, path, bitdepth, colo
- 
- def compare(im1, im2, exact, icc, cmyk):
-     if exact:
--        if cmyk and not HAVE_EXACT_CMYK8:
--            raise Exception("cmyk cannot be exact before ImageMagick 7.1.0-48")
--        elif icc:
-+        if icc:
-             raise Exception("icc cannot be exact")
-         else:
-             subprocess.check_call(
-@@ -5562,11 +5554,9 @@ def test_jpg_rot(tmp_path_factory, jpg_r
- )
- def test_jpg_cmyk(tmp_path_factory, jpg_cmyk_img, jpg_cmyk_pdf):
-     tmpdir = tmp_path_factory.mktemp("jpg_cmyk")
--    compare_ghostscript(
--        tmpdir, jpg_cmyk_img, jpg_cmyk_pdf, gsdevice="tiff32nc", exact=HAVE_EXACT_CMYK8
--    )
-+    compare_ghostscript(tmpdir, jpg_cmyk_img, jpg_cmyk_pdf, gsdevice="tiff32nc")
-     # not testing with poppler as it cannot write CMYK images
--    compare_mupdf(tmpdir, jpg_cmyk_img, jpg_cmyk_pdf, exact=HAVE_EXACT_CMYK8, cmyk=True)
-+    compare_mupdf(tmpdir, jpg_cmyk_img, jpg_cmyk_pdf, cmyk=True)
-     compare_pdfimages_cmyk(tmpdir, jpg_cmyk_img, jpg_cmyk_pdf)
- 
- 
-@@ -5957,12 +5947,9 @@ def test_tiff_cmyk8(tmp_path_factory, ti
-         tiff_cmyk8_img,
-         tiff_cmyk8_pdf,
-         gsdevice="tiff32nc",
--        exact=HAVE_EXACT_CMYK8,
-     )
-     # not testing with poppler as it cannot write CMYK images
--    compare_mupdf(
--        tmpdir, tiff_cmyk8_img, tiff_cmyk8_pdf, exact=HAVE_EXACT_CMYK8, cmyk=True
--    )
-+    compare_mupdf(tmpdir, tiff_cmyk8_img, tiff_cmyk8_pdf, cmyk=True)
-     compare_pdfimages_tiff(tmpdir, tiff_cmyk8_img, tiff_cmyk8_pdf)
- 
- 
-@@ -6403,11 +6390,9 @@ def test_tiff_ccitt_nometa2(
- )
- def test_miff_cmyk8(tmp_path_factory, miff_cmyk8_img, tiff_cmyk8_img, miff_cmyk8_pdf):
-     tmpdir = tmp_path_factory.mktemp("miff_cmyk8")
--    compare_ghostscript(
--        tmpdir, tiff_cmyk8_img, miff_cmyk8_pdf, gsdevice="tiff32nc", exact=False
--    )
-+    compare_ghostscript(tmpdir, tiff_cmyk8_img, miff_cmyk8_pdf, gsdevice="tiff32nc")
-     # not testing with poppler as it cannot write CMYK images
--    compare_mupdf(tmpdir, tiff_cmyk8_img, miff_cmyk8_pdf, exact=False, cmyk=True)
-+    compare_mupdf(tmpdir, tiff_cmyk8_img, miff_cmyk8_pdf, cmyk=True)
-     compare_pdfimages_tiff(tmpdir, tiff_cmyk8_img, miff_cmyk8_pdf)
- 
- 
diff --git a/media-gfx/img2pdf/img2pdf-0.5.1.ebuild b/media-gfx/img2pdf/img2pdf-0.5.1.ebuild
index 3158ece..379c012 100644
--- a/media-gfx/img2pdf/img2pdf-0.5.1.ebuild
+++ b/media-gfx/img2pdf/img2pdf-0.5.1.ebuild
@@ -16,10 +16,6 @@ SLOT="0"
 KEYWORDS="amd64 ppc64 x86"
 IUSE="gui"
 
-PATCHES=(
-	"${FILESDIR}/remove-exact-cmyk8.patch"
-)
-
 BDEPEND="
 	test? (
 		app-text/ghostscript-gpl
@@ -44,6 +40,12 @@ RDEPEND="
 
 distutils_enable_tests pytest
 
+EPYTEST_DESELECT=(
+    # Failing cmyk8 tests
+    src/img2pdf_test.py::test_miff_cmyk8
+    src/img2pdf_test.py::test_miff_cmyk8
+)
+
 src_prepare() {
 	distutils-r1_python_prepare_all