commit:     41c1ba18cc62836f4510034993c82c206fdbab21
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 11 22:14:30 2024 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Jan 11 22:14:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41c1ba18

media-libs/leptonica: 1.84.1 requires JPEG support for TIFF support

I got this slightly wrong before. JPEG support in libtiff itself seemingly
doesn't matter, except in the tests.

Closes: https://bugs.gentoo.org/921682
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 .../{leptonica-1.84.1-r1.ebuild => leptonica-1.84.1-r2.ebuild}   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/media-libs/leptonica/leptonica-1.84.1-r1.ebuild 
b/media-libs/leptonica/leptonica-1.84.1-r2.ebuild
similarity index 92%
rename from media-libs/leptonica/leptonica-1.84.1-r1.ebuild
rename to media-libs/leptonica/leptonica-1.84.1-r2.ebuild
index b3b3a772826e..3de09739be9f 100644
--- a/media-libs/leptonica/leptonica-1.84.1-r1.ebuild
+++ b/media-libs/leptonica/leptonica-1.84.1-r2.ebuild
@@ -14,7 +14,10 @@ SLOT="0/6"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc 
~x86 ~ppc-macos"
 IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib"
 # N.B. Tests need some features enabled:
-REQUIRED_USE="test? ( jpeg png tiff zlib )"
+REQUIRED_USE="
+       tiff? ( jpeg )
+       test? ( jpeg png tiff zlib )
+"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -25,11 +28,11 @@ RDEPEND="
                media-libs/libpng:0=[${MULTILIB_USEDEP}]
                sys-libs/zlib:=[${MULTILIB_USEDEP}]
        )
-       tiff? ( media-libs/tiff:=[jpeg,${MULTILIB_USEDEP}] )
+       tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] )
        webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
        zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
-       test? ( media-libs/tiff[zlib] )"
+       test? ( media-libs/tiff[jpeg,zlib] )"
 
 DOCS=( README version-notes )
 

Reply via email to