bump to 3.11.2_rc1

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

3 files changed, 143 insertions, 7 deletions

diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index 0d0c7e368582..fccf51d618ce 100644
--- a/dev-lang/ocaml/ChangeLog
+++ b/dev-lang/ocaml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/ocaml
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.173 2009/12/12 14:11:50 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.174 2010/01/03 16:13:59 aballier Exp $
+
+*ocaml-3.11.2_rc1 (03 Jan 2010)
+
+  03 Jan 2010; Alexis Ballier <aballier@gentoo.org>
+  +ocaml-3.11.2_rc1.ebuild:
+  bump to 3.11.2_rc1
 
   12 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org> ocaml-3.11.1.ebuild:
   Use -j1 for build as per bug #279968.
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 6dcf2898c67f..dd6b907e6cb7 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -9,15 +9,17 @@ AUX ocaml-3.10.2-tk85.patch 2414 RMD160 1b8dc94de1c90264684a300f5f31ffce02e94cec
 AUX ocaml-rebuild.sh 1055 RMD160 a75f61820cfdc262912cc5af1241779bf900d4d7 SHA1 a673a51e05d6103863061109c4d5956ca6efdf2b SHA256 446aab21ab2d757d37666c28a634f5d0da5f690f2694354d77cdb73b202a37ae
 DIST ocaml-3.10.2.tar.bz2 2284860 RMD160 f631230b090dbd9bf9a9f71631cd0347c033cbb1 SHA1 f604580bf2943891d8faf265eeb900bbe90abce0 SHA256 3755a32da1a7490d47fff7838c12c754d3fcfe69d7c9ff2358704259dc477c58
 DIST ocaml-3.11.1.tar.gz 2859411 RMD160 7a48021e80602917cc91f7cc3305d5f3ab92b0bc SHA1 05ccb525bb53f8676e238de31209713ec38ae63a SHA256 70bf4ec660b07c9119123eb8ef2a5d9e5e98fac8c4082cca33b2622e91386b53
+DIST ocaml-3.11.2+rc1.tar.bz2 2345810 RMD160 f2d47b603ee2b173a8bc38f4fef169b9ad98dfd4 SHA1 e592e08a3da1e024ca5d31fe66103f44c6402acc SHA256 a27184a6d72bb363f7514d2bad103810d5c8e584fc106dbc7e409da7078a5e03
 DIST ocaml-patches-1.tar.bz2 3108 RMD160 ad56f8be4b15347794f3167be82124fcdbf6f6dc SHA1 542ae4c2b1515730fe0c9050b6658106ef69ad19 SHA256 ad1c252cba7cc50f70d19049fcd78aa359672e436ab9906424548229a04afa49
 EBUILD ocaml-3.10.2.ebuild 4519 RMD160 c74e33993f7220e03c05bd53b8561314fd2005d7 SHA1 6f0ed3f24d696e157593d0d10da8e90c6afa8dcf SHA256 877db782c1b7f868698aef2ac7ffafa3ef45c56ffd8f59c25fa83866f2de19d8
 EBUILD ocaml-3.11.1.ebuild 4014 RMD160 ad0f01489f02a87c676444f03aaa46326fc70158 SHA1 6d9d400f80fc9b3013a3c2544e5f7d9da5f6b82a SHA256 cf57c39869c312aac689afce98145a772d319e9ff4190ca01f9477a2455ffb93
-MISC ChangeLog 27472 RMD160 7be019a74d0fc04160bf10827afbc845c448aa12 SHA1 e046d5f3a32f7adfe03703c776b76f77d3f2f43a SHA256 27d62a72883e3732aac8883f1c8ab067fc6066068dfa6f0f24941705be49c450
+EBUILD ocaml-3.11.2_rc1.ebuild 4058 RMD160 88b27433f3fc7fe196441cbcce84ca7a3fe3750c SHA1 444571416d4d4e6aa3e9f853accd03684ad3e5df SHA256 0c9a48fcaeb7207f58dab56ad5cda0e1279de983e96e67e39b51bed39da0029b
+MISC ChangeLog 27606 RMD160 a6f2085025f08e65d4af229590e06b89121d129a SHA1 fbb99186b52dc6dd68fdc66f111ffc6100b69339 SHA256 facb74ffbf296533e428c5b7231c27c49f6b40ef4073b86b3096346ed1136c68
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAksjpJoACgkQAiZjviIA2XjCuQCfSFMY2g9OAJ6wd8SnlIYN57yd
-f9sAoLolJQC/U3pJ0ynyLESNaFpHpNKO
-=LVL9
+iEYEARECAAYFAktA0G4ACgkQvFcC4BYPU0rK6gCgqwMJfZBEm8xeMLVhwWPtQCbh
+La4An3nI0uSz/IbxMC18MAXMHIsoLrIu
+=G26R
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ocaml/ocaml-3.11.2_rc1.ebuild b/dev-lang/ocaml/ocaml-3.11.2_rc1.ebuild
new file mode 100644
index 000000000000..ce9cdd7624cb
--- /dev/null
+++ b/dev-lang/ocaml/ocaml-3.11.2_rc1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.11.2_rc1.ebuild,v 1.1 2010/01/03 16:13:59 aballier Exp $
+
+EAPI="1"
+
+inherit flag-o-matic eutils multilib versionator toolchain-funcs
+
+PATCHLEVEL="1"
+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"
+
+	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 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.sh script rather than keeping it in $PORTDIR
+	dosbin "${FILESDIR}/ocaml-rebuild.sh"
+}
+
+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 "/usr/sbin/ocaml-rebuild.sh [-h | emerge options]"
+	ewarn "Which will call emerge on all old packages with the given options"
+	echo
+}