EAPI bump, fix bug 518540 for real

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x565C32BC

4 files changed, 98 insertions, 9 deletions

diff --git a/media-libs/leptonica/ChangeLog b/media-libs/leptonica/ChangeLog
index c36996d83b6a..c07bd8d3b47d 100644
--- a/media-libs/leptonica/ChangeLog
+++ b/media-libs/leptonica/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/leptonica
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/leptonica/ChangeLog,v 1.22 2014/08/30 17:54:58 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/leptonica/ChangeLog,v 1.23 2014/09/01 09:29:28 tomka Exp $
+
+*leptonica-1.71-r1 (01 Sep 2014)
+
+  01 Sep 2014; Thomas Kahle <tomka@gentoo.org>
+  +files/leptonica-1.71-fix-openjpeg-test.patch, +leptonica-1.71-r1.ebuild:
+  EAPI bump, fix bug 518540 for real
 
   30 Aug 2014; Chema Alonso <nimiux@gentoo.org> leptonica-1.70.ebuild:
   Stable for amd64 wrt bug #513376
diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 37136cbf8101..d38e1b5a1ceb 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX leptonica-1.68-zlib-include.patch 426 SHA256 49e5795d29a9e9c356fa1b2cfbf477300feb78679a584acb4649becff51a0837 SHA512 351777d7da5ab63db7dda71f66fc1d8193f6732ce3465ea2bcf495c4b1307850d631cd8ff16407568586a96c01cd8aecb4d05b41bd52aada79f493d7fb73f36b WHIRLPOOL bb2937c067c26e2dd3be1adb6afdd41e124f6ce77dac4bbfb4bdbb8791abfdcee7f58d7f0ed023dcb78787703f220f29efc3ff828cae1dac94316d61e727f898
+AUX leptonica-1.71-fix-openjpeg-test.patch 659 SHA256 39387caccd46106f439ec50372614105b30becafe99a0d394f5edc4d80128fe3 SHA512 25ecf06543459362b9d940ac1f760ac6576abd1d77fd87eed4990a15f194a83dc4d23750e4bc739e8afe994a4f7ed13427f40af5f253341d42352b381abbef28 WHIRLPOOL ab3411ca39a71e570a5fc84f4adde5e7f75128231fc2fdaf6e467409ac302eb53ceec9096297e4dc152f33b15f722f9e45df192a8f2b3c12fd6097dd9f4ae807
 AUX leptonica-1.71-openjpeg-2.0.patch 617 SHA256 4ab0602952d0591a9bf85e174b2f862ed1092fa35dec3b824c0360d53ba2da64 SHA512 4af87c9ee26a814089304f94b7cdeb0fdfd1154db4be5b7c4ff57ee6b2151982be5a7f976f884a5f3f4eb0e793d35c0f8c844df0a8edd7115a7144876e272e52 WHIRLPOOL 62a8a588e2c90e0ae482e51d5e112b029210c1f08238109742af1cd2b151b0ff7674f5bb5259a3c5acbd7aec75d433b46712a285d85e9c5dddf76c9a363ca518
 DIST leptonica-1.68.tar.gz 6695020 SHA256 acefb6c50db2913f117afdbb19a549f7409cf8fa5d9a435692cb10ff89a81f8f SHA512 3dad38279c328e671f65018d86c04da59a6dff481ff48530a6341505abbd3e2a526a5825a0995d77c690f54acbaa0818832bd44dd4246a87d726862e0c31d82b WHIRLPOOL e680f898ddabff46bedc0a8aed6bee95a3a748beaa5e68be3d8ea170fbfad501a68277f243a9d5aeab698aca068b8ef8be427fe69ba99f8d630fd207f913ff1f
 DIST leptonica-1.69.tar.gz 7618131 SHA256 3eb7669dcda7e417f399bb3698414ea523270797dfd36c59b08ef37a3fe0a72d SHA512 b30eb3fec393e48579fd29417f6e79977b727c80fec894fc04122118ee536a7749218af45a05de327bfe05c01b3bd677552a8fff4410c318713e3914f58a5e71 WHIRLPOOL e9beb2b73110601abef76ff56969a8e0979fabd175e2b84b63dec2c2cb6d2ca7eee4aa8062e1d51946759846c3c111ff46d440d33d7131c540db6b9eb41d11d7
