4 files changed, 90 insertions, 7 deletions
diff --git a/dev-ml/camlp5/ChangeLog b/dev-ml/camlp5/ChangeLog
index 3beded3e8275..253a741ae27b 100644
--- a/dev-ml/camlp5/ChangeLog
+++ b/dev-ml/camlp5/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-ml/camlp5
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlp5/ChangeLog,v 1.52 2010/12/24 16:04:41 aballier Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlp5/ChangeLog,v 1.53 2011/01/20 19:39:06 aballier Exp $
+
+*camlp5-6.02.1-r1 (20 Jan 2011)
+
+  20 Jan 2011; Alexis Ballier <aballier@gentoo.org> +camlp5-6.02.1-r1.ebuild,
+  +files/camlp5-6.02.1-Fix-regression-in-pretty-printing-of-labelled-argume.pat
+  ch:
+  Import a patch from upstream/debian to fix latest coq build failure, bug
+  #352174 by Thomas Kahle <tomka@gentoo.org> and Olivier Huber
 
   24 Dec 2010; Alexis Ballier <aballier@gentoo.org> -camlp5-5.15.ebuild,
   -camlp5-6.02.0.ebuild:
diff --git a/dev-ml/camlp5/Manifest b/dev-ml/camlp5/Manifest
index 27eef6f1624a..1125dd004c98 100644
--- a/dev-ml/camlp5/Manifest
+++ b/dev-ml/camlp5/Manifest
@@ -2,16 +2,18 @@
 Hash: SHA1
 
 AUX camlp5-5.14-ocaml312.patch 703 RMD160 b2b5c500d988ba50a43a44e2c64d2175f9f1f5b8 SHA1 632ec6be5dce8da5427d3352a8d81d11fadef191 SHA256 649fbcd7dd5e6d2df25d5f4a1de15f8b60f941729455bed940fff4d5163dcb6a
+AUX camlp5-6.02.1-Fix-regression-in-pretty-printing-of-labelled-argume.patch 648 RMD160 e0f618bf3896f66dc6af0ba357eddbe97743b036 SHA1 53481c13e69befce4370f32571c7a69581d56b97 SHA256 ee4c63f49659a132664d4068b0d416c7ddcef5da7bdb88d10fb0e31f168cfa7d
 DIST camlp5-5.14.tgz 685253 RMD160 0643a1fcf78d4848fd7090d105911dc43990eb66 SHA1 cae1cb1dfa506f640393c28d9b510a03f947ef9d SHA256 1b45413a3477ef6143ace5185122c162b765d86c6d963ab8bd2b771feda3baa5
 DIST camlp5-6.02.1.tgz 651881 RMD160 d26d8d0e1d0f1b3a86f0bfbca43c64f648bc543a SHA1 6d658988d89be00e90fcdccb31d615988b2e607c SHA256 b26828e9040748090a312ff321452ce5b2f8ee2ee90bae36e7b7493cde16623f
 EBUILD camlp5-5.14.ebuild 1313 RMD160 5f3953d7b86c43d5e92f62406c36499ed866b119 SHA1 484a811804a8f482beb11ddb65e4ce2ffefa2444 SHA256 4f4f1a4d6263c9e99a3d7651cd0ac871dc00e34ecba84f82c551282bb8cb3cb3
+EBUILD camlp5-6.02.1-r1.ebuild 1357 RMD160 e5e42639fa40ff183e6cda71ccb191a01c08355f SHA1 fb1c18f58a2b40bc266031eebf70b54b6c90694b SHA256 74c3b6f58a458586d33fab7989baeda00086aeb22200de72612867b8a0f22b1d
 EBUILD camlp5-6.02.1.ebuild 1242 RMD160 cb24ca7a859dd8dc0afdb21eb0247323dfe13278 SHA1 38cd0253a21c417a1d09ef5ec7b68a1264183d51 SHA256 ddd81e05b174e3e3a83ffcff26d142550053c63efffeb12877ee4019a7e2fb71
