Version bump, still unusable at large.

(Portage version: 2.0.51.22-r1)

4 files changed, 114 insertions, 12 deletions

diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index 99dfa3e69472..db595c7e52c7 100644
--- a/dev-lang/ocaml/ChangeLog
+++ b/dev-lang/ocaml/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/ocaml
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.70 2005/11/09 02:27:53 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.71 2005/11/10 22:40:19 mattam Exp $
+
+*ocaml-3.09.0 (10 Nov 2005)
+
+  10 Nov 2005; Matthieu Sozeau <mattam@gentoo.org> +ocaml-3.09.0.ebuild:
+  Version bump, marked -* as it breaks some packages in gentoo which i'm trying
+  to get up-to-date , but the ebuild can be useful as it is for experienced
+  people.
 
   09 Nov 2005; Jason Wever <weeve@gentoo.org> ocaml-3.08.4.ebuild:
   Marked stable on SPARC wrt bug #106837.
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 53cd56e421b4..a00b2cfcdf89 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -1,17 +1,19 @@
-MD5 144a830b4db48e541650a55d99110d95 ChangeLog 10814
+MD5 b10fa3bdb4eb894ca287293131dff553 ocaml-3.09.0.ebuild 2499
+MD5 876fd2e041258c5781f5adf98576e334 ocaml-3.08.4.ebuild 2501
+MD5 e3554fd0d2b4cbd09694d68ca3edb0d8 ocaml-3.08.1.ebuild 2149
+MD5 d3e28c5c99b056007b6b5b0781a4e542 ocaml-3.06-r2.ebuild 1660
+MD5 ef7cc12a4ff8aeec9ddb58ff65f7e3c0 ocaml-3.07-r1.ebuild 2910
+MD5 cfcf2e84fee42ef8460d98c45a4b947f ocaml-3.08.3.ebuild 2292
+MD5 8a3550fbb6cba97c847cbaff31525dcb ChangeLog 11083
+MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
+MD5 4df214d6cd74b3c5955d868879dd6cc7 files/ocaml-3.06-tcltk-8.4compat-patch.bz2 639
+MD5 3148840e70f4bb5263bdf7cd6c97e6d9 files/ocaml-rebuild.sh 1215
+MD5 c57fc46d92565b5d44c8c4f2a4a072d3 files/ocaml-3.08.3-gcc4.patch 710
 MD5 13c4abf06e236e8835011a387f90ecc9 files/digest-ocaml-3.06-r2 63
 MD5 c42de320103c2d3eb1aa4002e2e0716b files/digest-ocaml-3.07-r1 130
+MD5 45ff13419dd955aa86d021abbf325fc2 files/ocaml-3.07-hppa.patch 15730
 MD5 3854a7d6aaedc7d5fde7239776cec5cf files/digest-ocaml-3.08.1 66
 MD5 d80f37fe859bc2ea8f71e13f02578275 files/digest-ocaml-3.08.3 66
 MD5 b15b12e756d7eb95981891617e694a7a files/digest-ocaml-3.08.4 66
+MD5 366188bde75be172b0126d0d8cd76896 files/digest-ocaml-3.09.0 66
 MD5 91579cecf8659312c2324d8d40709433 files/ocaml-3.06-sparc-configure.patch 1660