@@ -10,17 +11,14 @@ DIST leptonica-1.71.tar.gz 10212309 SHA256 cc5d736e81496eb25e195f380f553537e0410
 EBUILD leptonica-1.68.ebuild 1453 SHA256 6fceb0881e38375a781fef3c031efb6e6c219af8fe654f007c40e5cf110dd4ea SHA512 00223db6f532757d688ad0cb5297bdceeb6895fd813f1a882fe8880b18e48e03dfbdb63261d5ed76cf373923d69f93b83fccac17bd236ae48de141430a9de2ce WHIRLPOOL 83b375dd808eea75c2830094a250220fd86836fb79192d7863c8a155d9aabb1894eaed34330d66e33ee4159990578ff44a24ea96a2210c0a29970418ef510b4b
 EBUILD leptonica-1.69.ebuild 1548 SHA256 b7c41a4da37d161cf3dcbf3db758feba4dae3046e15a3d650c1fcae89cffc99d SHA512 20cea55e295f20e24002ac6251009dceeb90769ba09fa23b82ffc40294da089cda34f9a92167a45164483469c89fb14f7e2e69614d552a157ccdcf58b3eb40ec WHIRLPOOL a69a7825e5c9b36d7784d9b512b8cd81bca5367e86549b6de457832824c038b6719e4cbdff29e3d1e9eb06ea6212fae46b6cf6e26642f7f43615390639722a4e
 EBUILD leptonica-1.70.ebuild 1553 SHA256 6e45e567c137bf4a586d8e7bf4d972192203c22d68b0a5a5be19ce96fe6b96db SHA512 dd10c246a6a5f1def4d794a9c43768a55fa27c265c7b8a02e3cf78b1e1aafdfa5ab01557caaffd9eba9c90700250e7b78250358655d1621dfbddd394e34c5d64 WHIRLPOOL acfcfc9c6280921321331b9894278c1126264086abc129cbf82fafe63d8c5310289f808ba493901e3146dab72679ca08e9ac0496f2af2a4304dceafa7d9d5d12
+EBUILD leptonica-1.71-r1.ebuild 1903 SHA256 d1004e97f8e6e2cc03465160b65aef9387fb4cbf4159299ebc995fc2e098d514 SHA512 cb00931034f57fbc03b626bba1bcc052245c859b91603426851a14ca6a37ff37d1014439581d0fa632085eedef8d7a69841e22565a422f79f0eac105586ed0a0 WHIRLPOOL 0f1733794c3b533151f8b958884fd103f25375cac3f8c794183277a9231e1235c0e7b4160a26a090b484ff4b8076a72429cfeec692a1b091096b3a0ffb86bb0c
 EBUILD leptonica-1.71.ebuild 1672 SHA256 50cc654a02928584d29508d2915d15ea3cf96eb49ee3b4ea2e72e878b860969e SHA512 bf718d661fe67fdb3a690788905da3c6cb62a2a97078c037a9da13b6baaa1c3e5a0d2cfed033748ac77322161113d27d06472b5926fa0bbee7c37018349cd1e8 WHIRLPOOL 674aba50aed554eae4dcbb6dc71183c22a1654e7fe9663dfe05d6cc7ffa524cfd5b12bb9c64fb508987e81ca384e4f25cd4db95909b10528fab9031438d83e00
-MISC ChangeLog 2914 SHA256 2695189f38d5c429c33227d776fe9cebc66b563ce7744b2d21c1eb464d735346 SHA512 2fb71b1803a1e0914bc709870c35165e7d665e9319bd1eed5d4b8a4626f825d9185e3830204ec8e92702322c99eca5bf7002ceded26770aef6a5e60582fe65c8 WHIRLPOOL ec59dd1beafc8189d1b65034c5443c5fd64864e61e3ad0c7e83b376619d6440561cd21cd80ce936be7a62ecf6310aec0978ecf6d22e0159c330fed9a46f98fa4
+MISC ChangeLog 3108 SHA256 f394926aadb9ebc66309d13aeae0a02041cddb23ca94e667149fd1018ce635ed SHA512 d7c7c6f7c908b3f0a533a8e4545bec59284659d547b159b59daf83b31875ef9c1f3016c7029cbad686d6c9ed350906ae0f0918f3c2d5547b28acd16d79c1c677 WHIRLPOOL 7e46be68a9b2c753c3f9f627ff4ca293e0abdb6643d64c7bf55b79049ecd76578d0d5a4112954e3a8ea40e245edc841c7829c4cc7481cb399692fd6ffa6e55f6
 MISC metadata.xml 372 SHA256 918a661a612f1dc071e2d1617a2c0572cdc28e6b99c99baf745f8b91c659ba2c SHA512 0e24442124acd590c7d761d7caa881b6157b7d94756cb4ad6ef9e5c4e9a0f7e8cc0c47a3cc275621407764ac5bd8981a3c05d2634444e3ff7f608c7da54e018e WHIRLPOOL 87ba33ad2919df255cc6f2c117fba928deb49c78ff1dd8c5ac1b8c0fb25fbada00a0c6fb03cf477af85221ca461d6ccf391f4048b248cc4f2db3106d6c1112d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUAhBAAAoJEA2sAkrWKOU2PhMH/3f569/f4tAQnApuiA+iDf4Z
