[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2024-01-11 Thread James Le Cuirot
commit: 41c1ba18cc62836f4510034993c82c206fdbab21
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Jan 11 22:14:30 2024 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Jan 11 22:14:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41c1ba18

media-libs/leptonica: 1.84.1 requires JPEG support for TIFF support

I got this slightly wrong before. JPEG support in libtiff itself seemingly
doesn't matter, except in the tests.

Closes: https://bugs.gentoo.org/921682
Signed-off-by: James Le Cuirot  gentoo.org>

 .../{leptonica-1.84.1-r1.ebuild => leptonica-1.84.1-r2.ebuild}   | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/media-libs/leptonica/leptonica-1.84.1-r1.ebuild 
b/media-libs/leptonica/leptonica-1.84.1-r2.ebuild
similarity index 92%
rename from media-libs/leptonica/leptonica-1.84.1-r1.ebuild
rename to media-libs/leptonica/leptonica-1.84.1-r2.ebuild
index b3b3a772826e..3de09739be9f 100644
--- a/media-libs/leptonica/leptonica-1.84.1-r1.ebuild
+++ b/media-libs/leptonica/leptonica-1.84.1-r2.ebuild
@@ -14,7 +14,10 @@ SLOT="0/6"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~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 )"
+REQUIRED_USE="
+   tiff? ( jpeg )
+   test? ( jpeg png tiff zlib )
+"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -25,11 +28,11 @@ RDEPEND="
media-libs/libpng:0=[${MULTILIB_USEDEP}]
sys-libs/zlib:=[${MULTILIB_USEDEP}]
)
-   tiff? ( media-libs/tiff:=[jpeg,${MULTILIB_USEDEP}] )
+   tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] )
webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
-   test? ( media-libs/tiff[zlib] )"
+   test? ( media-libs/tiff[jpeg,zlib] )"
 
 DOCS=( README version-notes )
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2024-01-10 Thread James Le Cuirot
commit: 6db214e5a1768cbb2b7ad2b23eca57104db16f53
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Jan 10 22:10:00 2024 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Jan 10 22:11:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6db214e5

media-libs/leptonica: 1.84.1 requires JPEG support in libtiff

Closes: https://bugs.gentoo.org/921682
Signed-off-by: James Le Cuirot  gentoo.org>

 .../leptonica/{leptonica-1.84.1.ebuild => leptonica-1.84.1-r1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/leptonica/leptonica-1.84.1.ebuild 
b/media-libs/leptonica/leptonica-1.84.1-r1.ebuild
similarity index 95%
rename from media-libs/leptonica/leptonica-1.84.1.ebuild
rename to media-libs/leptonica/leptonica-1.84.1-r1.ebuild
index 51b99d059922..b3b3a772826e 100644
--- a/media-libs/leptonica/leptonica-1.84.1.ebuild
+++ b/media-libs/leptonica/leptonica-1.84.1-r1.ebuild
@@ -25,11 +25,11 @@ RDEPEND="
media-libs/libpng:0=[${MULTILIB_USEDEP}]
sys-libs/zlib:=[${MULTILIB_USEDEP}]
)
-   tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] )
+   tiff? ( media-libs/tiff:=[jpeg,${MULTILIB_USEDEP}] )
webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
-   test? ( media-libs/tiff:0[jpeg,zlib] )"
+   test? ( media-libs/tiff[zlib] )"
 
 DOCS=( README version-notes )
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2024-01-07 Thread James Le Cuirot
commit: f14a6a64cd3c199520d18a2c2caf507eb58794a6
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Jan  7 14:52:20 2024 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Jan  7 14:52:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f14a6a64

media-libs/leptonica: Version bump to 1.84.1

2 or 3 flakey test failures, but these seem to occur in the previous version
anyway. Possibly down to some dependency.

Signed-off-by: James Le Cuirot  gentoo.org>

 media-libs/leptonica/Manifest|  1 +
 media-libs/leptonica/leptonica-1.84.1.ebuild | 77 
 2 files changed, 78 insertions(+)

diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 5d4519c9830d..9da2bbaa8e3b 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1 +1,2 @@
 DIST leptonica-1.83.1.tar.gz 14028566 BLAKE2B 
56c501f16eb58366e4ed2f168f714adef968c271a0636cc0f3663b762aac29352a508421702e8ab063f78f3faf01e3d9eb72fff43093b05722a1a604beb66a59
 SHA512 
14c76b8795e494637cd225982cd27a1cd82d22b34c0c0d6ed061530c0ed8cec87fc1c8482bbda8f56a04f240b9fb50d481b8fffe5df846958cb146f9d2d51553
+DIST leptonica-1.84.1.tar.gz 14102299 BLAKE2B 
1da9b5bd2b72fa82320126dd8e6e647fbc50be0dcd71a0f8e392d9617911fe4f224d51158ab230476afbf7fd0e15cae1b59d8469cbf68a43893ada09a8d93673
 SHA512 
949be33a09e1dfc04527f5401d3d682999bd6904dca0b4950b457d12564e3290ec5b62ab4b14ef14d6f499a0fbfa0ebc37c2e8ab2966913883127b9489f47e97

diff --git a/media-libs/leptonica/leptonica-1.84.1.ebuild 
b/media-libs/leptonica/leptonica-1.84.1.ebuild
new file mode 100644
index ..51b99d059922
--- /dev/null
+++ b/media-libs/leptonica/leptonica-1.84.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~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 )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   gif? ( >=media-libs/giflib-5.1.3:=[${MULTILIB_USEDEP}] )
+   jpeg? ( media-libs/libjpeg-turbo:=[${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:=[${MULTILIB_USEDEP}] )
+   webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+   zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+   test? ( media-libs/tiff:0[jpeg,zlib] )"
+
+DOCS=( README version-notes )
+
+src_prepare() {
+   default
+   elibtoolize
+
+   # unhtmlize docs
+   local X
+   for X in ${DOCS[@]}; do
+   awk '/<\/pre>/{s--} {if (s) print $0} //{s++}' \
+   "${X}.html" > "${X}" || die 'awk failed'
+   rm -f -- "${X}.html"
+   done
+}
+
+multilib_src_configure() {
+   ECONF_SOURCE="${S}" 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 webp libwebpmux) \
+   $(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() {
+   einstalldocs
+
+   # libtool archives covered by pkg-config
+   find "${ED}" -name '*.la' -delete || die
+}



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2023-08-03 Thread James Le Cuirot
commit: a8bf5cb108236d5eecfa96c281c5cbdf0915682e
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Aug  3 20:09:40 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Aug  3 20:09:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8bf5cb1

media-libs/leptonica: Drop old 1.82.0-r1

Signed-off-by: James Le Cuirot  gentoo.org>

 media-libs/leptonica/Manifest   |  1 -
 media-libs/leptonica/leptonica-1.82.0-r1.ebuild | 77 -
 2 files changed, 78 deletions(-)

diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index c10e579c23a2..5d4519c9830d 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,2 +1 @@
-DIST leptonica-1.82.0.tar.gz 14041481 BLAKE2B 
2e60a7e14bf9120348460ac122fe0e9a1c696f17fd8f23cd3eb1b1316e13ae7fd25bbaef3fc8531df6e2572fa06e86d757138b11b29dcc24dda9576b9c00f3b0
 SHA512 
cb0484570bf3921307ab5c805b3f0e08d4aaa811adfb592f3956b563fc145f7a45173e2278fc5d8a9e37f729bb34dbf8068e030e2066d54547f82d26b56aa27d
 DIST leptonica-1.83.1.tar.gz 14028566 BLAKE2B 
56c501f16eb58366e4ed2f168f714adef968c271a0636cc0f3663b762aac29352a508421702e8ab063f78f3faf01e3d9eb72fff43093b05722a1a604beb66a59
 SHA512 
14c76b8795e494637cd225982cd27a1cd82d22b34c0c0d6ed061530c0ed8cec87fc1c8482bbda8f56a04f240b9fb50d481b8fffe5df846958cb146f9d2d51553

diff --git a/media-libs/leptonica/leptonica-1.82.0-r1.ebuild 
b/media-libs/leptonica/leptonica-1.82.0-r1.ebuild
deleted file mode 100644
index 5d26a30aaa62..
--- a/media-libs/leptonica/leptonica-1.82.0-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 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 ~loong ~mips ppc ppc64 ~riscv ~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 )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   gif? ( >=media-libs/giflib-5.1.3:=[${MULTILIB_USEDEP}] )
-   jpeg? ( media-libs/libjpeg-turbo:=[${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:=[${MULTILIB_USEDEP}] )
-   webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
-   zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-   test? ( media-libs/tiff:0[jpeg,zlib] )"
-
-DOCS=( README version-notes )
-
-src_prepare() {
-   default
-   elibtoolize
-
-   # unhtmlize docs
-   local X
-   for X in ${DOCS[@]}; do
-   awk '/<\/pre>/{s--} {if (s) print $0} //{s++}' \
-   "${X}.html" > "${X}" || die 'awk failed'
-   rm -f -- "${X}.html"
-   done
-}
-
-multilib_src_configure() {
-   ECONF_SOURCE="${S}" 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 webp libwebpmux) \
-   $(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() {
-   einstalldocs
-
-   # libtool archives covered by pkg-config
-   find "${ED}" -name '*.la' -delete || die
-}



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2023-08-02 Thread Arthur Zamarin
commit: f2aa0b4c985581218ce4ddac31c913b716d11a5c
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Aug  2 18:27:44 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Aug  2 18:27:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2aa0b4c

media-libs/leptonica: Stabilize 1.83.1 ppc, #901079

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/leptonica/leptonica-1.83.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/leptonica/leptonica-1.83.1.ebuild 
b/media-libs/leptonica/leptonica-1.83.1.ebuild
index 6859a3d21f12..f49243aeb6f8 100644
--- a/media-libs/leptonica/leptonica-1.83.1.ebuild
+++ b/media-libs/leptonica/leptonica-1.83.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0/6"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 
~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~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 )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2023-07-16 Thread Sam James
commit: ca25f38577eeb9ff702e259b200411d73afe1840
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 16 23:01:04 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 16 23:01:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca25f385

media-libs/leptonica: Stabilize 1.83.1 ppc64, #901079

Signed-off-by: Sam James  gentoo.org>

 media-libs/leptonica/leptonica-1.83.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/leptonica/leptonica-1.83.1.ebuild 
b/media-libs/leptonica/leptonica-1.83.1.ebuild
index 81ed3a5d52f8..6859a3d21f12 100644
--- a/media-libs/leptonica/leptonica-1.83.1.ebuild
+++ b/media-libs/leptonica/leptonica-1.83.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0/6"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 
~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ~ppc ppc64 ~riscv ~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 )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2023-07-12 Thread Jakov Smolić
commit: a96a729881372ed6022526c817c10a20223ddd8e
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Jul 12 06:39:25 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Jul 12 06:39:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a96a7298

media-libs/leptonica: Stabilize 1.83.1 x86, #901079

Signed-off-by: Jakov Smolić  gentoo.org>

 media-libs/leptonica/leptonica-1.83.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/leptonica/leptonica-1.83.1.ebuild 
b/media-libs/leptonica/leptonica-1.83.1.ebuild
index 9f0d7a1ac019..81ed3a5d52f8 100644
--- a/media-libs/leptonica/leptonica-1.83.1.ebuild
+++ b/media-libs/leptonica/leptonica-1.83.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0/6"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 
~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~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 )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2023-04-01 Thread Arthur Zamarin
commit: 0df505bcf798d4f9d1e97454162e5bfda786f09a
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr  1 16:07:21 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr  1 16:07:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0df505bc

media-libs/leptonica: Stabilize 1.83.1 arm64, #901079

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/leptonica/leptonica-1.83.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/leptonica/leptonica-1.83.1.ebuild 
b/media-libs/leptonica/leptonica-1.83.1.ebuild
index 6e619b9a4b89..9f0d7a1ac019 100644
--- a/media-libs/leptonica/leptonica-1.83.1.ebuild
+++ b/media-libs/leptonica/leptonica-1.83.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0/6"
-KEYWORDS="~alpha amd64 arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 
~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~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 )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2023-03-17 Thread Arthur Zamarin
commit: 877d64026f437a5ce137d4c4ac6f3376c176247d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Mar 17 06:47:10 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Mar 17 06:47:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=877d6402

media-libs/leptonica: Stabilize 1.83.1 amd64, #901079

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/leptonica/leptonica-1.83.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/leptonica/leptonica-1.83.1.ebuild 
b/media-libs/leptonica/leptonica-1.83.1.ebuild
index e6ef3731896b..6e619b9a4b89 100644
--- a/media-libs/leptonica/leptonica-1.83.1.ebuild
+++ b/media-libs/leptonica/leptonica-1.83.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0/6"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 
~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~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 )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2023-03-16 Thread Sam James
commit: 8ecb9a9ad94d7e20e64edf0180a2a39014ab477f
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar 16 22:19:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 16 22:19:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ecb9a9a

