summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Briesenick <sbriesen@gentoo.org>2012-06-24 12:14:05 +0000
committerStefan Briesenick <sbriesen@gentoo.org>2012-06-24 12:14:05 +0000
commit913bdc0ac2fd9c9e2080a9c5f9acc2a08fb212f1 (patch)
tree9ed2cd7081e57aa00152b612419ed87edd6b40b5 /media-libs/leptonica
parentRemove obsolete KOffice mask (diff)
downloadhistorical-913bdc0ac2fd9c9e2080a9c5f9acc2a08fb212f1.tar.gz
historical-913bdc0ac2fd9c9e2080a9c5f9acc2a08fb212f1.tar.bz2
historical-913bdc0ac2fd9c9e2080a9c5f9acc2a08fb212f1.zip
fixing compile-error, solving bug #423065.
Package-Manager: portage-2.2.0_alpha111/cvs/Linux x86_64
Diffstat (limited to 'media-libs/leptonica')
-rw-r--r--media-libs/leptonica/ChangeLog5
-rw-r--r--media-libs/leptonica/Manifest16
-rw-r--r--media-libs/leptonica/leptonica-1.68.ebuild27
3 files changed, 27 insertions, 21 deletions
diff --git a/media-libs/leptonica/ChangeLog b/media-libs/leptonica/ChangeLog
index 675b61fa66b0..0d1f12902241 100644
--- a/media-libs/leptonica/ChangeLog
+++ b/media-libs/leptonica/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/leptonica
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/leptonica/ChangeLog,v 1.1 2012/02/16 00:06:55 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/leptonica/ChangeLog,v 1.2 2012/06/24 12:14:05 sbriesen Exp $
+
+ 24 Jun 2012; Stefan Briesenick <sbriesen@gentoo.org> leptonica-1.68.ebuild:
+ fixing compile-error, solving bug #423065.
*leptonica-1.68 (16 Feb 2012)
diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 9112e47e0e5c..ff8f831b9d51 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -3,15 +3,15 @@ Hash: SHA1
AUX leptonica-1.68-zlib-include.patch 426 RMD160 c306cfc1eb95d85ab6c1b5bde37a28e1e2894d66 SHA1 625ed8ab4456275a98178d39c09cdb207966c330 SHA256 49e5795d29a9e9c356fa1b2cfbf477300feb78679a584acb4649becff51a0837
DIST leptonica-1.68.tar.gz 6695020 RMD160 f1d20f0bae963b5c6753d5ceca5873d604a16e40 SHA1 a50563ac091f4195a5a3b4579c4fcc674b81c316 SHA256 acefb6c50db2913f117afdbb19a549f7409cf8fa5d9a435692cb10ff89a81f8f
-EBUILD leptonica-1.68.ebuild 1358 RMD160 9e4340b7d5aa6f77f2d9d974085cf3fb4a6e1323 SHA1 e96b081c7705df4c3fa07f9dd35328be6eaf6fa3 SHA256 489c2a6e60412c6f1486464d01dc241eb8b5a4a9fee5db63e63c2ab285a2b1c3
-MISC ChangeLog 424 RMD160 d4eb5210542bc45f4e486212bec9fcbc05f827cc SHA1 e8b387694586c2eab606029d1230a6ca5d2bdd88 SHA256 1c3102fb96a89929569a988722d1838f712a41970f3aff1137b2cb12321cfed1
+EBUILD leptonica-1.68.ebuild 1427 RMD160 46e4ec543fcd8c59b0258784983e95834085773b SHA1 379f3c15607ba77a5dfea38110025b5ced4f9989 SHA256 6a920b42ed608097dd4f15cb57395be451de3830783232def9e2ce219e0482f1
+MISC ChangeLog 548 RMD160 cb7aec264d638c6dbbfaf7d8a04703f115653307 SHA1 ff761703f7294cc01ba9b5e867811f6fe912aa19 SHA256 047369fce733ac57233b51a1a40b2d23fb83bf2c3f7c72362dcad13beb8d5252
MISC metadata.xml 378 RMD160 4ed3740461df44c1f8cb6a2a0d6391f0d3f42421 SHA1 873295dd96f744a1643ec975c4aec3bc60a6d6ee SHA256 da48cfcf402e4db42e77afb2e0ab97855f3ae1731e230008e8cceb4e0cf507d3
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
-iJwEAQECAAYFAk88SKsACgkQIaLonLtsQsd+rQP/T3rRFCIGyUAY+NtPe38cIrYl
-JGNnFUYaaKxZANE0i3GJvIf3BdheafroJqCtmUge8bM+uxiyl+iMP77oCY/SRm5q
-2syFCAhH7sPVOoQ5pnb9u+571BfaPKwX2kQH/e/jnQ9G+VY0QAvYsfo11cToFGwt
-4oxqSgIOwCbfEbPAOmU=
-=114n
+iJwEAQECAAYFAk/nBJgACgkQIaLonLtsQseu9AQAgd/nZ8K9tavg7Bakm5F8ItVw
+7YdVtJM6ieM2xZDL5L/wOc486kHzzRMR81ccQyjxCnjIb6hMLbOaUdp9zcQofiBy
+Ae+knnHxzhVUFFzYVvZEziivb1b/J8xAu5DXG4EveVUmy5LYEdxpqwss8wWH1r1H
+2axrI/Tttr/vrA288u8=
+=obZq
-----END PGP SIGNATURE-----
diff --git a/media-libs/leptonica/leptonica-1.68.ebuild b/media-libs/leptonica/leptonica-1.68.ebuild
index eac6d0a25f83..1b80f38baf27 100644
--- a/media-libs/leptonica/leptonica-1.68.ebuild
+++ b/media-libs/leptonica/leptonica-1.68.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/leptonica/leptonica-1.68.ebuild,v 1.1 2012/02/16 00:06:55 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/leptonica/leptonica-1.68.ebuild,v 1.2 2012/06/24 12:14:05 sbriesen Exp $
EAPI=4
@@ -25,28 +25,31 @@ RDEPEND="${DEPEND}"
DOCS=( README version-notes )
+# see bug 297101, error when enabling png and zlib
+PATCHES=( "${FILESDIR}/${P}-zlib-include.patch" )
+
src_prepare() {
# unhtmlize docs
local X
for X in ${DOCS[@]}; do
awk '/<\/pre>/{s--} {if (s) print $0} /<pre>/{s++}' \
"${X}.html" > "${X}" || die 'awk failed'
- rm -f "${X}.html"
+ rm -f -- "${X}.html"
done
-
- # see bug 297101, error when enabling png and zlib
- epatch "${FILESDIR}/${P}-zlib-include.patch"
+ autotools-utils_src_prepare
}
src_configure() {
# $(use_with webp libwebp) -> unknown
# so use-flag just for pulling dependencies
- econf \
- $(use_with gif giflib) \
- $(use_with jpeg) \
- $(use_with png libpng) \
- $(use_with tiff libtiff) \
- $(use_with zlib) \
- $(use_enable utils programs) \
+ local myeconfargs=(
+ $(use_with gif giflib)
+ $(use_with jpeg)
+ $(use_with png libpng)
+ $(use_with tiff libtiff)
+ $(use_with zlib)
+ $(use_enable utils programs)
$(use_enable static-libs static)
+ )
+ autotools-utils_src_configure
}