Bugfix release, takes precedence over 3.09.0. Now 3.09 is supported in portage, all ocaml-packages support it, at least they have a ~marked version which does.

Package-Manager: portage-2.0.51.22-r1

10 files changed, 36 insertions, 44 deletions

diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index 5202beb2eaf0..b6964e23c407 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.73 2005/12/21 14:43:29 cryos Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.74 2006/02/04 16:46:29 mattam Exp $
+
+*ocaml-3.09.1 (04 Feb 2006)
+
+  04 Feb 2006; Matthieu Sozeau <mattam@gentoo.org> -ocaml-3.09.0.ebuild,
+  +ocaml-3.09.1.ebuild:
+  Bumped to 3.09.1, bugfix release of 3.09.0 which i removed. All ocaml packages
+  should support it from now. 
 
   21 Dec 2005; Marcus D. Hanwell <cryos@gentoo.org> ocaml-3.08.4.ebuild:
   Stable on amd64, bug 106837.
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 0e353c0fa601..2a5f45997a5e 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -1,29 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c7fe25b1bf54e0e4bccd5e4a8ec7c425 ChangeLog 11282
+MD5 417009ff4a8289e0989e42b30bdcafda ocaml-3.08.4.ebuild 2500
+MD5 f84082b66a53438d09304d24f8cc2ecd ocaml-3.08.1.ebuild 2150
+MD5 bf3f061b8bf28c5641a23bc073bef225 ocaml-3.06-r2.ebuild 1661
+MD5 265fa5742b4a08b3a6245b2267bc980b ocaml-3.07-r1.ebuild 2907
+MD5 84c63e3619c4dbffdfcfdce49b48bc3a ocaml-3.08.3.ebuild 2290
+MD5 bc5cd28732ed170ee7236367856624f0 ocaml-3.09.1.ebuild 2331
+MD5 2bb73bfac30cfab13753c65c9ec46c92 ChangeLog 11522
+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 9295b3bfcedf64968ef0d9585eb03279 files/digest-ocaml-3.09.1 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 df9e8e8ef7471d9588373dea12b7f49e ocaml-3.08.4.ebuild 2499
-MD5 b2f71c18310d84ec7f3faa4b27fed380 ocaml-3.09.0.ebuild 2499
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDqWocntT9W3vfTuoRAlAzAKCU14o+PbPbv3IK2mXFKFZfvcAgQgCfRcIN
-A8QKil4/95XHrU/NNmnW+xY=
-=Gzvu
------END PGP SIGNATURE-----
diff --git a/dev-lang/ocaml/files/digest-ocaml-3.09.0 b/dev-lang/ocaml/files/digest-ocaml-3.09.0
deleted file mode 100644
index e14b54c857db..000000000000
--- a/dev-lang/ocaml/files/digest-ocaml-3.09.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 834f88b1f39aa066bb620747764c0588 ocaml-3.09.0.tar.bz2 2013495
diff --git a/dev-lang/ocaml/files/digest-ocaml-3.09.1 b/dev-lang/ocaml/files/digest-ocaml-3.09.1
new file mode 100644
index 000000000000..723cd790b6bd
--- /dev/null
+++ b/dev-lang/ocaml/files/digest-ocaml-3.09.1
@@ -0,0 +1 @@
+MD5 b6b380ae71f6f7bc7ff0989a0f8409e6 ocaml-3.09.1.tar.bz2 2035552
diff --git a/dev-lang/ocaml/ocaml-3.06-r2.ebuild b/dev-lang/ocaml/ocaml-3.06-r2.ebuild
index 2fe0060ed335..35a0484b81e2 100644
--- a/dev-lang/ocaml/ocaml-3.06-r2.ebuild
+++ b/dev-lang/ocaml/ocaml-3.06-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.06-r2.ebuild,v 1.9 2005/01/03 00:58:51 j4rg0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.06-r2.ebuild,v 1.10 2006/02/04 16:46:29 mattam Exp $
 
 inherit flag-o-matic eutils
 
diff --git a/dev-lang/ocaml/ocaml-3.07-r1.ebuild b/dev-lang/ocaml/ocaml-3.07-r1.ebuild
index fd2863ea01d0..d9dc0959cc03 100644
--- a/dev-lang/ocaml/ocaml-3.07-r1.ebuild
+++ b/dev-lang/ocaml/ocaml-3.07-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.07-r1.ebuild,v 1.30 2005/03/19 19:40:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.07-r1.ebuild,v 1.31 2006/02/04 16:46:29 mattam Exp $
 
 inherit flag-o-matic eutils
 
diff --git a/dev-lang/ocaml/ocaml-3.08.1.ebuild b/dev-lang/ocaml/ocaml-3.08.1.ebuild
index 17de7c6c3b79..1cdd167cb836 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-2005 Gentoo Foundation
+# Copyright 1999-2006 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.13 2005/04/01 17:21:07 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.08.1.ebuild,v 1.14 2006/02/04 16:46:29 mattam Exp $
 
 inherit flag-o-matic eutils
 
diff --git a/dev-lang/ocaml/ocaml-3.08.3.ebuild b/dev-lang/ocaml/ocaml-3.08.3.ebuild
index 82455d0e7966..eae6a9247996 100644
--- a/dev-lang/ocaml/ocaml-3.08.3.ebuild
+++ b/dev-lang/ocaml/ocaml-3.08.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.08.3.ebuild,v 1.9 2005/10/16 09:44:31 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.08.3.ebuild,v 1.10 2006/02/04 16:46:29 mattam Exp $
 
 inherit flag-o-matic eutils multilib
 
diff --git a/dev-lang/ocaml/ocaml-3.08.4.ebuild b/dev-lang/ocaml/ocaml-3.08.4.ebuild
index f54746066f7c..f965de355916 100644
--- a/dev-lang/ocaml/ocaml-3.08.4.ebuild
+++ b/dev-lang/ocaml/ocaml-3.08.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.08.4.ebuild,v 1.5 2005/12/21 14:43:29 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.08.4.ebuild,v 1.6 2006/02/04 16:46:29 mattam Exp $
 
 inherit flag-o-matic eutils multilib
 
diff --git a/dev-lang/ocaml/ocaml-3.09.0.ebuild b/dev-lang/ocaml/ocaml-3.09.1.ebuild
index 11560550e698..bbe3378134f1 100644
--- a/dev-lang/ocaml/ocaml-3.09.0.ebuild
+++ b/dev-lang/ocaml/ocaml-3.09.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.09.1.ebuild,v 1.1 2006/02/04 16:46:29 mattam Exp $
 
 inherit flag-o-matic eutils multilib
 
@@ -11,7 +11,7 @@ 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
+KEYWORDS="~x86 ~ppc"
 IUSE="tcltk latex"
 
 DEPEND="virtual/libc
@@ -32,11 +32,6 @@ src_compile() {
 	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