media-libs/leptonica: Stabilize 1.83.1 arm, #901079

Signed-off-by: Sam James  gentoo.org>

 media-libs/leptonica/leptonica-1.83.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/leptonica/leptonica-1.83.1.ebuild 
b/media-libs/leptonica/leptonica-1.83.1.ebuild
index e93d52c14fe0..e6ef3731896b 100644
--- a/media-libs/leptonica/leptonica-1.83.1.ebuild
+++ b/media-libs/leptonica/leptonica-1.83.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0/6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc 
~x86 ~ppc-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~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 )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2023-01-27 Thread James Le Cuirot
commit: 584602b41e3bc62cf9180fddf1c509d1d9415bd6
Author: James Le Cuirot  gentoo  org>
AuthorDate: Fri Jan 27 23:19:46 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Jan 27 23:19:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=584602b4

media-libs/leptonica: Bump to 1.83.1, drop broken 1.83.0

Closes: https://bugs.gentoo.org/891833
Signed-off-by: James Le Cuirot  gentoo.org>

 media-libs/leptonica/Manifest   | 2 +-
 .../leptonica/{leptonica-1.83.0.ebuild => leptonica-1.83.1.ebuild}  | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index c30dde409206..c10e579c23a2 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,2 +1,2 @@
 DIST leptonica-1.82.0.tar.gz 14041481 BLAKE2B 
2e60a7e14bf9120348460ac122fe0e9a1c696f17fd8f23cd3eb1b1316e13ae7fd25bbaef3fc8531df6e2572fa06e86d757138b11b29dcc24dda9576b9c00f3b0
 SHA512 
cb0484570bf3921307ab5c805b3f0e08d4aaa811adfb592f3956b563fc145f7a45173e2278fc5d8a9e37f729bb34dbf8068e030e2066d54547f82d26b56aa27d
-DIST leptonica-1.83.0.tar.gz 14031018 BLAKE2B 
42cc6be7448dda36b027a01c84e51d269c7c4928640585ae12c9b1e63d434d72314da7c072c7fc9073ae09ead0c9a1322edf409fec2bb50dc7cfb6f4f06a6faa
 SHA512 
2d21972109776c3308438c0e2e93f4ae1fb89e233bebf9730324f8804dab90432ad5fe41cdf491cde36d78cf61cb481391545d51539bab0139e8375bc91a33e1
+DIST leptonica-1.83.1.tar.gz 14028566 BLAKE2B 
56c501f16eb58366e4ed2f168f714adef968c271a0636cc0f3663b762aac29352a508421702e8ab063f78f3faf01e3d9eb72fff43093b05722a1a604beb66a59
 SHA512 
14c76b8795e494637cd225982cd27a1cd82d22b34c0c0d6ed061530c0ed8cec87fc1c8482bbda8f56a04f240b9fb50d481b8fffe5df846958cb146f9d2d51553

diff --git a/media-libs/leptonica/leptonica-1.83.0.ebuild 
b/media-libs/leptonica/leptonica-1.83.1.ebuild
similarity index 100%
rename from media-libs/leptonica/leptonica-1.83.0.ebuild
rename to media-libs/leptonica/leptonica-1.83.1.ebuild



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2023-01-13 Thread James Le Cuirot
commit: e96f850ede522182979c39358a06bef66104ff21
Author: James Le Cuirot  gentoo  org>
AuthorDate: Fri Jan 13 23:32:08 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Jan 13 23:32:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e96f850e

media-libs/leptonica: Version bump to 1.83.0

Signed-off-by: James Le Cuirot  gentoo.org>

 media-libs/leptonica/Manifest|  1 +
 media-libs/leptonica/leptonica-1.83.0.ebuild | 77 
 2 files changed, 78 insertions(+)

diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index c809dadde62d..c30dde409206 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1 +1,2 @@
 DIST leptonica-1.82.0.tar.gz 14041481 BLAKE2B 
2e60a7e14bf9120348460ac122fe0e9a1c696f17fd8f23cd3eb1b1316e13ae7fd25bbaef3fc8531df6e2572fa06e86d757138b11b29dcc24dda9576b9c00f3b0
 SHA512 
cb0484570bf3921307ab5c805b3f0e08d4aaa811adfb592f3956b563fc145f7a45173e2278fc5d8a9e37f729bb34dbf8068e030e2066d54547f82d26b56aa27d
+DIST leptonica-1.83.0.tar.gz 14031018 BLAKE2B 
42cc6be7448dda36b027a01c84e51d269c7c4928640585ae12c9b1e63d434d72314da7c072c7fc9073ae09ead0c9a1322edf409fec2bb50dc7cfb6f4f06a6faa
 SHA512 
2d21972109776c3308438c0e2e93f4ae1fb89e233bebf9730324f8804dab90432ad5fe41cdf491cde36d78cf61cb481391545d51539bab0139e8375bc91a33e1

diff --git a/media-libs/leptonica/leptonica-1.83.0.ebuild 
b/media-libs/leptonica/leptonica-1.83.0.ebuild
new file mode 100644
index ..e93d52c14fe0
--- /dev/null
+++ b/media-libs/leptonica/leptonica-1.83.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~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 )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   gif? ( >=media-libs/giflib-5.1.3:=[${MULTILIB_USEDEP}] )
+   jpeg? ( media-libs/libjpeg-turbo:=[${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:=[${MULTILIB_USEDEP}] )
+   webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+   zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+   test? ( media-libs/tiff:0[jpeg,zlib] )"
+
+DOCS=( README version-notes )
+
+src_prepare() {
+   default
+   elibtoolize
+
+   # unhtmlize docs
+   local X
+   for X in ${DOCS[@]}; do
+   awk '/<\/pre>/{s--} {if (s) print $0} //{s++}' \
+   "${X}.html" > "${X}" || die 'awk failed'
+   rm -f -- "${X}.html"
+   done
+}
+
+multilib_src_configure() {
+   ECONF_SOURCE="${S}" 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 webp libwebpmux) \
+   $(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() {
+   einstalldocs
+
+   # libtool archives covered by pkg-config
+   find "${ED}" -name '*.la' -delete || die
+}



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2022-09-29 Thread James Le Cuirot
commit: 2fb2cc7f5221737f76431f2637f27e046fdc725f
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Sep 29 22:31:49 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Sep 29 22:32:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fb2cc7f

media-libs/leptonica: Drop old 1.80.0 and 1.81.1

Signed-off-by: James Le Cuirot  gentoo.org>

 media-libs/leptonica/Manifest|  2 -
 media-libs/leptonica/leptonica-1.80.0.ebuild | 77 
 media-libs/leptonica/leptonica-1.81.1.ebuild | 77 
 3 files changed, 156 deletions(-)

diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 41b12d98348a..c809dadde62d 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,3 +1 @@
-DIST leptonica-1.80.0.tar.gz 13926793 BLAKE2B 
1c8916acbea7411038c27ad422f7ac8d5769680ae0554a50da332676de4abdd3c6dfab69dfa4abc3525f3aa298062f4f2315548bda9d120e91abf6ffb5b41e1c
 SHA512 
f8062a169b7ac558c8818615e534c0dcb5db48924af4d3106d0e0929e9b2f03347bdeaae45f80bded0b2aed135bb133f775244c8c752891ca4948b5d6b21e147
-DIST leptonica-1.81.1.tar.gz 14056320 BLAKE2B 
09a3859d8d2bbef4ea5d450c81dd5af1c95752501e4b40779a57d099eb30934fbfe4099ab2d7abadf518af25cbd3c36269261c9c6d3850a44a2b16c2eb795801
 SHA512 
3c24e30eab21b634094543a722172553e35d928b3a50bfe78e9b0123cd16d710b4be8714acaac87344b22292b460d6ffb06b05a8e7f3df060544a2bbf3f8a7d2
 DIST leptonica-1.82.0.tar.gz 14041481 BLAKE2B 
2e60a7e14bf9120348460ac122fe0e9a1c696f17fd8f23cd3eb1b1316e13ae7fd25bbaef3fc8531df6e2572fa06e86d757138b11b29dcc24dda9576b9c00f3b0
 SHA512 
cb0484570bf3921307ab5c805b3f0e08d4aaa811adfb592f3956b563fc145f7a45173e2278fc5d8a9e37f729bb34dbf8068e030e2066d54547f82d26b56aa27d

diff --git a/media-libs/leptonica/leptonica-1.80.0.ebuild 
b/media-libs/leptonica/leptonica-1.80.0.ebuild
deleted file mode 100644
index ef081d205e74..
--- a/media-libs/leptonica/leptonica-1.80.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 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"
-# 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}] )
-   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] )"
-
-DOCS=( README version-notes )
-
-src_prepare() {
-   default
-   elibtoolize
-
-   # unhtmlize docs
-   local X
-   for X in ${DOCS[@]}; do
-   awk '/<\/pre>/{s--} {if (s) print $0} //{s++}' \
-   "${X}.html" > "${X}" || die 'awk failed'
-   rm -f -- "${X}.html"
-   done
-}
-
-multilib_src_configure() {
-   ECONF_SOURCE="${S}" 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 webp libwebpmux) \
-   $(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() {
-   einstalldocs
-
-   # libtool archives covered by pkg-config
-   find "${ED}" -name '*.la' -delete || die
-}

diff --git a/media-libs/leptonica/leptonica-1.81.1.ebuild 
b/media-libs/leptonica/leptonica-1.81.1.ebuild
deleted file mode 100644
index f831a57c4e72..
--- a/media-libs/leptonica/leptonica-1.81.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 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/;

[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2022-09-27 Thread Agostino Sarubbo
commit: 70b3b5031eda4e33872641be4980412f8edca2e4
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Sep 27 07:10:25 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Sep 27 07:10:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70b3b503

media-libs/leptonica: Stabilize 1.82.0 x86, #873061

Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/leptonica/leptonica-1.82.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/leptonica/leptonica-1.82.0.ebuild 
b/media-libs/leptonica/leptonica-1.82.0.ebuild
index ad04cef4f580..fbdc79c07067 100644
--- a/media-libs/leptonica/leptonica-1.82.0.ebuild
+++ b/media-libs/leptonica/leptonica-1.82.0.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc ~x86 
~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~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 )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2022-09-27 Thread Agostino Sarubbo
commit: 527132b0e7734db2a3f7408675a92cf44c2cc880
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Sep 27 07:09:20 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Sep 27 07:09:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=527132b0

media-libs/leptonica: Stabilize 1.82.0 ppc64, #873061

Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/leptonica/leptonica-1.82.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/leptonica/leptonica-1.82.0.ebuild 
b/media-libs/leptonica/leptonica-1.82.0.ebuild
index 36cbdf24572e..ad04cef4f580 100644
--- a/media-libs/leptonica/leptonica-1.82.0.ebuild
+++ b/media-libs/leptonica/leptonica-1.82.0.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ~ppc64 ~riscv ~sparc ~x86 
~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~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 )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2022-09-27 Thread Agostino Sarubbo
commit: 5268c8edc7bcb2a79699845f5b35e971497361fb
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Sep 27 07:08:33 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Sep 27 07:08:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5268c8ed

media-libs/leptonica: Stabilize 1.82.0 ppc, #873061

Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/leptonica/leptonica-1.82.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/leptonica/leptonica-1.82.0.ebuild 
b/media-libs/leptonica/leptonica-1.82.0.ebuild
index 037aee1ab717..36cbdf24572e 100644
--- a/media-libs/leptonica/leptonica-1.82.0.ebuild
+++ b/media-libs/leptonica/leptonica-1.82.0.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 
~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ~ppc64 ~riscv ~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 )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2022-09-27 Thread Agostino Sarubbo
commit: 7564dfe164dccfc7af38dd34f6314910d3b6008b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Sep 27 07:07:18 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Sep 27 07:07:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7564dfe1

