sbriesen    12/06/24 12:14:05

  Modified:             ChangeLog leptonica-1.68.ebuild
  Log:
  fixing compile-error, solving bug #423065.
  
  (Portage version: 2.2.0_alpha111/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  media-libs/leptonica/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/leptonica/ChangeLog?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/leptonica/ChangeLog?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/leptonica/ChangeLog?r1=1.1&r2=1.2

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/leptonica/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ChangeLog	16 Feb 2012 00:06:55 -0000	1.1
+++ ChangeLog	24 Jun 2012 12:14:05 -0000	1.2
@@ -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@g.o> leptonica-1.68.ebuild:
+  fixing compile-error, solving bug #423065.
 
 *leptonica-1.68 (16 Feb 2012)
 



1.2                  media-libs/leptonica/leptonica-1.68.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/leptonica/leptonica-1.68.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/leptonica/leptonica-1.68.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/leptonica/leptonica-1.68.ebuild?r1=1.1&r2=1.2

Index: leptonica-1.68.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/leptonica/leptonica-1.68.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- leptonica-1.68.ebuild	16 Feb 2012 00:06:55 -0000	1.1
+++ leptonica-1.68.ebuild	24 Jun 2012 12:14:05 -0000	1.2
@@ -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 @@
 
 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
 }