bump to 4.00.0 final

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

3 files changed, 139 insertions, 5 deletions

diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index 26ef63d53c7e..6e8dbecc9742 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.205 2012/07/19 23:38:57 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.206 2012/07/27 00:27:01 aballier Exp $
+
+*ocaml-4.00.0 (27 Jul 2012)
+
+  27 Jul 2012; Alexis Ballier <aballier@gentoo.org> +ocaml-4.00.0.ebuild:
+  bump to 4.00.0 final
 
 *ocaml-4.00.0_rc1 (19 Jul 2012)
 
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 9836c89587c4..2d2cee648014 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -7,19 +7,21 @@ DIST ocaml-3.11.2.tar.bz2 2346284 SHA256 86f3387a0d7e7c8be2a3c53af083a5a726e3336
 DIST ocaml-3.12.1.tar.bz2 2949124 SHA256 edcf563da75e0b91f09765649caa98ab1535e0c7498f0737b5591b7de084958d SHA512 cbb050aabcbe19a4aa070d6cb74f3774cb136692dfd9433ca977f0f9520ad2f583b6cfb1a9cedfedc92e7dc794ac4a869e20aa5a67a4739002feb290435dc7e7 WHIRLPOOL b7bf4844452ab52027e6b785159df6e4defc548d2f3d31eb73dc0dc05214e7c19ed654c8b3ff234a85691599df0be568ba02fafe257856be7f603177584a7ca0
 DIST ocaml-4.00.0+beta2.tar.bz2 2745117 SHA256 dde859f626ab62104e7238a882be8866c31a943c4f548bbebce14f16a1b20663 SHA512 a5d61a90c0c5c2b1c727296eb1e3206bd6b79dece82c028af5d73bf0186d1d876d984a8751a83792815489084865ab33d67336f2cae119ce2fe94068ee5dae58 WHIRLPOOL f4cd80669b37bed11e705e75ef1e7a5398c927b1a216f060eb016a9a66668626f7ea0d83b7786af06d2fe569d3bcdc94fa3d912de6072c46773825e85abc2183
 DIST ocaml-4.00.0+rc1.tar.bz2 2761700 SHA256 dbfb8db04ebf553e04d3e1c78bdbe87fc40c60e40a2cc5c554d74154d3d0c2d8 SHA512 858e39bcaf71fbfbb553be6a334b60f626ee71866b6704e6ef16fc995be750aa2a3137336ecd08cba3795fa68062aa63eb357386cacfde14511d861935553898 WHIRLPOOL 82067f2e38881efd4ac4eb2d911b282a5ea859aa17b95192e8c9ce675841cf5b8c12a8d82053234197979438f808b7be5df95718fd65d217f7e447617783caf4
+DIST ocaml-4.00.0.tar.bz2 2760767 SHA256 ec886d7bc587ce472fcbdf294feb4b1fa2d8e7ef78ab6a4e66551699435d5cd7 SHA512 428632f8f54afee3bc512853689df5702cfa95140aa31d33a8ff752b669481050808cf36ec52262764d17c48b0a03d5e427151ecec2e899361853e5c258578ca WHIRLPOOL 0a6aa4c57b35a563539e4cacb0387c0fdb869f57fc8cccb37344299988f76c4de6ab08c478b22d0303d146a80e8352e8fb4f1156fb9372f1a7d75e2001e4c323
 DIST ocaml-patches-1.tar.bz2 3108 SHA256 ad1c252cba7cc50f70d19049fcd78aa359672e436ab9906424548229a04afa49 SHA512 36042cfec68ec06a172f07c7e8ac7904fccd0619a0d5ae2ffc6c87216be7450463fdbeeb9544e5df9d7d93ce9cd52b1502d4b74ee196a911c9f9273bc41d4396 WHIRLPOOL 2f04b3859295973b20bd83e718812f0ab1a993dc143523ebeab7b3d23cfda2bfe0f1eeb2ca1dc1393ae00192337e0cdc9d1472c5681fb719390d337a7d1ddc0e
 DIST ocaml-patches-3.tar.bz2 4101 SHA256 c4ceb604f4480c78d1cf4f848b0903c8d37798d9761f582d8d1643d4e38b8658 SHA512 8be5c44de5a6b0b7c14723e41d92fe807b881b218cc5eee38ea7519c0f971415cb7fe30035303da275089dcb8a61c4f334c4a88e0bdbced3953503794b8308a7 WHIRLPOOL f1920606785702c44dead01b1426145653bc1931acba2d614c6818baddc051e4f74ca0322cae66ade63ba0cd0df5651cfd67f511fca5f12973b67a0c50ebab6d
 DIST ocaml-patches-4.tar.bz2 2429 SHA256 42e7120e8b682dfbef9e5f5cc95adfc67f0ca7289c067f67dc28562d3cca6cc5 SHA512 bf66dee09807775a705eb80a58c6f4f5394ccae8614e3eb9d3ed8633cd52d28648e5fb10200d00479a40a7c6a371f8345fed4e67932024ea7632cadb407e310e WHIRLPOOL 107b1301a3d1035e368fba749821ee9d53aa22c08d30b5dbb470eb77060bbc47a82ef54a5340e22b0d2874e7c52aa55161551e84a52510b85c27189d3ef47a46
 EBUILD ocaml-3.11.2.ebuild 4127 SHA256 89abc74d30c03d2755623f3b9eadcb1a4b975fb9b668616f380640b6af76aeea SHA512 ac4a51bdf2e199635a2ab8fa18cab1907ef5f4357bc9695d23462d4cda4e836867a6de6c9d07f93522094ce764331d47528a6a46182fd3342a382dbae363da0c WHIRLPOOL 8b0d3bd3a359443dad4f4611af785cf857a2d3cbb8736f41fff28b7e86519036e7810fa3dbcba60fb07a4e79bb8148400b256b36a3390491151883ebb2c15132
 EBUILD ocaml-3.12.1.ebuild 4045 SHA256 924440c4a1a73ea30cd8833d85cde70f9ad95eb9ce5e13326f9b288569dd52e9 SHA512 3f6c6430eaac2020759134ea26012e2c657dd49f42fc54bbc6fff133639bdd78bfbe381d44b53281c9dd51d8a86eeaa25729b9766a12f45c2fd31a757df9ef94 WHIRLPOOL 1355f4ae0c98153efdfc95cd74a67383176d2141c5bef77cf41fd44b22901c3b5446d4aa0d7c83c7bd4d4a3fac564328a7a434051b523b64e827bd81db20d0d9