media-libs/leptonica: Stabilize 1.82.0 arm64, #873061

Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/leptonica/leptonica-1.82.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/leptonica/leptonica-1.82.0.ebuild 
b/media-libs/leptonica/leptonica-1.82.0.ebuild
index f842e2aaea33..037aee1ab717 100644
--- a/media-libs/leptonica/leptonica-1.82.0.ebuild
+++ b/media-libs/leptonica/leptonica-1.82.0.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 
~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~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 )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2022-09-27 Thread Agostino Sarubbo
commit: 12ed794d43c03c6a308b8a0734921aee6d7ac46c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Sep 27 07:06:35 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Sep 27 07:06:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12ed794d

media-libs/leptonica: Stabilize 1.82.0 arm, #873061

Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/leptonica/leptonica-1.82.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/leptonica/leptonica-1.82.0.ebuild 
b/media-libs/leptonica/leptonica-1.82.0.ebuild
index cb76f3664053..f842e2aaea33 100644
--- a/media-libs/leptonica/leptonica-1.82.0.ebuild
+++ b/media-libs/leptonica/leptonica-1.82.0.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 
~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~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 )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2022-09-27 Thread Agostino Sarubbo
commit: 878d815b1b41bc6003d5e69bb5984825e8f7b36c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Sep 27 07:05:28 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Sep 27 07:05:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=878d815b

media-libs/leptonica: Stabilize 1.82.0 amd64, #873061

Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/leptonica/leptonica-1.82.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/leptonica/leptonica-1.82.0.ebuild 
b/media-libs/leptonica/leptonica-1.82.0.ebuild
index 1a5b2148e48a..cb76f3664053 100644
--- a/media-libs/leptonica/leptonica-1.82.0.ebuild
+++ b/media-libs/leptonica/leptonica-1.82.0.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc 
~x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~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 )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2022-05-14 Thread WANG Xuerui
commit: c23a58bde4c6d2b933ddc7caa1076f6ddb84f9c5
Author: WANG Xuerui  gentoo  org>
AuthorDate: Sat May 14 07:27:35 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Sat May 14 07:28:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c23a58bd

media-libs/leptonica: keyword 1.82.0 for ~loong

Tests passed on real hardware.

Signed-off-by: WANG Xuerui  gentoo.org>

 media-libs/leptonica/leptonica-1.82.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/leptonica/leptonica-1.82.0.ebuild 
b/media-libs/leptonica/leptonica-1.82.0.ebuild
index f831a57c4e72..1a5b2148e48a 100644
--- a/media-libs/leptonica/leptonica-1.82.0.ebuild
+++ b/media-libs/leptonica/leptonica-1.82.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 
~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~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 )"



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2021-09-25 Thread James Le Cuirot
commit: ed6a1e8e56a53d0f3e2823e6ee451100bc9e040c
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Sep 25 22:46:43 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Sep 25 22:46:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed6a1e8e

media-libs/leptonica: Drop old 1.81.0

Signed-off-by: James Le Cuirot  gentoo.org>

 media-libs/leptonica/Manifest|  1 -
 media-libs/leptonica/leptonica-1.81.0.ebuild | 77 
 2 files changed, 78 deletions(-)

diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 4f95540cb54..41b12d98348 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,4 +1,3 @@
 DIST leptonica-1.80.0.tar.gz 13926793 BLAKE2B 
1c8916acbea7411038c27ad422f7ac8d5769680ae0554a50da332676de4abdd3c6dfab69dfa4abc3525f3aa298062f4f2315548bda9d120e91abf6ffb5b41e1c
 SHA512 
f8062a169b7ac558c8818615e534c0dcb5db48924af4d3106d0e0929e9b2f03347bdeaae45f80bded0b2aed135bb133f775244c8c752891ca4948b5d6b21e147
-DIST leptonica-1.81.0.tar.gz 14056128 BLAKE2B 
21a6be10d8579746855b6c12785ecd75ce475cc24601ddd2b71ac79aee1a82dd96d26a0b779feae6b0a4028fca4556accd6a208525999c457250a6fcd0e0a5cf
 SHA512 
e6e530a490337941018393ffc69ca45a92fecdee290c6de63f7656207228c19e474ec2e9291591cee85c782edbc46d51d69692871e425ed2367a7dd679dc7771
 DIST leptonica-1.81.1.tar.gz 14056320 BLAKE2B 
09a3859d8d2bbef4ea5d450c81dd5af1c95752501e4b40779a57d099eb30934fbfe4099ab2d7abadf518af25cbd3c36269261c9c6d3850a44a2b16c2eb795801
 SHA512 
3c24e30eab21b634094543a722172553e35d928b3a50bfe78e9b0123cd16d710b4be8714acaac87344b22292b460d6ffb06b05a8e7f3df060544a2bbf3f8a7d2
 DIST leptonica-1.82.0.tar.gz 14041481 BLAKE2B 
2e60a7e14bf9120348460ac122fe0e9a1c696f17fd8f23cd3eb1b1316e13ae7fd25bbaef3fc8531df6e2572fa06e86d757138b11b29dcc24dda9576b9c00f3b0
 SHA512 
cb0484570bf3921307ab5c805b3f0e08d4aaa811adfb592f3956b563fc145f7a45173e2278fc5d8a9e37f729bb34dbf8068e030e2066d54547f82d26b56aa27d

diff --git a/media-libs/leptonica/leptonica-1.81.0.ebuild 
b/media-libs/leptonica/leptonica-1.81.0.ebuild
deleted file mode 100644
index cc3881a79ba..000
--- a/media-libs/leptonica/leptonica-1.81.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 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"
-# 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}] )
-   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] )"
-
-DOCS=( README version-notes )
-
-src_prepare() {
-   default
-   elibtoolize
-
-   # unhtmlize docs
-   local X
-   for X in ${DOCS[@]}; do
-   awk '/<\/pre>/{s--} {if (s) print $0} //{s++}' \
-   "${X}.html" > "${X}" || die 'awk failed'
-   rm -f -- "${X}.html"
-   done
-}
-
-multilib_src_configure() {
-   ECONF_SOURCE="${S}" 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 webp libwebpmux) \
-   $(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() {
-   einstalldocs
-
-   # libtool archives covered by pkg-config
-   find "${ED}" -name '*.la' -delete || die
-}



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2021-09-25 Thread James Le Cuirot
commit: 02a892aa5e8b6df33e2b667368506f875822f80f
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Sep 25 22:46:11 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Sep 25 22:46:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02a892aa

media-libs/leptonica: Version bump to 1.82.0

Signed-off-by: James Le Cuirot  gentoo.org>

 media-libs/leptonica/Manifest|  1 +
 media-libs/leptonica/leptonica-1.82.0.ebuild | 77 
 2 files changed, 78 insertions(+)

diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 0a99028753e..4f95540cb54 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,3 +1,4 @@
 DIST leptonica-1.80.0.tar.gz 13926793 BLAKE2B 
1c8916acbea7411038c27ad422f7ac8d5769680ae0554a50da332676de4abdd3c6dfab69dfa4abc3525f3aa298062f4f2315548bda9d120e91abf6ffb5b41e1c
 SHA512 
f8062a169b7ac558c8818615e534c0dcb5db48924af4d3106d0e0929e9b2f03347bdeaae45f80bded0b2aed135bb133f775244c8c752891ca4948b5d6b21e147
 DIST leptonica-1.81.0.tar.gz 14056128 BLAKE2B 
21a6be10d8579746855b6c12785ecd75ce475cc24601ddd2b71ac79aee1a82dd96d26a0b779feae6b0a4028fca4556accd6a208525999c457250a6fcd0e0a5cf
 SHA512 
e6e530a490337941018393ffc69ca45a92fecdee290c6de63f7656207228c19e474ec2e9291591cee85c782edbc46d51d69692871e425ed2367a7dd679dc7771
 DIST leptonica-1.81.1.tar.gz 14056320 BLAKE2B 
09a3859d8d2bbef4ea5d450c81dd5af1c95752501e4b40779a57d099eb30934fbfe4099ab2d7abadf518af25cbd3c36269261c9c6d3850a44a2b16c2eb795801
 SHA512 
3c24e30eab21b634094543a722172553e35d928b3a50bfe78e9b0123cd16d710b4be8714acaac87344b22292b460d6ffb06b05a8e7f3df060544a2bbf3f8a7d2
+DIST leptonica-1.82.0.tar.gz 14041481 BLAKE2B 
2e60a7e14bf9120348460ac122fe0e9a1c696f17fd8f23cd3eb1b1316e13ae7fd25bbaef3fc8531df6e2572fa06e86d757138b11b29dcc24dda9576b9c00f3b0
 SHA512 
cb0484570bf3921307ab5c805b3f0e08d4aaa811adfb592f3956b563fc145f7a45173e2278fc5d8a9e37f729bb34dbf8068e030e2066d54547f82d26b56aa27d

diff --git a/media-libs/leptonica/leptonica-1.82.0.ebuild 
b/media-libs/leptonica/leptonica-1.82.0.ebuild
new file mode 100644
index 000..f831a57c4e7
--- /dev/null
+++ b/media-libs/leptonica/leptonica-1.82.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 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 ~riscv ~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 )"
+RESTRICT="!test? ( test )"
+
+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[jpeg,zlib] )"
+
+DOCS=( README version-notes )
+
+src_prepare() {
+   default
+   elibtoolize
+
+   # unhtmlize docs
+   local X
+   for X in ${DOCS[@]}; do
+   awk '/<\/pre>/{s--} {if (s) print $0} //{s++}' \
+   "${X}.html" > "${X}" || die 'awk failed'
+   rm -f -- "${X}.html"
+   done
+}
+
+multilib_src_configure() {
+   ECONF_SOURCE="${S}" 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 webp libwebpmux) \
+   $(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() {
+   einstalldocs
+
+   # libtool archives covered by pkg-config
+   find "${ED}" -name '*.la' -delete || die
+}



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2021-08-24 Thread Marek Szuba
commit: 5b9f953b458c8e80d1fa725b57255e69b885b1bc
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Aug 24 19:48:26 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Aug 24 21:02:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b9f953b

media-libs/leptonica: keyword 1.81.1 for ~riscv

Originally two tests in iomisc_reg (index 38) failed due
to JPEG-compressed test TIFF output being empty files; turns out this
a) happens if media-libs/tiff is built with USE=-jpeg, and b) is not
riscv-specific. All tests pass now.

