Taking over maintainership as I am in close contact with

upstream. Version bump with multilib support. Drop some old unused
versions.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x9C6D7DE4

8 files changed, 98 insertions, 212 deletions

diff --git a/media-libs/leptonica/ChangeLog b/media-libs/leptonica/ChangeLog
index e9466419185a..90499fdbd53e 100644
--- a/media-libs/leptonica/ChangeLog
+++ b/media-libs/leptonica/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/leptonica
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/leptonica/ChangeLog,v 1.35 2015/02/24 08:48:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/leptonica/ChangeLog,v 1.36 2015/05/01 23:24:02 chewi Exp $
+
+*leptonica-1.72 (01 May 2015)
+
+  01 May 2015; James Le Cuirot <chewi@gentoo.org> +leptonica-1.72.ebuild,
+  -files/leptonica-1.68-zlib-include.patch, -leptonica-1.68.ebuild,
+  -leptonica-1.69.ebuild, -leptonica-1.70.ebuild, metadata.xml:
+  Taking over maintainership as I am in close contact with upstream. Version
+  bump with multilib support. Drop some old unused versions.
 
   24 Feb 2015; Agostino Sarubbo <ago@gentoo.org> leptonica-1.71-r1.ebuild:
   Stable for alpha, wrt bug #524542
diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index cc082a3c23da..f87b2a34ba81 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,34 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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
-DIST leptonica-1.70.tar.gz 9890585 SHA256 d3d209a1f6d1f7a80119486b5011bc8c6627e582c927ab44ba33c37edb2cfba2 SHA512 6a0769b4ff646c84582c3c81d770e72b282d941f88fa9e46548705cd4850d48a40f0af0829903cd917319c872f4679caa98bde556fa753eff65f3e9fc3679084 WHIRLPOOL 347b5976c9e701f937c0129d9764ec634a80a74040ee95ea462966b5f5cc6caddd150864bab037e2607a5481f2d00965def4cae0a973d3d0ac8b2bdb7c1c0d3d
 DIST leptonica-1.71.tar.gz 10212309 SHA256 cc5d736e81496eb25e195f380f553537e0410c3f7151a778b2a546e35c7eb848 SHA512 fd02eec19a442d767ba39ce01132ef1304a977e038bdbf64ec5e763607d51adf1c06aaa687fc3ec542854e535618b6da2042f10709286c2e1d236e43d77efd51 WHIRLPOOL 5a3d57735e8e36785dea9a481a602b0f812c08bab5e42ebaac2e3fa2d42a0c8c697a61351ec1122a14fd9f471945c200a1c75015bd35b043fd208a1cad079733
-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 1549 SHA256 a21858b81740af1cc24e8a1e743aba59cfa4436a42c3d60aa951defdcd8a493e SHA512 c5959df5f2757f451282450a9282359dc7c1a3179d2078abe628c89c3b58b3fc06815c273df2e11ed5763b761718fe25511266c833b2aa46c3ca8e0096295a51 WHIRLPOOL 30be305a8a7a812f25ca3f88fd270f28cee4631f7bd50cb7f9d65f51b8f5b0ba290ee1a423a598e6cc7880be5975d18f87618788e018798991621a784220f057
+DIST leptonica-1.72.tar.gz 10580170 SHA256 79d5eadd32658c9fea38700c975d60aa3d088eaa3e307659f004d40834de1f56 SHA512 8cb7acade68fbd9239dee4c24c5f35fd4cbb4db9e36fbf596478bd1e4635e45034664a16cec21c084091fbad64b4b6e78a4cb43fda8d0c0fc32f55a8cbf110d2 WHIRLPOOL b494b2ef928d1c1bd0b142e81c1cccf6312ee5b9822909506b1e9c7c9f57bebba5a7d824efdbde5e85e6dadb974775c9e7c5a7cdd2fc2f9466703e68694d471a
 EBUILD leptonica-1.71-r1.ebuild 1945 SHA256 be0b25556bddbd5ee32635e92e6ae09ac0cc02c61d5aee925a28ad76954ea1d8 SHA512 dd6a0a7786ace901bd9b94ac5eccf69ea35995294383e064215db54a424b6fa15be06ee1895a3a3b4380a11e0bcf97bdc448801cef6844eb4d79cf860ed2c5b7 WHIRLPOOL 1fa6b7cd5474633d9dead9fe1389b033d8bdd21904d8919f68cf96898a2c9659bf4624bda29d0112ff36de3d338132e339935a634c8ba677b203b0bb58ed56a9
 EBUILD leptonica-1.71.ebuild 1666 SHA256 bcfc8ef0a10e6009560bd29bfad80a2a2d1690f8e3c5d40ba76a90a60f70ef80 SHA512 d61d8d35f7770aa614195f13175a10b28f2ea21675f77ad4f6aad79cfaad976d736aa2a4fe7589e91bc1548341263d10b9b5af26747df6b686b065f3504d00de WHIRLPOOL 31cb65888e42574789bc6ad8534c4b76d8b698d803a1a3b23741e925f44f39622993916555b5101e111f391f9ac83c1fa018f96769fb92bca4fa3c4c2ab2afc7
