version bump

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

3 files changed, 140 insertions, 5 deletions

diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index c3e2a8b8c81d..948ed2aa5c57 100644
--- a/dev-lang/ocaml/ChangeLog
+++ b/dev-lang/ocaml/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/ocaml
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.203 2012/05/24 10:47:13 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.204 2012/06/10 20:12:21 aballier Exp $
+
+*ocaml-4.00.0_beta2 (10 Jun 2012)
+
+  10 Jun 2012; Alexis Ballier <aballier@gentoo.org> +ocaml-4.00.0_beta2.ebuild:
+  version bump
 
   24 May 2012; Alexis Ballier <aballier@gentoo.org> ocaml-3.12.1.ebuild:
   keyword ~amd64-fbsd
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 9efc26cc24cd..0e58db3db09b 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -5,16 +5,19 @@ AUX ocaml-rebuild.sh 1120 RMD160 a5138feb7cadc22f89fd5b1ad628d67e6e6734e0 SHA1 b
 AUX ocaml.conf 177 RMD160 3a0d91eabe02ccf823931bb3256322c15f38b38a SHA1 603ac7177e01542c74bb95e836fd341cef5dfe2c SHA256 b7f7ad0ff15bec096dcb87265d87f9b0ce8f946d4a2676dd7638ca0e14bb05c1
 DIST ocaml-3.11.2.tar.bz2 2346284 RMD160 a407e579b7fa134fc8126c5c5b544dd60cedecb1 SHA1 59053ce0078da2367f4ce61da886d22c6e86a46d SHA256 86f3387a0d7e7c8be2a3c53af083a5a726e333686208d5ea0dd6bb5ac3f58143
 DIST ocaml-3.12.1.tar.bz2 2949124 RMD160 61d38c0785491c8790ac02ab78fb2f26ea490fc1 SHA1 29b44117b116b1a5bc54a8b4514af483793a769f SHA256 edcf563da75e0b91f09765649caa98ab1535e0c7498f0737b5591b7de084958d
+DIST ocaml-4.00.0+beta2.tar.bz2 2745117 RMD160 345a2ce3a3f163aac402d4e6b56d4f07e70f39d4 SHA1 75fedc849cc1cbfe620f0258c0f6c8214467efb7 SHA256 dde859f626ab62104e7238a882be8866c31a943c4f548bbebce14f16a1b20663
 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 ocaml-patches-4.tar.bz2 2429 RMD160 e558861a837f7e2fa088d0e7826eeb3a4306f6ac SHA1 e26d584486026d48a21c12a2ef2cfe6b72e33164 SHA256 42e7120e8b682dfbef9e5f5cc95adfc67f0ca7289c067f67dc28562d3cca6cc5
 EBUILD ocaml-3.11.2.ebuild 4127 RMD160 af407baa063d742b0a1d60f4604c72363963ff91 SHA1 179506aecc9e48cd9e4c7f6319584467d7a137d9 SHA256 89abc74d30c03d2755623f3b9eadcb1a4b975fb9b668616f380640b6af76aeea
 EBUILD ocaml-3.12.1.ebuild 4045 RMD160 217aa688d9644780de331446948fe91d6d91116a SHA1 4fd9ff8f8d86794beb6f811322c61076e21a587d SHA256 924440c4a1a73ea30cd8833d85cde70f9ad95eb9ce5e13326f9b288569dd52e9