Signed-off-by: Marek Szuba  gentoo.org>

 media-libs/leptonica/leptonica-1.81.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/leptonica/leptonica-1.81.1.ebuild 
b/media-libs/leptonica/leptonica-1.81.1.ebuild
index cc3881a79ba..f831a57c4e7 100644
--- a/media-libs/leptonica/leptonica-1.81.1.ebuild
+++ b/media-libs/leptonica/leptonica-1.81.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~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 )"
@@ -29,7 +29,7 @@ RDEPEND="
webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
-   test? ( media-libs/tiff:0[zlib] )"
+   test? ( media-libs/tiff:0[jpeg,zlib] )"
 
 DOCS=( README version-notes )
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2021-06-14 Thread James Le Cuirot
commit: 64bd0074e9cd30eae1f58c1928b84c0101b55247
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Jun 14 21:47:28 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Jun 14 21:47:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64bd0074

media-libs/leptonica: Version bump to 1.81.1

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: James Le Cuirot  gentoo.org>

 media-libs/leptonica/Manifest|  1 +
 media-libs/leptonica/leptonica-1.81.1.ebuild | 77 
 2 files changed, 78 insertions(+)

diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 2230a008b60..0a99028753e 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,2 +1,3 @@
 DIST leptonica-1.80.0.tar.gz 13926793 BLAKE2B 
1c8916acbea7411038c27ad422f7ac8d5769680ae0554a50da332676de4abdd3c6dfab69dfa4abc3525f3aa298062f4f2315548bda9d120e91abf6ffb5b41e1c
 SHA512 
f8062a169b7ac558c8818615e534c0dcb5db48924af4d3106d0e0929e9b2f03347bdeaae45f80bded0b2aed135bb133f775244c8c752891ca4948b5d6b21e147
 DIST leptonica-1.81.0.tar.gz 14056128 BLAKE2B 
21a6be10d8579746855b6c12785ecd75ce475cc24601ddd2b71ac79aee1a82dd96d26a0b779feae6b0a4028fca4556accd6a208525999c457250a6fcd0e0a5cf
 SHA512 
e6e530a490337941018393ffc69ca45a92fecdee290c6de63f7656207228c19e474ec2e9291591cee85c782edbc46d51d69692871e425ed2367a7dd679dc7771
+DIST leptonica-1.81.1.tar.gz 14056320 BLAKE2B 
09a3859d8d2bbef4ea5d450c81dd5af1c95752501e4b40779a57d099eb30934fbfe4099ab2d7abadf518af25cbd3c36269261c9c6d3850a44a2b16c2eb795801
 SHA512 
3c24e30eab21b634094543a722172553e35d928b3a50bfe78e9b0123cd16d710b4be8714acaac87344b22292b460d6ffb06b05a8e7f3df060544a2bbf3f8a7d2

diff --git a/media-libs/leptonica/leptonica-1.81.1.ebuild 
b/media-libs/leptonica/leptonica-1.81.1.ebuild
new file mode 100644
index 000..cc3881a79ba
--- /dev/null
+++ b/media-libs/leptonica/leptonica-1.81.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 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"
+# 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}] )
+   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] )"
+
+DOCS=( README version-notes )
+
+src_prepare() {
+   default
+   elibtoolize
+
+   # unhtmlize docs
+   local X
+   for X in ${DOCS[@]}; do
+   awk '/<\/pre>/{s--} {if (s) print $0} //{s++}' \
+   "${X}.html" > "${X}" || die 'awk failed'
+   rm -f -- "${X}.html"
+   done
+}
+
+multilib_src_configure() {
+   ECONF_SOURCE="${S}" 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 webp libwebpmux) \
+   $(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() {
+   einstalldocs
+
+   # libtool archives covered by pkg-config
+   find "${ED}" -name '*.la' -delete || die
+}



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2021-06-08 Thread James Le Cuirot
commit: bba6f9df3fc024ae114d6b1854d68c1e9377d6ef
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Jun  8 13:26:05 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Jun  8 13:26:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bba6f9df

media-libs/leptonica: Version bump to 1.81.0

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: James Le Cuirot  gentoo.org>

 media-libs/leptonica/Manifest|  1 +
 media-libs/leptonica/leptonica-1.81.0.ebuild | 77 
 2 files changed, 78 insertions(+)

diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 600d0be76e7..2230a008b60 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1 +1,2 @@
 DIST leptonica-1.80.0.tar.gz 13926793 BLAKE2B 
1c8916acbea7411038c27ad422f7ac8d5769680ae0554a50da332676de4abdd3c6dfab69dfa4abc3525f3aa298062f4f2315548bda9d120e91abf6ffb5b41e1c
 SHA512 
f8062a169b7ac558c8818615e534c0dcb5db48924af4d3106d0e0929e9b2f03347bdeaae45f80bded0b2aed135bb133f775244c8c752891ca4948b5d6b21e147
+DIST leptonica-1.81.0.tar.gz 14056128 BLAKE2B 
21a6be10d8579746855b6c12785ecd75ce475cc24601ddd2b71ac79aee1a82dd96d26a0b779feae6b0a4028fca4556accd6a208525999c457250a6fcd0e0a5cf
 SHA512 
e6e530a490337941018393ffc69ca45a92fecdee290c6de63f7656207228c19e474ec2e9291591cee85c782edbc46d51d69692871e425ed2367a7dd679dc7771

diff --git a/media-libs/leptonica/leptonica-1.81.0.ebuild 
b/media-libs/leptonica/leptonica-1.81.0.ebuild
new file mode 100644
index 000..cc3881a79ba
--- /dev/null
+++ b/media-libs/leptonica/leptonica-1.81.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 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"
+# 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}] )
+   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] )"
+
+DOCS=( README version-notes )
+
+src_prepare() {
+   default
+   elibtoolize
+
+   # unhtmlize docs
+   local X
+   for X in ${DOCS[@]}; do
+   awk '/<\/pre>/{s--} {if (s) print $0} //{s++}' \
+   "${X}.html" > "${X}" || die 'awk failed'
+   rm -f -- "${X}.html"
+   done
+}
+
+multilib_src_configure() {
+   ECONF_SOURCE="${S}" 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 webp libwebpmux) \
+   $(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() {
+   einstalldocs
+
+   # libtool archives covered by pkg-config
+   find "${ED}" -name '*.la' -delete || die
+}



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2021-06-08 Thread Sam James
commit: ae7580f0865908e4c3aab99019caa549655a9149
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun  8 09:19:40 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun  8 09:19:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae7580f0

media-libs/leptonica: add github remote-id

Signed-off-by: Sam James  gentoo.org>

 media-libs/leptonica/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/media-libs/leptonica/metadata.xml 
b/media-libs/leptonica/metadata.xml
index 78be582d1df..b5b2f1a097e 100644
--- a/media-libs/leptonica/metadata.xml
+++ b/media-libs/leptonica/metadata.xml
@@ -13,4 +13,7 @@
containing software that is broadly useful for image
processing and image analysis applications.

+   
+   danbloomberg/leptonica
+   
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/files/, media-libs/leptonica/

2021-05-30 Thread James Le Cuirot
commit: d6c29e1f27e5073deee0636184b3a27677978ba4
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun May 30 17:59:49 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun May 30 17:59:49 2021 +
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  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..000
--- 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 
-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..000
--- 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} //{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
-}



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2021-05-21 Thread Sam James
commit: 6dfaa9fb1775a39eb39893de22e05161739b
Author: Sam James  gentoo  org>
AuthorDate: Sat May 22 01:31:43 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 22 01:31:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dfaa9fb

media-libs/leptonica: Stabilize 1.80.0 arm, #775629

Signed-off-by: Sam James  gentoo.org>

 media-libs/leptonica/leptonica-1.80.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/leptonica/leptonica-1.80.0.ebuild 
b/media-libs/leptonica/leptonica-1.80.0.ebuild
index f1737c0b4fb..ee995cad6cf 100644
--- a/media-libs/leptonica/leptonica-1.80.0.ebuild
+++ b/media-libs/leptonica/leptonica-1.80.0.ebuild
@@ -10,7 +10,7 @@ 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"
+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 )"
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2021-05-16 Thread Sam James
commit: c58e36e2f2374eccb2e6201235078c716cc5ee2d
Author: Sam James  gentoo  org>
AuthorDate: Sun May 16 12:43:01 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 16 12:45:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c58e36e2

media-libs/leptonica: Stabilize 1.80.0 ppc64, #775629

Signed-off-by: Sam James  gentoo.org>

 media-libs/leptonica/leptonica-1.80.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/leptonica/leptonica-1.80.0.ebuild 
