From 212ea07f83af4a0e81255cf8ec189dd29cc71e42 Mon Sep 17 00:00:00 2001
From: James Le Cuirot <chewi@gentoo.org>
Date: Sat, 26 Aug 2017 08:55:51 +0100
Subject: [PATCH] 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(+)
 create mode 100644 media-libs/leptonica/files/baseline_reg.patch
 create mode 100644 media-libs/leptonica/leptonica-1.74.4.ebuild

diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index d41cb3be0063..1327005e2f1e 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 000000000000..9ff7fe7da45b
--- /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 000000000000..7b6d6cda6720
--- /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
+}
-- 
2.26.2