+EBUILD ocaml-4.00.0.ebuild 3982 SHA256 77df6c597358aa57ff5e8824ecfce494d1ef74df931506c21f9ba491d3afeb8e SHA512 e27a43c83c6241bdd18fb846580252dd448d19d8cc6c03bbe74e973c1416399ac7d08aa87187090e077bd6291649163fb6d2bdded632d92c34d495ad3b4441d5 WHIRLPOOL 76f2d6be1d4455f691bd43a10de531d064b89833a30351084d1fe28a2e0624769920fbcd8ef82f7f741f2c7ff28075e6b2bf14768f3002141835e4f26ef1e199
 EBUILD ocaml-4.00.0_beta2.ebuild 3988 SHA256 008173b68b08f5e9346a87d15a44b89eeb81ed2045ff3fcb732282a3d6c7b927 SHA512 f0409ddc7dee2f7bf367bd6ef65b2f327e9f84135d3113a2902ff480123adc1db320aebc90ec2b0a7609e73cb96f2fda7c5cf5feda03100c3f2839e2b709c916 WHIRLPOOL 29ea852d5d31fc1dbdf7be6fca52ac9f960f46e700e7630df52992848cd7c4d469be3a545ad2ca69e6bae269a131ca27600c13446826c1603e42d6e4cdc21b1a
 EBUILD ocaml-4.00.0_rc1.ebuild 3986 SHA256 465238823a1417592ecd3b638deeee76f1d312599fb56046ae0d5419dddabe5f SHA512 abb63a9705a58f8fc4544a54fcfad6d4df7aaf641a103ab545a93ac8c67bc7ecf8a54657017a5b37e83e3757041f8f0b9f97bc84714739d14c64f587967465f5 WHIRLPOOL bc1392f800e0a59371873bc4a556d82983a6d702eae3b9d54f32ccb437f571eb9e60c7ef8d94971056222380732fe60ec5e40a1cb0ce524f421e5d80dc187412
-MISC ChangeLog 31846 SHA256 13b99ad73f42f0cc340b98d8afb4ed1544f64ad35a7617c232fcf6082c2495d4 SHA512 92e459a6360c8df14904430f1610fb3da5ea16f092b869419ec45b47e63fd77ababa167c626f67e8419f0e1315b84424adb344bfff97286a997b38507e303c3c WHIRLPOOL 5d08bdaed40b1b3384bc27562f290c9b53e1eede53a2074f1bfc7b4f3cb21254285e7c19eb04e48c70726ad2ba3444d4a09b774f4cb95b3a88085f710129853d
+MISC ChangeLog 31973 SHA256 e5d0a7684b4d0bdf824a020d0b2fd6c0c86a231f2da955c8e2242817b4e6a749 SHA512 5d2c998a464cbe28126f081fce45115a2a00afd6e151f4da150c33d30efd47196a846810e0bbfba38113d0078efb7fc1f0a8f1e3b396a7cc50469fe11f02ae25 WHIRLPOOL 2f80b9d0c34bd4add68d495e630d96ae6e79659dd24a12bedf564ac616e309e7a1912637c0c75c211b6bc87f62da3bf5aa82087c3b0e46bd97673bba5296e589
 MISC metadata.xml 155 SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81 SHA512 a525f91dd332fc144c42d1437bdae9c889cbcece6294c2d2f4baf6a532ac2e13492736e75b41c83fac31033a9ae53c37deb96286a5ab8575611136617640952c WHIRLPOOL 71a9c7aaf4e268c65c0d1e30e343911ccbcf99ef8c23773abc2b3af8d58d9f7d5c09632805d8ba9050c09eef629f2b340db9eb9ba8b9cd2e5d655fce3f91fcb6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAImpcACgkQvFcC4BYPU0qM1QCfUKdIDr45kakAQ8xBKL27sj5h
-sW8AnRcXqsxBTzOGVM7aCb3iMP+5cJ35
-=tkb9
+iEYEAREIAAYFAlAR4FsACgkQvFcC4BYPU0o3lwCfQjOhW2UVr5Lwmpxs9AxvPzxB
+OhwAnAz9Bs3tEAz+9qS/w4fYZmtT59NG
+=wfjI
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ocaml/ocaml-4.00.0.ebuild b/dev-lang/ocaml/ocaml-4.00.0.ebuild
new file mode 100644
index 000000000000..a0f99c48623c
--- /dev/null
+++ b/dev-lang/ocaml/ocaml-4.00.0.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.ebuild,v 1.1 2012/07/27 00:27:01 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
+}