b/media-libs/leptonica/leptonica-1.80.0.ebuild
index 0fed03c6f12..f1737c0b4fb 100644
--- a/media-libs/leptonica/leptonica-1.80.0.ebuild
+++ b/media-libs/leptonica/leptonica-1.80.0.ebuild
@@ -10,7 +10,7 @@ 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"
+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 )"
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2021-05-16 Thread Sam James
commit: 775a0a3967e9fa7b2290605aacfd539e178fbaed
Author: Sam James  gentoo  org>
AuthorDate: Sun May 16 12:42:32 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 16 12:45:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=775a0a39

media-libs/leptonica: Stabilize 1.80.0 ppc, #775629

Signed-off-by: Sam James  gentoo.org>

 media-libs/leptonica/leptonica-1.80.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/leptonica/leptonica-1.80.0.ebuild 
b/media-libs/leptonica/leptonica-1.80.0.ebuild
index 3107b707e6f..0fed03c6f12 100644
--- a/media-libs/leptonica/leptonica-1.80.0.ebuild
+++ b/media-libs/leptonica/leptonica-1.80.0.ebuild
@@ -10,7 +10,7 @@ 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"
+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 )"
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2021-05-15 Thread Sam James
commit: 9dfb676f8a9d693d4545f095ce3b6ebd67fc86e6
Author: Sam James  gentoo  org>
AuthorDate: Sun May 16 00:12:36 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 16 00:12:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dfb676f

media-libs/leptonica: Stabilize 1.80.0 x86, #775629

Signed-off-by: Sam James  gentoo.org>

 media-libs/leptonica/leptonica-1.80.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/leptonica/leptonica-1.80.0.ebuild 
b/media-libs/leptonica/leptonica-1.80.0.ebuild
index 5fbbbc4b970..f6e32931f7e 100644
--- a/media-libs/leptonica/leptonica-1.80.0.ebuild
+++ b/media-libs/leptonica/leptonica-1.80.0.ebuild
@@ -10,7 +10,7 @@ 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"
+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 )"
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2021-05-15 Thread Sam James
commit: fe57c0f02ca5fbc12a068b26149a0021e73a1f6d
Author: Sam James  gentoo  org>
AuthorDate: Sun May 16 00:12:12 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 16 00:12:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe57c0f0

media-libs/leptonica: Stabilize 1.80.0 amd64, #775629

Signed-off-by: Sam James  gentoo.org>

 media-libs/leptonica/leptonica-1.80.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/leptonica/leptonica-1.80.0.ebuild 
b/media-libs/leptonica/leptonica-1.80.0.ebuild
index 5cf65cc4ca8..5fbbbc4b970 100644
--- a/media-libs/leptonica/leptonica-1.80.0.ebuild
+++ b/media-libs/leptonica/leptonica-1.80.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ 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"
+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 )"
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2020-08-18 Thread James Le Cuirot
commit: 55c4b7f1b59c711a13100a6aeddc6cba07539334
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Aug 18 22:44:57 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Aug 18 22:48:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55c4b7f1

media-libs/leptonica: Version bump to 1.80.0

Package-Manager: Portage-3.0.3, Repoman-2.3.23
Signed-off-by: James Le Cuirot  gentoo.org>

 media-libs/leptonica/Manifest|  1 +
 media-libs/leptonica/leptonica-1.80.0.ebuild | 74 
 2 files changed, 75 insertions(+)

diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index c15d96e0731..ee59ba83a97 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.78.0.tar.gz 12905925 BLAKE2B 
6a7b74e8aa78a3e4fa6429bbf180001e7d362ebd37d4fd179ba90df7a41993e52d708813ea5a2b30dc90516b7bec83e5386735025993d73f279ab595c39f6c9c
 SHA512 
f059ccc8e7b5ff2c796aeb4ab18bd25e133ec4f38c36b9e2ee203db35a1e68cf45b8baf78ebc4acba4e3607328d1374ea0e8425f35cbe06c6c5728a1ec8c3f50
 DIST leptonica-1.79.0.tar.gz 13438669 BLAKE2B 
59c126c0bc4690cf48937171f818637f420b4e4c56ebf866ca4c0d2a9a8f2ae2653f6ef7650340138fb1dd2ca2d3826e0f844d44afddb14856e31daf10f41c41
 SHA512 
4d0830683757004bb47752a17985d80c6758b97c0fd6ec64d23bbf43c9c68b04bee751831574afa4c25f5d5030c0c9f7fc22d9fc8ef932aa990401344f588ba5
+DIST leptonica-1.80.0.tar.gz 13926793 BLAKE2B 
1c8916acbea7411038c27ad422f7ac8d5769680ae0554a50da332676de4abdd3c6dfab69dfa4abc3525f3aa298062f4f2315548bda9d120e91abf6ffb5b41e1c
 SHA512 
f8062a169b7ac558c8818615e534c0dcb5db48924af4d3106d0e0929e9b2f03347bdeaae45f80bded0b2aed135bb133f775244c8c752891ca4948b5d6b21e147

diff --git a/media-libs/leptonica/leptonica-1.80.0.ebuild 
b/media-libs/leptonica/leptonica-1.80.0.ebuild
new file mode 100644
index 000..5cf65cc4ca8
--- /dev/null
+++ b/media-libs/leptonica/leptonica-1.80.0.ebuild
@@ -0,0 +1,74 @@
+# 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] )"
+
+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} //{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 webp libwebpmux) \
+   $(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
+}



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/, media-libs/leptonica/files/

2020-08-18 Thread James Le Cuirot
commit: e35c6156fd236dc36b1a01cd5f1fe729fc6a4488
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Aug 18 22:47:56 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Aug 18 22:48:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e35c6156

media-libs/leptonica: Drop old 1.78.0 and 1.79.0-r1

Package-Manager: Portage-3.0.3, Repoman-2.3.23
Signed-off-by: James Le Cuirot  gentoo.org>

 media-libs/leptonica/Manifest   |   2 -
 media-libs/leptonica/files/1.78.0-gnuplot.patch |  13 --
 media-libs/leptonica/files/1.79.0-tests.patch   | 299 
 media-libs/leptonica/leptonica-1.78.0.ebuild|  76 --
 media-libs/leptonica/leptonica-1.79.0-r1.ebuild |  78 ---
 5 files changed, 468 deletions(-)

diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index ee59ba83a97..0d43b2fd2af 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,4 +1,2 @@
 DIST leptonica-1.74.4.tar.gz 12349877 BLAKE2B 
5c4a71c1c4f44b617f16b1b1029455badee268dc1ac459f1c7ffe6af5b8dbe702bdbaa6e5564af6e41d0881c59e1aa43dc40d5164f618f13ca2a563b2aa3bd0e
 SHA512 
e74732c10218430463ca01f15e19d329dceb938e315586ed100c634c4d50809824f1d9bf7eeaf91654caf42ed78a5ae5de7c08e7a1d8884c580c536121627891
-DIST leptonica-1.78.0.tar.gz 12905925 BLAKE2B 
6a7b74e8aa78a3e4fa6429bbf180001e7d362ebd37d4fd179ba90df7a41993e52d708813ea5a2b30dc90516b7bec83e5386735025993d73f279ab595c39f6c9c
 SHA512 
f059ccc8e7b5ff2c796aeb4ab18bd25e133ec4f38c36b9e2ee203db35a1e68cf45b8baf78ebc4acba4e3607328d1374ea0e8425f35cbe06c6c5728a1ec8c3f50
-DIST leptonica-1.79.0.tar.gz 13438669 BLAKE2B 
59c126c0bc4690cf48937171f818637f420b4e4c56ebf866ca4c0d2a9a8f2ae2653f6ef7650340138fb1dd2ca2d3826e0f844d44afddb14856e31daf10f41c41
 SHA512 
4d0830683757004bb47752a17985d80c6758b97c0fd6ec64d23bbf43c9c68b04bee751831574afa4c25f5d5030c0c9f7fc22d9fc8ef932aa990401344f588ba5
 DIST leptonica-1.80.0.tar.gz 13926793 BLAKE2B 
1c8916acbea7411038c27ad422f7ac8d5769680ae0554a50da332676de4abdd3c6dfab69dfa4abc3525f3aa298062f4f2315548bda9d120e91abf6ffb5b41e1c
 SHA512 
f8062a169b7ac558c8818615e534c0dcb5db48924af4d3106d0e0929e9b2f03347bdeaae45f80bded0b2aed135bb133f775244c8c752891ca4948b5d6b21e147