-MISC ChangeLog 6286 RMD160 373f46c0bb11a45ee4b61c859a0334a8bfcbc805 SHA1 79764224faf210b5b00cd86e0d52de2275af3034 SHA256 3d400d6661c56d48f3a5ad1ab0c03b74170eca1f3e9a6a64b95025ed3ce2a7d0
+MISC ChangeLog 6622 RMD160 2f08f1f99c921d2508287892219a181da7bf7f8c SHA1 35a4801b93bb17e3c3cec632631321737b1b556f SHA256 a7d593237a9826a127ab14434a90b8b8080f383146448ff8c98fcac6b64af2f7
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk0UxJ4ACgkQvFcC4BYPU0p9KwCeI2oxTOgdF7SUx5jsBnRiURQC
-s3sAnApsMrfMht06Jf2hW3BBQ2HNj94x
-=4Gm/
+iEYEARECAAYFAk04j2AACgkQvFcC4BYPU0pB6ACeL9oM1NcOazNZZvvbQIIoMH5F
+pHMAnA2NFxUUK7RFP/qFqaexLG7613ge
+=gdd/
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/camlp5/camlp5-6.02.1-r1.ebuild b/dev-ml/camlp5/camlp5-6.02.1-r1.ebuild
new file mode 100644
index 000000000000..c5270748163a
--- /dev/null
+++ b/dev-ml/camlp5/camlp5-6.02.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlp5/camlp5-6.02.1-r1.ebuild,v 1.1 2011/01/20 19:39:06 aballier Exp $
+
+EAPI="2"
+
+inherit multilib findlib eutils
+
+DESCRIPTION="A preprocessor-pretty-printer of ocaml"
+HOMEPAGE="http://pauillac.inria.fr/~ddr/camlp5/"
+SRC_URI="http://pauillac.inria.fr/~ddr/camlp5/distrib/src/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="doc +ocamlopt"
+
+DEPEND=">=dev-lang/ocaml-3.10[ocamlopt?]"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-Fix-regression-in-pretty-printing-of-labelled-argume.patch"
+}
+
+src_configure() {
+	./configure \
+		-prefix /usr \
+	    -bindir /usr/bin \
+		-libdir /usr/$(get_libdir)/ocaml \
+		-mandir /usr/share/man || die "configure failed"
+}
+
+src_compile(){
+	emake || die "emake failed"
+	if use ocamlopt; then
+		emake  opt || die "Compiling native code programs failed"
+		emake  opt.opt || die "Compiling native code programs failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	# findlib support
+	insinto "$(ocamlfind printconf destdir)/${PN}"
+	doins etc/META || die "failed to install META file for findlib support"
+
+	use doc && dohtml -r doc/*
+
+	dodoc CHANGES DEVEL ICHANGES README UPGRADING MODE
+}
diff --git a/dev-ml/camlp5/files/camlp5-6.02.1-Fix-regression-in-pretty-printing-of-labelled-argume.patch b/dev-ml/camlp5/files/camlp5-6.02.1-Fix-regression-in-pretty-printing-of-labelled-argume.patch
new file mode 100644
index 000000000000..56a554d5374c
--- /dev/null
+++ b/dev-ml/camlp5/files/camlp5-6.02.1-Fix-regression-in-pretty-printing-of-labelled-argume.patch
@@ -0,0 +1,23 @@
+From: Stephane Glondu <steph@glondu.net>
+Date: Mon, 6 Dec 2010 11:39:34 +0100
+Subject: [PATCH] Fix regression in pretty-printing of labelled arguments
+
+Patch provided by Daniel de Rauglaudre, applied in upstream CVS.
+---
+ etc/pr_o.ml |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/etc/pr_o.ml b/etc/pr_o.ml
+index ad8d6b9..747e64e 100644
+--- a/etc/pr_o.ml
++++ b/etc/pr_o.ml
+@@ -2080,7 +2080,7 @@ value poly_type pc =
+ value label_ipatt expr pc (p, oe) =
+   match Pcaml.unvala oe with
+   [ Some e -> pprintf pc "~%p:%p" patt p expr e
+-  | None -> patt pc p ]
++  | None -> pprintf pc "~%p" patt p ]
+ ;
+ 
+ EXTEND_PRINTER
+--