Add ocaml 3.10.1 release candidate 1, for testing purposes

Package-Manager: portage-2.1.4_rc10

4 files changed, 167 insertions, 5 deletions

diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index 9f4aa06dd5ed..e9203208eef9 100644
--- a/dev-lang/ocaml/ChangeLog
+++ b/dev-lang/ocaml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/ocaml
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.128 2007/12/19 16:58:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.129 2007/12/20 19:45:17 aballier Exp $
+
+*ocaml-3.10.1_rc1 (20 Dec 2007)
+
+  20 Dec 2007; Alexis Ballier <aballier@gentoo.org>
+  +ocaml-3.10.1_rc1.ebuild:
+  Add ocaml 3.10.1 release candidate 1, for testing purposes
 
   19 Dec 2007; Alexis Ballier <aballier@gentoo.org> ocaml-3.10.0.ebuild:
   make the information about the need to run ocaml-rebuild.sh a warning
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 5d8b5abcd28d..7f1b1d2386dd 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ocaml-3.09.3-Makefile.patch 1489 RMD160 2405669fdfe7ac35191c59d51c36dcea4f43e2c0 SHA1 16d5cfa7e12d542928d90c144125fbc3deb049f7 SHA256 da690e61fd4f72e28ed4f41a0b7c18a26a11f9ad42d4d8aa95301c02317336b9
 MD5 0d21d3b76fc3a724bd2b8d2e8d3a603f files/ocaml-3.09.3-Makefile.patch 1489
 RMD160 2405669fdfe7ac35191c59d51c36dcea4f43e2c0 files/ocaml-3.09.3-Makefile.patch 1489
@@ -54,6 +57,7 @@ DIST ocaml-3.08.4.tar.bz2 2054019 RMD160 448ed9af56cacb9c32208d064e1c9732a2086bd
 DIST ocaml-3.09.2.tar.bz2 2036341 RMD160 45edae84e5787775a5beed29a1ad2881f4df8505 SHA1 578c66707532882782735352a3628b78193da5e7 SHA256 2115d6a4e420b5517ed7313c64bd6bd93f610ec208250b7d025595376180b0b1
 DIST ocaml-3.09.3.tar.bz2 2038617 RMD160 fdc124218c556c62c897ee6720970279e2d5426b SHA1 5d63c6e0d13463f85c0d5147d641d2bceef87d6b SHA256 607842b4f4917a759f19541a421370a834f5b948855ca54cef40d22b19a0934f
 DIST ocaml-3.10.0.tar.gz 3402010 RMD160 40032fb06a3ae76838a56bad51119e5b30a099fd SHA1 e1315052c2dba59e56fdb7cb89640c283d076ba5 SHA256 daa56c4ebc21640be84e124fc5fefe091d0048d412b7e2b1e68bc2f56ff74314
+DIST ocaml-3.10.1+rc1.tar.gz 2783125 RMD160 6a17ef19111cd954eb74d1f87895553d9e096347 SHA1 b163b06cd715afcf0f3a0da17aeaa01ec5afa072 SHA256 6e827f93790981e21d8deea30dbe66357c51e6684d9cb2c5e2a4c730aec7073e
 EBUILD ocaml-3.08.4.ebuild 2546 RMD160 d8de669b55b5454c216cee4f7e9bb944ac7a3d64 SHA1 ffbfb6674c4b0d7cb4e254354d974340415cba91 SHA256 644e873f75382a2e655280b7fb0afb33276834c005b6c2f65f657f9a3f030809
 MD5 2ea3a2344ffca45254d1a16e93aa4d5b ocaml-3.08.4.ebuild 2546
 RMD160 d8de669b55b5454c216cee4f7e9bb944ac7a3d64 ocaml-3.08.4.ebuild 2546
@@ -78,10 +82,14 @@ EBUILD ocaml-3.10.0.ebuild 4511 RMD160 16942e59cf6fba64f0f9c9ad5262c380273f3df5
 MD5 607ec385b3e5698804239dc5aac9fded ocaml-3.10.0.ebuild 4511
 RMD160 16942e59cf6fba64f0f9c9ad5262c380273f3df5 ocaml-3.10.0.ebuild 4511
 SHA256 5ce24c87a9d972eb9cdfa1a02f002f1cfee484186b0747964329c4dfdf75888d ocaml-3.10.0.ebuild 4511