diff --git a/media-libs/leptonica/files/1.78.0-gnuplot.patch 
b/media-libs/leptonica/files/1.78.0-gnuplot.patch
deleted file mode 100644
index 758b78258dd..000
--- a/media-libs/leptonica/files/1.78.0-gnuplot.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/files/1.79.0-tests.patch 
b/media-libs/leptonica/files/1.79.0-tests.patch
deleted file mode 100644
index eb794240dbd..000
--- a/media-libs/leptonica/files/1.79.0-tests.patch
+++ /dev/null
@@ -1,299 +0,0 @@
-From b4cdb9256934c8f35cad558bf7288567211a792f Mon Sep 17 00:00:00 2001
-From: James Le Cuirot 
-Date: Tue, 24 Mar 2020 20:59:17 +
-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();
-+pixDestroy();
- pixSetResolution(pix1, 300, 300);
- pixGetDimensions(pix1, , , 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", 

[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2020-04-03 Thread Mike Gilbert
commit: 26f480da09756dbe15b00c4a4f40e1de4b4d2a2d
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Apr  4 03:37:26 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Apr  4 03:37:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26f480da

media-libs/leptonica: fix automagic dep on libwebpmux

Package-Manager: Portage-2.3.96_p4, Repoman-2.3.22_p1
Signed-off-by: Mike Gilbert  gentoo.org>

 .../leptonica/{leptonica-1.79.0.ebuild => leptonica-1.79.0-r1.ebuild}  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-libs/leptonica/leptonica-1.79.0.ebuild 
b/media-libs/leptonica/leptonica-1.79.0-r1.ebuild
similarity index 96%
rename from media-libs/leptonica/leptonica-1.79.0.ebuild
rename to media-libs/leptonica/leptonica-1.79.0-r1.ebuild
index 842c45ad994..52aa41650f9 100644
--- a/media-libs/leptonica/leptonica-1.79.0.ebuild
+++ b/media-libs/leptonica/leptonica-1.79.0-r1.ebuild
@@ -21,7 +21,7 @@ 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}] )
+   sys-libs/zlib:=[${MULTILIB_USEDEP}] )
tiff? ( media-libs/tiff:0=[${MULTILIB_USEDEP}] )
webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
@@ -58,6 +58,7 @@ multilib_src_configure() {
$(use_with png libpng) \
$(use_with tiff libtiff) \
$(use_with webp libwebp) \
+   $(use_with webp libwebpmux) \
$(use_with zlib) \
$(use_enable static-libs static) \
$(multilib_native_use_enable utils programs)



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/files/, media-libs/leptonica/

2020-03-24 Thread James Le Cuirot
commit: 20ed12df72f4bdc5e4592d18c37ec0ef46fc3250
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Mar 24 21:37:13 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Mar 24 21:37:13 2020 +
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  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..000
--- 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 
-Date: Mon, 14 Jan 2019 20:26:14 +
-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..000
--- 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
-  

[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/files/, media-libs/leptonica/

2020-03-24 Thread James Le Cuirot
commit: 0f291ef7d5a838cd0754c8c13c620ea0497bdd0a
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Mar 24 21:35:59 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Mar 24 21:35:59 2020 +
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  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 000..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 
+Date: Tue, 24 Mar 2020 20:59:17 +
+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();
++pixDestroy();
+ pixSetResolution(pix1, 300, 300);
+ pixGetDimensions(pix1, , , 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");
++

[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2019-05-16 Thread Aaron Bauman
commit: c4ae7e5d8e88118194075bc3461ddfca259742db
Author: Aaron Bauman  gentoo  org>
AuthorDate: Thu May 16 15:10:58 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Thu May 16 19:27:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4ae7e5d

media-libs/leptonica: arm64 stable

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.12
RepoMan-Options: --include-arches="arm64"

 media-libs/leptonica/leptonica-1.74.4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/leptonica/leptonica-1.74.4.ebuild 
b/media-libs/leptonica/leptonica-1.74.4.ebuild
index 3cf85a420a5..b7780f8a88c 100644
--- a/media-libs/leptonica/leptonica-1.74.4.ebuild
+++ b/media-libs/leptonica/leptonica-1.74.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ 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"
+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:



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2019-03-30 Thread James Le Cuirot
commit: 39f418d2be666ea105c9a3b9abb6fddf8781695c
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Mar 30 10:12:40 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Mar 30 10:12:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39f418d2

media-libs/leptonica: Drop old 1.76.0

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: James Le Cuirot  gentoo.org>

 media-libs/leptonica/Manifest|  1 -
 media-libs/leptonica/leptonica-1.76.0.ebuild | 71 
 2 files changed, 72 deletions(-)

diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 42976f4d8cb..28e10f61db1 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.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

diff --git a/media-libs/leptonica/leptonica-1.76.0.ebuild 
b/media-libs/leptonica/leptonica-1.76.0.ebuild
deleted file mode 100644
index 6d4921ca759..000
--- a/media-libs/leptonica/leptonica-1.76.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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"
-
-# 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] )"
-
-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} //{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
-}



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/, media-libs/leptonica/files/

2019-03-30 Thread James Le Cuirot
commit: 8baeb6bfce5f9af05903bf8d0a417b4db0ae81ca
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Mar 30 10:11:28 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Mar 30 10:11:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8baeb6bf

media-libs/leptonica: Version bump to 1.78.0

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: James Le Cuirot  gentoo.org>

 media-libs/leptonica/Manifest   |  1 +
 media-libs/leptonica/files/1.78.0-gnuplot.patch | 13 +
 media-libs/leptonica/leptonica-1.78.0.ebuild| 75 +
 3 files changed, 89 insertions(+)

diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 74485e4a7d9..42976f4d8cb 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.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

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 000..758b78258dd
--- /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.78.0.ebuild 
b/media-libs/leptonica/leptonica-1.78.0.ebuild
new file mode 100644
index 000..1e8f7a678d8
--- /dev/null
+++ b/media-libs/leptonica/leptonica-1.78.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} //{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) 

[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/files/, media-libs/leptonica/

2019-01-14 Thread James Le Cuirot
commit: 2edc2a7914a5175332d2b3bdf713477ee9061a85
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Jan 14 20:49:10 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Jan 14 20:50:06 2019 +
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  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 000..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 
+Date: Mon, 14 Jan 2019 20:26:14 +
+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 000..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} //{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) 

[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2018-10-19 Thread Michał Górny
commit: a2e28c3fb181b4bcb42835ad794b421a9c5aef02
Author: Marty E. Plummer  startmail  com>
AuthorDate: Mon Oct 15 18:48:04 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Oct 19 08:50:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2e28c3f

media-libs/leptonica: remove local webp use flag

Signed-off-by: Marty E. Plummer  startmail.com>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Michał Górny  gentoo.org>

 media-libs/leptonica/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-libs/leptonica/metadata.xml 
b/media-libs/leptonica/metadata.xml
index be92a2a304f..78be582d1df 100644
--- a/media-libs/leptonica/metadata.xml
+++ b/media-libs/leptonica/metadata.xml
@@ -6,7 +6,6 @@
James Le Cuirot


-   Adds support for the WebP image format
Install command-line utilities





[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2018-05-03 Thread James Le Cuirot
commit: e29280f24af0e1b58dbe3b44efdc36d46ccc3681
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu May  3 22:10:00 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu May  3 22:11:37 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e29280f2

media-libs/leptonica: Version bump to 1.76.0

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 media-libs/leptonica/Manifest|  1 +
 media-libs/leptonica/leptonica-1.76.0.ebuild | 71 
 2 files changed, 72 insertions(+)

diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index cc05c36c3b7..a682eb6a1a5 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.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/leptonica-1.76.0.ebuild 
b/media-libs/leptonica/leptonica-1.76.0.ebuild
new file mode 100644
index 000..6d4921ca759
--- /dev/null
+++ b/media-libs/leptonica/leptonica-1.76.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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"
+
+# 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] )"
+
+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} //{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
+}



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/files/, media-libs/leptonica/

2018-05-03 Thread James Le Cuirot
commit: 6ede9b55e00397596b21e05060683f02d5be7842
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu May  3 22:11:16 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu May  3 22:11:38 2018 +
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..000
--- 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 
-Date: Tue, 13 Feb 2018 14:37:32 +
-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..000
--- 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} //{s++}' \
-   "${X}.html" > "${X}" || die 'awk failed'
-   rm -f -- "${X}.html"
-   done
-}
-
-multilib_src_configure() {
-   econf \
-   --enable-shared \
-

[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2018-03-17 Thread James Le Cuirot
commit: 16ed15a8c597a2459537671cd25b204d5b1c578d
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Mar 17 13:47:22 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Mar 17 13:49:20 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16ed15a8

media-libs/leptonica: Drop old 1.74.1

This removes the last stable version on sparc.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-libs/leptonica/Manifest|  1 -
 media-libs/leptonica/leptonica-1.74.1.ebuild | 61 
 2 files changed, 62 deletions(-)

diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 2d8282e6a63..cc05c36c3b7 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,3 +1,2 @@
-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

diff --git a/media-libs/leptonica/leptonica-1.74.1.ebuild 
b/media-libs/leptonica/leptonica-1.74.1.ebuild
deleted file mode 100644
index e1e2552dda2..000
--- a/media-libs/leptonica/leptonica-1.74.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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}"
-
-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} //{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
-}



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2018-03-17 Thread Mikle Kolyada
commit: 69c1e16afd584577fd0c872e5343d57f494a7060
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Mar 17 13:30:46 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Mar 17 13:30:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69c1e16a

media-libs/leptonica: arm stable wrt bug #636332

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-libs/leptonica/leptonica-1.74.4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/leptonica/leptonica-1.74.4.ebuild 
b/media-libs/leptonica/leptonica-1.74.4.ebuild
index 45423f90bac..3cf85a420a5 100644
--- a/media-libs/leptonica/leptonica-1.74.4.ebuild
+++ b/media-libs/leptonica/leptonica-1.74.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ 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"
+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:



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/, media-libs/leptonica/files/

2018-02-13 Thread James Le Cuirot
commit: 46de3dc525675413229e868165c7c713643661ff
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Feb 13 14:51:26 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Feb 13 14:51:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46de3dc5

media-libs/leptonica: Patch to avoid gnuplot dependency

The test suite already checked whether gnuplot is present but it
didn't check whether PNG support is enabled.

Bug: https://github.com/DanBloomberg/leptonica/pull/308
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-libs/leptonica/files/gnuplot-png.patch | 29 
 media-libs/leptonica/leptonica-1.75.2.ebuild |  6 ++
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/media-libs/leptonica/files/gnuplot-png.patch 
b/media-libs/leptonica/files/gnuplot-png.patch
new file mode 100644
index 000..4e87fca73b3
--- /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 
+Date: Tue, 13 Feb 2018 14:37:32 +
+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
index 38ffafa4bed..d72072546d5 100644
--- a/media-libs/leptonica/leptonica-1.75.2.ebuild
+++ b/media-libs/leptonica/leptonica-1.75.2.ebuild
@@ -26,11 +26,9 @@ RDEPEND="gif? ( 
>=media-libs/giflib-5.1.3:=[${MULTILIB_USEDEP}] )
zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
 
 DEPEND="${RDEPEND}
-   test? (
-   media-libs/tiff:0[zlib]
-   sci-visualization/gnuplot[cairo]
-   )"
+   test? ( media-libs/tiff:0[zlib] )"
 
+PATCHES=( "${FILESDIR}"/gnuplot-png.patch )
 ECONF_SOURCE="${S}"
 DOCS=( README version-notes )
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2018-02-12 Thread James Le Cuirot
commit: dab2bb9e9cac1cc69e8d15d0a9d5cce598868b4e
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon Feb 12 22:59:50 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Feb 12 23:00:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dab2bb9e

media-libs/leptonica: Version bump to 1.75.2

Deals with tiff[zlib] test requirement.

Bug: https://bugs.gentoo.org/636882
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-libs/leptonica/Manifest|  1 +
 media-libs/leptonica/leptonica-1.75.2.ebuild | 74 
 2 files changed, 75 insertions(+)

diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index c1b4cc8089b..2d8282e6a63 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,2 +1,3 @@
 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

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 000..38ffafa4bed
--- /dev/null
+++ b/media-libs/leptonica/leptonica-1.75.2.ebuild
@@ -0,0 +1,74 @@
+# 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]
+   sci-visualization/gnuplot[cairo]
+   )"
+
+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} //{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
+}



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2017-11-10 Thread Sergei Trofimovich
commit: 84c28dc732a6dbbb0ae4b559f01f7043c603db2d
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Nov 10 10:06:55 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Nov 10 10:06:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84c28dc7

media-libs/leptonica: stable 1.74.4 for ppc/ppc64, bug #636332

Package-Manager: Portage-2.3.13, Repoman-2.3.4
RepoMan-Options: --include-arches="ppc ppc64"

 media-libs/leptonica/leptonica-1.74.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/leptonica/leptonica-1.74.4.ebuild 
b/media-libs/leptonica/leptonica-1.74.4.ebuild
index 66d9fe3923a..45423f90bac 100644
--- a/media-libs/leptonica/leptonica-1.74.4.ebuild
+++ b/media-libs/leptonica/leptonica-1.74.4.ebuild
@@ -10,7 +10,7 @@ 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"
+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:



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2017-11-08 Thread Tobias Klausmann
commit: 557190ba04c8be4a8946898940a212eeadff1519
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Wed Nov  8 20:50:08 2017 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Wed Nov  8 20:50:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=557190ba

