build with ocaml-3.12.1

Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64

4 files changed, 95 insertions, 12 deletions

diff --git a/dev-ml/ocamlduce/ChangeLog b/dev-ml/ocamlduce/ChangeLog
index 08b170cabdac..b5893c6e5fc8 100644
--- a/dev-ml/ocamlduce/ChangeLog
+++ b/dev-ml/ocamlduce/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ml/ocamlduce
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlduce/ChangeLog,v 1.18 2011/06/26 20:00:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlduce/ChangeLog,v 1.19 2011/07/06 16:32:39 aballier Exp $
+
+*ocamlduce-3.12.0.0-r20 (06 Jul 2011)
+
+  06 Jul 2011; Alexis Ballier <aballier@gentoo.org>
+  +ocamlduce-3.12.0.0-r20.ebuild, +files/ocaml-3.12.1.patch:
+  build with ocaml-3.12.1
 
 *ocamlduce-3.12.0.0-r10 (26 Jun 2011)
 
diff --git a/dev-ml/ocamlduce/Manifest b/dev-ml/ocamlduce/Manifest
index 4e7c94ecc7a2..bd65d04ae5ad 100644
--- a/dev-ml/ocamlduce/Manifest
+++ b/dev-ml/ocamlduce/Manifest
@@ -1,22 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX ocaml-3.12.1.patch 558 RMD160 674ca37b088e3cb12cc191445b49de400d998a11 SHA1 b7c8dba47b1375c3645c4a0f19e9c18216908ee7 SHA256 3baef7d620f68b42c63ec7d7790cc2a762fb9f0cc6a83d5f692212d3dfe97369
 DIST ocaml-3.11.2.tar.bz2 2346284 RMD160 a407e579b7fa134fc8126c5c5b544dd60cedecb1 SHA1 59053ce0078da2367f4ce61da886d22c6e86a46d SHA256 86f3387a0d7e7c8be2a3c53af083a5a726e333686208d5ea0dd6bb5ac3f58143
 DIST ocaml-3.12.0.tar.bz2 2639049 RMD160 3d10d5f7431d8200688fa74122e7ed528126a0fa SHA1 33ebbfb1115806f117808f37e40d206c8994943d SHA256 17811756209ec9658e1027b0d3b8e5dedb772ca1c43e0bdfa630a2a183ffec3b
 DIST ocaml-3.12.1+rc1.tar.bz2 2649826 RMD160 0545a2d1fc30d9e896d5eaa73a7d347c2a293fbf SHA1 95fe6ca614d4295889168ac6c7e4a3afaba810e1 SHA256 ab03ce9d9425c327622e387333ba6f69edf8a6c4f49f4dbba66894e218bfea35
+DIST ocaml-3.12.1.tar.bz2 2949124 RMD160 61d38c0785491c8790ac02ab78fb2f26ea490fc1 SHA1 29b44117b116b1a5bc54a8b4514af483793a769f SHA256 edcf563da75e0b91f09765649caa98ab1535e0c7498f0737b5591b7de084958d
 DIST ocaml-patches-1.tar.bz2 3108 RMD160 ad56f8be4b15347794f3167be82124fcdbf6f6dc SHA1 542ae4c2b1515730fe0c9050b6658106ef69ad19 SHA256 ad1c252cba7cc50f70d19049fcd78aa359672e436ab9906424548229a04afa49
 DIST ocaml-patches-3.tar.bz2 4101 RMD160 f830b0be28a96f8892776d0372fa10fb56a605ee SHA1 f165b9fce29cc4d96a81abbc7edbde35e33b4c0c SHA256 c4ceb604f4480c78d1cf4f848b0903c8d37798d9761f582d8d1643d4e38b8658
 DIST ocamlduce-3.11.2.0.tar.gz 139459 RMD160 cae634e3a077c4295e9b082f919d182aa586c5a2 SHA1 e3b3268f07a6d16342733232a5d9bf2c50cf6792 SHA256 8bd6563b979dd127a76fa5f8a3137c83010b14bf581e02e15371904f1d8beddd
 DIST ocamlduce-3.12.0.0.tar.gz 138677 RMD160 4deee8799ec1c8c519e008a7d7d920f424ae2f24 SHA1 1cc8cb089edeb438d57b50b51c0dda1f35476927 SHA256 fe78ff3f31dda6f3760c0b3ee13603436e42142077f8d5473f005d5290e04f8c
 EBUILD ocamlduce-3.11.2.0.ebuild 2019 RMD160 bf9dfe416e8e9509b3b7007640a3577dc9fe0d0b SHA1 4707a59716a3d90d563f276ea141e05148fad991 SHA256 d488b6d7a8adf1767a983c73c9b7cc524b6b26dce253662e85c289191d1fd813
 EBUILD ocamlduce-3.12.0.0-r10.ebuild 2031 RMD160 aab723ac8ca02349d67543d4c497264d4e02801a SHA1 23cf595261668d070fd73f74e7066c671335ab9c SHA256 3d92017bdc9e0df2455ae002a879e55cfc6cbe27d1545b5cff3d715351328215
+EBUILD ocamlduce-3.12.0.0-r20.ebuild 2078 RMD160 ddc76bd5edfa2888d378206ba8f18f0dec1cabf1 SHA1 5ce431654587e9a26d6927bca984f9f6c818ee82 SHA256 f27e48a57f958594866e9f25d48115ee9a676b79d1b8efb01c8b32766ca0808e
 EBUILD ocamlduce-3.12.0.0.ebuild 2019 RMD160 af4542d410bf7bea46bbaca5a216649c10f48eca SHA1 023c57e1c67e1af28996e9c24c5d3f26650d02d1 SHA256 16e7b5d84d586d8b0cfaaf7625c73bfa6f96f927bb7ab6f20418c8c0a31ec8ad