-MISC ChangeLog 4401 SHA256 9cfefda0fd57e773157ce5357df47c67b63edbfb25d1a2a73741876c36608e0c SHA512 e8f4efe5df5e1236d5fa06286f7493b679760a3d9328b414bd2d7e0e7372c5684103a7f5621dc437ae6fbbc53f8909d35421cfaa387f05afd125bbb41954f2aa WHIRLPOOL ff71364a4a5aa5fde18b3c4db0ea0119975d2d0a3b1ed94f5361f19d980f2825f83b84392fe1f3e53cd76a478de59e65c09e43b5bf8ae8a08270a481c305c856
-MISC metadata.xml 372 SHA256 918a661a612f1dc071e2d1617a2c0572cdc28e6b99c99baf745f8b91c659ba2c SHA512 0e24442124acd590c7d761d7caa881b6157b7d94756cb4ad6ef9e5c4e9a0f7e8cc0c47a3cc275621407764ac5bd8981a3c05d2634444e3ff7f608c7da54e018e WHIRLPOOL 87ba33ad2919df255cc6f2c117fba928deb49c78ff1dd8c5ac1b8c0fb25fbada00a0c6fb03cf477af85221ca461d6ccf391f4048b248cc4f2db3106d6c1112d7
+EBUILD leptonica-1.72.ebuild 1782 SHA256 847c4af09b565292290ece24e37db2b9a999bbf62ca80b91fde27a2a85464a95 SHA512 48dd2800800230eeef1cf9c68f075a421c7fb2d63829b02eecf3364f57fa8c25eecb2bbb167a708955be23b1065374fb1ae208c7633a7cce7262aa220337edce WHIRLPOOL b3b83296b08b5c0a65030f298342de513ad3be5c5fb48d0037d604e04094884880abc9fc248a8e65ed4ef478b91916c28d567869b10fc985cc387f00d4829547
+MISC ChangeLog 4779 SHA256 50bbea836037dcf63d6e08969cf944d1a96f62bbae81aa437fea7e24b0829885 SHA512 648c35f79b1d915f78e47572c261cd2c8410a4cce19b66a4d84f23826896c113c0d68c251a98cba581cf73fa6b2b1101acb97460dc2137fda80a329c392ecec0 WHIRLPOOL 972d81b24c2b75ff4f53bd17b35db02758169ea3c2df182eadc86d31f30f78a3a21179faa6a4ba703b8e840df4e51c169231044e78c950c4aff810eb3a85fb4d
+MISC metadata.xml 570 SHA256 ab2a1d0008d4eace1dabe0cbd536fd189e37ffdfe3c3a625fceb5da174a7610e SHA512 43578ddd809eae4da15535fa10743c40bc3abc40f3633f801a601f49ffabc5f3a344f377ea90f14fed850cb5dbb9c1b91500d73f53c443b239980054af7f1719 WHIRLPOOL 1c818f6d70334f463735ae9fb466abb7d09e9abaad9e60c90fabd16aeb26c8b6f17de301d363fdbd07b3d6e13993819f2dc132c76f3c0a1619a9070394452ca8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJU7DrlAAoJELp701BxlEWflmcP/3DfTosAor8VRuGkwWhqWE1E
-ZRuFQ9mf3gWYhP8j/pHjuP712y8JTCI7WuicQRXQ6MyVDkWQzg17EQCO9EWPE6Hb
-9TO/uWWltTJJY/YRO+sA12SJOSyfF9jrRzLoWZCj1i1uf4A4/sj4ojAsjpQfVyTr
-oukWqNDqdEwjMDKwd/xUzFImhXVIf9njDQcNyyz/fYdrXlV3Q6VjAcOgORhgW9+8
-fdvhYoEcaUJXsHycrGMZVMXqYP9Z13VTmY3ExB2HQ3IimDAcwel12eJpQ6Ry87BB
-T/0kvi5Y211sa4GAiFmnDuEJ1qWygbHO3SUi3vHuuomk+f/6gBkd8jmfoBULbWOh
-4SE5g3gw6WZatf70ri9YqyDyQ8vFlJ5YWqrknbbuz3mjeHTWH/qsCZjm31Uimw/t
-EtWTAmj0QKKCWvLR90F27wsiiGdmlWtDUtgr1TP8PlSmFhKCtDO9eCxT3VejYKFx
-05eM0geqFjbLKJqJnJJsue14GYTCNEExHBh0gm4eruMw8srZkoUwYnnkc8AdBZNB
-oIxeWIHvmx4OP5/O2TzHgwbkT0vxSsdvo/jTcZWYbjcp1xj7vnGWBtZh2Ag+UlOu
-lA+hg4bn/Xuf4kY/6mV4DsQt7PmyHs77Hzqo5qgZEDAolGRznMh6nBj9XWV/Tglx
-uqeAu69Za1Th0xTwLNEr
-=k+yH
+iQJ8BAEBCABmBQJVRAsiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3k68MP/37cnY9bASkT/DwMVb1PS5YD
+yKKIgLN4l93/KBt8EXXlEU/h4xwi47KBduzNnYcgrhZm5UWEsG3KC/lSUnnm/Uqc
+C+vIdHQU7hqGFbas/nNMtJwAkcLpAauSmAM7OnhbM3cbLPk7KBnAGz0iseYRfpVT
+QTpk5OWd1kf5oERYX+eW88V5yjoC1yLo3egYUebkJ0MsV7vSPf/GrizFiAnXiqIA
+E164wdzAF6caHf69IFe5ft1ivY15YuUq/P/Y85rxq+dvbnCxHgkS4q7SJV/d092n
+kvhKXydVqfvXmQBIuShd0WNK/o21p6E6ZrzQNoeV3zl5W90o2+vWJVdwNXEB0mJA
+Yv6M68puAkxBgZ3kGgIcApfxIwJZ7XIcyswKGa5rzVRLUC3o86GiZOJd5fdt087L
+Kw9icDzGvQjeJA24aq+MCmDPAwJlg5YluSqMV2vetKFXx9GJEu8SeicnuOdRKjbU
+jx8Nz+kDUiwCdBVy5VVPYs+QPw/qK2MAXP7RiJseL8m0/Lv1Znt4Q3nyNYXUYiyO
+tkAVqwOgE1UvbqS+LF6PdxlgvXb/C2UMB8GzUAOUneFP465K1SgPLIh8ACCqVkUa
+4pRm+HQt3VrP+WQMXzPHjTnfi0biak1aNBQFcDpjJP0iEJHV2icauZ4wMHOiF5Ii
+zjAI8l9MLAOFDt81WTWj
+=9HVy
 -----END PGP SIGNATURE-----