-MD5 4df214d6cd74b3c5955d868879dd6cc7 files/ocaml-3.06-tcltk-8.4compat-patch.bz2 639
-MD5 45ff13419dd955aa86d021abbf325fc2 files/ocaml-3.07-hppa.patch 15730
-MD5 c57fc46d92565b5d44c8c4f2a4a072d3 files/ocaml-3.08.3-gcc4.patch 710
-MD5 3148840e70f4bb5263bdf7cd6c97e6d9 files/ocaml-rebuild.sh 1215
-MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
-MD5 d3e28c5c99b056007b6b5b0781a4e542 ocaml-3.06-r2.ebuild 1660
-MD5 ef7cc12a4ff8aeec9ddb58ff65f7e3c0 ocaml-3.07-r1.ebuild 2910
-MD5 e3554fd0d2b4cbd09694d68ca3edb0d8 ocaml-3.08.1.ebuild 2149
-MD5 cfcf2e84fee42ef8460d98c45a4b947f ocaml-3.08.3.ebuild 2292
-MD5 876fd2e041258c5781f5adf98576e334 ocaml-3.08.4.ebuild 2501
diff --git a/dev-lang/ocaml/files/digest-ocaml-3.09.0 b/dev-lang/ocaml/files/digest-ocaml-3.09.0
new file mode 100644
index 000000000000..e14b54c857db
--- /dev/null
+++ b/dev-lang/ocaml/files/digest-ocaml-3.09.0
@@ -0,0 +1 @@
+MD5 834f88b1f39aa066bb620747764c0588 ocaml-3.09.0.tar.bz2 2013495
diff --git a/dev-lang/ocaml/ocaml-3.09.0.ebuild b/dev-lang/ocaml/ocaml-3.09.0.ebuild
new file mode 100644
index 000000000000..11560550e698
--- /dev/null
+++ b/dev-lang/ocaml/ocaml-3.09.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.09.0.ebuild,v 1.1 2005/11/10 22:40:19 mattam Exp $
+
+inherit flag-o-matic eutils multilib
+
+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-3.09/${P}.tar.bz2"
+
+LICENSE="QPL-1.0 LGPL-2"
+SLOT="0"
+KEYWORDS="-*" # Still breaks a great number of packages
+IUSE="tcltk latex"
+
+DEPEND="virtual/libc
+	tcltk? ( >=dev-lang/tk-3.3.3 )"
+
+pkg_setup() {
+	ewarn
+	ewarn "Building ocaml with unsafe CFLAGS can have unexpected results"
+	ewarn "Please retry building with safer CFLAGS before reporting bugs"
+	ewarn "Likewise, building with a hardened gcc is not possible."
+	ewarn
+}
+
+src_compile() {
+	filter-flags "-fstack-protector"
+	replace-flags "-O?" -O2
+
+	local myconf
+	use tcltk || myconf="-no-tk"
+
+	# Fix for bug #23767. Still bugish ?
+	# if [ "${ARCH}" = "sparc" ]; then
+	#	myconf="${myconf} -host sparc-unknown-linux-gnu"
+	# fi
+
+	# Fix for bug #46703
+	export LC_ALL=C
+
+	./configure -prefix /usr \
+		-bindir /usr/bin \
+		-libdir /usr/$(get_libdir)/ocaml \
+		-mandir /usr/share/man \
+		--with-pthread ${myconf} || die
+
+	sed -i -e "s/\(BYTECCCOMPOPTS=.*\)/\1 ${CFLAGS}/" config/Makefile
+	sed -i -e "s/\(NATIVECCCOMPOPTS=.*\)/\1 ${CFLAGS}/" config/Makefile
+
+	make world || die
+	make opt || die
+	make opt.opt || die
+}
+
+src_install() {
+	make BINDIR=${D}/usr/bin \
+		LIBDIR=${D}/usr/$(get_libdir)/ocaml \
+		MANDIR=${D}/usr/share/man \
+		install || die
+
+	# compiler libs
+	dodir /usr/lib/ocaml/compiler-libs
+	insinto /usr/lib/ocaml/compiler-libs
+	doins {utils,typing,parsing}/*.{mli,cmi,cmo,cmx,o}
+
+	# headers
+	dodir /usr/include
+	dosym /usr/lib/ocaml/caml /usr/include/
+
+	# silly, silly makefiles
+	dosed "s:${D}::g" /usr/$(get_libdir)/ocaml/ld.conf
+
+	# documentation
+	dodoc Changes INSTALL LICENSE README Upgrading
+}
+
+pkg_postinst() {
+	if use latex; then
+		echo "TEXINPUTS=/usr/$(get_libdir)/ocaml/ocamldoc:" > /etc/env.d/99ocamldoc
+	fi
+
+	echo
+	einfo "OCaml is not binary compatible from version to version,"
+	einfo "so you (may) need to rebuild all packages depending on it that"
+	einfo "are actually installed on your system."
+	einfo "To do so, you can run: "
+	einfo "sh ${FILESDIR}/ocaml-rebuild.sh [-h | emerge options]"
+	einfo "Which will call emerge on all old packages with the given options"
+	echo
+}