-MISC ChangeLog 2409 RMD160 b6b91a2fe0be4111ad5cb06d22935a96e14a90e6 SHA1 df7c6ddbdcb6fd355bdd9361a7e625e33e5549b5 SHA256 e38c6b9e6a270b9a4c2647194445f125fe2ffac5c2040d59a3bd708c1e860184
+MISC ChangeLog 2588 RMD160 ec2d423695147176da384a912f37c672f93ba30e SHA1 2abbb63842ca4c722bdb2f19a98cde1152acd31f SHA256 6b0b849e02e668af7fe84591368169abbf6a1a379ccc12f59d5dc983e85d7e81
 MISC metadata.xml 596 RMD160 1b88beb573543cf7b16a9287535e628b342441dd SHA1 cf8f0204da2e16dcb83d837fa5916747a589f8cf SHA256 88c57d0b9cfb5ddde09162a1b25f7412df877e030bc80bb9433089f2dee9f0ea
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk4Hj/oACgkQvFcC4BYPU0oQggCdHWdTisrV96o9GIroxEkUZ848
-gAwAoLLg6NNRybSs9++gdBs+Ji7yjKZp
-=694r
------END PGP SIGNATURE-----
diff --git a/dev-ml/ocamlduce/files/ocaml-3.12.1.patch b/dev-ml/ocamlduce/files/ocaml-3.12.1.patch
new file mode 100644
index 000000000000..15bfec61a7b6
--- /dev/null
+++ b/dev-ml/ocamlduce/files/ocaml-3.12.1.patch
@@ -0,0 +1,13 @@
+Index: work/ocamlduce-3.12.0.0/patches/typing.diff
+===================================================================
+--- work.orig/ocamlduce-3.12.0.0/patches/typing.diff
++++ work/ocamlduce-3.12.0.0/patches/typing.diff
+@@ -1987,7 +1987,7 @@ index ce84576..7b98d21 100644
+ @@ -106,6 +106,7 @@ and structure_item ppf tbl s =
+    | Pstr_class cdl -> List.iter (class_declaration ppf tbl) cdl;
+    | Pstr_class_type _ -> ()
+-   | Pstr_include _ -> ()
++   | Pstr_include me -> module_expr ppf tbl me;
+ +  | Pstr_namespace _ -> ()
+  
+  and expression ppf tbl e =
diff --git a/dev-ml/ocamlduce/ocamlduce-3.12.0.0-r20.ebuild b/dev-ml/ocamlduce/ocamlduce-3.12.0.0-r20.ebuild
new file mode 100644
index 000000000000..a6a96d60289e
--- /dev/null
+++ b/dev-ml/ocamlduce/ocamlduce-3.12.0.0-r20.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlduce/ocamlduce-3.12.0.0-r20.ebuild,v 1.1 2011/07/06 16:32:39 aballier Exp $
+
+EAPI="2"
+
+inherit versionator eutils toolchain-funcs flag-o-matic multilib
+
+OCAML_VERSION=3.12.1
+OCAML_TARBALL=ocaml-${OCAML_VERSION}.tar.bz2
+OCAML_PATCHLEVEL=3
+OCAML_GENTOO_PATCHES=ocaml-patches-${OCAML_PATCHLEVEL}.tar.bz2
+
+DESCRIPTION="OCamlDuce is a merger between OCaml and CDuce"
+HOMEPAGE="http://ocamlduce.forge.ocamlcore.org/"
+SRC_URI="https://forge.ocamlcore.org/frs/download.php/441/${P}.tar.gz
+	ftp://ftp.inria.fr/INRIA/cristal/ocaml/ocaml-$(get_version_component_range 1-2 ${OCAML_VERSION})/${OCAML_TARBALL}
+	mirror://gentoo/${OCAML_GENTOO_PATCHES}"
+
+LICENSE="QPL-1.0 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="+ocamlopt"
+
+DEPEND="~dev-lang/ocaml-${OCAML_VERSION/+/_}[ocamlopt?]
+	>=dev-ml/findlib-1.2.4-r1
+	!!<dev-ml/${P}"
+
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P}/ocaml-${OCAML_VERSION}
+
+src_unpack() {
+	unpack ${P}.tar.gz ${OCAML_GENTOO_PATCHES}
+}
+
+src_prepare() {
+	cd "${WORKDIR}/${P}"
+	epatch "${FILESDIR}/ocaml-${OCAML_VERSION}.patch"
+	emake OCAML_SOURCE="${DISTDIR}/${OCAML_TARBALL}" prepare || die "failed to prepare"
+	cd "${S}"
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+}
+
+src_configure() {
+	RAW_LDFLAGS="$(raw-ldflags)" ./configure -prefix /usr \
+		--bindir /usr/bin \
+		--libdir /usr/$(get_libdir)/ocaml \
+		--mandir /usr/share/man \
+		-host "${CHOST}" \
+		-cc "$(tc-getCC)" \
+		-as "$(tc-getAS)" \
+		-aspp "$(tc-getCC) -c" \
+		--with-pthread || die "configure failed!"
+}
+
+src_compile() {
+	if use ocamlopt; then
+		emake -f Makefile.ocamlduce -j1 world.opt || die
+	else
+		emake -f Makefile.ocamlduce -j1 world || die
+	fi
+}
+
+src_install() {
+	emake -f Makefile.ocamlduce BINDIR="${D}/usr/bin" LIBDIR="${D}/usr/$(get_libdir)/ocaml" installbyte || die
+	if use ocamlopt; then
+		emake -f Makefile.ocamlduce BINDIR="${D}/usr/bin" LIBDIR="${D}/usr/$(get_libdir)/ocaml" installopt || die
+	fi
+	dodoc Changes README
+}