media-libs/leptonica-1.74.4-r0: alpha stable

Gentoo-Bug: http://bugs.gentoo.org/636332

 media-libs/leptonica/leptonica-1.74.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/leptonica/leptonica-1.74.4.ebuild 
b/media-libs/leptonica/leptonica-1.74.4.ebuild
index 8d1a8276d12..66d9fe3923a 100644
--- a/media-libs/leptonica/leptonica-1.74.4.ebuild
+++ b/media-libs/leptonica/leptonica-1.74.4.ebuild
@@ -10,7 +10,7 @@ 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"
+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:



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2017-11-07 Thread Thomas Deutschmann
commit: 740d1899a8192053dfc99660aefe5c4708e7c73b
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Nov  7 18:12:22 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Nov  7 18:22:24 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=740d1899

media-libs/leptonica: x86 stable (bug #636332)

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 media-libs/leptonica/leptonica-1.74.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/leptonica/leptonica-1.74.4.ebuild 
b/media-libs/leptonica/leptonica-1.74.4.ebuild
index fc85453d9a1..8d1a8276d12 100644
--- a/media-libs/leptonica/leptonica-1.74.4.ebuild
+++ b/media-libs/leptonica/leptonica-1.74.4.ebuild
@@ -10,7 +10,7 @@ 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"
+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:



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2017-11-07 Thread Manuel Rüger
commit: d0d35e7af933f7dd8bd7362095e71e716c562808
Author: Manuel Rüger  gentoo  org>
AuthorDate: Tue Nov  7 13:15:15 2017 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Tue Nov  7 13:15:15 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0d35e7a

media-libs/leptonica: Stable on amd64

Package-Manager: Portage-2.3.12, Repoman-2.3.4

 media-libs/leptonica/leptonica-1.74.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/leptonica/leptonica-1.74.4.ebuild 
b/media-libs/leptonica/leptonica-1.74.4.ebuild
index 7b6d6cda672..fc85453d9a1 100644
--- a/media-libs/leptonica/leptonica-1.74.4.ebuild
+++ b/media-libs/leptonica/leptonica-1.74.4.ebuild
@@ -10,7 +10,7 @@ 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"
+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:



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/files/, media-libs/leptonica/

2017-08-26 Thread James Le Cuirot
commit: 212ea07f83af4a0e81255cf8ec189dd29cc71e42
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Aug 26 07:55:51 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Aug 26 07:55:51 2017 +
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 000..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 
+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 000..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} //{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
+ 

[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2017-08-26 Thread James Le Cuirot
commit: 1f6a1aa6fbced7d815cf23514b4c40dc37aa5018
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Aug 26 07:45:26 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Aug 26 07:45:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f6a1aa6

media-libs/leptonica: Use GH for SRC_URI as leptonica.org drops old

Package-Manager: Portage-2.3.8, Repoman-2.3.2

 media-libs/leptonica/leptonica-1.74.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/leptonica/leptonica-1.74.1.ebuild 
b/media-libs/leptonica/leptonica-1.74.1.ebuild
index 6255f7b264a..e1e2552dda2 100644
--- a/media-libs/leptonica/leptonica-1.74.1.ebuild
+++ b/media-libs/leptonica/leptonica-1.74.1.ebuild
@@ -7,7 +7,7 @@ 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;
+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"



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2017-07-11 Thread Alexis Ballier
commit: e19dd0edb72a4ba88b9dbcd031f9d60a5ea7c840
Author: Alexis Ballier  gentoo  org>
AuthorDate: Mon Jul 10 18:23:17 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Jul 11 08:38:27 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e19dd0ed

media-libs/leptonica: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-libs/leptonica/leptonica-1.74.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/leptonica/leptonica-1.74.1.ebuild 
b/media-libs/leptonica/leptonica-1.74.1.ebuild
index c0186536939..6255f7b264a 100644
--- a/media-libs/leptonica/leptonica-1.74.1.ebuild
+++ b/media-libs/leptonica/leptonica-1.74.1.ebuild
@@ -10,7 +10,7 @@ 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"
+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:



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/files/, media-libs/leptonica/

2017-02-24 Thread James Le Cuirot
commit: 457fd74562d5265a86c3698f6f113c7352dc5446
Author: James Le Cuirot  gentoo  org>
AuthorDate: Fri Feb 24 10:35:44 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Feb 24 10:36:02 2017 +
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 
1ae8f107a7c7b5068307aea5687ee3d38169c8c18da0dd8aa1d7c1fe613adab6bc8ccb58bb54bd8ab0957659d4fdaa03fc35f3d90c25f3431aa9bbbef0fc

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..00
--- 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.ac2014-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..00
--- 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, x...@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..00
--- 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 )"
-

[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2017-02-23 Thread Michael Weber
commit: 9ec0ec9016f2615f02330a8497e5b12148f7e4fa
Author: Michael Weber  gentoo  org>
AuthorDate: Thu Feb 23 23:55:41 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Fri Feb 24 00:13:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ec0ec90

media-libs/leptonica: arm ppc64 stable (bug 608494).

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-libs/leptonica/leptonica-1.74.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/leptonica/leptonica-1.74.1.ebuild 
b/media-libs/leptonica/leptonica-1.74.1.ebuild
index 74fac9205c..0a3bd2f170 100644
--- a/media-libs/leptonica/leptonica-1.74.1.ebuild
+++ b/media-libs/leptonica/leptonica-1.74.1.ebuild
@@ -11,7 +11,7 @@ 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"
+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:



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2017-02-17 Thread Agostino Sarubbo
commit: 6fecdcf5b0ece1072100bf896e550269f596df2d
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Feb 17 10:56:04 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Feb 17 10:56:04 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fecdcf5

media-libs/leptonica: sparc stable wrt bug #608494

Package-Manager: portage-2.3.3
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/leptonica/leptonica-1.74.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/leptonica/leptonica-1.74.1.ebuild 
b/media-libs/leptonica/leptonica-1.74.1.ebuild
index 0b80d54eda..74fac9205c 100644
--- a/media-libs/leptonica/leptonica-1.74.1.ebuild
+++ b/media-libs/leptonica/leptonica-1.74.1.ebuild
@@ -11,7 +11,7 @@ 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"
+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:



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2017-02-12 Thread Agostino Sarubbo
commit: b698d697d5bbe64a4e93d151c0b8b192f3298809
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Feb 12 16:59:31 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Feb 12 17:00:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b698d697

media-libs/leptonica: ppc stable wrt bug #608494

Package-Manager: portage-2.3.3
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/leptonica/leptonica-1.74.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/leptonica/leptonica-1.74.1.ebuild 
b/media-libs/leptonica/leptonica-1.74.1.ebuild
index 10c21868ac..161b866c19 100644
--- a/media-libs/leptonica/leptonica-1.74.1.ebuild
+++ b/media-libs/leptonica/leptonica-1.74.1.ebuild
@@ -11,7 +11,7 @@ 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"
+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:



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2017-02-07 Thread Agostino Sarubbo
commit: 84e1f697c5ec710b2f0f431fc2bcc05db0952403
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Feb  7 11:27:47 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Feb  7 11:27:47 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84e1f697

media-libs/leptonica: amd64 stable wrt bug #608494

Package-Manager: portage-2.3.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/leptonica/leptonica-1.74.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/leptonica/leptonica-1.74.1.ebuild 
b/media-libs/leptonica/leptonica-1.74.1.ebuild
index 671a715..f062e8a 100644
--- a/media-libs/leptonica/leptonica-1.74.1.ebuild
+++ b/media-libs/leptonica/leptonica-1.74.1.ebuild
@@ -11,7 +11,7 @@ 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"
+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:



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2017-01-07 Thread James Le Cuirot
commit: 13204d5f6555a60e563d2098ec0223e6cc61a2bf
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Jan  7 14:19:46 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Jan  7 14:20:29 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13204d5f

media-libs/leptonica: Version bump to 1.74.1

This release is mostly just making the versioning consistent.

Package-Manager: portage-2.3.3

 media-libs/leptonica/Manifest|  1 +
 media-libs/leptonica/leptonica-1.74.1.ebuild | 62 
 2 files changed, 63 insertions(+)

diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 8947007..24eb3d7 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,2 +1,3 @@
 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 
1ae8f107a7c7b5068307aea5687ee3d38169c8c18da0dd8aa1d7c1fe613adab6bc8ccb58bb54bd8ab0957659d4fdaa03fc35f3d90c25f3431aa9bbbef0fc

diff --git a/media-libs/leptonica/leptonica-1.74.1.ebuild 
b/media-libs/leptonica/leptonica-1.74.1.ebuild
new file mode 100644
index ..671a715
--- /dev/null
+++ b/media-libs/leptonica/leptonica-1.74.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 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} //{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
+}



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2016-12-31 Thread James Le Cuirot
commit: caccfb429ebfd64ec51e87715ca344bedce0352f
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Dec 31 10:49:42 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Dec 31 16:37:57 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caccfb42

media-libs/leptonica: Remove old 1.73

Package-Manager: portage-2.3.3

 media-libs/leptonica/Manifest  |  1 -
 media-libs/leptonica/leptonica-1.73.ebuild | 62 --
 2 files changed, 63 deletions(-)

diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index b6eb974..8947007 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,3 +1,2 @@
 DIST leptonica-1.71.tar.gz 10212309 SHA256 
cc5d736e81496eb25e195f380f553537e0410c3f7151a778b2a546e35c7eb848 SHA512 
fd02eec19a442d767ba39ce01132ef1304a977e038bdbf64ec5e763607d51adf1c06aaa687fc3ec542854e535618b6da2042f10709286c2e1d236e43d77efd51
 WHIRLPOOL 
5a3d57735e8e36785dea9a481a602b0f812c08bab5e42ebaac2e3fa2d42a0c8c697a61351ec1122a14fd9f471945c200a1c75015bd35b043fd208a1cad079733
-DIST leptonica-1.73.tar.gz 10894175 SHA256 
19e4335c674e7b78af9338d5382cc5266f34a62d4ce533d860af48eaa859afc1 SHA512 
4808474d5941a91fbf542a22fed26ddc33f9c4baf2699096acf5e894b7e4e84889d165373b7d1df391a68cda8176113cf122f15203a9e38d3059e17140efc575
 WHIRLPOOL 
b7ff93ecf5c8f66b4c85b64d6db16c18303bdcfe4a8c62735f79bd2e8f1260ad4e4c8b8f4a398cfbd001f2f5af3ff6a720eea83c25a38472b3222e4d2fd5dea9
 DIST leptonica-1.74.tar.gz 11624575 SHA256 
e170f8a3f79e7f1742aff975ad5bb0c4a124df1532e6e38d9d71aaa5111de5a2 SHA512 
6c563a8f30faf7dc0ad321aa58a012a0d03fc3fba7eb3c3e7b69be8bf2e71cc5f13420ded9cc08b232a780b78234e10bbdbe6a77ef26c5af330c6c6eac477f77
 WHIRLPOOL 
