bump to 3.12.1

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

3 files changed, 142 insertions, 5 deletions

diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index 201ffb0e8439..663d8b31a2de 100644
--- a/dev-lang/ocaml/ChangeLog
+++ b/dev-lang/ocaml/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/ocaml
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.191 2011/06/26 18:09:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.192 2011/07/04 22:11:34 aballier Exp $
+
+*ocaml-3.12.1 (04 Jul 2011)
+
+  04 Jul 2011; Alexis Ballier <aballier@gentoo.org> +ocaml-3.12.1.ebuild:
+  bump to 3.12.1
 
 *ocaml-3.12.1_rc1 (26 Jun 2011)
 
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index d473acc05e5e..f3d47e2a8d7e 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -6,18 +6,20 @@ AUX ocaml.conf 177 RMD160 3a0d91eabe02ccf823931bb3256322c15f38b38a SHA1 603ac717
 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
 EBUILD ocaml-3.11.2.ebuild 4127 RMD160 af407baa063d742b0a1d60f4604c72363963ff91 SHA1 179506aecc9e48cd9e4c7f6319584467d7a137d9 SHA256 89abc74d30c03d2755623f3b9eadcb1a4b975fb9b668616f380640b6af76aeea
 EBUILD ocaml-3.12.0-r1.ebuild 4042 RMD160 2467c9813ffda62843763471d8cee3445a3c73c6 SHA1 ddd04923cd91f62f263278bc515c3fed1154c0f6 SHA256 c4684a7d29730187bf799bf38dbcb1bbdb94d60262fbc6c2fde8932d19274090
 EBUILD ocaml-3.12.0.ebuild 4134 RMD160 faa3071fa8b1b4d524abc1e6c3f1191d6dc9b931 SHA1 91b69aebf944fa29e1ab79fb647e3359f5f21e59 SHA256 cfd950545519033379929e51473de15be899441997d8bf289b38a4ba24a531dc
+EBUILD ocaml-3.12.1.ebuild 4039 RMD160 341ee276f5280ae9224a34b3d6d51ce351e7e97c SHA1 82e663d5f44fde1ba43eb220e108a09f5b98c1ab SHA256 ab10b5c56e99d95b7babf9a8a88eed77e2edc29876d1a2f5aee3e1e272af2f8e
 EBUILD ocaml-3.12.1_rc1.ebuild 4043 RMD160 d1453314474a7cd972101b7366a9b8da960a4f11 SHA1 7cf956c3f3259d07736a114786348c41242a6893 SHA256 138a4896f1f0b5a24d4b125702d242bf5416ae0aa686c79cbd2c563d746bf2e9
-MISC ChangeLog 30091 RMD160 1580b210fda88bb95f6c78d20c8b1afceef0c970 SHA1 16003da9bb9c1dd20cdaf47ff5303309babd74b8 SHA256 c36bf827ce9487823aaa66b78dc5bd50bcdd10f0e14b315736b9fb47eebacfa1
+MISC ChangeLog 30212 RMD160 da01e6dcafeaf5f9c037d2dabf5e359291caaffc SHA1 f0b992752e3e2820088d4b0418ef8af822c39342 SHA256 c27fc5444e7a50c92b92f7d8848f06e480847c4f7ee13b8a2f46b393a0d252fc
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4HdesACgkQvFcC4BYPU0oJRgCcCg1+47VU+gtNqYHeSY7+mY/5
-538AoI+DUUsRUkhjBSPShxC1HDJ1AbHF
-=A6Ua
+iEYEARECAAYFAk4SOpsACgkQvFcC4BYPU0p6pACeIzRWRmZ3Ka20+jTI9yvkn/mA
+7PQAoIbWfyBjkJUjJ47TyhXlX/XYrdq0
+=6mff
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ocaml/ocaml-3.12.1.ebuild b/dev-lang/ocaml/ocaml-3.12.1.ebuild
new file mode 100644
index 000000000000..a1066660f512
--- /dev/null
+++ b/dev-lang/ocaml/ocaml-3.12.1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.12.1.ebuild,v 1.1 2011/07/04 22:11:34 aballier Exp $
+
+EAPI="1"
+
+inherit flag-o-matic eutils multilib versionator toolchain-funcs
+
+PATCHLEVEL="3"
+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 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="emacs gdbm 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 )
+	gdbm? ( sys-libs/gdbm )"
+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"
+	# Fails to build on arm if >O0 is used
+	use arm && replace-flags "-O?" -O0
+
+	use tk || myconf="${myconf} -no-tk"
+	use ncurses || myconf="${myconf} -no-curses"
+	use X || myconf="${myconf} -no-graph"
+	use gdbm || myconf="${myconf} -no-dbm"
+
+	# 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"
+	echo
+}