bump to 3.11.1rc0 and define eapi before inherit

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

5 files changed, 157 insertions, 11 deletions

diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index 9a2dcd27c1cb..4ba42865568f 100644
--- a/dev-lang/ocaml/ChangeLog
+++ b/dev-lang/ocaml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/ocaml
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.161 2009/04/09 14:05:36 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.162 2009/05/19 23:12:46 aballier Exp $
+
+*ocaml-3.11.1_rc0 (19 May 2009)
+
+  19 May 2009; Alexis Ballier <aballier@gentoo.org> ocaml-3.10.2.ebuild,
+  ocaml-3.11.0.ebuild, +ocaml-3.11.1_rc0.ebuild:
+  bump to 3.11.1rc0 and define eapi before inherit
 
   09 Apr 2009; Raúl Porcel <armin76@gentoo.org> ocaml-3.10.2.ebuild:
   arm stable
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index e166b26b2574..62a78e85d8bf 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ocaml-3.10.0-automagic.patch 1849 RMD160 6986c47d9d2d9bdaf246f3399ccc59a5751fe86d SHA1 d999c1023c5aa07316d8405fde6ebf3a1bcb2b9f SHA256 f959da02f8b31f3d1ad5b76426d493b50c87dc3a6241204470866a321ece40f9
 AUX ocaml-3.10.0-call-ld-with-proper-ldflags.patch 1497 RMD160 7eef667019e79f2877836f77a31466f9d301725b SHA1 36d95fb8b05e7bbff8e5f49a8f1faec5f11f0c78 SHA256 13d6cc7401c8374327e438517975fe9abf1b99030bb3243f2adb91d12570bc8d
 AUX ocaml-3.10.0-configure.patch 5644 RMD160 1a63847a6e632f59fef8ff448b96bc45da15eae5 SHA1 6a030e48dd5fc399b985dd99e21b6c0e6b95a12e SHA256 f42e11db2d184532aa561b0b117f7ce5850bb50981ea997d08eee34f826360ac
@@ -10,8 +13,17 @@ AUX ocaml-rebuild.sh 1055 RMD160 a75f61820cfdc262912cc5af1241779bf900d4d7 SHA1 a
 DIST ocaml-3.08.4.tar.bz2 2054019 RMD160 448ed9af56cacb9c32208d064e1c9732a2086bd2 SHA1 d9eb54611d24f9e1c33736f12c7ba87412057cbb SHA256 8d4322791d0dd424f355636ba50934ac17dbefde269736dad0da0683c8888684
 DIST ocaml-3.10.2.tar.bz2 2284860 RMD160 f631230b090dbd9bf9a9f71631cd0347c033cbb1 SHA1 f604580bf2943891d8faf265eeb900bbe90abce0 SHA256 3755a32da1a7490d47fff7838c12c754d3fcfe69d7c9ff2358704259dc477c58
 DIST ocaml-3.11.0.tar.bz2 2359311 RMD160 06f367eacfa3f4d413138fc2386bf3b1ee822cf6 SHA1 fed19b82828789b8c509049590f0b82f8e5e6eb3 SHA256 3faa9057bdac916413a5dee17180f5a8fbc7fb7589465208f72f692bddbd6776
+DIST ocaml-3.11.1+rc0.tar.gz 2858765 RMD160 9627ccc08acbcc84f0bd2027cdd931a3982fef86 SHA1 5f9e0dd5d2e2c6da9aa19996f07d61afa266d1b9 SHA256 56ea6cca5d56409bff1e0d532c09db79342b667389a7d75bbf13635bbe84ad57
 EBUILD ocaml-3.08.4.ebuild 2552 RMD160 7cac08ba5e62c21754311ca920446ab3dee835ec SHA1 f56425432f9d7ac20d727bcbe85de3e6969ea16a SHA256 9be8d5de70f05b5512a8239bc6b3a5cd9627476b32e5bb1ab9c8996c129e0261