1ae8f107a7c7b5068307aea5687ee3d38169c8c18da0dd8aa1d7c1fe613adab6bc8ccb58bb54bd8ab0957659d4fdaa03fc35f3d90c25f3431aa9bbbef0fc

diff --git a/media-libs/leptonica/leptonica-1.73.ebuild 
b/media-libs/leptonica/leptonica-1.73.ebuild
deleted file mode 100644
index 6c30bf0..
--- a/media-libs/leptonica/leptonica-1.73.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 )"
-
-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} //{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
-}



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2016-12-31 Thread James Le Cuirot
commit: 0ee4d70c3a0ae94b17b7366398df667ab5b04e56
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Dec 31 10:48:43 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Dec 31 16:37:49 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ee4d70c

media-libs/leptonica: Version bump to 1.74

There is some versioning inconsistency upstream as this is referred to
as 1.74.0 in places. I have asked upstream to straighten this out.

Package-Manager: portage-2.3.3

 media-libs/leptonica/Manifest  |  1 +
 media-libs/leptonica/leptonica-1.74.ebuild | 62 ++
 2 files changed, 63 insertions(+)

diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 39555f9..b6eb974 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,2 +1,3 @@
 DIST leptonica-1.71.tar.gz 10212309 SHA256 
cc5d736e81496eb25e195f380f553537e0410c3f7151a778b2a546e35c7eb848 SHA512 
fd02eec19a442d767ba39ce01132ef1304a977e038bdbf64ec5e763607d51adf1c06aaa687fc3ec542854e535618b6da2042f10709286c2e1d236e43d77efd51
 WHIRLPOOL 
5a3d57735e8e36785dea9a481a602b0f812c08bab5e42ebaac2e3fa2d42a0c8c697a61351ec1122a14fd9f471945c200a1c75015bd35b043fd208a1cad079733
 DIST leptonica-1.73.tar.gz 10894175 SHA256 
19e4335c674e7b78af9338d5382cc5266f34a62d4ce533d860af48eaa859afc1 SHA512 
4808474d5941a91fbf542a22fed26ddc33f9c4baf2699096acf5e894b7e4e84889d165373b7d1df391a68cda8176113cf122f15203a9e38d3059e17140efc575
 WHIRLPOOL 
b7ff93ecf5c8f66b4c85b64d6db16c18303bdcfe4a8c62735f79bd2e8f1260ad4e4c8b8f4a398cfbd001f2f5af3ff6a720eea83c25a38472b3222e4d2fd5dea9
+DIST leptonica-1.74.tar.gz 11624575 SHA256 
e170f8a3f79e7f1742aff975ad5bb0c4a124df1532e6e38d9d71aaa5111de5a2 SHA512 
6c563a8f30faf7dc0ad321aa58a012a0d03fc3fba7eb3c3e7b69be8bf2e71cc5f13420ded9cc08b232a780b78234e10bbdbe6a77ef26c5af330c6c6eac477f77
 WHIRLPOOL 
1ae8f107a7c7b5068307aea5687ee3d38169c8c18da0dd8aa1d7c1fe613adab6bc8ccb58bb54bd8ab0957659d4fdaa03fc35f3d90c25f3431aa9bbbef0fc

diff --git a/media-libs/leptonica/leptonica-1.74.ebuild 
b/media-libs/leptonica/leptonica-1.74.ebuild
new file mode 100644
index ..260e2d9
--- /dev/null
+++ b/media-libs/leptonica/leptonica-1.74.ebuild
@@ -0,0 +1,62 @@
+# 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} //{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
+}



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2016-01-27 Thread James Le Cuirot
commit: a967f3cea856acb65b56c3e37957d99ca662d931
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Jan 27 13:49:59 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Jan 27 13:53:26 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a967f3ce

media-libs/leptonica: Version bump to 1.73

Includes EAPI bump to 6 and migration away from deprecated
autotools-multilib eclass.

Package-Manager: portage-2.2.27

 media-libs/leptonica/Manifest  |  2 +-
 ...tonica-1.72-r2.ebuild => leptonica-1.73.ebuild} | 42 --
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 35f963e..39555f9 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,2 +1,2 @@
 DIST leptonica-1.71.tar.gz 10212309 SHA256 
cc5d736e81496eb25e195f380f553537e0410c3f7151a778b2a546e35c7eb848 SHA512 
fd02eec19a442d767ba39ce01132ef1304a977e038bdbf64ec5e763607d51adf1c06aaa687fc3ec542854e535618b6da2042f10709286c2e1d236e43d77efd51
 WHIRLPOOL 
5a3d57735e8e36785dea9a481a602b0f812c08bab5e42ebaac2e3fa2d42a0c8c697a61351ec1122a14fd9f471945c200a1c75015bd35b043fd208a1cad079733
-DIST leptonica-1.72.tar.gz 10580170 SHA256 
79d5eadd32658c9fea38700c975d60aa3d088eaa3e307659f004d40834de1f56 SHA512 
8cb7acade68fbd9239dee4c24c5f35fd4cbb4db9e36fbf596478bd1e4635e45034664a16cec21c084091fbad64b4b6e78a4cb43fda8d0c0fc32f55a8cbf110d2
 WHIRLPOOL 
b494b2ef928d1c1bd0b142e81c1cccf6312ee5b9822909506b1e9c7c9f57bebba5a7d824efdbde5e85e6dadb974775c9e7c5a7cdd2fc2f9466703e68694d471a
+DIST leptonica-1.73.tar.gz 10894175 SHA256 
19e4335c674e7b78af9338d5382cc5266f34a62d4ce533d860af48eaa859afc1 SHA512 
4808474d5941a91fbf542a22fed26ddc33f9c4baf2699096acf5e894b7e4e84889d165373b7d1df391a68cda8176113cf122f15203a9e38d3059e17140efc575
 WHIRLPOOL 
b7ff93ecf5c8f66b4c85b64d6db16c18303bdcfe4a8c62735f79bd2e8f1260ad4e4c8b8f4a398cfbd001f2f5af3ff6a720eea83c25a38472b3222e4d2fd5dea9

diff --git a/media-libs/leptonica/leptonica-1.72-r2.ebuild 
b/media-libs/leptonica/leptonica-1.73.ebuild
similarity index 69%
rename from media-libs/leptonica/leptonica-1.72-r2.ebuild
rename to media-libs/leptonica/leptonica-1.73.ebuild
index 5860c75..6c30bf0 100644
--- a/media-libs/leptonica/leptonica-1.72-r2.ebuild
+++ b/media-libs/leptonica/leptonica-1.73.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit autotools-multilib
+inherit eutils multilib-minimal
 
 DESCRIPTION="C library for image processing and analysis"
 HOMEPAGE="http://www.leptonica.org/;
-SRC_URI="http://www.leptonica.com/source/${P}.tar.gz;
-
+SRC_URI="http://www.leptonica.org/source/${P}.tar.gz;
 LICENSE="Apache-2.0"
-SLOT="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"
 
@@ -28,9 +27,12 @@ DEPEND="gif? ( media-libs/giflib:=[${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
@@ -38,21 +40,23 @@ src_prepare() {
"${X}.html" > "${X}" || die 'awk failed'
rm -f -- "${X}.html"
done
-
-   autotools-utils_src_prepare
 }
 
 multilib_src_configure() {
-   local myeconfargs=(
-   $(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)
+   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)
-   )
-   autotools-utils_src_configure
+}
+
+src_install() {
+   multilib-minimal_src_install
+   prune_libtool_files
 }



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2015-11-07 Thread Fabian Groffen
commit: c07291ef650a41e65c53b546ea92c20623fd99d6
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov  7 16:12:56 2015 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Nov  7 16:12:56 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c07291ef

media-libs/leptonica: marked ~ppc-macos, bug #564816

Package-Manager: portage-2.2.20-prefix

 media-libs/leptonica/leptonica-1.72-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/leptonica/leptonica-1.72-r2.ebuild 
b/media-libs/leptonica/leptonica-1.72-r2.ebuild
index 6ffb07e..5860c75 100644
--- a/media-libs/leptonica/leptonica-1.72-r2.ebuild
+++ b/media-libs/leptonica/leptonica-1.72-r2.ebuild
@@ -12,7 +12,7 @@ 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"
+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:



[gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/

2015-09-01 Thread Tobias Klausmann
commit: de3545282f5f4883883e124728b7b56bf9e83dae
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Tue Sep  1 19:40:11 2015 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Tue Sep  1 19:40:11 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de354528

media-libs/leptonica: Fixing HOMEPAGE move due to code.google.com shutdown

Package-Manager: portage-2.2.20.1

 media-libs/leptonica/leptonica-1.71-r1.ebuild | 2 +-
 media-libs/leptonica/leptonica-1.71.ebuild| 2 +-
 media-libs/leptonica/leptonica-1.72-r2.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-libs/leptonica/leptonica-1.71-r1.ebuild 
b/media-libs/leptonica/leptonica-1.71-r1.ebuild
index 8854733..23f9ea7 100644
--- a/media-libs/leptonica/leptonica-1.71-r1.ebuild
+++ b/media-libs/leptonica/leptonica-1.71-r1.ebuild
@@ -8,7 +8,7 @@ AUTOTOOLS_AUTORECONF="1"
 inherit eutils autotools-utils
 
 DESCRIPTION="C library for image processing and analysis"
-HOMEPAGE="https://code.google.com/p/leptonica/;
+HOMEPAGE="http://www.leptonica.org/;
 SRC_URI="http://www.leptonica.com/source/${P}.tar.gz;
 
 LICENSE="Apache-2.0"

diff --git a/media-libs/leptonica/leptonica-1.71.ebuild 
b/media-libs/leptonica/leptonica-1.71.ebuild
index 42ad496..72d5fd9 100644
--- a/media-libs/leptonica/leptonica-1.71.ebuild
+++ b/media-libs/leptonica/leptonica-1.71.ebuild
@@ -7,7 +7,7 @@ EAPI=4
 inherit eutils autotools-utils
 
 DESCRIPTION="C library for image processing and analysis"
-HOMEPAGE="https://code.google.com/p/leptonica/;
+HOMEPAGE="http://www.leptonica.org/;
 SRC_URI="http://www.leptonica.com/source/${P}.tar.gz;
 
 LICENSE="Apache-2.0"

diff --git a/media-libs/leptonica/leptonica-1.72-r2.ebuild 
b/media-libs/leptonica/leptonica-1.72-r2.ebuild
index 2061170..6ffb07e 100644
--- a/media-libs/leptonica/leptonica-1.72-r2.ebuild
+++ b/media-libs/leptonica/leptonica-1.72-r2.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 inherit autotools-multilib
 
 DESCRIPTION="C library for image processing and analysis"
-HOMEPAGE="https://code.google.com/p/leptonica/;
+HOMEPAGE="http://www.leptonica.org/;
 SRC_URI="http://www.leptonica.com/source/${P}.tar.gz;
 
 LICENSE="Apache-2.0"