version bump

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

3 files changed, 139 insertions, 5 deletions

diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index f3bc8ecf8488..fad8c4f39510 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.207 2012/07/27 00:29:20 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.208 2012/10/07 21:33:31 aballier Exp $
+
+*ocaml-4.00.1 (07 Oct 2012)
+
+  07 Oct 2012; Alexis Ballier <aballier@gentoo.org> +ocaml-4.00.1.ebuild:
+  version bump
 
   27 Jul 2012; Alexis Ballier <aballier@gentoo.org> -ocaml-4.00.0_beta2.ebuild,
   -ocaml-4.00.0_rc1.ebuild:
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index fcd6e00a2f57..439f840bda42 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -6,18 +6,20 @@ AUX ocaml.conf 177 SHA256 b7f7ad0ff15bec096dcb87265d87f9b0ce8f946d4a2676dd7638ca
 DIST ocaml-3.11.2.tar.bz2 2346284 SHA256 86f3387a0d7e7c8be2a3c53af083a5a726e333686208d5ea0dd6bb5ac3f58143 SHA512 69888797bdab8f7baa5e398db08a723388876ed5920b62e9bf29a5214badde1c2024365f88bcbd89d43a0c8d9e4d1bd15486e4b12e8432f1c1bcedd17782faaf WHIRLPOOL d1e6d0851f8f1315f95cd0a470bb61dc1d39ec70f2ec23169ffc9aa74b2d02f5419e3474093319cb47125e7534a0d121751fd1971653e43bdca167f823d4c94a
 DIST ocaml-3.12.1.tar.bz2 2949124 SHA256 edcf563da75e0b91f09765649caa98ab1535e0c7498f0737b5591b7de084958d SHA512 cbb050aabcbe19a4aa070d6cb74f3774cb136692dfd9433ca977f0f9520ad2f583b6cfb1a9cedfedc92e7dc794ac4a869e20aa5a67a4739002feb290435dc7e7 WHIRLPOOL b7bf4844452ab52027e6b785159df6e4defc548d2f3d31eb73dc0dc05214e7c19ed654c8b3ff234a85691599df0be568ba02fafe257856be7f603177584a7ca0
 DIST ocaml-4.00.0.tar.bz2 2760767 SHA256 ec886d7bc587ce472fcbdf294feb4b1fa2d8e7ef78ab6a4e66551699435d5cd7 SHA512 428632f8f54afee3bc512853689df5702cfa95140aa31d33a8ff752b669481050808cf36ec52262764d17c48b0a03d5e427151ecec2e899361853e5c258578ca WHIRLPOOL 0a6aa4c57b35a563539e4cacb0387c0fdb869f57fc8cccb37344299988f76c4de6ab08c478b22d0303d146a80e8352e8fb4f1156fb9372f1a7d75e2001e4c323
+DIST ocaml-4.00.1.tar.bz2 2762205 SHA256 33c3f4acff51685f5bfd7c260f066645e767d4e865877bf1613c176a77799951 SHA512 77899430706394af558666361b152d47df3a3e21831059875f8b317d0ff9d1a010177bf1e5851e522e086c20768e92c71344aa53eda0ce003f278752870ab5da WHIRLPOOL 3fdc090e1158ae72c91685aef62c751f897f4e3efcfbdc07e00d92e83351494fd126bdaca31039c1bf5dc4107072d978bb30e02c879caafc215dbc913f2d6ed1
 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
-MISC ChangeLog 32095 SHA256 5536b8721d1754fd0df8e584567fb2b6bc0140b1dc679c4929ca82bd2c147def SHA512 849b40d0a825b290921ab16425f58ef037196d42e67a5bca48506ffbc2fd1c86d1d94426ab84b79d957368b3770f659330257803ee03253978b0b400fba6444e WHIRLPOOL 103343ec49a851075aada25c15321ed44cad332914a0b6e710e38173dd4c7dbffadbfb6abfd6d91eec31c948d9d4424c36fdd7654ffd67e2c7ec36f1b8276c73
+EBUILD ocaml-4.00.1.ebuild 3982 SHA256 2bdeb236dc1dbad8d039714aa7ab2e7ef925a239e1c9d4f0ccd8bd414e4510fa SHA512 cfb862da54b84d5f64d84c6b4af44d9529e062b5945681ec551a5e9b80c750eefda67931058c97cd87eeea092b4086938b3cf19ce4cd2176b0b530861f03ed74 WHIRLPOOL 32a1dda92beb3242f25d7137a13a85cf2ca3ccf1968da0483c25ff15a82f4a586f0840c06d426fddb3112351ccf0dd05afb982b9db341b5a7821c14e952ea2c3
+MISC ChangeLog 32214 SHA256 79b0ab9acef12acb28146bfeedb2719b622d167c24c7f7fdf52749d50b4d27d0 SHA512 3e24b9193b4be074ddc16a14fd89d0dcbd5e8e53cfe20bc05125c28095dabd877fb66ed14f6c3b1f9664e943b4f7a9f8694e919a6defd4a94344042d2e40f471 WHIRLPOOL 21fbd7cb1668fc3159aedb72028d06dc0cd89b90eccab60774685ad28327533c9d42910861c3ec79d9e2935e95f6b22e88bf3de4f6896e83ca6a9640d80a1d99
 MISC metadata.xml 155 SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81 SHA512 a525f91dd332fc144c42d1437bdae9c889cbcece6294c2d2f4baf6a532ac2e13492736e75b41c83fac31033a9ae53c37deb96286a5ab8575611136617640952c WHIRLPOOL 71a9c7aaf4e268c65c0d1e30e343911ccbcf99ef8c23773abc2b3af8d58d9f7d5c09632805d8ba9050c09eef629f2b340db9eb9ba8b9cd2e5d655fce3f91fcb6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAR4OYACgkQvFcC4BYPU0oJ8wCgm2CQznP/SxhMdkoj7L5gpIKg
-4lcAnj0p5metLt1lKyZ+cmNGaU7pLbLK
-=2IWB
+iEYEAREIAAYFAlBx9SwACgkQvFcC4BYPU0pOTQCfTR38EmQCNK6vhGHn/ZvpudOO
+bdwAoKe2wL088ilxT2EMZke8oVGp1QeZ
+=5tPn
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ocaml/ocaml-4.00.1.ebuild b/dev-lang/ocaml/ocaml-4.00.1.ebuild
new file mode 100644
index 000000000000..4c629b541117
--- /dev/null
+++ b/dev-lang/ocaml/ocaml-4.00.1.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.1.ebuild,v 1.1 2012/10/07 21:33:31 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
+}