diff --git a/media-libs/leptonica/files/leptonica-1.68-zlib-include.patch b/media-libs/leptonica/files/leptonica-1.68-zlib-include.patch
deleted file mode 100644
index 06c9a47c8363..000000000000
--- a/media-libs/leptonica/files/leptonica-1.68-zlib-include.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- leptonica-1.68.orig/src/pngio.c	2011-02-01 00:41:12.000000000 -0500
-+++ leptonica-1.68/src/pngio.c	2011-07-09 09:17:17.000000000 -0400
-@@ -108,6 +108,10 @@
- 
- #include "png.h"
- 
-+#ifdef HAVE_LIBZ
-+#include "zlib.h"
-+#endif
-+
- /* ----------------Set defaults for read/write options ----------------- */
-     /* strip 16 bpp --> 8 bpp on reading png; default is for stripping */
- static l_int32   var_PNG_STRIP_16_TO_8 = 1;
diff --git a/media-libs/leptonica/leptonica-1.68.ebuild b/media-libs/leptonica/leptonica-1.68.ebuild
deleted file mode 100644
index 9b721305aed4..000000000000
--- a/media-libs/leptonica/leptonica-1.68.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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.68.ebuild,v 1.10 2014/08/21 11:33:58 armin76 Exp $
-
-EAPI=4
-
-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 ppc ppc64 ~sparc x86"
-IUSE="gif jpeg png tiff webp utils zlib static-libs"
-
-DEPEND="gif? ( media-libs/giflib )
-	jpeg? ( virtual/jpeg )
-	png? ( media-libs/libpng )
-	tiff? ( media-libs/tiff )
-	webp? ( media-libs/libwebp )
-	zlib? ( sys-libs/zlib )"
-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"
-	done
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# $(use_with webp libwebp) -> unknown
-	# so use-flag just for pulling dependencies
-	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
-}
diff --git a/media-libs/leptonica/leptonica-1.69.ebuild b/media-libs/leptonica/leptonica-1.69.ebuild
deleted file mode 100644
index 082be006ef96..000000000000
--- a/media-libs/leptonica/leptonica-1.69.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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.69.ebuild,v 1.4 2014/08/21 11:33:58 armin76 Exp $
-
-EAPI=4
-
-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="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gif jpeg png tiff webp utils zlib static-libs"
-
-DEPEND="gif? ( media-libs/giflib )
-	jpeg? ( virtual/jpeg )
-	png? ( media-libs/libpng )
-	tiff? ( media-libs/tiff )
-	webp? ( media-libs/libwebp )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-DOCS=( README version-notes )
-
-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"
-	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 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
-}
diff --git a/media-libs/leptonica/leptonica-1.70.ebuild b/media-libs/leptonica/leptonica-1.70.ebuild
deleted file mode 100644
index 4fe7ab4f48b8..000000000000
--- a/media-libs/leptonica/leptonica-1.70.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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.70.ebuild,v 1.5 2014/09/19 09:28:23 ago Exp $
-
-EAPI=4
-
-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 png tiff webp utils zlib static-libs"
-
-DEPEND="gif? ( media-libs/giflib )
-	jpeg? ( virtual/jpeg )
-	png? ( media-libs/libpng )
-	tiff? ( media-libs/tiff )
-	webp? ( media-libs/libwebp )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-DOCS=( README version-notes )
-
-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"
-	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 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
-}
diff --git a/media-libs/leptonica/leptonica-1.72.ebuild b/media-libs/leptonica/leptonica-1.72.ebuild
new file mode 100644
index 000000000000..49cb1aa02ca4
--- /dev/null
+++ b/media-libs/leptonica/leptonica-1.72.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/leptonica/leptonica-1.72.ebuild,v 1.1 2015/05/01 23:24:02 chewi Exp $
+
+EAPI=5
+
+inherit autotools-multilib
+
+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 static-libs test tiff utils webp zlib"
+
+# N.B. Tests need some features enabled:
+REQUIRED_USE="test? ( jpeg png tiff )"
+
+DEPEND="gif? ( media-libs/giflib:=[${MULTILIB_USEDEP}] )
+	jpeg? ( virtual/jpeg:=[${MULTILIB_USEDEP}] )
+	jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:=[${MULTILIB_USEDEP}]
+		   sys-libs/zlib:=[${MULTILIB_USEDEP}] )
+	tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] )
+	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+DOCS=( README version-notes )
+
+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"
+	done
+
+	# Don't spam /tmp.
+	sed -i -r 's/(#define\s+ADD_LEPTONICA_SUBDIR\s+)0/\11/' \
+		src/environ.h || die
+
+	autotools-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_with gif giflib)
+		$(use_with jpeg)
+		$(use_with jpeg2k libopenjpeg)
+		$(use_with png libpng)
+		$(use_with tiff libtiff)
+		$(use_with webp libwebp)
+		$(use_with zlib)
+		$(use_enable static-libs static)
+		$(multilib_native_use_enable utils programs)
+	)
+	autotools-utils_src_configure
+}
diff --git a/media-libs/leptonica/metadata.xml b/media-libs/leptonica/metadata.xml
index 957c5c26c281..3f7ef2924819 100644
--- a/media-libs/leptonica/metadata.xml
+++ b/media-libs/leptonica/metadata.xml
@@ -2,11 +2,16 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-	  <email>tomka@gentoo.org</email>
-	  <name>Thomas Kahle</name>
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
 	</maintainer>
 	<use>
 		<flag name="webp">Adds support for the WebP image format</flag>
 		<flag name="utils">Install command-line utilities</flag>
 	</use>
+	<longdescription>
+		Leptonica is a pedagogically-oriented open source site
+		containing software that is broadly useful for image
+		processing and image analysis applications.
+	</longdescription>
 </pkgmetadata>