version bump

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

3 files changed, 82 insertions, 5 deletions

diff --git a/dev-ml/ocamlduce/ChangeLog b/dev-ml/ocamlduce/ChangeLog
index e0f9eb63cf61..b2e3c5762aaf 100644
--- a/dev-ml/ocamlduce/ChangeLog
+++ b/dev-ml/ocamlduce/ChangeLog
@@ -1,6 +1,11 @@
 # 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.20 2011/07/06 16:38:12 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlduce/ChangeLog,v 1.21 2011/07/07 20:34:43 aballier Exp $
+
+*ocamlduce-3.12.1.0 (07 Jul 2011)
+
+  07 Jul 2011; Alexis Ballier <aballier@gentoo.org> +ocamlduce-3.12.1.0.ebuild:
+  version bump
 
   06 Jul 2011; Alexis Ballier <aballier@gentoo.org> -ocamlduce-3.11.2.0.ebuild,
   -ocamlduce-3.12.0.0.ebuild, -ocamlduce-3.12.0.0-r10.ebuild:
diff --git a/dev-ml/ocamlduce/Manifest b/dev-ml/ocamlduce/Manifest
index aa4f5adea980..fb0706ddadd9 100644
--- a/dev-ml/ocamlduce/Manifest
+++ b/dev-ml/ocamlduce/Manifest
@@ -5,13 +5,15 @@ AUX ocaml-3.12.1.patch 558 RMD160 674ca37b088e3cb12cc191445b49de400d998a11 SHA1
 DIST ocaml-3.12.1.tar.bz2 2949124 RMD160 61d38c0785491c8790ac02ab78fb2f26ea490fc1 SHA1 29b44117b116b1a5bc54a8b4514af483793a769f SHA256 edcf563da75e0b91f09765649caa98ab1535e0c7498f0737b5591b7de084958d
 DIST ocaml-patches-3.tar.bz2 4101 RMD160 f830b0be28a96f8892776d0372fa10fb56a605ee SHA1 f165b9fce29cc4d96a81abbc7edbde35e33b4c0c SHA256 c4ceb604f4480c78d1cf4f848b0903c8d37798d9761f582d8d1643d4e38b8658
 DIST ocamlduce-3.12.0.0.tar.gz 138677 RMD160 4deee8799ec1c8c519e008a7d7d920f424ae2f24 SHA1 1cc8cb089edeb438d57b50b51c0dda1f35476927 SHA256 fe78ff3f31dda6f3760c0b3ee13603436e42142077f8d5473f005d5290e04f8c
+DIST ocamlduce-3.12.1.0.tar.gz 140291 RMD160 33078e31c4cffade2f6d762fa9e9e4023f96fec4 SHA1 c5006c36071a1e22736ccd5bb96024f13e575302 SHA256 3eda11591d9babf9f6fc25f257367cd36fffe3cc03a6b0105a2d49fc62aa91ab
 EBUILD ocamlduce-3.12.0.0-r20.ebuild 2078 RMD160 ddc76bd5edfa2888d378206ba8f18f0dec1cabf1 SHA1 5ce431654587e9a26d6927bca984f9f6c818ee82 SHA256 f27e48a57f958594866e9f25d48115ee9a676b79d1b8efb01c8b32766ca0808e
-MISC ChangeLog 2744 RMD160 a14917fb54c50489a54dfee20177ae281b297c4b SHA1 8093c406855db9da04ca650c4cb642f84907edc2 SHA256 b537852919a2d9c5db52cf73f0cb3d6f0f612087377a09b6dbaf3a9938e039fd
+EBUILD ocamlduce-3.12.1.0.ebuild 2023 RMD160 6055f033a826a3246561318f15db25b83caff1e5 SHA1 9deb6585dfee602b06966b133fdcd0998b6a6c5a SHA256 77e44ad97e692471d69c08b900d682e083a915b4b0cc6064462bf4b1bb4f2728
+MISC ChangeLog 2875 RMD160 041677f7fba5e1f4fe0ff33e7842f69986849c25 SHA1 2fab9567504e520579a1e9fe79d2088d41083e45 SHA256 dfaf5c210df9864570711dc0f9ad5ee463f7933b3bf706bae3ae35cb41c1a61c
 MISC metadata.xml 596 RMD160 1b88beb573543cf7b16a9287535e628b342441dd SHA1 cf8f0204da2e16dcb83d837fa5916747a589f8cf SHA256 88c57d0b9cfb5ddde09162a1b25f7412df877e030bc80bb9433089f2dee9f0ea
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4Uj3kACgkQvFcC4BYPU0pC5wCguVqexDoQBg2vBEp2rSXFP/Wp
-6fIAnA9VHbWmYj7+kanfU7FbITjgF3Qf
-=U2M5
+iEYEARECAAYFAk4WGGkACgkQvFcC4BYPU0q8BACeI9BXMvJmx4U+klM8SjTHLCSb
+UEMAnRFjne+IHC9Osvmi8QjsinH2sQLR
+=naj2
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/ocamlduce/ocamlduce-3.12.1.0.ebuild b/dev-ml/ocamlduce/ocamlduce-3.12.1.0.ebuild
new file mode 100644
index 000000000000..58163de92886
--- /dev/null
+++ b/dev-ml/ocamlduce/ocamlduce-3.12.1.0.ebuild
@@ -0,0 +1,70 @@
+# 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.1.0.ebuild,v 1.1 2011/07/07 20:34:43 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/644/${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}"
+	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
+}