Move 3.08.1 to x86 and add 3.08.2 release

5 files changed, 103 insertions, 12 deletions

diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index 9da8ca6c9ed4..d13f90df5452 100644
--- a/dev-lang/ocaml/ChangeLog
+++ b/dev-lang/ocaml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/ocaml
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.49 2004/10/20 18:02:57 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.50 2004/11/29 09:01:58 mattam Exp $
+
+*ocaml-3.08.2 (29 Nov 2004)
+
+  29 Nov 2004; Matthieu Sozeau <mattam@gentoo.org> ocaml-3.08.1.ebuild,
+  +ocaml-3.08.2.ebuild:
+  Move 3.08.1 to x86 and add 3.08.2 release.
 
   20 Oct 2004; Matthieu Sozeau <mattam@gentoo.org> ocaml-3.07-r1.ebuild,
   ocaml-3.08.1.ebuild, ocaml-3.08.ebuild:
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index aabc55022271..854f2b951165 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -1,14 +1,16 @@
-MD5 34b83569d4085df5767e38bee2335e58 ChangeLog 8122
-MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
-MD5 c85f40f70b1285aa7425e3b813c3faaf ocaml-3.07-r1.ebuild 2910
-MD5 a345c82ec2955b8bd3d3bbe3fadabe62 ocaml-3.06-r2.ebuild 1660
+MD5 66c51ce7a3c5317a96c62202d188ebd9 ocaml-3.08.2.ebuild 2160
 MD5 8a2c0ff344513c09aa5df744a685b2bd ocaml-3.08.ebuild 2208
 MD5 66c51ce7a3c5317a96c62202d188ebd9 ocaml-3.08.1.ebuild 2160
-MD5 77519cb4017543f060a963387b593299 files/digest-ocaml-3.08 65
-MD5 3854a7d6aaedc7d5fde7239776cec5cf files/digest-ocaml-3.08.1 66
-MD5 13c4abf06e236e8835011a387f90ecc9 files/digest-ocaml-3.06-r2 63
-MD5 91579cecf8659312c2324d8d40709433 files/ocaml-3.06-sparc-configure.patch 1660
+MD5 a345c82ec2955b8bd3d3bbe3fadabe62 ocaml-3.06-r2.ebuild 1660
+MD5 c85f40f70b1285aa7425e3b813c3faaf ocaml-3.07-r1.ebuild 2910
+MD5 34b83569d4085df5767e38bee2335e58 ChangeLog 8122
+MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
 MD5 4df214d6cd74b3c5955d868879dd6cc7 files/ocaml-3.06-tcltk-8.4compat-patch.bz2 639
+MD5 d996b9a852fbfcb0c2d9bddb4896add2 files/ocaml-rebuild.sh 1228
+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 d996b9a852fbfcb0c2d9bddb4896add2 files/ocaml-rebuild.sh 1228
+MD5 3854a7d6aaedc7d5fde7239776cec5cf files/digest-ocaml-3.08.1 66
+MD5 297f14a190458a7b61eed6c30d2b61ba files/digest-ocaml-3.08.2 66
+MD5 77519cb4017543f060a963387b593299 files/digest-ocaml-3.08 65
+MD5 91579cecf8659312c2324d8d40709433 files/ocaml-3.06-sparc-configure.patch 1660
diff --git a/dev-lang/ocaml/files/digest-ocaml-3.08.2 b/dev-lang/ocaml/files/digest-ocaml-3.08.2
new file mode 100644
index 000000000000..44e178e3d1e1
--- /dev/null
+++ b/dev-lang/ocaml/files/digest-ocaml-3.08.2
@@ -0,0 +1 @@
+MD5 608319707707cf4ac3f7a13eb63260ad ocaml-3.08.2.tar.bz2 2052501
diff --git a/dev-lang/ocaml/ocaml-3.08.1.ebuild b/dev-lang/ocaml/ocaml-3.08.1.ebuild
index 4ab9c565892a..bb26b1fe52b1 100644
--- a/dev-lang/ocaml/ocaml-3.08.1.ebuild
+++ b/dev-lang/ocaml/ocaml-3.08.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.08.1.ebuild,v 1.5 2004/10/23 06:07:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.08.1.ebuild,v 1.6 2004/11/29 09:01:58 mattam Exp $
 
 inherit flag-o-matic eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://caml.inria.fr/distrib/ocaml-3.08/${P}.tar.bz2"
 
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~alpha ~ia64 ~amd64 ~hppa ~ppc-macos"
+KEYWORDS="x86 ~sparc ~ppc ~alpha ~ia64 ~amd64 ~hppa ~ppc-macos"
 IUSE="tcltk latex"
 
 DEPEND="virtual/libc
diff --git a/dev-lang/ocaml/ocaml-3.08.2.ebuild b/dev-lang/ocaml/ocaml-3.08.2.ebuild
new file mode 100644
index 000000000000..55ba0711fc1a
--- /dev/null
+++ b/dev-lang/ocaml/ocaml-3.08.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.08.2.ebuild,v 1.1 2004/11/29 09:01:58 mattam Exp $
+
+inherit flag-o-matic eutils
+
+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.08/${P}.tar.bz2"
+
+LICENSE="QPL-1.0 LGPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha ~ia64 ~amd64 ~hppa ~ppc-macos"
+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
+}
+
+src_compile() {
+	filter-flags "-fstack-protector"
+	replace-flags "-O?" -O2
+
+	local myconf
+	use tcltk || myconf="-no-tk"
+
+	# Fix for bug #23767.
+	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/lib/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/lib/ocaml \
+		MANDIR=${D}/usr/share/man \
+		install || die
+
+	# silly, silly makefiles
+	dosed "s:${D}::g" /usr/lib/ocaml/ld.conf
+
+	# documentation
+	dodoc Changes INSTALL LICENSE README Upgrading
+}
+
+pkg_postinst() {
+	if use latex; then
+		echo "TEXINPUTS=/usr/lib/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
+}