Gentoo Archives: gentoo-commits

From: "Stefan Briesenick (sbriesen)" <sbriesen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/leptonica: ChangeLog leptonica-1.68.ebuild
Date: Sun, 24 Jun 2012 12:14:20
Message-Id: 20120624121405.769CC2004B@flycatcher.gentoo.org
1 sbriesen 12/06/24 12:14:05
2
3 Modified: ChangeLog leptonica-1.68.ebuild
4 Log:
5 fixing compile-error, solving bug #423065.
6
7 (Portage version: 2.2.0_alpha111/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.2 media-libs/leptonica/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/leptonica/ChangeLog?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/leptonica/ChangeLog?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/leptonica/ChangeLog?r1=1.1&r2=1.2
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-libs/leptonica/ChangeLog,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- ChangeLog 16 Feb 2012 00:06:55 -0000 1.1
23 +++ ChangeLog 24 Jun 2012 12:14:05 -0000 1.2
24 @@ -1,6 +1,9 @@
25 # ChangeLog for media-libs/leptonica
26 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/media-libs/leptonica/ChangeLog,v 1.1 2012/02/16 00:06:55 sbriesen Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/media-libs/leptonica/ChangeLog,v 1.2 2012/06/24 12:14:05 sbriesen Exp $
29 +
30 + 24 Jun 2012; Stefan Briesenick <sbriesen@g.o> leptonica-1.68.ebuild:
31 + fixing compile-error, solving bug #423065.
32
33 *leptonica-1.68 (16 Feb 2012)
34
35
36
37
38 1.2 media-libs/leptonica/leptonica-1.68.ebuild
39
40 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/leptonica/leptonica-1.68.ebuild?rev=1.2&view=markup
41 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/leptonica/leptonica-1.68.ebuild?rev=1.2&content-type=text/plain
42 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/leptonica/leptonica-1.68.ebuild?r1=1.1&r2=1.2
43
44 Index: leptonica-1.68.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/media-libs/leptonica/leptonica-1.68.ebuild,v
47 retrieving revision 1.1
48 retrieving revision 1.2
49 diff -u -r1.1 -r1.2
50 --- leptonica-1.68.ebuild 16 Feb 2012 00:06:55 -0000 1.1
51 +++ leptonica-1.68.ebuild 24 Jun 2012 12:14:05 -0000 1.2
52 @@ -1,6 +1,6 @@
53 # Copyright 1999-2012 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/media-libs/leptonica/leptonica-1.68.ebuild,v 1.1 2012/02/16 00:06:55 sbriesen Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/media-libs/leptonica/leptonica-1.68.ebuild,v 1.2 2012/06/24 12:14:05 sbriesen Exp $
57
58 EAPI=4
59
60 @@ -25,28 +25,31 @@
61
62 DOCS=( README version-notes )
63
64 +# see bug 297101, error when enabling png and zlib
65 +PATCHES=( "${FILESDIR}/${P}-zlib-include.patch" )
66 +
67 src_prepare() {
68 # unhtmlize docs
69 local X
70 for X in ${DOCS[@]}; do
71 awk '/<\/pre>/{s--} {if (s) print $0} /<pre>/{s++}' \
72 "${X}.html" > "${X}" || die 'awk failed'
73 - rm -f "${X}.html"
74 + rm -f -- "${X}.html"
75 done
76 -
77 - # see bug 297101, error when enabling png and zlib
78 - epatch "${FILESDIR}/${P}-zlib-include.patch"
79 + autotools-utils_src_prepare
80 }
81
82 src_configure() {
83 # $(use_with webp libwebp) -> unknown
84 # so use-flag just for pulling dependencies
85 - econf \
86 - $(use_with gif giflib) \
87 - $(use_with jpeg) \
88 - $(use_with png libpng) \
89 - $(use_with tiff libtiff) \
90 - $(use_with zlib) \
91 - $(use_enable utils programs) \
92 + local myeconfargs=(
93 + $(use_with gif giflib)
94 + $(use_with jpeg)
95 + $(use_with png libpng)
96 + $(use_with tiff libtiff)
97 + $(use_with zlib)
98 + $(use_enable utils programs)
99 $(use_enable static-libs static)
100 + )
101 + autotools-utils_src_configure
102 }