gentoo resync : 15.02.2018

3 files changed, 104 insertions, 0 deletions

diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 4fdeda916754..cf725ada7f74 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,6 +1,9 @@
 AUX baseline_reg.patch 847 BLAKE2B d45b93ba00abffca157438b6140e329de2cafe95be97fafcfc60272fa821fb847984838179cff186babf8931f79decdccb1bfa0a724abc6de675b1551ff0684e SHA512 a35f518aaf384ed35130cbd509e2ae16efc1878a3528d174156105af6d6259a094d205c47084f068b1f42e07ab87e750d6b82113376e00e041e81fedf90dd541
+AUX gnuplot-png.patch 1093 BLAKE2B 0f09fb0575c4b35d22b33c0a669e1c5c61bd07e698a44c2b295da37413fb3ae4fc0ac952208b2cee5b20ac374c1f96554c18e7b61b46811b574a2f1ed009f744 SHA512 128602fee63a9ca4b99200dd4c1e3b183f0f1fe6d2109975fc2de0f41476a3ea39c443e6191099a4972d32b7725c08a2e9dbb1bbc1715d73238d85f491c8bf69
 DIST leptonica-1.74.1.tar.gz 11707064 BLAKE2B 8ffc9c2c0f9ffb83a5ab91ed27a17b3fd53ea550719f302ac0447f1768746ed7b14b324a2486061200984905f33df78da82cb2c19173b17fe8a66eeef51a84b1 SHA512 c6f08458d288997283aa56258932a79f4ecef10bf3fb95c91749b8b6fbe2a1573774371d969a43c2b73eb6fd67c1d6a3d07db465c29e5055bd42fc0ac22a5b47
 DIST leptonica-1.74.4.tar.gz 12349877 BLAKE2B 5c4a71c1c4f44b617f16b1b1029455badee268dc1ac459f1c7ffe6af5b8dbe702bdbaa6e5564af6e41d0881c59e1aa43dc40d5164f618f13ca2a563b2aa3bd0e SHA512 e74732c10218430463ca01f15e19d329dceb938e315586ed100c634c4d50809824f1d9bf7eeaf91654caf42ed78a5ae5de7c08e7a1d8884c580c536121627891
+DIST leptonica-1.75.2.tar.gz 12377982 BLAKE2B d2d52a5237f23a812ccd1439a13f579e5a21db51d5f9a00ba6d7d108bf9ab084aa4a032a6fe092e8f302628357a4e947064647b34496aa7c5b02c89f78497c4d SHA512 b5107673d1b94b936105cf9795e349c89bd58b80f5947f8e041867b052580215f4fb5bc728cd893c11082efdde11158562a1c93ad53387b6ffb33e7b9e089efb
 EBUILD leptonica-1.74.1.ebuild 1668 BLAKE2B d90ab773cef1d51ca2bbe38c13ebe0c412ee15dd265b38f3fa3ed2b57e18d12766928445b1ce9fb714965908b36513be995c8a97fca74a2e2879bcfd19be899b SHA512 4b114487e1b52877be9d4d85aa06b0340231565f4696682144d20b12403b78f086d7067ac0d1c388951c3ed99b8a5541764892391da8c9b0dc2c3dc256964815
 EBUILD leptonica-1.74.4.ebuild 1715 BLAKE2B a37760d4318cb5579447ef37f76391e7c3cb29bcac946b27421cc2ac67d287b496e231efeea5311fd5abe79981d7f4029acc949e0589412c365154c43ea5c2c2 SHA512 0beb0bdc9dd6736d2092b4cbd2cf00cd8454778ec9042d338f2abcc2b8a58fc9e721483e689eb34dede11144c3c7f3aed234ab3480210b946575208ff20f4784
+EBUILD leptonica-1.75.2.ebuild 1955 BLAKE2B 7dc81a47fc99dfc89fa388ed44a032659193969d3dcf4251130a0f23e39e9fd3f3afb20428142bfbc5289fde9a70b690ba21afa6842f745eadf4e115f1788ae6 SHA512 cf52396e2f12d8baa8e8642e8530cd2e2d84f4233ee24260cb12472fcb055c1854298224d061a178c2932ced0f45e669e54e0825fd10ac5d8bd232020c456d14
 MISC metadata.xml 584 BLAKE2B 577358c352b0d57e1c73e93ec313eb799a577af32893be3d77b2f68769493e5db075af57a2951541036f0a43b19933e9580fcc147d259462e78fb850bbf90a55 SHA512 be7f1725bd6c5807b12b4ef4f1d602e80e79637262c442d98f828fe8f1615092bdf603b56d72203c23bc32c847a7a35fbf7c331787c1afd86b3cbe051d5bf55b
diff --git a/media-libs/leptonica/files/gnuplot-png.patch b/media-libs/leptonica/files/gnuplot-png.patch
new file mode 100644
index 000000000000..4e87fca73b3c
--- /dev/null
+++ b/media-libs/leptonica/files/gnuplot-png.patch
@@ -0,0 +1,29 @@
+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
new file mode 100644
index 000000000000..d72072546d55
--- /dev/null
+++ b/media-libs/leptonica/leptonica-1.75.2.ebuild
@@ -0,0 +1,72 @@
+# 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
+}