Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/leptonica/
Date: Wed, 27 Jan 2016 13:53:46
Message-Id: 1453902806.a967f3cea856acb65b56c3e37957d99ca662d931.chewi@gentoo
1 commit: a967f3cea856acb65b56c3e37957d99ca662d931
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 27 13:49:59 2016 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 27 13:53:26 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a967f3ce
7
8 media-libs/leptonica: Version bump to 1.73
9
10 Includes EAPI bump to 6 and migration away from deprecated
11 autotools-multilib eclass.
12
13 Package-Manager: portage-2.2.27
14
15 media-libs/leptonica/Manifest | 2 +-
16 ...tonica-1.72-r2.ebuild => leptonica-1.73.ebuild} | 42 ++++++++++++----------
17 2 files changed, 24 insertions(+), 20 deletions(-)
18
19 diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
20 index 35f963e..39555f9 100644
21 --- a/media-libs/leptonica/Manifest
22 +++ b/media-libs/leptonica/Manifest
23 @@ -1,2 +1,2 @@
24 DIST leptonica-1.71.tar.gz 10212309 SHA256 cc5d736e81496eb25e195f380f553537e0410c3f7151a778b2a546e35c7eb848 SHA512 fd02eec19a442d767ba39ce01132ef1304a977e038bdbf64ec5e763607d51adf1c06aaa687fc3ec542854e535618b6da2042f10709286c2e1d236e43d77efd51 WHIRLPOOL 5a3d57735e8e36785dea9a481a602b0f812c08bab5e42ebaac2e3fa2d42a0c8c697a61351ec1122a14fd9f471945c200a1c75015bd35b043fd208a1cad079733
25 -DIST leptonica-1.72.tar.gz 10580170 SHA256 79d5eadd32658c9fea38700c975d60aa3d088eaa3e307659f004d40834de1f56 SHA512 8cb7acade68fbd9239dee4c24c5f35fd4cbb4db9e36fbf596478bd1e4635e45034664a16cec21c084091fbad64b4b6e78a4cb43fda8d0c0fc32f55a8cbf110d2 WHIRLPOOL b494b2ef928d1c1bd0b142e81c1cccf6312ee5b9822909506b1e9c7c9f57bebba5a7d824efdbde5e85e6dadb974775c9e7c5a7cdd2fc2f9466703e68694d471a
26 +DIST leptonica-1.73.tar.gz 10894175 SHA256 19e4335c674e7b78af9338d5382cc5266f34a62d4ce533d860af48eaa859afc1 SHA512 4808474d5941a91fbf542a22fed26ddc33f9c4baf2699096acf5e894b7e4e84889d165373b7d1df391a68cda8176113cf122f15203a9e38d3059e17140efc575 WHIRLPOOL b7ff93ecf5c8f66b4c85b64d6db16c18303bdcfe4a8c62735f79bd2e8f1260ad4e4c8b8f4a398cfbd001f2f5af3ff6a720eea83c25a38472b3222e4d2fd5dea9
27
28 diff --git a/media-libs/leptonica/leptonica-1.72-r2.ebuild b/media-libs/leptonica/leptonica-1.73.ebuild
29 similarity index 69%
30 rename from media-libs/leptonica/leptonica-1.72-r2.ebuild
31 rename to media-libs/leptonica/leptonica-1.73.ebuild
32 index 5860c75..6c30bf0 100644
33 --- a/media-libs/leptonica/leptonica-1.72-r2.ebuild
34 +++ b/media-libs/leptonica/leptonica-1.73.ebuild
35 @@ -1,17 +1,16 @@
36 -# Copyright 1999-2015 Gentoo Foundation
37 +# Copyright 1999-2016 Gentoo Foundation
38 # Distributed under the terms of the GNU General Public License v2
39 # $Id$
40
41 -EAPI=5
42 +EAPI=6
43
44 -inherit autotools-multilib
45 +inherit eutils multilib-minimal
46
47 DESCRIPTION="C library for image processing and analysis"
48 HOMEPAGE="http://www.leptonica.org/"
49 -SRC_URI="http://www.leptonica.com/source/${P}.tar.gz"
50 -
51 +SRC_URI="http://www.leptonica.org/source/${P}.tar.gz"
52 LICENSE="Apache-2.0"
53 -SLOT="0"
54 +SLOT="0/5"
55 KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
56 IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib"
57
58 @@ -28,9 +27,12 @@ DEPEND="gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] )
59 zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
60 RDEPEND="${DEPEND}"
61
62 +ECONF_SOURCE="${S}"
63 DOCS=( README version-notes )
64
65 src_prepare() {
66 + default
67 +
68 # unhtmlize docs
69 local X
70 for X in ${DOCS[@]}; do
71 @@ -38,21 +40,23 @@ src_prepare() {
72 "${X}.html" > "${X}" || die 'awk failed'
73 rm -f -- "${X}.html"
74 done
75 -
76 - autotools-utils_src_prepare
77 }
78
79 multilib_src_configure() {
80 - local myeconfargs=(
81 - $(use_with gif giflib)
82 - $(use_with jpeg)
83 - $(use_with jpeg2k libopenjpeg)
84 - $(use_with png libpng)
85 - $(use_with tiff libtiff)
86 - $(use_with webp libwebp)
87 - $(use_with zlib)
88 - $(use_enable static-libs static)
89 + econf \
90 + --enable-shared \
91 + $(use_with gif giflib) \
92 + $(use_with jpeg) \
93 + $(use_with jpeg2k libopenjpeg) \
94 + $(use_with png libpng) \
95 + $(use_with tiff libtiff) \
96 + $(use_with webp libwebp) \
97 + $(use_with zlib) \
98 + $(use_enable static-libs static) \
99 $(multilib_native_use_enable utils programs)
100 - )
101 - autotools-utils_src_configure
102 +}
103 +
104 +src_install() {
105 + multilib-minimal_src_install
106 + prune_libtool_files
107 }