gentoo resync : 05.04.2019

3 files changed, 26 insertions, 8 deletions

diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index dbf806066055..66f7294dca7d 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,9 +1,10 @@
 AUX 1.77.0-gnuplot.patch 987 BLAKE2B 51f1fa225cb124fd3b078ed895234fb343ea78c06dd5d763dee71f37a0826c5c2dcb2c845cd1b47a2e6a855075ddf806cfa3ea5895077163bce2209acffe5851 SHA512 36d996202de66ffd0b241b813779c62830d688c42bc21670d277f370243636c6c0658067d806b6be3f765aa1527a4ebd4bac3fe6e0188fc5381f599f14239b51
+AUX 1.78.0-gnuplot.patch 672 BLAKE2B 85058c0eab02b289df011f3e4462d91c43e9780591c0991206523d55ce91f02fab85ff47c235522614862e14f078d5e0879fd89b88e70607167f91d57f7b63c0 SHA512 846d5488667b3a21dea81a7059505cdfd2916eff51053dadda978f1520a250ce8ebfdf7b5a820e11630dee4dfb9c0b78340aed9dc109f6fd119e01b855c16554
 AUX baseline_reg.patch 847 BLAKE2B d45b93ba00abffca157438b6140e329de2cafe95be97fafcfc60272fa821fb847984838179cff186babf8931f79decdccb1bfa0a724abc6de675b1551ff0684e SHA512 a35f518aaf384ed35130cbd509e2ae16efc1878a3528d174156105af6d6259a094d205c47084f068b1f42e07ab87e750d6b82113376e00e041e81fedf90dd541
 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
+DIST leptonica-1.78.0.tar.gz 12905925 BLAKE2B 6a7b74e8aa78a3e4fa6429bbf180001e7d362ebd37d4fd179ba90df7a41993e52d708813ea5a2b30dc90516b7bec83e5386735025993d73f279ab595c39f6c9c SHA512 f059ccc8e7b5ff2c796aeb4ab18bd25e133ec4f38c36b9e2ee203db35a1e68cf45b8baf78ebc4acba4e3607328d1374ea0e8425f35cbe06c6c5728a1ec8c3f50
 EBUILD leptonica-1.74.4.ebuild 1714 BLAKE2B 0d6f7f596f2ddda2515ec95966cfdb4e9bc7c059fd88c58700a2c05139529fd550fa7a077b30da8fe0f8abee36a9d5b915ac56b5d86a8573c3e44767c2e13338 SHA512 26fcc48126498ab1d7c80f4aeaa0a263bd443e0fd72ceaefdc00e34543fc9a3a91c7cac6481bd334f58f29b920983b3b175cc9091128ce6a096530a1d808a15e
-EBUILD leptonica-1.76.0.ebuild 1912 BLAKE2B a526eae23b91e0f089db992d80280e192462328ad520831d513dcb7e0f5d025de3e0e786dc935552e53b8529ba997d71dff4fd0f5f5e8fb0519ae9947a5f1037 SHA512 ab4f22f918c8c23275b2d5a343bb9952b00a167522722b63c350effaedad0c6ab0cdbc62e5487a4d16d0cc4d2088e050d3fca139219eaa9c1991e929c79dfd6e
 EBUILD leptonica-1.77.0.ebuild 1995 BLAKE2B bc14325f908d06c6cb9d6002849d68b1a7b6844238c88103c16551bf661b45230491d50d1572d05508c1c974c0392a87412fa17100208cbf8b021731ff228fde SHA512 71f006841bbc39526b858ed09705c7835ca6dfe23c756fdaa64a8ccd3ea54e4bc633d60833e39f2277cd7d011872cb2590f2557a55961842ac1cd624420e84f5
+EBUILD leptonica-1.78.0.ebuild 1995 BLAKE2B bc14325f908d06c6cb9d6002849d68b1a7b6844238c88103c16551bf661b45230491d50d1572d05508c1c974c0392a87412fa17100208cbf8b021731ff228fde SHA512 71f006841bbc39526b858ed09705c7835ca6dfe23c756fdaa64a8ccd3ea54e4bc633d60833e39f2277cd7d011872cb2590f2557a55961842ac1cd624420e84f5
 MISC metadata.xml 518 BLAKE2B 59db99ac81e5c10275950d5c67e1c85c61c48f9eef84d533606a26beb1f3b6b3c1eb844a163687376a74dcd9561dfc91f6b85df4202a20ecf3c58f8e1201b88e SHA512 2a34197102a9d9d90faa90aa2f19e78e8a848e779ad3ad0f1bdb7d3d9d91572749ce2351c402403a0281019af1b59e0fd19c4e1809bd00836cede17647391773
diff --git a/media-libs/leptonica/files/1.78.0-gnuplot.patch b/media-libs/leptonica/files/1.78.0-gnuplot.patch
new file mode 100644
index 000000000000..758b78258dd3
--- /dev/null
+++ b/media-libs/leptonica/files/1.78.0-gnuplot.patch
@@ -0,0 +1,13 @@
+diff --git a/prog/reg_wrapper.sh b/prog/reg_wrapper.sh
+index cee1f54..f16d980 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[12]|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]|projection|rankbin|rankhisto|wordboxes)
+         GNUPLOT=$(type -P gnuplot || type -P wgnuplot)
+ 
+         if [ -z "${GNUPLOT}" ] || ! "${GNUPLOT}" -e "set terminal png" 2>/dev/null ; then
diff --git a/media-libs/leptonica/leptonica-1.76.0.ebuild b/media-libs/leptonica/leptonica-1.78.0.ebuild
index 6d4921ca7594..1e8f7a678d8b 100644
--- a/media-libs/leptonica/leptonica-1.76.0.ebuild
+++ b/media-libs/leptonica/leptonica-1.78.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit ltprune multilib-minimal
+inherit multilib-minimal
 
 DESCRIPTION="C library for image processing and analysis"
 HOMEPAGE="http://www.leptonica.org/"
@@ -28,6 +28,10 @@ RDEPEND="gif? ( >=media-libs/giflib-5.1.3:=[${MULTILIB_USEDEP}] )
 DEPEND="${RDEPEND}
 	test? ( media-libs/tiff:0[zlib] )"
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-gnuplot.patch
+)
+
 ECONF_SOURCE="${S}"
 DOCS=( README version-notes )
 
@@ -65,7 +69,7 @@ multilib_src_test() {
 	rm -rf /tmp/lept/ || die
 }
 
-src_install() {
-	multilib-minimal_src_install
-	prune_libtool_files
+multilib_src_install_all() {
+	# libtool archives covered by pkg-config.
+	find "${D}" -name "*.la" -delete || die
 }