1 |
commit: d6c29e1f27e5073deee0636184b3a27677978ba4 |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 30 17:59:49 2021 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 30 17:59:49 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6c29e1f |
7 |
|
8 |
media-libs/leptonica: Drop old and vulnerable 1.74.4 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/775629 |
11 |
Package-Manager: Portage-3.0.19, Repoman-3.0.3 |
12 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
13 |
|
14 |
media-libs/leptonica/Manifest | 1 - |
15 |
media-libs/leptonica/files/baseline_reg.patch | 22 ---------- |
16 |
media-libs/leptonica/leptonica-1.74.4.ebuild | 63 --------------------------- |
17 |
3 files changed, 86 deletions(-) |
18 |
|
19 |
diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest |
20 |
index 0d43b2fd2af..600d0be76e7 100644 |
21 |
--- a/media-libs/leptonica/Manifest |
22 |
+++ b/media-libs/leptonica/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
-DIST leptonica-1.74.4.tar.gz 12349877 BLAKE2B 5c4a71c1c4f44b617f16b1b1029455badee268dc1ac459f1c7ffe6af5b8dbe702bdbaa6e5564af6e41d0881c59e1aa43dc40d5164f618f13ca2a563b2aa3bd0e SHA512 e74732c10218430463ca01f15e19d329dceb938e315586ed100c634c4d50809824f1d9bf7eeaf91654caf42ed78a5ae5de7c08e7a1d8884c580c536121627891 |
25 |
DIST leptonica-1.80.0.tar.gz 13926793 BLAKE2B 1c8916acbea7411038c27ad422f7ac8d5769680ae0554a50da332676de4abdd3c6dfab69dfa4abc3525f3aa298062f4f2315548bda9d120e91abf6ffb5b41e1c SHA512 f8062a169b7ac558c8818615e534c0dcb5db48924af4d3106d0e0929e9b2f03347bdeaae45f80bded0b2aed135bb133f775244c8c752891ca4948b5d6b21e147 |
26 |
|
27 |
diff --git a/media-libs/leptonica/files/baseline_reg.patch b/media-libs/leptonica/files/baseline_reg.patch |
28 |
deleted file mode 100644 |
29 |
index 9ff7fe7da45..00000000000 |
30 |
--- a/media-libs/leptonica/files/baseline_reg.patch |
31 |
+++ /dev/null |
32 |
@@ -1,22 +0,0 @@ |
33 |
-From eab13986198098688fdeb60c3c87f77df32eace8 Mon Sep 17 00:00:00 2001 |
34 |
-From: James Le Cuirot <chewi@××××××××××××××.uk> |
35 |
-Date: Sat, 15 Jul 2017 12:06:32 +0100 |
36 |
-Subject: [PATCH] Add baseline_reg to gnuplot-dependent test list |
37 |
- |
38 |
---- |
39 |
- prog/reg_wrapper.sh | 2 +- |
40 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
41 |
- |
42 |
-diff --git a/prog/reg_wrapper.sh b/prog/reg_wrapper.sh |
43 |
-index 0947990..2845077 100755 |
44 |
---- a/prog/reg_wrapper.sh |
45 |
-+++ b/prog/reg_wrapper.sh |
46 |
-@@ -31,7 +31,7 @@ TEST_NAME="${TEST##*/}" |
47 |
- TEST_NAME="${TEST_NAME%_reg*}" |
48 |
- |
49 |
- case "${TEST_NAME}" in |
50 |
-- colormask|colorspace|dna|enhance|fpix1|kernel|nearline|projection|rankbin|rankhisto) |
51 |
-+ baseline|colormask|colorspace|dna|enhance|fpix1|kernel|nearline|projection|rankbin|rankhisto) |
52 |
- which gnuplot > /dev/null || which wgnuplot > /dev/null || exec ${@%${TEST}} /bin/sh -c "exit 77" ;; |
53 |
- esac |
54 |
- |
55 |
|
56 |
diff --git a/media-libs/leptonica/leptonica-1.74.4.ebuild b/media-libs/leptonica/leptonica-1.74.4.ebuild |
57 |
deleted file mode 100644 |
58 |
index 5b4df59969a..00000000000 |
59 |
--- a/media-libs/leptonica/leptonica-1.74.4.ebuild |
60 |
+++ /dev/null |
61 |
@@ -1,63 +0,0 @@ |
62 |
-# Copyright 1999-2021 Gentoo Authors |
63 |
-# Distributed under the terms of the GNU General Public License v2 |
64 |
- |
65 |
-EAPI=6 |
66 |
- |
67 |
-inherit ltprune multilib-minimal |
68 |
- |
69 |
-DESCRIPTION="C library for image processing and analysis" |
70 |
-HOMEPAGE="http://www.leptonica.org/" |
71 |
-SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.gz" |
72 |
-LICENSE="Apache-2.0" |
73 |
-SLOT="0/5" |
74 |
-KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~sparc x86 ~ppc-macos" |
75 |
-IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib" |
76 |
-RESTRICT="!test? ( test )" |
77 |
- |
78 |
-# N.B. Tests need some features enabled: |
79 |
-REQUIRED_USE="test? ( jpeg png tiff zlib )" |
80 |
- |
81 |
-DEPEND="gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] ) |
82 |
- jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) |
83 |
- jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] ) |
84 |
- png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] |
85 |
- sys-libs/zlib:=[${MULTILIB_USEDEP}] ) |
86 |
- tiff? ( media-libs/tiff:0=[${MULTILIB_USEDEP}] ) |
87 |
- webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] ) |
88 |
- zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )" |
89 |
-RDEPEND="${DEPEND}" |
90 |
- |
91 |
-PATCHES=( "${FILESDIR}"/baseline_reg.patch ) |
92 |
-ECONF_SOURCE="${S}" |
93 |
-DOCS=( README version-notes ) |
94 |
- |
95 |
-src_prepare() { |
96 |
- default |
97 |
- |
98 |
- # unhtmlize docs |
99 |
- local X |
100 |
- for X in ${DOCS[@]}; do |
101 |
- awk '/<\/pre>/{s--} {if (s) print $0} /<pre>/{s++}' \ |
102 |
- "${X}.html" > "${X}" || die 'awk failed' |
103 |
- rm -f -- "${X}.html" |
104 |
- done |
105 |
-} |
106 |
- |
107 |
-multilib_src_configure() { |
108 |
- econf \ |
109 |
- --enable-shared \ |
110 |
- $(use_with gif giflib) \ |
111 |
- $(use_with jpeg) \ |
112 |
- $(use_with jpeg2k libopenjpeg) \ |
113 |
- $(use_with png libpng) \ |
114 |
- $(use_with tiff libtiff) \ |
115 |
- $(use_with webp libwebp) \ |
116 |
- $(use_with zlib) \ |
117 |
- $(use_enable static-libs static) \ |
118 |
- $(multilib_native_use_enable utils programs) |
119 |
-} |
120 |
- |
121 |
-src_install() { |
122 |
- multilib-minimal_src_install |
123 |
- prune_libtool_files |
124 |
-} |