bump release candidate under pmask

Package-Manager: portage-2.1.4.4

3 files changed, 145 insertions, 5 deletions

diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index a6fcea9d2f43..5662f771664c 100644
--- a/dev-lang/ocaml/ChangeLog
+++ b/dev-lang/ocaml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/ocaml
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.135 2008/02/24 15:51:57 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.136 2008/02/24 16:39:14 aballier Exp $
+
+*ocaml-3.10.2_rc1 (24 Feb 2008)
+
+  24 Feb 2008; Alexis Ballier <aballier@gentoo.org>
+  +ocaml-3.10.2_rc1.ebuild:
+  bump release candidate under pmask
 
   24 Feb 2008; Alexis Ballier <aballier@gentoo.org> -ocaml-3.09.2.ebuild,
   -ocaml-3.09.3.ebuild, -ocaml-3.10.0.ebuild:
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 293ab2718688..598f23f0fce9 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -16,16 +16,18 @@ AUX ocaml-rebuild.sh 1363 RMD160 8eda8892012f6600fb54be8ef3dd0594a649c81f SHA1 2
 DIST ocaml-3.08.4.tar.bz2 2054019 RMD160 448ed9af56cacb9c32208d064e1c9732a2086bd2 SHA1 d9eb54611d24f9e1c33736f12c7ba87412057cbb SHA256 8d4322791d0dd424f355636ba50934ac17dbefde269736dad0da0683c8888684
 DIST ocaml-3.09.3.tar.bz2 2038617 RMD160 fdc124218c556c62c897ee6720970279e2d5426b SHA1 5d63c6e0d13463f85c0d5147d641d2bceef87d6b SHA256 607842b4f4917a759f19541a421370a834f5b948855ca54cef40d22b19a0934f
 DIST ocaml-3.10.1.tar.gz 2783352 RMD160 799798a3045ec8b026b923783301685445a5a733 SHA1 ba3a1848ca8bed5d25eb2934564a4a13050849f6 SHA256 ad4fb7c87942221bb3d7deab80cb1a104136eb62a29efc0b8233d1880f731977
+DIST ocaml-3.10.2+rc1.tar.bz2 2284916 RMD160 25a49a4dbf865f819790fac7d14bcd270d942746 SHA1 6b28d311c90784652c642abf372898495124c940 SHA256 ea481cc8974ad79908f145693ca5f5b71f5fb9b84f6c6b9b0942d983b0ac0f6c
 EBUILD ocaml-3.08.4.ebuild 2548 RMD160 b1f9ce0b2df4c8221e5c09e03ae8e7151100ad6c SHA1 193867386e022acdfcf6792353be23ee0f71d73d SHA256 78a55619ad7e4e2404a00e275abd4907d2873899ee3ef633b0d127e39a9b98e1
 EBUILD ocaml-3.09.3-r1.ebuild 5527 RMD160 6f0f629b140dbe1b85f09e7a178ca73fee58fb4d SHA1 fd65f3e6048994cf76872cab7ee89b8b28a0251e SHA256 14e63cf0f62a5d916fc2ce3a04fa44fb1a98b8a806c3885f0c13d90ecb7eebc0
 EBUILD ocaml-3.09.3-r2.ebuild 5620 RMD160 0c851ed0b39423e36c8142620338dfc2a10fb05e SHA1 3667223a5f98109ba10d7b2429493964cb013d0f SHA256 fe645b9728880c28fdf5e61dd3043d12b3b1b015b01081c84929a32652db4969
 EBUILD ocaml-3.10.1.ebuild 4370 RMD160 60b6ed6e7ec9c159f788cdbcdf16bf6f52528c95 SHA1 b22152e4b429214446fc18827c412e2ea98fe86b SHA256 eebdb972fb7adb9db81399fe9dcdbc7603468d9b10eba7cb4cf5a24a60e502ff
-MISC ChangeLog 21403 RMD160 032726cb0155987052b623a0095b5dc8be5d0dc2 SHA1 18fbb77c9fc56e70e2777e151b5a4545454ba8a6 SHA256 34a381e96859376190befc33ec391c41765bede7f921e90e872cca4a7e2421b0
+EBUILD ocaml-3.10.2_rc1.ebuild 4375 RMD160 0a7207b2ec37f2ff1868387d971bac4c58e2ef23 SHA1 0817d74ee801075ef97b0148d33fac57bc43279a SHA256 bc7b3d21bcf87e76210917b6be24793fcbac65929ed2fc88cf1bd8fec8fc9d34
+MISC ChangeLog 21554 RMD160 a767d74374fa3724fac27352c415f4c1510e78d6 SHA1 c48985eb2735ce31075e8c58f763cfaabb6ea688 SHA256 74abf58c3a2751705f0408f309f4c68590ebb3e29a47f2bb48fe70985e047032
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHwZKmvFcC4BYPU0oRAn/mAKCLc9Ivn7tGFdpDC7wM5yBwaWTSbQCgwCFb
-f+MlKka40zoHeINEbd/XGjQ=
-=4331
+iD8DBQFHwZ28vFcC4BYPU0oRAv53AKCNRIFcJkmNGsgKrUTIAQuoEuT5RQCfX4YO
+Gd+xxiSW3Lg5SWCcCynJcsE=
+=fNej
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ocaml/ocaml-3.10.2_rc1.ebuild b/dev-lang/ocaml/ocaml-3.10.2_rc1.ebuild
new file mode 100644
index 000000000000..4b741f25def1
--- /dev/null
+++ b/dev-lang/ocaml/ocaml-3.10.2_rc1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2008 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_rc1.ebuild,v 1.1 2008/02/24 16:39:14 aballier Exp $
+
+inherit flag-o-matic eutils multilib versionator toolchain-funcs
+
+EAPI="1"
+
+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.bz2"
+
+LICENSE="QPL-1.0 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~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 )"
+
+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
+
+	# 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 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,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
+}