gentoo resync : 31.05.2021

4 files changed, 14 insertions, 99 deletions

diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 96240bc4c9a5..3ed90f329bcd 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,6 +1,3 @@
-AUX baseline_reg.patch 847 BLAKE2B d45b93ba00abffca157438b6140e329de2cafe95be97fafcfc60272fa821fb847984838179cff186babf8931f79decdccb1bfa0a724abc6de675b1551ff0684e SHA512 a35f518aaf384ed35130cbd509e2ae16efc1878a3528d174156105af6d6259a094d205c47084f068b1f42e07ab87e750d6b82113376e00e041e81fedf90dd541
-DIST leptonica-1.74.4.tar.gz 12349877 BLAKE2B 5c4a71c1c4f44b617f16b1b1029455badee268dc1ac459f1c7ffe6af5b8dbe702bdbaa6e5564af6e41d0881c59e1aa43dc40d5164f618f13ca2a563b2aa3bd0e SHA512 e74732c10218430463ca01f15e19d329dceb938e315586ed100c634c4d50809824f1d9bf7eeaf91654caf42ed78a5ae5de7c08e7a1d8884c580c536121627891
 DIST leptonica-1.80.0.tar.gz 13926793 BLAKE2B 1c8916acbea7411038c27ad422f7ac8d5769680ae0554a50da332676de4abdd3c6dfab69dfa4abc3525f3aa298062f4f2315548bda9d120e91abf6ffb5b41e1c SHA512 f8062a169b7ac558c8818615e534c0dcb5db48924af4d3106d0e0929e9b2f03347bdeaae45f80bded0b2aed135bb133f775244c8c752891ca4948b5d6b21e147
-EBUILD leptonica-1.74.4.ebuild 1739 BLAKE2B fdd42c8ae0e6c59a9892c1d4e761a00f4f5e353fe904dbcf624eb14c5d1fe72f57668078e01524ea8a549348a6e022a5c93324836d0ea85bc89fb14afdfbe5fa SHA512 206dbadf6ffbd98c47cec1eb49b80dbc0fea5b91b7a036966ae3ebd21eda1a6decfc804008f1163c10156c59ca7e8abfa777e85b9c1f6ccdac73920379526078
-EBUILD leptonica-1.80.0.ebuild 2018 BLAKE2B 1ee023027c04abf35ea7108aee366b0ffb491a0eea9c98297dabcef9a83a33890588f038919d49402ea84c4d974398831521b41ef39e69306d8596c4c15fa457 SHA512 9fec7391ba7b2302ebb42e41f0b49b4371ac25793a7095709860bd1304d264b7da3757f87f985599f8168296cf2a9cda2b5507669acab74db44b117b24200fe6
+EBUILD leptonica-1.80.0.ebuild 2037 BLAKE2B 118a97e20f0951c04290529e17865b3e527b717dad7686b098dd92cbae65d05cf306c781e0b0328e49145740804f81ccc3e9b5a45ed4bf2db37b949484feb7a0 SHA512 697d321bc53a898e0ce098a76c6b124f20745df63263ce75c11a9d113cc1074ec00961012deaee93010b966924e0418e8c04efc1669816897937b40d8f9805e7
 MISC metadata.xml 518 BLAKE2B 59db99ac81e5c10275950d5c67e1c85c61c48f9eef84d533606a26beb1f3b6b3c1eb844a163687376a74dcd9561dfc91f6b85df4202a20ecf3c58f8e1201b88e SHA512 2a34197102a9d9d90faa90aa2f19e78e8a848e779ad3ad0f1bdb7d3d9d91572749ce2351c402403a0281019af1b59e0fd19c4e1809bd00836cede17647391773
diff --git a/media-libs/leptonica/files/baseline_reg.patch b/media-libs/leptonica/files/baseline_reg.patch
deleted file mode 100644
index 9ff7fe7da45b..000000000000
--- 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 5b4df59969af..000000000000
--- 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
-}
diff --git a/media-libs/leptonica/leptonica-1.80.0.ebuild b/media-libs/leptonica/leptonica-1.80.0.ebuild
index ee995cad6cf1..ef081d205e74 100644
--- a/media-libs/leptonica/leptonica-1.80.0.ebuild
+++ b/media-libs/leptonica/leptonica-1.80.0.ebuild
@@ -8,28 +8,29 @@ 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 )"
+RESTRICT="!test? ( test )"
 
-RDEPEND="gif? ( >=media-libs/giflib-5.1.3:=[${MULTILIB_USEDEP}] )
+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}] )
+	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] )"
 
-ECONF_SOURCE="${S}"
 DOCS=( README version-notes )
 
 src_prepare() {
@@ -46,7 +47,7 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	econf \
+	ECONF_SOURCE="${S}" econf \
 		--enable-shared \
 		$(use_with gif giflib) \
 		$(use_with jpeg) \
@@ -69,6 +70,8 @@ multilib_src_test() {
 }
 
 multilib_src_install_all() {
-	# libtool archives covered by pkg-config.
-	find "${D}" -name "*.la" -delete || die
+	einstalldocs
+
+	# libtool archives covered by pkg-config
+	find "${ED}" -name '*.la' -delete || die
 }