-8+47t9P+VZ8eIgFHSvviZ9p6k0GQrNku6dcY9Xfvvfb4KlCwExDXQmRmvHHA8iuh
-uB+vBv6NHd2T0JAq9i1hFFP7zGtvyAdM7EJcz2QfLG6SPEBvq9LCWkZbLB9u0xPH
-FiMtXbXV/0SBrD/b3M/SnGwCe2H5mlMvMju1NGOKaL7hO8tGnYxPYSSG60aHrrH5
-OJcFXBYQXJorCk/cCZRY612xiz0hL9bMtd34y6uqexx5AypbKgFs207Ntt4a2sEP
-cu3YZ8JLZt8JUFSRK0xPHSVSIsCfuLKU481icyQ08tfaNoWpnXIIMI47EfgPxs4=
-=ejcE
+iF4EAREIAAYFAlQEPKYACgkQid6yGVZcMrzJ+wD9HNAJhRatEOTZFGQtBlBFP6q+
+kcvbE8oN2Uqn3tN1s9kA/j7/V4Kz6YAiow3CPZAmx2wyj9UVxrtD+IwfPPleRpwB
+=gBjy
 -----END PGP SIGNATURE-----
diff --git a/media-libs/leptonica/files/leptonica-1.71-fix-openjpeg-test.patch b/media-libs/leptonica/files/leptonica-1.71-fix-openjpeg-test.patch
new file mode 100644
index 000000000000..f7d18a24adce
--- /dev/null
+++ b/media-libs/leptonica/files/leptonica-1.71-fix-openjpeg-test.patch
@@ -0,0 +1,15 @@
+--- leptonica-1.71.orig/configure.ac	2014-08-31 14:33:16.834598973 +0200
++++ leptonica-1.71/configure.ac	2014-09-01 10:56:59.394975447 +0200
+@@ -78,10 +78,10 @@
+   )
+ )
+ 
+-AS_IF([test "x$with_libopenjp2" != xno],
++AS_IF([test "x$with_libopenjpeg" != xno],
+   AC_CHECK_LIB([openjp2], [opj_create_decompress],
+     AC_DEFINE([HAVE_LIBJP2K], 1, [Define to 1 if you have libopenjp2.]) AC_SUBST([LIBJP2K_LIBS], [-lopenjp2]),
+-    AS_IF([test "x$with_libopenjp2" = xyes], AC_MSG_ERROR([libopenjp2 support requested but library not found]))
++    AS_IF([test "x$with_libopenjpeg" = xyes], AC_MSG_ERROR([libopenjp2 support requested but library not found]))
+   )
+ )
+ 
diff --git a/media-libs/leptonica/leptonica-1.71-r1.ebuild b/media-libs/leptonica/leptonica-1.71-r1.ebuild
new file mode 100644
index 000000000000..8610bc3748fa
--- /dev/null
+++ b/media-libs/leptonica/leptonica-1.71-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/leptonica/leptonica-1.71-r1.ebuild,v 1.1 2014/09/01 09:29:28 tomka Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF="1"
+inherit eutils autotools-utils
+
+DESCRIPTION="C library for image processing and analysis"
+HOMEPAGE="http://code.google.com/p/leptonica/"
+SRC_URI="http://www.leptonica.com/source/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gif jpeg jpeg2k png tiff webp utils zlib static-libs"
+
+# N.b. Tests need at least tiff, jpeg and maybe others to work
+DEPEND="gif? ( media-libs/giflib )
+	jpeg? ( virtual/jpeg )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	png? ( media-libs/libpng
+		   sys-libs/zlib
+		 )
+	tiff? ( media-libs/tiff )
+	webp? ( media-libs/libwebp )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+DOCS=( README version-notes )
+PATCHES=( "${FILESDIR}"/"${P}"-fix-openjpeg-test.patch )
+
+src_prepare() {
+	if has_version "<media-libs/openjpeg-2.1" ; then
+		epatch "${FILESDIR}"/"${P}"-openjpeg-2.0.patch
+	fi
+
+	# 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"
+	done
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	# $(use_with webp libwebp) -> unknown
+	# so use-flag just for pulling dependencies
+	# zlib handling see bug 454890
+	local myeconfargs=(
+		$(use_with gif giflib)
+		$(use_with jpeg)
+		$(use_with jpeg2k libopenjpeg)
+		$(use_with png libpng)
+		$(use_with tiff libtiff)
+		$(use_enable utils programs)
+		$(use_enable static-libs static)
+	)
+	# libpng requires zlib:
+	if use png && ! use zlib ; then
+		# Ignore users non-sensical choice of -zlib
+		myeconfargs+=("--with-zlib")
+	else
+		myeconfargs+=( $(use_with zlib) )
+	fi
+	autotools-utils_src_configure
+}