-EBUILD ocaml-3.10.2.ebuild 4482 RMD160 69341815dca5ea44f36f25dd6bc2a59353baeb01 SHA1 80103b965da77d51fe5f23087e41a7dadbb49d5b SHA256 2bb0438a8e904d08fa81c2635bfc5f5b7fe78d4aaa9356a445e60a395f4fd9d5
-EBUILD ocaml-3.11.0.ebuild 4268 RMD160 a5f197601f321000f0fc31fcb12564eca5f0a85c SHA1 8df1af3b37e2fad0d6b761cff26a0f1821ab9232 SHA256 e57950cec904f87c95d8a18d21731a4a451a4b6e3b2c9113612d20d3fc9d1a52
-MISC ChangeLog 25646 RMD160 83881820847b6e9410a1e0380902213d8dfeaa85 SHA1 8db243c295d79c58aa968bb44e296615f17fdd41 SHA256 df44fc0415910d5df7143c76e6c9cb39eadcc565bf293572e883cd86935d874b
+EBUILD ocaml-3.10.2.ebuild 4483 RMD160 4ff4c804896a2fd8541061219e46ca1612ecffa8 SHA1 3e1aeb9f1471392431f9ea9283feac2290e467f4 SHA256 eca3f4782ca03e663acde9062231367c248624d0a655cf0200f24aeb8fa47da4
+EBUILD ocaml-3.11.0.ebuild 4268 RMD160 6db33d00134aafc23132d2ec647e4bdce5676916 SHA1 2a2a626d5269b6c905c8b64887805f1792c3887c SHA256 f75479396b5ab225614dc1bbb260698174ab6c02efcbe4e4293c67cb6af2142c
+EBUILD ocaml-3.11.1_rc0.ebuild 4271 RMD160 56192904059baaf952e2d17c19b48127fde7f358 SHA1 efc953ca3da5cb4ca31a583d534b4a1ba5d0d8cb SHA256 8ec1495b75983b908ade6b40a3dce42375115bd0b495810f2b7bd772178c0b3e
+MISC ChangeLog 25854 RMD160 b7d5b9d61479103176ebf0f29d31000ea1b7d9f2 SHA1 94cfbf24e265b5c637ddcd904321a6bd086ac1be SHA256 7bfd1cd2d5397513fa0b08e96058d5ce6e6f2909813957db2756b0595806a2e6
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoTPPwACgkQvFcC4BYPU0qEIwCeNxUxCAfCQZf58cxVMKDrDW4y
+TmYAoJjyVEkUOOddula+fRDIzI9c9QZF
+=4+rG
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/ocaml/ocaml-3.10.2.ebuild b/dev-lang/ocaml/ocaml-3.10.2.ebuild
index 3a27e93ec6b2..7e888f634f0b 100644
--- a/dev-lang/ocaml/ocaml-3.10.2.ebuild
+++ b/dev-lang/ocaml/ocaml-3.10.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.10.2.ebuild,v 1.13 2009/04/09 14:05:36 armin76 Exp $
-
-inherit flag-o-matic eutils multilib versionator toolchain-funcs
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.10.2.ebuild,v 1.14 2009/05/19 23:12:46 aballier Exp $
 
 EAPI="1"
 
+inherit flag-o-matic eutils multilib versionator toolchain-funcs
+
 MY_P="${P/_rc/+rc}"
 DESCRIPTION="Fast modern type-inferring functional programming language descended from the ML family"
 HOMEPAGE="http://www.ocaml.org/"
diff --git a/dev-lang/ocaml/ocaml-3.11.0.ebuild b/dev-lang/ocaml/ocaml-3.11.0.ebuild
index c6560730446f..0451f3516887 100644
--- a/dev-lang/ocaml/ocaml-3.11.0.ebuild
+++ b/dev-lang/ocaml/ocaml-3.11.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.11.0.ebuild,v 1.3 2009/01/20 08:43:57 aballier Exp $
-
-inherit flag-o-matic eutils multilib versionator toolchain-funcs
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.11.0.ebuild,v 1.4 2009/05/19 23:12:46 aballier Exp $
 
 EAPI="1"
 
+inherit flag-o-matic eutils multilib versionator toolchain-funcs
+
 MY_P="${P/_/+}"
 DESCRIPTION="Fast modern type-inferring functional programming language descended from the ML family"
 HOMEPAGE="http://www.ocaml.org/"
diff --git a/dev-lang/ocaml/ocaml-3.11.1_rc0.ebuild b/dev-lang/ocaml/ocaml-3.11.1_rc0.ebuild
new file mode 100644
index 000000000000..6d5a2df496a0
--- /dev/null
+++ b/dev-lang/ocaml/ocaml-3.11.1_rc0.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.11.1_rc0.ebuild,v 1.1 2009/05/19 23:12:46 aballier Exp $
+
+EAPI="1"
+
+inherit flag-o-matic eutils multilib versionator toolchain-funcs
+
+MY_P="${P/_/+}"
+DESCRIPTION="Fast modern type-inferring functional programming language descended from the ML family"
+HOMEPAGE="http://www.ocaml.org/"
+SRC_URI="http://caml.inria.fr/pub/distrib/ocaml-$( get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+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}/${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}"
+
+	# Fix the EXEC_STACK in ocaml compiled binaries (#153382)
+	epatch "${FILESDIR}"/${PN}-3.11.0_beta1-exec-stack-fixes.patch
+
+	# The configure script doesn't inherit previous defined variables,
+	# overwriting previous declarations of bytecccompopts, bytecclinkopts,
+	# nativecccompopts and nativecclinkopts. Reported upstream as issue 0004267.
+	epatch "${FILESDIR}"/${PN}-3.11.0_beta1-configure.patch
+
+	# ocaml has automagics on libX11 and gdbm
+	# http://caml.inria.fr/mantis/view.php?id=4278
+	epatch "${FILESDIR}/${PN}-3.10.0-automagic.patch"
+
+	# Respect LDFLAGS for ocamlyacc
+	epatch "${FILESDIR}"/${PN}-3.11.0_beta1-yaccldflags.patch
+}
+
+src_compile() {
+	export LC_ALL=C
+	local myconf="--host ${CHOST}"
+
+	# 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 \
+		--with-pthread ${myconf} || die "configure failed!"
+
+	make world || die "make world failed!"
+
+	# Native code generation can be disabled now
+	if use ocamlopt ; then
+		make opt || die "make opt failed!"
+		make 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
+}