-MISC ChangeLog 20290 RMD160 d73209009300f5b62b71cdf6a3040e3bc902bc04 SHA1 049ebd2d8037195d12f67d85a8ffda9b11008b60 SHA256 554bba8730e278be8e50bae80bb5bf3cc16d1cd4a6dd4c4ba3a30bcd07c5a0a8
-MD5 72b28e410e93754133bd2dd754503c10 ChangeLog 20290
-RMD160 d73209009300f5b62b71cdf6a3040e3bc902bc04 ChangeLog 20290
-SHA256 554bba8730e278be8e50bae80bb5bf3cc16d1cd4a6dd4c4ba3a30bcd07c5a0a8 ChangeLog 20290
+EBUILD ocaml-3.10.1_rc1.ebuild 4593 RMD160 0c2d28c9dd788260b2e2fac774ab1eaf68fb7677 SHA1 466d7a0b25d965d1db5bd552ff9fb00283681a8e SHA256 0e9e8aa93191f0589f0d2f7bbf187039a84d10a4cd20a8e89680d835d8ecfb2d
+MD5 8bc0446d6151c143cef55db57485fb65 ocaml-3.10.1_rc1.ebuild 4593
+RMD160 0c2d28c9dd788260b2e2fac774ab1eaf68fb7677 ocaml-3.10.1_rc1.ebuild 4593
+SHA256 0e9e8aa93191f0589f0d2f7bbf187039a84d10a4cd20a8e89680d835d8ecfb2d ocaml-3.10.1_rc1.ebuild 4593
+MISC ChangeLog 20465 RMD160 e10cb0eab8af69997943c3c2fd937658ab9b1dc9 SHA1 79c24bd78e1ff2189b42a372080cde9fbce21ae8 SHA256 4d9404812cb017bd6c41d04e9d8d3743357e5f661abfcd187ecbd9976241be26
+MD5 c2bd26b8edb10d65fec0bc577008a543 ChangeLog 20465
+RMD160 e10cb0eab8af69997943c3c2fd937658ab9b1dc9 ChangeLog 20465
+SHA256 4d9404812cb017bd6c41d04e9d8d3743357e5f661abfcd187ecbd9976241be26 ChangeLog 20465
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
 MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
 RMD160 dfaa057e679b01302a807c75a32a910098b26809 metadata.xml 155
@@ -104,3 +112,13 @@ SHA256 19708f759185ed39623e03921462ba20fb6f3533268673d2bcd7dd07cef57350 files/di
 MD5 32b15ff4497fd92f1363c49ef055dca8 files/digest-ocaml-3.10.0 241
 RMD160 86491b12892676d992e47bb25bbcbaed14ba8364 files/digest-ocaml-3.10.0 241
 SHA256 a6f377880030b038e0db0c027d1c60e5c0293db3862c1ebb6c01fbd8bdf7adfd files/digest-ocaml-3.10.0 241
+MD5 76ff9a8fb76d943ef63c92bf0048b864 files/digest-ocaml-3.10.1_rc1 253
+RMD160 b091154f1606d9201795b4d7c549fe05ddbed3af files/digest-ocaml-3.10.1_rc1 253
+SHA256 86fe3acae1fe08f7ea793e557b3282a9c84cca491a9990dd14f7b1020634e326 files/digest-ocaml-3.10.1_rc1 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHasZjvFcC4BYPU0oRAiofAKCPzqJP8Lb7UqLe6E/BnnbMzZkELwCfV/mO
+NgzNnlpyI6kIqNJq+tXCJz8=
+=SE37
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/ocaml/files/digest-ocaml-3.10.1_rc1 b/dev-lang/ocaml/files/digest-ocaml-3.10.1_rc1
new file mode 100644
index 000000000000..3e6cf66702c8
--- /dev/null
+++ b/dev-lang/ocaml/files/digest-ocaml-3.10.1_rc1
@@ -0,0 +1,3 @@
+MD5 00563ca3d5dbb7a28628d3716b36e63f ocaml-3.10.1+rc1.tar.gz 2783125
+RMD160 6a17ef19111cd954eb74d1f87895553d9e096347 ocaml-3.10.1+rc1.tar.gz 2783125
+SHA256 6e827f93790981e21d8deea30dbe66357c51e6684d9cb2c5e2a4c730aec7073e ocaml-3.10.1+rc1.tar.gz 2783125
diff --git a/dev-lang/ocaml/ocaml-3.10.1_rc1.ebuild b/dev-lang/ocaml/ocaml-3.10.1_rc1.ebuild
new file mode 100644
index 000000000000..bbf2354c5cf2
--- /dev/null
+++ b/dev-lang/ocaml/ocaml-3.10.1_rc1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.10.1_rc1.ebuild,v 1.1 2007/12/20 19:45:17 aballier Exp $
+
+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 (Meta Language) family"
+HOMEPAGE="http://www.ocaml.org/"
+SRC_URI="http://caml.inria.fr/distrib/ocaml-$( get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+LICENSE="QPL-1.0 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="emacs gdbm latex ncurses 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 )"
+
+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}"
+
+	# Fix the EXEC_STACK in ocaml compiled binaries (#153382)
+	epatch "${FILESDIR}"/${PN}-3.10.0-exec-stack-fixes.patch
+
+	# Quick and somewhat dirty fix for bug #110541
+	# The sed in the Makefile doesn't replace all occurences of @compiler@
+	# in driver/ocamlcomp.sh.in. Reported upstream as issue 0004268.
+	#epatch "${FILESDIR}"/${P}-execheap.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.10.0-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"
+
+	# Call ld with proper flags, different from gcc ones
+	# This happens when calling ocamlc -pack
+	# See comment in the patch
+	epatch "${FILESDIR}/${PN}-3.10.0-call-ld-with-proper-ldflags.patch"
+
+}
+
+src_compile() {
+	local myconf="--host ${CHOST}"
+
+	# dev-lang/ocaml tends to break/give unexpected results with "unsafe" CFLAGS.
+	strip-flags
+	replace-flags "-O?" -O2
+
+	# 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.
+	./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 is unsupported on some archs
+	if ! use ppc64 ; 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,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
+}