-MISC ChangeLog 31588 RMD160 580426b75a03f69de0838b5ff1727b40eeb61e4e SHA1 bbe4f583aaf755ba7db37da063e1603ddab3baf1 SHA256 1dd817384558bacd0d88263f00501db5e21202cc551b64824517a7584a304ab2
+EBUILD ocaml-4.00.0_beta2.ebuild 3988 RMD160 c2ee44afd32b7e32a4900847ddbaa32994641460 SHA1 4ad93e2cd0b13db76850e1c412b5b8e2090d039f SHA256 008173b68b08f5e9346a87d15a44b89eeb81ed2045ff3fcb732282a3d6c7b927
+MISC ChangeLog 31719 RMD160 7fa10b8b9eac7608f5f906e303b61bc89bcdb5ba SHA1 a719aef0239380cd2ac7fd8280a9241b736412a1 SHA256 0c25f31bcd2a3b87c1f403a4df9bf9da272b0ee7ecdf363c1013773ce24c41c3
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk++EbcACgkQvFcC4BYPU0pmpQCghCVOc0JBGKAhDQT29/IMUhJV
-BGIAnAiRWEInWIVpLKmxX4ChRo4IpaKE
-=VPQW
+iEYEARECAAYFAk/U/6sACgkQvFcC4BYPU0pyDQCeM3HszwGuOCiJAxZfvrgeLltg
+35QAmgNsluEX1MzAm2Xfn9m/9eCwx8c/
+=DTPJ
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ocaml/ocaml-4.00.0_beta2.ebuild b/dev-lang/ocaml/ocaml-4.00.0_beta2.ebuild
new file mode 100644
index 000000000000..b81ed070945d
--- /dev/null
+++ b/dev-lang/ocaml/ocaml-4.00.0_beta2.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-4.00.0_beta2.ebuild,v 1.1 2012/06/10 20:12:21 aballier Exp $
+
+EAPI="1"
+
+inherit flag-o-matic eutils multilib versionator toolchain-funcs
+
+PATCHLEVEL="4"
+MY_P="${P/_/+}"
+DESCRIPTION="Fast modern type-inferring functional programming language descended from the ML family"
+HOMEPAGE="http://www.ocaml.org/"
+SRC_URI="ftp://ftp.inria.fr/INRIA/Projects/cristal/ocaml/ocaml-$(get_version_component_range 1-2)/${MY_P}.tar.bz2
+	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
+LICENSE="QPL-1.0 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="emacs latex ncurses +ocamlopt tk X xemacs"
+
+DEPEND="tk? ( >=dev-lang/tk-3.3.3 )
+	ncurses? ( sys-libs/ncurses )
+	X? ( x11-libs/libX11 x11-proto/xproto )"
+RDEPEND="${DEPEND}"
+
+PDEPEND="emacs? ( app-emacs/ocaml-mode )
+	xemacs? ( app-xemacs/ocaml )"
+
+S="${WORKDIR}/${MY_P}"
+pkg_setup() {
+	# dev-lang/ocaml creates its own objects but calls gcc for linking, which will
+	# results in relocations if gcc wants to create a PIE executable
+	if gcc-specs-pie ; then
+		append-ldflags -nopie
+		ewarn "Ocaml generates its own native asm, you're using a PIE compiler"
+		ewarn "We have appended -nopie to ocaml build options"
+		ewarn "because linking an executable with pie while the objects are not pic will not work"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+}
+
+src_compile() {
+	export LC_ALL=C
+	local myconf=""
+
+	# Causes build failures because it builds some programs with -pg,
+	# bug #270920
+	filter-flags -fomit-frame-pointer
+	# Bug #285993
+	filter-mfpmath sse
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	use tk || myconf="${myconf} -no-tk"
+	use ncurses || myconf="${myconf} -no-curses"
+	use X || myconf="${myconf} -no-graph"
+
+	# ocaml uses a home-brewn configure script, preventing it to use econf.
+	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" \
+		-partialld "$(tc-getLD) -r" \
+		--with-pthread ${myconf} || die "configure failed!"
+
+	emake -j1 world || die "make world failed!"
+
+	# Native code generation can be disabled now
+	if use ocamlopt ; then
+		# bug #279968
+		emake -j1 opt || die "make opt failed!"
+		emake -j1 opt.opt || die "make opt.opt failed!"
+	fi
+}
+
+src_install() {
+	make BINDIR="${D}"/usr/bin \
+		LIBDIR="${D}"/usr/$(get_libdir)/ocaml \
+		MANDIR="${D}"/usr/share/man \
+		install || die "make install failed!"
+
+	# Install the compiler libs
+	dodir /usr/$(get_libdir)/ocaml/compiler-libs
+	insinto /usr/$(get_libdir)/ocaml/compiler-libs
+	doins {utils,typing,parsing}/*.{mli,cmi,cmo}
+	use ocamlopt && doins {utils,typing,parsing}/*.{cmx,o}
+
+	# Symlink the headers to the right place
+	dodir /usr/include
+	dosym /usr/$(get_libdir)/ocaml/caml /usr/include/
+
+	# Remove ${D} from ld.conf, as the buildsystem isn't $(DESTDIR) aware
+	dosed "s:${D}::g" /usr/$(get_libdir)/ocaml/ld.conf
+
+	dodoc Changes INSTALL README Upgrading
+
+	# Create and envd entry for latex input files (this definitely belongs into
+	# CONTENT and not in pkg_postinst.
+	if use latex ; then
+		echo "TEXINPUTS=/usr/$(get_libdir)/ocaml/ocamldoc:" > "${T}"/99ocamldoc
+		doenvd "${T}"/99ocamldoc
+	fi
+
+	# Install ocaml-rebuild portage set
+	insinto /usr/share/portage/config/sets
+	doins "${FILESDIR}/ocaml.conf" || die
+}
+
+pkg_postinst() {
+	echo
+	ewarn "OCaml is not binary compatible from version to version, so you"
+	ewarn "need to rebuild all packages depending on it, that are actually"
+	ewarn "installed on your system. To do so, you can run:"
+	ewarn "emerge @ocaml-rebuild"
+	ewarn "Or, (almost) equivalently: emerge -1 /usr/$(get_libdir)/ocaml"
+	echo
+}