* [gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/files/, media-libs/leptonica/
@ 2017-02-24 10:36 James Le Cuirot
0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2017-02-24 10:36 UTC (permalink / raw
To: gentoo-commits
commit: 457fd74562d5265a86c3698f6f113c7352dc5446
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 24 10:35:44 2017 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Feb 24 10:36:02 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=457fd745
media-libs/leptonica: Drop all pre-1.74.1 versions
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-libs/leptonica/Manifest | 2 -
.../files/leptonica-1.71-fix-openjpeg-test.patch | 15 -----
.../files/leptonica-1.71-openjpeg-2.0.patch | 26 --------
media-libs/leptonica/leptonica-1.71-r1.ebuild | 72 ----------------------
media-libs/leptonica/leptonica-1.71.ebuild | 62 -------------------
media-libs/leptonica/leptonica-1.74.ebuild | 62 -------------------
6 files changed, 239 deletions(-)
diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 24eb3d767c..d41cb3be00 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,3 +1 @@
-DIST leptonica-1.71.tar.gz 10212309 SHA256 cc5d736e81496eb25e195f380f553537e0410c3f7151a778b2a546e35c7eb848 SHA512 fd02eec19a442d767ba39ce01132ef1304a977e038bdbf64ec5e763607d51adf1c06aaa687fc3ec542854e535618b6da2042f10709286c2e1d236e43d77efd51 WHIRLPOOL 5a3d57735e8e36785dea9a481a602b0f812c08bab5e42ebaac2e3fa2d42a0c8c697a61351ec1122a14fd9f471945c200a1c75015bd35b043fd208a1cad079733
DIST leptonica-1.74.1.tar.gz 11707064 SHA256 746a517a47a3bd2a90bc8d581ca6464c10f30e91a60209735efe45b3778bec62 SHA512 c6f08458d288997283aa56258932a79f4ecef10bf3fb95c91749b8b6fbe2a1573774371d969a43c2b73eb6fd67c1d6a3d07db465c29e5055bd42fc0ac22a5b47 WHIRLPOOL 6ff724464e4a2522c3a5f10854562e9f20800fd43ee4c4957cf5afdf979e5b90b1fdf6ed75ca0a14f1d5eedc1795d37e491020ca476c3917c718c381e0339752
-DIST leptonica-1.74.tar.gz 11624575 SHA256 e170f8a3f79e7f1742aff975ad5bb0c4a124df1532e6e38d9d71aaa5111de5a2 SHA512 6c563a8f30faf7dc0ad321aa58a012a0d03fc3fba7eb3c3e7b69be8bf2e71cc5f13420ded9cc08b232a780b78234e10bbdbe6a77ef26c5af330c6c6eac477f77 WHIRLPOOL 1ae8f107a7c7b5068307aea5687ee3d38169c8c18da0dd8aa1d7c1fe613adab6bc8ccb58bb54bd8ab09576594444d4fdaa03fc35f3d90c25f3431aa9bbbef0fc
diff --git a/media-libs/leptonica/files/leptonica-1.71-fix-openjpeg-test.patch b/media-libs/leptonica/files/leptonica-1.71-fix-openjpeg-test.patch
deleted file mode 100644
index f7d18a24ad..0000000000
--- a/media-libs/leptonica/files/leptonica-1.71-fix-openjpeg-test.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- leptonica-1.71.orig/configure.ac 2014-08-31 14:33:16.834598973 +0200
-+++ leptonica-1.71/configure.ac 2014-09-01 10:56:59.394975447 +0200
-@@ -78,10 +78,10 @@
- )
- )
-
--AS_IF([test "x$with_libopenjp2" != xno],
-+AS_IF([test "x$with_libopenjpeg" != xno],
- AC_CHECK_LIB([openjp2], [opj_create_decompress],
- AC_DEFINE([HAVE_LIBJP2K], 1, [Define to 1 if you have libopenjp2.]) AC_SUBST([LIBJP2K_LIBS], [-lopenjp2]),
-- AS_IF([test "x$with_libopenjp2" = xyes], AC_MSG_ERROR([libopenjp2 support requested but library not found]))
-+ AS_IF([test "x$with_libopenjpeg" = xyes], AC_MSG_ERROR([libopenjp2 support requested but library not found]))
- )
- )
-
diff --git a/media-libs/leptonica/files/leptonica-1.71-openjpeg-2.0.patch b/media-libs/leptonica/files/leptonica-1.71-openjpeg-2.0.patch
deleted file mode 100644
index ed855729f1..0000000000
--- a/media-libs/leptonica/files/leptonica-1.71-openjpeg-2.0.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Better use `pkg-config --cflags libopenjp2`
-
-Michael Weber, xmw@gentoo.org
-
---- leptonica-1.71/src/libversions.c
-+++ leptonica-1.71/src/libversions.c
-@@ -69,7 +69,7 @@
- #endif
-
- #if HAVE_LIBJP2K /* assuming it's 2.1 */
--#include "openjpeg-2.1/openjpeg.h"
-+#include "openjpeg-2.0/openjpeg.h"
- #endif
-
- #define stringJoinInPlace(s1, s2) \
---- leptonica-1.71/src/jp2kio.c
-+++ leptonica-1.71/src/jp2kio.c
-@@ -108,7 +108,7 @@
-
- /* Leptonica supports both 2.0 and 2.1. If you have 2.0,
- * change MINOR to 0. */
--#define MINOR 1
-+#define MINOR 0
-
- #if MINOR == 0
- static const l_int32 OpjMinor = 0;
diff --git a/media-libs/leptonica/leptonica-1.71-r1.ebuild b/media-libs/leptonica/leptonica-1.71-r1.ebuild
deleted file mode 100644
index 1baff3d9cc..0000000000
--- a/media-libs/leptonica/leptonica-1.71-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF="1"
-inherit eutils autotools-utils
-
-DESCRIPTION="C library for image processing and analysis"
-HOMEPAGE="http://www.leptonica.org/"
-SRC_URI="http://www.leptonica.com/source/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~mips ~ppc ~ppc64 sparc x86"
-IUSE="gif jpeg jpeg2k png tiff webp utils zlib static-libs test"
-
-# N.b. Tests need all tested features enabled:
-REQUIRED_USE="test? ( gif jpeg jpeg2k png tiff webp )"
-
-DEPEND="gif? ( media-libs/giflib )
- jpeg? ( virtual/jpeg )
- jpeg2k? ( media-libs/openjpeg:2= )
- png? ( media-libs/libpng
- sys-libs/zlib
- )
- tiff? ( media-libs/tiff )
- webp? ( media-libs/libwebp )
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-DOCS=( README version-notes )
-PATCHES=( "${FILESDIR}"/"${P}"-fix-openjpeg-test.patch )
-
-src_prepare() {
- if has_version "=media-libs/openjpeg-2.0.0" ; then
- epatch "${FILESDIR}"/"${P}"-openjpeg-2.0.patch
- fi
-
- # unhtmlize docs
- local X
- for X in ${DOCS[@]}; do
- awk '/<\/pre>/{s--} {if (s) print $0} /<pre>/{s++}' \
- "${X}.html" > "${X}" || die 'awk failed'
- rm -f -- "${X}.html"
- done
- autotools-utils_src_prepare
-}
-
-src_configure() {
- # $(use_with webp libwebp) -> unknown
- # so use-flag just for pulling dependencies
- # zlib handling see bug 454890
- local myeconfargs=(
- $(use_with gif giflib)
- $(use_with jpeg)
- $(use_with jpeg2k libopenjpeg)
- $(use_with png libpng)
- $(use_with tiff libtiff)
- $(use_enable utils programs)
- $(use_enable static-libs static)
- )
- # libpng requires zlib:
- if use png && ! use zlib ; then
- # Ignore users non-sensical choice of -zlib
- myeconfargs+=("--with-zlib")
- else
- myeconfargs+=( $(use_with zlib) )
- fi
- autotools-utils_src_configure
-}
diff --git a/media-libs/leptonica/leptonica-1.71.ebuild b/media-libs/leptonica/leptonica-1.71.ebuild
deleted file mode 100644
index 72d5fd9c79..0000000000
--- a/media-libs/leptonica/leptonica-1.71.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils autotools-utils
-
-DESCRIPTION="C library for image processing and analysis"
-HOMEPAGE="http://www.leptonica.org/"
-SRC_URI="http://www.leptonica.com/source/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~mips ppc ppc64 ~sparc x86"
-IUSE="gif jpeg jpeg2k png tiff webp utils zlib static-libs"
-
-DEPEND="gif? ( media-libs/giflib )
- jpeg? ( virtual/jpeg )
- jpeg2k? ( >=media-libs/openjpeg-2.1 )
- !jpeg2k? ( !<media-libs/openjpeg-2.1 )
- png? ( media-libs/libpng )
- tiff? ( media-libs/tiff )
- webp? ( media-libs/libwebp )
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-DOCS=( README version-notes )
-
-src_prepare() {
- # unhtmlize docs
- local X
- for X in ${DOCS[@]}; do
- awk '/<\/pre>/{s--} {if (s) print $0} /<pre>/{s++}' \
- "${X}.html" > "${X}" || die 'awk failed'
- rm -f -- "${X}.html"
- done
- autotools-utils_src_prepare
-}
-
-src_configure() {
- # $(use_with webp libwebp) -> unknown
- # so use-flag just for pulling dependencies
- # zlib handling see bug 454890
- local myeconfargs=(
- $(use_with gif giflib)
- $(use_with jpeg)
- $(use_with jpeg2k libopenjpeg)
- $(use_with png libpng)
- $(use_with tiff libtiff)
- $(use_enable utils programs)
- $(use_enable static-libs static)
- )
- # libpng requires zlib:
- if use png && ! use zlib ; then
- # Ignore users non-sensical choice of -zlib
- myeconfargs+=("--with-zlib")
- else
- myeconfargs+=( $(use_with zlib) )
- fi
- autotools-utils_src_configure
-}
diff --git a/media-libs/leptonica/leptonica-1.74.ebuild b/media-libs/leptonica/leptonica-1.74.ebuild
deleted file mode 100644
index 260e2d91a3..0000000000
--- a/media-libs/leptonica/leptonica-1.74.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit eutils multilib-minimal
-
-DESCRIPTION="C library for image processing and analysis"
-HOMEPAGE="http://www.leptonica.org/"
-SRC_URI="http://www.leptonica.org/source/${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~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 )"
-
-DEPEND="gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] )
- jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
- jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
- png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}]
- sys-libs/zlib:=[${MULTILIB_USEDEP}] )
- tiff? ( media-libs/tiff:0=[${MULTILIB_USEDEP}] )
- webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
- zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-ECONF_SOURCE="${S}"
-DOCS=( README version-notes )
-
-src_prepare() {
- default
-
- # unhtmlize docs
- local X
- for X in ${DOCS[@]}; do
- awk '/<\/pre>/{s--} {if (s) print $0} /<pre>/{s++}' \
- "${X}.html" > "${X}" || die 'awk failed'
- rm -f -- "${X}.html"
- done
-}
-
-multilib_src_configure() {
- econf \
- --enable-shared \
- $(use_with gif giflib) \
- $(use_with jpeg) \
- $(use_with jpeg2k libopenjpeg) \
- $(use_with png libpng) \
- $(use_with tiff libtiff) \
- $(use_with webp libwebp) \
- $(use_with zlib) \
- $(use_enable static-libs static) \
- $(multilib_native_use_enable utils programs)
-}
-
-src_install() {
- multilib-minimal_src_install
- prune_libtool_files
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/files/, media-libs/leptonica/
@ 2017-08-26 7:56 James Le Cuirot
0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2017-08-26 7:56 UTC (permalink / raw
To: gentoo-commits
commit: 212ea07f83af4a0e81255cf8ec189dd29cc71e42
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 26 07:55:51 2017 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Aug 26 07:55:51 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=212ea07f
media-libs/leptonica: Version bump to 1.74.4 (bug #623604)
Package-Manager: Portage-2.3.8, Repoman-2.3.2
media-libs/leptonica/Manifest | 1 +
media-libs/leptonica/files/baseline_reg.patch | 22 ++++++++++
media-libs/leptonica/leptonica-1.74.4.ebuild | 62 +++++++++++++++++++++++++++
3 files changed, 85 insertions(+)
diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index d41cb3be006..1327005e2f1 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1 +1,2 @@
DIST leptonica-1.74.1.tar.gz 11707064 SHA256 746a517a47a3bd2a90bc8d581ca6464c10f30e91a60209735efe45b3778bec62 SHA512 c6f08458d288997283aa56258932a79f4ecef10bf3fb95c91749b8b6fbe2a1573774371d969a43c2b73eb6fd67c1d6a3d07db465c29e5055bd42fc0ac22a5b47 WHIRLPOOL 6ff724464e4a2522c3a5f10854562e9f20800fd43ee4c4957cf5afdf979e5b90b1fdf6ed75ca0a14f1d5eedc1795d37e491020ca476c3917c718c381e0339752
+DIST leptonica-1.74.4.tar.gz 12349877 SHA256 29c35426a416bf454413c6fec24c24a0b633e26144a17e98351b6dffaa4a833b SHA512 e74732c10218430463ca01f15e19d329dceb938e315586ed100c634c4d50809824f1d9bf7eeaf91654caf42ed78a5ae5de7c08e7a1d8884c580c536121627891 WHIRLPOOL 8b59f35ccab36d5e9fd68964bdfc56b84079c704c624a7a3ff767d82d7df4591784487f181f9cb733ce2b26476e63b8953cce2c698ca81858c71c4dd9edfb58a
diff --git a/media-libs/leptonica/files/baseline_reg.patch b/media-libs/leptonica/files/baseline_reg.patch
new file mode 100644
index 00000000000..9ff7fe7da45
--- /dev/null
+++ b/media-libs/leptonica/files/baseline_reg.patch
@@ -0,0 +1,22 @@
+From eab13986198098688fdeb60c3c87f77df32eace8 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@aura-online.co.uk>
+Date: Sat, 15 Jul 2017 12:06:32 +0100
+Subject: [PATCH] Add baseline_reg to gnuplot-dependent test list
+
+---
+ prog/reg_wrapper.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/prog/reg_wrapper.sh b/prog/reg_wrapper.sh
+index 0947990..2845077 100755
+--- a/prog/reg_wrapper.sh
++++ b/prog/reg_wrapper.sh
+@@ -31,7 +31,7 @@ TEST_NAME="${TEST##*/}"
+ TEST_NAME="${TEST_NAME%_reg*}"
+
+ case "${TEST_NAME}" in
+- colormask|colorspace|dna|enhance|fpix1|kernel|nearline|projection|rankbin|rankhisto)
++ baseline|colormask|colorspace|dna|enhance|fpix1|kernel|nearline|projection|rankbin|rankhisto)
+ which gnuplot > /dev/null || which wgnuplot > /dev/null || exec ${@%${TEST}} /bin/sh -c "exit 77" ;;
+ esac
+
diff --git a/media-libs/leptonica/leptonica-1.74.4.ebuild b/media-libs/leptonica/leptonica-1.74.4.ebuild
new file mode 100644
index 00000000000..7b6d6cda672
--- /dev/null
+++ b/media-libs/leptonica/leptonica-1.74.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib-minimal
+
+DESCRIPTION="C library for image processing and analysis"
+HOMEPAGE="http://www.leptonica.org/"
+SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~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 )"
+
+DEPEND="gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] )
+ jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+ jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
+ png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}]
+ sys-libs/zlib:=[${MULTILIB_USEDEP}] )
+ tiff? ( media-libs/tiff:0=[${MULTILIB_USEDEP}] )
+ webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+ zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/baseline_reg.patch )
+ECONF_SOURCE="${S}"
+DOCS=( README version-notes )
+
+src_prepare() {
+ default
+
+ # unhtmlize docs
+ local X
+ for X in ${DOCS[@]}; do
+ awk '/<\/pre>/{s--} {if (s) print $0} /<pre>/{s++}' \
+ "${X}.html" > "${X}" || die 'awk failed'
+ rm -f -- "${X}.html"
+ done
+}
+
+multilib_src_configure() {
+ econf \
+ --enable-shared \
+ $(use_with gif giflib) \
+ $(use_with jpeg) \
+ $(use_with jpeg2k libopenjpeg) \
+ $(use_with png libpng) \
+ $(use_with tiff libtiff) \
+ $(use_with webp libwebp) \
+ $(use_with zlib) \
+ $(use_enable static-libs static) \
+ $(multilib_native_use_enable utils programs)
+}
+
+src_install() {
+ multilib-minimal_src_install
+ prune_libtool_files
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/files/, media-libs/leptonica/
@ 2018-05-03 22:11 James Le Cuirot
0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2018-05-03 22:11 UTC (permalink / raw
To: gentoo-commits
commit: 6ede9b55e00397596b21e05060683f02d5be7842
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu May 3 22:11:16 2018 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu May 3 22:11:38 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ede9b55
media-libs/leptonica: Remove old 1.75.2
Package-Manager: Portage-2.3.31, Repoman-2.3.9
media-libs/leptonica/Manifest | 1 -
media-libs/leptonica/files/gnuplot-png.patch | 29 -----------
media-libs/leptonica/leptonica-1.75.2.ebuild | 72 ----------------------------
3 files changed, 102 deletions(-)
diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index a682eb6a1a5..f41ecb5fcdf 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,3 +1,2 @@
DIST leptonica-1.74.4.tar.gz 12349877 BLAKE2B 5c4a71c1c4f44b617f16b1b1029455badee268dc1ac459f1c7ffe6af5b8dbe702bdbaa6e5564af6e41d0881c59e1aa43dc40d5164f618f13ca2a563b2aa3bd0e SHA512 e74732c10218430463ca01f15e19d329dceb938e315586ed100c634c4d50809824f1d9bf7eeaf91654caf42ed78a5ae5de7c08e7a1d8884c580c536121627891
-DIST leptonica-1.75.2.tar.gz 12377982 BLAKE2B d2d52a5237f23a812ccd1439a13f579e5a21db51d5f9a00ba6d7d108bf9ab084aa4a032a6fe092e8f302628357a4e947064647b34496aa7c5b02c89f78497c4d SHA512 b5107673d1b94b936105cf9795e349c89bd58b80f5947f8e041867b052580215f4fb5bc728cd893c11082efdde11158562a1c93ad53387b6ffb33e7b9e089efb
DIST leptonica-1.76.0.tar.gz 12436958 BLAKE2B 3cbb581340531762090f009393b21252d6f7ecbe3dd7c30043f42e8a437f6ae16d3e95229fedcf6845ca47e4323a35ab3e72e349c6fae35f0587c21b44461ef8 SHA512 83c77bebbf739cecab997ee08f7c9abf3ca884019c559b8f77c292ea2676c464cbf9b6812d7f12aefceef86c19d04bb3bc85119de298647a641b984dcdf3b111
diff --git a/media-libs/leptonica/files/gnuplot-png.patch b/media-libs/leptonica/files/gnuplot-png.patch
deleted file mode 100644
index 4e87fca73b3..00000000000
--- a/media-libs/leptonica/files/gnuplot-png.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 1b3c9b64ee204b3f9371cea624c959b3177c9c1d Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@aura-online.co.uk>
-Date: Tue, 13 Feb 2018 14:37:32 +0000
-Subject: [PATCH] Skip gnuplot tests if it is missing PNG support
-
----
- prog/reg_wrapper.sh | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/prog/reg_wrapper.sh b/prog/reg_wrapper.sh
-index bc60c82..4afdc08 100755
---- a/prog/reg_wrapper.sh
-+++ b/prog/reg_wrapper.sh
-@@ -32,7 +32,11 @@ TEST_NAME="${TEST_NAME%_reg*}"
-
- case "${TEST_NAME}" in
- baseline|boxa1|colormask|colorspace|dna|enhance|extrema|fpix1|italic|kernel|nearline|projection|rankbin|rankhisto|wordboxes)
-- which gnuplot > /dev/null || which wgnuplot > /dev/null || exec ${@%${TEST}} /bin/sh -c "exit 77" ;;
-+ GNUPLOT=$(type -P gnuplot wgnuplot)
-+
-+ if [ -z "${GNUPLOT}" ] || ! "${GNUPLOT}" -e "set terminal png" 2>/dev/null ; then
-+ exec ${@%${TEST}} /bin/sh -c "exit 77"
-+ fi
- esac
-
- exec ${@%${TEST}} /bin/sh -c "cd \"${srcdir}\" && \"${PWD}/\"${TEST} generate && \"${PWD}/\"${TEST} compare"
---
-2.16.1
-
diff --git a/media-libs/leptonica/leptonica-1.75.2.ebuild b/media-libs/leptonica/leptonica-1.75.2.ebuild
deleted file mode 100644
index d72072546d5..00000000000
--- a/media-libs/leptonica/leptonica-1.75.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib-minimal
-
-DESCRIPTION="C library for image processing and analysis"
-HOMEPAGE="http://www.leptonica.org/"
-SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~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 )"
-
-RDEPEND="gif? ( >=media-libs/giflib-5.1.3:=[${MULTILIB_USEDEP}] )
- jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
- jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
- png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}]
- sys-libs/zlib:=[${MULTILIB_USEDEP}] )
- tiff? ( media-libs/tiff:0=[${MULTILIB_USEDEP}] )
- webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
- zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
- test? ( media-libs/tiff:0[zlib] )"
-
-PATCHES=( "${FILESDIR}"/gnuplot-png.patch )
-ECONF_SOURCE="${S}"
-DOCS=( README version-notes )
-
-src_prepare() {
- default
-
- # unhtmlize docs
- local X
- for X in ${DOCS[@]}; do
- awk '/<\/pre>/{s--} {if (s) print $0} /<pre>/{s++}' \
- "${X}.html" > "${X}" || die 'awk failed'
- rm -f -- "${X}.html"
- done
-}
-
-multilib_src_configure() {
- econf \
- --enable-shared \
- $(use_with gif giflib) \
- $(use_with jpeg) \
- $(use_with jpeg2k libopenjpeg) \
- $(use_with png libpng) \
- $(use_with tiff libtiff) \
- $(use_with webp libwebp) \
- $(use_with zlib) \
- $(use_enable static-libs static) \
- $(multilib_native_use_enable utils programs)
-}
-
-multilib_src_test() {
- default
-
- # ${TMPDIR} is not respected. It used to be but it lead to issues
- # and there have been long debates with upstream about it. :(
- rm -rf /tmp/lept/ || die
-}
-
-src_install() {
- multilib-minimal_src_install
- prune_libtool_files
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/files/, media-libs/leptonica/
@ 2019-01-14 20:50 James Le Cuirot
0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2019-01-14 20:50 UTC (permalink / raw
To: gentoo-commits
commit: 2edc2a7914a5175332d2b3bdf713477ee9061a85
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 14 20:49:10 2019 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Jan 14 20:50:06 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2edc2a79
media-libs/leptonica: Version bump to 1.77.0, EAPI 7
Package-Manager: Portage-2.3.55, Repoman-2.3.12
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
media-libs/leptonica/Manifest | 1 +
media-libs/leptonica/files/1.77.0-gnuplot.patch | 25 +++++++++
media-libs/leptonica/leptonica-1.77.0.ebuild | 75 +++++++++++++++++++++++++
3 files changed, 101 insertions(+)
diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index f41ecb5fcdf..74485e4a7d9 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,2 +1,3 @@
DIST leptonica-1.74.4.tar.gz 12349877 BLAKE2B 5c4a71c1c4f44b617f16b1b1029455badee268dc1ac459f1c7ffe6af5b8dbe702bdbaa6e5564af6e41d0881c59e1aa43dc40d5164f618f13ca2a563b2aa3bd0e SHA512 e74732c10218430463ca01f15e19d329dceb938e315586ed100c634c4d50809824f1d9bf7eeaf91654caf42ed78a5ae5de7c08e7a1d8884c580c536121627891
DIST leptonica-1.76.0.tar.gz 12436958 BLAKE2B 3cbb581340531762090f009393b21252d6f7ecbe3dd7c30043f42e8a437f6ae16d3e95229fedcf6845ca47e4323a35ab3e72e349c6fae35f0587c21b44461ef8 SHA512 83c77bebbf739cecab997ee08f7c9abf3ca884019c559b8f77c292ea2676c464cbf9b6812d7f12aefceef86c19d04bb3bc85119de298647a641b984dcdf3b111
+DIST leptonica-1.77.0.tar.gz 12888756 BLAKE2B a1de6ff8d886c4e302faa362ad5c18ece727771e5cdbe62b33c34c950d1af9e0e97418e59485568a6386eb2a7e51fd42ffb2fd01f16591c5bc668961640f1f4d SHA512 3cf764c76d5acb6d5982c44e78c02d7a7c3b5e79937c41df193e71dd8a02dbbf965d34a2ecdf0444e907cb73c06bdb8bcae4ceafbf5ee1483c022659e897015b
diff --git a/media-libs/leptonica/files/1.77.0-gnuplot.patch b/media-libs/leptonica/files/1.77.0-gnuplot.patch
new file mode 100644
index 00000000000..0d6b0e3cb15
--- /dev/null
+++ b/media-libs/leptonica/files/1.77.0-gnuplot.patch
@@ -0,0 +1,25 @@
+From 5204b5453fe8035d77e34add80f8ebb1f36b9350 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@aura-online.co.uk>
+Date: Mon, 14 Jan 2019 20:26:14 +0000
+Subject: [PATCH] Add boxa2_reg and numa[12]_reg to gnuplot-dependent test list
+
+---
+ prog/reg_wrapper.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/prog/reg_wrapper.sh b/prog/reg_wrapper.sh
+index 5568c8e..ff9264d 100755
+--- a/prog/reg_wrapper.sh
++++ b/prog/reg_wrapper.sh
+@@ -31,7 +31,7 @@ TEST_NAME="${TEST##*/}"
+ TEST_NAME="${TEST_NAME%_reg*}"
+
+ case "${TEST_NAME}" in
+- baseline|boxa1|colormask|colorspace|dna|enhance|extrema|fpix1|italic|kernel|nearline|projection|rankbin|rankhisto|wordboxes)
++ baseline|boxa[12]|colormask|colorspace|dna|enhance|extrema|fpix1|italic|kernel|nearline|numa[12]|projection|rankbin|rankhisto|wordboxes)
+ GNUPLOT=$(type -P gnuplot || type -P wgnuplot)
+
+ if [ -z "${GNUPLOT}" ] || ! "${GNUPLOT}" -e "set terminal png" 2>/dev/null ; then
+--
+2.19.2
+
diff --git a/media-libs/leptonica/leptonica-1.77.0.ebuild b/media-libs/leptonica/leptonica-1.77.0.ebuild
new file mode 100644
index 00000000000..1e8f7a678d8
--- /dev/null
+++ b/media-libs/leptonica/leptonica-1.77.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="C library for image processing and analysis"
+HOMEPAGE="http://www.leptonica.org/"
+SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~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 )"
+
+RDEPEND="gif? ( >=media-libs/giflib-5.1.3:=[${MULTILIB_USEDEP}] )
+ jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+ jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
+ png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}]
+ sys-libs/zlib:=[${MULTILIB_USEDEP}] )
+ tiff? ( media-libs/tiff:0=[${MULTILIB_USEDEP}] )
+ webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+ zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+ test? ( media-libs/tiff:0[zlib] )"
+
+PATCHES=(
+ "${FILESDIR}"/${PV}-gnuplot.patch
+)
+
+ECONF_SOURCE="${S}"
+DOCS=( README version-notes )
+
+src_prepare() {
+ default
+
+ # unhtmlize docs
+ local X
+ for X in ${DOCS[@]}; do
+ awk '/<\/pre>/{s--} {if (s) print $0} /<pre>/{s++}' \
+ "${X}.html" > "${X}" || die 'awk failed'
+ rm -f -- "${X}.html"
+ done
+}
+
+multilib_src_configure() {
+ econf \
+ --enable-shared \
+ $(use_with gif giflib) \
+ $(use_with jpeg) \
+ $(use_with jpeg2k libopenjpeg) \
+ $(use_with png libpng) \
+ $(use_with tiff libtiff) \
+ $(use_with webp libwebp) \
+ $(use_with zlib) \
+ $(use_enable static-libs static) \
+ $(multilib_native_use_enable utils programs)
+}
+
+multilib_src_test() {
+ default
+
+ # ${TMPDIR} is not respected. It used to be but it lead to issues
+ # and there have been long debates with upstream about it. :(
+ rm -rf /tmp/lept/ || die
+}
+
+multilib_src_install_all() {
+ # libtool archives covered by pkg-config.
+ find "${D}" -name "*.la" -delete || die
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/files/, media-libs/leptonica/
@ 2020-03-24 21:37 James Le Cuirot
0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2020-03-24 21:37 UTC (permalink / raw
To: gentoo-commits
commit: 20ed12df72f4bdc5e4592d18c37ec0ef46fc3250
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 24 21:37:13 2020 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 24 21:37:13 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20ed12df
media-libs/leptonica: Drop old 1.77.0
Package-Manager: Portage-2.3.95, Repoman-2.3.20
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
media-libs/leptonica/Manifest | 1 -
media-libs/leptonica/files/1.77.0-gnuplot.patch | 25 --------
media-libs/leptonica/leptonica-1.77.0.ebuild | 76 -------------------------
3 files changed, 102 deletions(-)
diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 04424055d98..c15d96e0731 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,4 +1,3 @@
DIST leptonica-1.74.4.tar.gz 12349877 BLAKE2B 5c4a71c1c4f44b617f16b1b1029455badee268dc1ac459f1c7ffe6af5b8dbe702bdbaa6e5564af6e41d0881c59e1aa43dc40d5164f618f13ca2a563b2aa3bd0e SHA512 e74732c10218430463ca01f15e19d329dceb938e315586ed100c634c4d50809824f1d9bf7eeaf91654caf42ed78a5ae5de7c08e7a1d8884c580c536121627891
-DIST leptonica-1.77.0.tar.gz 12888756 BLAKE2B a1de6ff8d886c4e302faa362ad5c18ece727771e5cdbe62b33c34c950d1af9e0e97418e59485568a6386eb2a7e51fd42ffb2fd01f16591c5bc668961640f1f4d SHA512 3cf764c76d5acb6d5982c44e78c02d7a7c3b5e79937c41df193e71dd8a02dbbf965d34a2ecdf0444e907cb73c06bdb8bcae4ceafbf5ee1483c022659e897015b
DIST leptonica-1.78.0.tar.gz 12905925 BLAKE2B 6a7b74e8aa78a3e4fa6429bbf180001e7d362ebd37d4fd179ba90df7a41993e52d708813ea5a2b30dc90516b7bec83e5386735025993d73f279ab595c39f6c9c SHA512 f059ccc8e7b5ff2c796aeb4ab18bd25e133ec4f38c36b9e2ee203db35a1e68cf45b8baf78ebc4acba4e3607328d1374ea0e8425f35cbe06c6c5728a1ec8c3f50
DIST leptonica-1.79.0.tar.gz 13438669 BLAKE2B 59c126c0bc4690cf48937171f818637f420b4e4c56ebf866ca4c0d2a9a8f2ae2653f6ef7650340138fb1dd2ca2d3826e0f844d44afddb14856e31daf10f41c41 SHA512 4d0830683757004bb47752a17985d80c6758b97c0fd6ec64d23bbf43c9c68b04bee751831574afa4c25f5d5030c0c9f7fc22d9fc8ef932aa990401344f588ba5
diff --git a/media-libs/leptonica/files/1.77.0-gnuplot.patch b/media-libs/leptonica/files/1.77.0-gnuplot.patch
deleted file mode 100644
index 0d6b0e3cb15..00000000000
--- a/media-libs/leptonica/files/1.77.0-gnuplot.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5204b5453fe8035d77e34add80f8ebb1f36b9350 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@aura-online.co.uk>
-Date: Mon, 14 Jan 2019 20:26:14 +0000
-Subject: [PATCH] Add boxa2_reg and numa[12]_reg to gnuplot-dependent test list
-
----
- prog/reg_wrapper.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/prog/reg_wrapper.sh b/prog/reg_wrapper.sh
-index 5568c8e..ff9264d 100755
---- a/prog/reg_wrapper.sh
-+++ b/prog/reg_wrapper.sh
-@@ -31,7 +31,7 @@ TEST_NAME="${TEST##*/}"
- TEST_NAME="${TEST_NAME%_reg*}"
-
- case "${TEST_NAME}" in
-- baseline|boxa1|colormask|colorspace|dna|enhance|extrema|fpix1|italic|kernel|nearline|projection|rankbin|rankhisto|wordboxes)
-+ baseline|boxa[12]|colormask|colorspace|dna|enhance|extrema|fpix1|italic|kernel|nearline|numa[12]|projection|rankbin|rankhisto|wordboxes)
- GNUPLOT=$(type -P gnuplot || type -P wgnuplot)
-
- if [ -z "${GNUPLOT}" ] || ! "${GNUPLOT}" -e "set terminal png" 2>/dev/null ; then
---
-2.19.2
-
diff --git a/media-libs/leptonica/leptonica-1.77.0.ebuild b/media-libs/leptonica/leptonica-1.77.0.ebuild
deleted file mode 100644
index 12157b1bdd7..00000000000
--- a/media-libs/leptonica/leptonica-1.77.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="C library for image processing and analysis"
-HOMEPAGE="http://www.leptonica.org/"
-SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
-IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib"
-RESTRICT="!test? ( test )"
-
-# N.B. Tests need some features enabled:
-REQUIRED_USE="test? ( jpeg png tiff zlib )"
-
-RDEPEND="gif? ( >=media-libs/giflib-5.1.3:=[${MULTILIB_USEDEP}] )
- jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
- jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
- png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}]
- sys-libs/zlib:=[${MULTILIB_USEDEP}] )
- tiff? ( media-libs/tiff:0=[${MULTILIB_USEDEP}] )
- webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
- zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
- test? ( media-libs/tiff:0[zlib] )"
-
-PATCHES=(
- "${FILESDIR}"/${PV}-gnuplot.patch
-)
-
-ECONF_SOURCE="${S}"
-DOCS=( README version-notes )
-
-src_prepare() {
- default
-
- # unhtmlize docs
- local X
- for X in ${DOCS[@]}; do
- awk '/<\/pre>/{s--} {if (s) print $0} /<pre>/{s++}' \
- "${X}.html" > "${X}" || die 'awk failed'
- rm -f -- "${X}.html"
- done
-}
-
-multilib_src_configure() {
- econf \
- --enable-shared \
- $(use_with gif giflib) \
- $(use_with jpeg) \
- $(use_with jpeg2k libopenjpeg) \
- $(use_with png libpng) \
- $(use_with tiff libtiff) \
- $(use_with webp libwebp) \
- $(use_with zlib) \
- $(use_enable static-libs static) \
- $(multilib_native_use_enable utils programs)
-}
-
-multilib_src_test() {
- default
-
- # ${TMPDIR} is not respected. It used to be but it lead to issues
- # and there have been long debates with upstream about it. :(
- rm -rf /tmp/lept/ || die
-}
-
-multilib_src_install_all() {
- # libtool archives covered by pkg-config.
- find "${D}" -name "*.la" -delete || die
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/files/, media-libs/leptonica/
@ 2020-03-24 21:37 James Le Cuirot
0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2020-03-24 21:37 UTC (permalink / raw
To: gentoo-commits
commit: 0f291ef7d5a838cd0754c8c13c620ea0497bdd0a
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 24 21:35:59 2020 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 24 21:35:59 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f291ef7
media-libs/leptonica: Version bump to 1.79.0
Package-Manager: Portage-2.3.95, Repoman-2.3.20
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
media-libs/leptonica/Manifest | 1 +
media-libs/leptonica/files/1.79.0-tests.patch | 299 ++++++++++++++++++++++++++
media-libs/leptonica/leptonica-1.79.0.ebuild | 77 +++++++
3 files changed, 377 insertions(+)
diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 28e10f61db1..04424055d98 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,3 +1,4 @@
DIST leptonica-1.74.4.tar.gz 12349877 BLAKE2B 5c4a71c1c4f44b617f16b1b1029455badee268dc1ac459f1c7ffe6af5b8dbe702bdbaa6e5564af6e41d0881c59e1aa43dc40d5164f618f13ca2a563b2aa3bd0e SHA512 e74732c10218430463ca01f15e19d329dceb938e315586ed100c634c4d50809824f1d9bf7eeaf91654caf42ed78a5ae5de7c08e7a1d8884c580c536121627891
DIST leptonica-1.77.0.tar.gz 12888756 BLAKE2B a1de6ff8d886c4e302faa362ad5c18ece727771e5cdbe62b33c34c950d1af9e0e97418e59485568a6386eb2a7e51fd42ffb2fd01f16591c5bc668961640f1f4d SHA512 3cf764c76d5acb6d5982c44e78c02d7a7c3b5e79937c41df193e71dd8a02dbbf965d34a2ecdf0444e907cb73c06bdb8bcae4ceafbf5ee1483c022659e897015b
DIST leptonica-1.78.0.tar.gz 12905925 BLAKE2B 6a7b74e8aa78a3e4fa6429bbf180001e7d362ebd37d4fd179ba90df7a41993e52d708813ea5a2b30dc90516b7bec83e5386735025993d73f279ab595c39f6c9c SHA512 f059ccc8e7b5ff2c796aeb4ab18bd25e133ec4f38c36b9e2ee203db35a1e68cf45b8baf78ebc4acba4e3607328d1374ea0e8425f35cbe06c6c5728a1ec8c3f50
+DIST leptonica-1.79.0.tar.gz 13438669 BLAKE2B 59c126c0bc4690cf48937171f818637f420b4e4c56ebf866ca4c0d2a9a8f2ae2653f6ef7650340138fb1dd2ca2d3826e0f844d44afddb14856e31daf10f41c41 SHA512 4d0830683757004bb47752a17985d80c6758b97c0fd6ec64d23bbf43c9c68b04bee751831574afa4c25f5d5030c0c9f7fc22d9fc8ef932aa990401344f588ba5
diff --git a/media-libs/leptonica/files/1.79.0-tests.patch b/media-libs/leptonica/files/1.79.0-tests.patch
new file mode 100644
index 00000000000..eb794240dbd
--- /dev/null
+++ b/media-libs/leptonica/files/1.79.0-tests.patch
@@ -0,0 +1,299 @@
+From b4cdb9256934c8f35cad558bf7288567211a792f Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@aura-online.co.uk>
+Date: Tue, 24 Mar 2020 20:59:17 +0000
+Subject: [PATCH] Fix parallel running of tests by using unique directories
+
+diff --git a/prog/pdfio2_reg.c b/prog/pdfio2_reg.c
+index 3f2090d..19da5a3 100644
+--- a/prog/pdfio2_reg.c
++++ b/prog/pdfio2_reg.c
+@@ -55,7 +55,7 @@ L_REGPARAMS *rp;
+ return 1;
+
+ l_pdfSetDateAndVersion(0);
+- lept_mkdir("lept/pdf");
++ lept_mkdir("lept/pdf2");
+
+ /* ---------- pdf convert segmented with image regions ---------- */
+ fprintf(stderr, "\n*** Writing segmented images with image regions\n");
+@@ -65,6 +65,12 @@ L_REGPARAMS *rp;
+ * small bogus regions at the top, but we'll keep them for
+ * the demonstration. */
+ pix1 = pixRead("rabi.png");
++ pix2 = pixScaleToGray2(pix1);
++ pixWrite("/tmp/lept/pdf2/rabi8.jpg", pix2, IFF_JFIF_JPEG);
++ pix3 = pixThresholdTo4bpp(pix2, 16, 1);
++ pixWrite("/tmp/lept/pdf2/rabi4.png", pix3, IFF_PNG);
++ pixDestroy(&pix2);
++ pixDestroy(&pix3);
+ pixSetResolution(pix1, 300, 300);
+ pixGetDimensions(pix1, &w, &h, NULL);
+ pix2 = pixGenerateHalftoneMask(pix1, NULL, NULL, NULL);
+@@ -77,41 +83,41 @@ L_REGPARAMS *rp;
+
+ /* 1 bpp input */
+ convertToPdfSegmented("rabi.png", 300, L_G4_ENCODE, 128, boxa1,
+- 0, 0.25, NULL, "/tmp/lept/pdf/file00.pdf");
++ 0, 0.25, NULL, "/tmp/lept/pdf2/file00.pdf");
+ convertToPdfSegmented("rabi.png", 300, L_JPEG_ENCODE, 128, boxa1,
+- 0, 0.25, NULL, "/tmp/lept/pdf/file01.pdf");
++ 0, 0.25, NULL, "/tmp/lept/pdf2/file01.pdf");
+ convertToPdfSegmented("rabi.png", 300, L_FLATE_ENCODE, 128, boxa1,
+- 0, 0.25, NULL, "/tmp/lept/pdf/file02.pdf");
++ 0, 0.25, NULL, "/tmp/lept/pdf2/file02.pdf");
+
+ /* 8 bpp input, no cmap */
+- convertToPdfSegmented("/tmp/lept/pdf/rabi8.jpg", 150, L_G4_ENCODE, 128,
+- boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file03.pdf");
+- convertToPdfSegmented("/tmp/lept/pdf/rabi8.jpg", 150, L_JPEG_ENCODE, 128,
+- boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file04.pdf");
+- convertToPdfSegmented("/tmp/lept/pdf/rabi8.jpg", 150, L_FLATE_ENCODE, 128,
+- boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file05.pdf");
++ convertToPdfSegmented("/tmp/lept/pdf2/rabi8.jpg", 150, L_G4_ENCODE, 128,
++ boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file03.pdf");
++ convertToPdfSegmented("/tmp/lept/pdf2/rabi8.jpg", 150, L_JPEG_ENCODE, 128,
++ boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file04.pdf");
++ convertToPdfSegmented("/tmp/lept/pdf2/rabi8.jpg", 150, L_FLATE_ENCODE, 128,
++ boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file05.pdf");
+
+ /* 4 bpp input, cmap */
+- convertToPdfSegmented("/tmp/lept/pdf/rabi4.png", 150, L_G4_ENCODE, 128,
+- boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file06.pdf");
+- convertToPdfSegmented("/tmp/lept/pdf/rabi4.png", 150, L_JPEG_ENCODE, 128,
+- boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file07.pdf");
+- convertToPdfSegmented("/tmp/lept/pdf/rabi4.png", 150, L_FLATE_ENCODE, 128,
+- boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file08.pdf");
++ convertToPdfSegmented("/tmp/lept/pdf2/rabi4.png", 150, L_G4_ENCODE, 128,
++ boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file06.pdf");
++ convertToPdfSegmented("/tmp/lept/pdf2/rabi4.png", 150, L_JPEG_ENCODE, 128,
++ boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file07.pdf");
++ convertToPdfSegmented("/tmp/lept/pdf2/rabi4.png", 150, L_FLATE_ENCODE, 128,
++ boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file08.pdf");
+
+ /* 4 bpp input, cmap, data output */
+ data = NULL;
+- convertToPdfDataSegmented("/tmp/lept/pdf/rabi4.png", 150, L_G4_ENCODE,
++ convertToPdfDataSegmented("/tmp/lept/pdf2/rabi4.png", 150, L_G4_ENCODE,
+ 128, boxa2, 0, 0.5, NULL, &data, &nbytes);
+- l_binaryWrite("/tmp/lept/pdf/file09.pdf", "w", data, nbytes);
++ l_binaryWrite("/tmp/lept/pdf2/file09.pdf", "w", data, nbytes);
+ lept_free(data);
+- convertToPdfDataSegmented("/tmp/lept/pdf/rabi4.png", 150, L_JPEG_ENCODE,
++ convertToPdfDataSegmented("/tmp/lept/pdf2/rabi4.png", 150, L_JPEG_ENCODE,
+ 128, boxa2, 0, 0.5, NULL, &data, &nbytes);
+- l_binaryWrite("/tmp/lept/pdf/file10.pdf", "w", data, nbytes);
++ l_binaryWrite("/tmp/lept/pdf2/file10.pdf", "w", data, nbytes);
+ lept_free(data);
+- convertToPdfDataSegmented("/tmp/lept/pdf/rabi4.png", 150, L_FLATE_ENCODE,
++ convertToPdfDataSegmented("/tmp/lept/pdf2/rabi4.png", 150, L_FLATE_ENCODE,
+ 128, boxa2, 0, 0.5, NULL, &data, &nbytes);
+- l_binaryWrite("/tmp/lept/pdf/file11.pdf", "w", data, nbytes);
++ l_binaryWrite("/tmp/lept/pdf2/file11.pdf", "w", data, nbytes);
+ lept_free(data);
+ fprintf(stderr, "Segmented images time: %7.3f\n", stopTimer());
+
+@@ -125,17 +131,17 @@ L_REGPARAMS *rp;
+
+ pix1 = pixRead("candelabrum.011.jpg");
+ pix2 = pixScale(pix1, 3.0, 3.0);
+- pixWrite("/tmp/lept/pdf/candelabrum3.jpg", pix2, IFF_JFIF_JPEG);
+- GetImageMask(pix2, 200, &boxa1, rp, "/tmp/lept/pdf/seg1.jpg");
+- convertToPdfSegmented("/tmp/lept/pdf/candelabrum3.jpg", 200, L_G4_ENCODE,
++ pixWrite("/tmp/lept/pdf2/candelabrum3.jpg", pix2, IFF_JFIF_JPEG);
++ GetImageMask(pix2, 200, &boxa1, rp, "/tmp/lept/pdf2/seg1.jpg");
++ convertToPdfSegmented("/tmp/lept/pdf2/candelabrum3.jpg", 200, L_G4_ENCODE,
+ 100, boxa1, 0, 0.25, NULL,
+- "/tmp/lept/pdf/file12.pdf");
+- convertToPdfSegmented("/tmp/lept/pdf/candelabrum3.jpg", 200, L_JPEG_ENCODE,
++ "/tmp/lept/pdf2/file12.pdf");
++ convertToPdfSegmented("/tmp/lept/pdf2/candelabrum3.jpg", 200, L_JPEG_ENCODE,
+ 100, boxa1, 0, 0.25, NULL,
+- "/tmp/lept/pdf/file13.pdf");
+- convertToPdfSegmented("/tmp/lept/pdf/candelabrum3.jpg", 200, L_FLATE_ENCODE,
++ "/tmp/lept/pdf2/file13.pdf");
++ convertToPdfSegmented("/tmp/lept/pdf2/candelabrum3.jpg", 200, L_FLATE_ENCODE,
+ 100, boxa1, 0, 0.25, NULL,
+- "/tmp/lept/pdf/file14.pdf");
++ "/tmp/lept/pdf2/file14.pdf");
+
+ pixDestroy(&pix1);
+ pixDestroy(&pix2);
+@@ -143,25 +149,25 @@ L_REGPARAMS *rp;
+
+ pix1 = pixRead("lion-page.00016.jpg");
+ pix2 = pixScale(pix1, 3.0, 3.0);
+- pixWrite("/tmp/lept/pdf/lion16.jpg", pix2, IFF_JFIF_JPEG);
++ pixWrite("/tmp/lept/pdf2/lion16.jpg", pix2, IFF_JFIF_JPEG);
+ pix3 = pixRead("lion-mask.00016.tif");
+ boxa1 = pixConnComp(pix3, NULL, 8);
+ boxa2 = boxaTransform(boxa1, 0, 0, 3.0, 3.0);
+- convertToPdfSegmented("/tmp/lept/pdf/lion16.jpg", 200, L_G4_ENCODE,
+- 190, boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file15.pdf");
+- convertToPdfSegmented("/tmp/lept/pdf/lion16.jpg", 200, L_JPEG_ENCODE,
+- 190, boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file16.pdf");
+- convertToPdfSegmented("/tmp/lept/pdf/lion16.jpg", 200, L_FLATE_ENCODE,
+- 190, boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file17.pdf");
++ convertToPdfSegmented("/tmp/lept/pdf2/lion16.jpg", 200, L_G4_ENCODE,
++ 190, boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file15.pdf");
++ convertToPdfSegmented("/tmp/lept/pdf2/lion16.jpg", 200, L_JPEG_ENCODE,
++ 190, boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file16.pdf");
++ convertToPdfSegmented("/tmp/lept/pdf2/lion16.jpg", 200, L_FLATE_ENCODE,
++ 190, boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file17.pdf");
+
+ /* Quantize the non-image part and flate encode.
+ * This is useful because it results in a smaller file than
+ * when you flate-encode the un-quantized non-image regions. */
+ pix4 = pixScale(pix3, 3.0, 3.0); /* higher res mask, for combining */
+ pix5 = QuantizeNonImageRegion(pix2, pix4, 12);
+- pixWrite("/tmp/lept/pdf/lion16-quant.png", pix5, IFF_PNG);
+- convertToPdfSegmented("/tmp/lept/pdf/lion16-quant.png", 200, L_FLATE_ENCODE,
+- 190, boxa2, 0, 0.5, NULL, "/tmp/lept/pdf/file18.pdf");
++ pixWrite("/tmp/lept/pdf2/lion16-quant.png", pix5, IFF_PNG);
++ convertToPdfSegmented("/tmp/lept/pdf2/lion16-quant.png", 200, L_FLATE_ENCODE,
++ 190, boxa2, 0, 0.5, NULL, "/tmp/lept/pdf2/file18.pdf");
+ fprintf(stderr, "Color segmented images time: %7.3f\n", stopTimer());
+
+ pixDestroy(&pix1);
+@@ -197,8 +203,8 @@ L_REGPARAMS *rp;
+
+ startTimer();
+ convertFilesToPdf("/tmp/lept/image", "file", 100, 0.8, 0, 75, "4 file test",
+- "/tmp/lept/pdf/file19.pdf");
+- fprintf(stderr, "4-page pdf generated: /tmp/lept/pdf/file19.pdf\n"
++ "/tmp/lept/pdf2/file19.pdf");
++ fprintf(stderr, "4-page pdf generated: /tmp/lept/pdf2/file19.pdf\n"
+ "Multi-page gen time: %7.3f\n", stopTimer());
+ pixDestroy(&pix1);
+ pixDestroy(&pix2);
+@@ -208,26 +214,26 @@ L_REGPARAMS *rp;
+ pixDestroy(&pix6);
+ #endif
+
+- regTestCheckFile(rp, "/tmp/lept/pdf/file00.pdf");
+- regTestCheckFile(rp, "/tmp/lept/pdf/file01.pdf");
+- regTestCheckFile(rp, "/tmp/lept/pdf/file02.pdf");
+- regTestCheckFile(rp, "/tmp/lept/pdf/file03.pdf");
+- regTestCheckFile(rp, "/tmp/lept/pdf/file04.pdf");
+- regTestCheckFile(rp, "/tmp/lept/pdf/file05.pdf");
+- regTestCheckFile(rp, "/tmp/lept/pdf/file06.pdf");
+- regTestCheckFile(rp, "/tmp/lept/pdf/file07.pdf");
+- regTestCheckFile(rp, "/tmp/lept/pdf/file08.pdf");
+- regTestCheckFile(rp, "/tmp/lept/pdf/file09.pdf");
+- regTestCheckFile(rp, "/tmp/lept/pdf/file10.pdf");
+- regTestCheckFile(rp, "/tmp/lept/pdf/file11.pdf");
+- regTestCheckFile(rp, "/tmp/lept/pdf/file12.pdf");
+- regTestCheckFile(rp, "/tmp/lept/pdf/file13.pdf");
+- regTestCheckFile(rp, "/tmp/lept/pdf/file14.pdf");
+- regTestCheckFile(rp, "/tmp/lept/pdf/file15.pdf");
+- regTestCheckFile(rp, "/tmp/lept/pdf/file16.pdf");
+- regTestCheckFile(rp, "/tmp/lept/pdf/file17.pdf");
+- regTestCheckFile(rp, "/tmp/lept/pdf/file18.pdf");
+- regTestCheckFile(rp, "/tmp/lept/pdf/file19.pdf");
++ regTestCheckFile(rp, "/tmp/lept/pdf2/file00.pdf");
++ regTestCheckFile(rp, "/tmp/lept/pdf2/file01.pdf");
++ regTestCheckFile(rp, "/tmp/lept/pdf2/file02.pdf");
++ regTestCheckFile(rp, "/tmp/lept/pdf2/file03.pdf");
++ regTestCheckFile(rp, "/tmp/lept/pdf2/file04.pdf");
++ regTestCheckFile(rp, "/tmp/lept/pdf2/file05.pdf");
++ regTestCheckFile(rp, "/tmp/lept/pdf2/file06.pdf");
++ regTestCheckFile(rp, "/tmp/lept/pdf2/file07.pdf");
++ regTestCheckFile(rp, "/tmp/lept/pdf2/file08.pdf");
++ regTestCheckFile(rp, "/tmp/lept/pdf2/file09.pdf");
++ regTestCheckFile(rp, "/tmp/lept/pdf2/file10.pdf");
++ regTestCheckFile(rp, "/tmp/lept/pdf2/file11.pdf");
++ regTestCheckFile(rp, "/tmp/lept/pdf2/file12.pdf");
++ regTestCheckFile(rp, "/tmp/lept/pdf2/file13.pdf");
++ regTestCheckFile(rp, "/tmp/lept/pdf2/file14.pdf");
++ regTestCheckFile(rp, "/tmp/lept/pdf2/file15.pdf");
++ regTestCheckFile(rp, "/tmp/lept/pdf2/file16.pdf");
++ regTestCheckFile(rp, "/tmp/lept/pdf2/file17.pdf");
++ regTestCheckFile(rp, "/tmp/lept/pdf2/file18.pdf");
++ regTestCheckFile(rp, "/tmp/lept/pdf2/file19.pdf");
+
+ #if 1
+ /* ------------------ Test multipage pdf generation ----------------- */
+@@ -235,9 +241,9 @@ L_REGPARAMS *rp;
+
+ /* Generate a multi-page pdf from all these files */
+ startTimer();
+- concatenatePdf("/tmp/lept/pdf", "file", "/tmp/lept/pdf/cat_lept.pdf");
++ concatenatePdf("/tmp/lept/pdf2", "file", "/tmp/lept/pdf2/cat_lept.pdf");
+ fprintf(stderr,
+- "All files have been concatenated: /tmp/lept/pdf/cat_lept.pdf\n"
++ "All files have been concatenated: /tmp/lept/pdf2/cat_lept.pdf\n"
+ "Concatenation time: %7.3f\n", stopTimer());
+ #endif
+
+@@ -249,7 +255,7 @@ L_REGPARAMS *rp;
+ lept_mkdir("lept/good");
+ lept_cp("testfile1.pdf", "lept/good", NULL, NULL);
+ lept_cp("testfile2.pdf", "lept/good", NULL, NULL);
+- concatenatePdf("/tmp/lept/good", "file", "/tmp/lept/pdf/good.pdf");
++ concatenatePdf("/tmp/lept/good", "file", "/tmp/lept/pdf2/good.pdf");
+
+ /* Make a bad version with the pdf id removed, so that it is not
+ * recognized as a pdf */
+@@ -273,8 +279,8 @@ L_REGPARAMS *rp;
+ fprintf(stderr, "\nWe attempt to build from a bad directory\n");
+ fprintf(stderr, "The next 3 error messages are intentional\n");
+ lept_cp("testfile1.pdf", "lept/bad", NULL, NULL);
+- concatenatePdf("/tmp/lept/bad", "file", "/tmp/lept/pdf/bad.pdf");
+- filesAreIdentical("/tmp/lept/pdf/good.pdf", "/tmp/lept/pdf/bad.pdf", &same);
++ concatenatePdf("/tmp/lept/bad", "file", "/tmp/lept/pdf2/bad.pdf");
++ filesAreIdentical("/tmp/lept/pdf/good.pdf", "/tmp/lept/pdf2/bad.pdf", &same);
+ if (same)
+ fprintf(stderr, "Fixed: files are the same\n"
+ "Attempt succeeded\n");
+@@ -290,8 +296,8 @@ L_REGPARAMS *rp;
+ l_int32 ret;
+
+ fprintf(stderr, "\n*** pdftk writes multipage pdfs from images\n");
+- tempfile1 = genPathname("/tmp/lept/pdf", "file*.pdf");
+- tempfile2 = genPathname("/tmp/lept/pdf", "cat_pdftk.pdf");
++ tempfile1 = genPathname("/tmp/lept/pdf2", "file*.pdf");
++ tempfile2 = genPathname("/tmp/lept/pdf2", "cat_pdftk.pdf");
+ snprintf(buffer, sizeof(buffer), "pdftk %s output %s",
+ tempfile1, tempfile2);
+ ret = system(buffer); /* pdftk */
+diff --git a/prog/webpanimio_reg.c b/prog/webpanimio_reg.c
+index 8f61aab..3938e16 100644
+--- a/prog/webpanimio_reg.c
++++ b/prog/webpanimio_reg.c
+@@ -75,8 +75,8 @@ L_REGPARAMS *rp;
+ return 0;
+ #endif /* abort */
+
+- lept_rmdir("lept/webp");
+- lept_mkdir("lept/webp");
++ lept_rmdir("lept/webpanim");
++ lept_mkdir("lept/webpanim");
+
+ niters = 5;
+ duration = 250; /* ms */
+@@ -85,9 +85,9 @@ L_REGPARAMS *rp;
+ pixa = pixaCreate(6);
+ pixaAddPix(pixa, pix1, L_COPY);
+ pixaAddPix(pixa, pix2, L_COPY);
+- pixaWriteWebPAnim("/tmp/lept/webp/margeanim.webp", pixa, niters,
++ pixaWriteWebPAnim("/tmp/lept/webpanim/margeanim.webp", pixa, niters,
+ duration, 80, 0);
+- regTestCheckFile(rp, "/tmp/lept/webp/margeanim.webp");
++ regTestCheckFile(rp, "/tmp/lept/webpanim/margeanim.webp");
+ pixaDestroy(&pixa);
+ pixDestroy(&pix1);
+ pixDestroy(&pix2);
+diff --git a/prog/reg_wrapper.sh b/prog/reg_wrapper.sh
+index 94a6fa3..804954c 100755
+--- a/prog/reg_wrapper.sh
++++ b/prog/reg_wrapper.sh
+@@ -31,7 +31,7 @@ TEST_NAME="${TEST##*/}"
+ TEST_NAME="${TEST_NAME%_reg*}"
+
+ case "${TEST_NAME}" in
+- baseline|boxa[1234]|colormask|colorspace|dna|enhance|extrema|fpix1|italic|kernel|nearline|numa[12]|projection|rankbin|rankhisto|wordboxes)
++ baseline|boxa[1234]|colormask|colorspace|dna|enhance|extrema|fpix1|italic|kernel|nearline|numa[12]|pixa1|projection|rankbin|rankhisto|wordboxes)
+ GNUPLOT=$(which gnuplot || which wgnuplot)
+
+ if [ -z "${GNUPLOT}" ] || ! "${GNUPLOT}" -e "set terminal png" 2>/dev/null ; then
+--
+2.25.1
diff --git a/media-libs/leptonica/leptonica-1.79.0.ebuild b/media-libs/leptonica/leptonica-1.79.0.ebuild
new file mode 100644
index 00000000000..842c45ad994
--- /dev/null
+++ b/media-libs/leptonica/leptonica-1.79.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool multilib-minimal
+
+DESCRIPTION="C library for image processing and analysis"
+HOMEPAGE="http://www.leptonica.org/"
+SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib"
+RESTRICT="!test? ( test )"
+
+# N.B. Tests need some features enabled:
+REQUIRED_USE="test? ( jpeg png tiff zlib )"
+
+RDEPEND="gif? ( >=media-libs/giflib-5.1.3:=[${MULTILIB_USEDEP}] )
+ jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+ jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
+ png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}]
+ sys-libs/zlib:=[${MULTILIB_USEDEP}] )
+ tiff? ( media-libs/tiff:0=[${MULTILIB_USEDEP}] )
+ webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+ zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+ test? ( media-libs/tiff:0[zlib] )"
+
+PATCHES=(
+ "${FILESDIR}"/${PV}-tests.patch
+)
+
+ECONF_SOURCE="${S}"
+DOCS=( README version-notes )
+
+src_prepare() {
+ default
+ elibtoolize
+
+ # unhtmlize docs
+ local X
+ for X in ${DOCS[@]}; do
+ awk '/<\/pre>/{s--} {if (s) print $0} /<pre>/{s++}' \
+ "${X}.html" > "${X}" || die 'awk failed'
+ rm -f -- "${X}.html"
+ done
+}
+
+multilib_src_configure() {
+ econf \
+ --enable-shared \
+ $(use_with gif giflib) \
+ $(use_with jpeg) \
+ $(use_with jpeg2k libopenjpeg) \
+ $(use_with png libpng) \
+ $(use_with tiff libtiff) \
+ $(use_with webp libwebp) \
+ $(use_with zlib) \
+ $(use_enable static-libs static) \
+ $(multilib_native_use_enable utils programs)
+}
+
+multilib_src_test() {
+ default
+
+ # ${TMPDIR} is not respected. It used to be but it lead to issues
+ # and there have been long debates with upstream about it. :(
+ rm -rf /tmp/lept/ || die
+}
+
+multilib_src_install_all() {
+ # libtool archives covered by pkg-config.
+ find "${D}" -name "*.la" -delete || die
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/files/, media-libs/leptonica/
@ 2021-05-30 18:00 James Le Cuirot
0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2021-05-30 18:00 UTC (permalink / raw
To: gentoo-commits
commit: d6c29e1f27e5073deee0636184b3a27677978ba4
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun May 30 17:59:49 2021 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun May 30 17:59:49 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6c29e1f
media-libs/leptonica: Drop old and vulnerable 1.74.4
Bug: https://bugs.gentoo.org/775629
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
media-libs/leptonica/Manifest | 1 -
media-libs/leptonica/files/baseline_reg.patch | 22 ----------
media-libs/leptonica/leptonica-1.74.4.ebuild | 63 ---------------------------
3 files changed, 86 deletions(-)
diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 0d43b2fd2af..600d0be76e7 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,2 +1 @@
-DIST leptonica-1.74.4.tar.gz 12349877 BLAKE2B 5c4a71c1c4f44b617f16b1b1029455badee268dc1ac459f1c7ffe6af5b8dbe702bdbaa6e5564af6e41d0881c59e1aa43dc40d5164f618f13ca2a563b2aa3bd0e SHA512 e74732c10218430463ca01f15e19d329dceb938e315586ed100c634c4d50809824f1d9bf7eeaf91654caf42ed78a5ae5de7c08e7a1d8884c580c536121627891
DIST leptonica-1.80.0.tar.gz 13926793 BLAKE2B 1c8916acbea7411038c27ad422f7ac8d5769680ae0554a50da332676de4abdd3c6dfab69dfa4abc3525f3aa298062f4f2315548bda9d120e91abf6ffb5b41e1c SHA512 f8062a169b7ac558c8818615e534c0dcb5db48924af4d3106d0e0929e9b2f03347bdeaae45f80bded0b2aed135bb133f775244c8c752891ca4948b5d6b21e147
diff --git a/media-libs/leptonica/files/baseline_reg.patch b/media-libs/leptonica/files/baseline_reg.patch
deleted file mode 100644
index 9ff7fe7da45..00000000000
--- a/media-libs/leptonica/files/baseline_reg.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From eab13986198098688fdeb60c3c87f77df32eace8 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@aura-online.co.uk>
-Date: Sat, 15 Jul 2017 12:06:32 +0100
-Subject: [PATCH] Add baseline_reg to gnuplot-dependent test list
-
----
- prog/reg_wrapper.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/prog/reg_wrapper.sh b/prog/reg_wrapper.sh
-index 0947990..2845077 100755
---- a/prog/reg_wrapper.sh
-+++ b/prog/reg_wrapper.sh
-@@ -31,7 +31,7 @@ TEST_NAME="${TEST##*/}"
- TEST_NAME="${TEST_NAME%_reg*}"
-
- case "${TEST_NAME}" in
-- colormask|colorspace|dna|enhance|fpix1|kernel|nearline|projection|rankbin|rankhisto)
-+ baseline|colormask|colorspace|dna|enhance|fpix1|kernel|nearline|projection|rankbin|rankhisto)
- which gnuplot > /dev/null || which wgnuplot > /dev/null || exec ${@%${TEST}} /bin/sh -c "exit 77" ;;
- esac
-
diff --git a/media-libs/leptonica/leptonica-1.74.4.ebuild b/media-libs/leptonica/leptonica-1.74.4.ebuild
deleted file mode 100644
index 5b4df59969a..00000000000
--- a/media-libs/leptonica/leptonica-1.74.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit ltprune multilib-minimal
-
-DESCRIPTION="C library for image processing and analysis"
-HOMEPAGE="http://www.leptonica.org/"
-SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~sparc x86 ~ppc-macos"
-IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib"
-RESTRICT="!test? ( test )"
-
-# N.B. Tests need some features enabled:
-REQUIRED_USE="test? ( jpeg png tiff zlib )"
-
-DEPEND="gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] )
- jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
- jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
- png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}]
- sys-libs/zlib:=[${MULTILIB_USEDEP}] )
- tiff? ( media-libs/tiff:0=[${MULTILIB_USEDEP}] )
- webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
- zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/baseline_reg.patch )
-ECONF_SOURCE="${S}"
-DOCS=( README version-notes )
-
-src_prepare() {
- default
-
- # unhtmlize docs
- local X
- for X in ${DOCS[@]}; do
- awk '/<\/pre>/{s--} {if (s) print $0} /<pre>/{s++}' \
- "${X}.html" > "${X}" || die 'awk failed'
- rm -f -- "${X}.html"
- done
-}
-
-multilib_src_configure() {
- econf \
- --enable-shared \
- $(use_with gif giflib) \
- $(use_with jpeg) \
- $(use_with jpeg2k libopenjpeg) \
- $(use_with png libpng) \
- $(use_with tiff libtiff) \
- $(use_with webp libwebp) \
- $(use_with zlib) \
- $(use_enable static-libs static) \
- $(multilib_native_use_enable utils programs)
-}
-
-src_install() {
- multilib-minimal_src_install
- prune_libtool_files
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-05-30 18:00 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-03 22:11 [gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/files/, media-libs/leptonica/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2021-05-30 18:00 James Le Cuirot
2020-03-24 21:37 James Le Cuirot
2020-03-24 21:37 James Le Cuirot
2019-01-14 20:50 James Le Cuirot
2017-08-26 7:56 James Le Cuirot
2017-02-24 10:36 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox