Allow to disable ocamlopt via an useflag

Package-Manager: portage-2.1.4_rc14

4 files changed, 33 insertions, 25 deletions

diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index a3c1b2c7546b..a95c79123190 100644
--- a/dev-lang/ocaml/ChangeLog
+++ b/dev-lang/ocaml/ChangeLog
@@ -1,6 +1,10 @@
 # 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.132 2008/01/02 18:35:23 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.133 2008/01/03 18:04:24 aballier Exp $
+
+  03 Jan 2008; Alexis Ballier <aballier@gentoo.org> ocaml-3.10.0.ebuild,
+  ocaml-3.10.1_rc2.ebuild:
+  Allow to disable ocamlopt via an useflag
 
   02 Jan 2008; Alexis Ballier <aballier@gentoo.org> ocaml-3.08.4.ebuild,
   ocaml-3.09.2.ebuild, ocaml-3.09.3.ebuild:
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index f7acc4f372b0..ceb4daa29e08 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -74,18 +74,18 @@ EBUILD ocaml-3.09.3.ebuild 2502 RMD160 eac169c312fc029e9a1c9e7fcbea19a583807a22
 MD5 167a7cba7536c6b1ffa4f4e1edcdc3c9 ocaml-3.09.3.ebuild 2502
 RMD160 eac169c312fc029e9a1c9e7fcbea19a583807a22 ocaml-3.09.3.ebuild 2502
 SHA256 61dfff3a6f92329bf1c7e040221d831c5bf10bac5a068a884d1100b859403a67 ocaml-3.09.3.ebuild 2502
-EBUILD ocaml-3.10.0.ebuild 4281 RMD160 6ca096d81a7d6fe395b4ebfe9a0205ae202e6ab2 SHA1 b851396310fd5e1ee8dc097b98b4997e4efd9ceb SHA256 7a8d68d9a2e3f8994a933f69d5b8b9a5f17b9097da7daaefdbf4885bac1868bd
-MD5 08c50219db6431b7985ce2bc02f48446 ocaml-3.10.0.ebuild 4281
-RMD160 6ca096d81a7d6fe395b4ebfe9a0205ae202e6ab2 ocaml-3.10.0.ebuild 4281
-SHA256 7a8d68d9a2e3f8994a933f69d5b8b9a5f17b9097da7daaefdbf4885bac1868bd ocaml-3.10.0.ebuild 4281
-EBUILD ocaml-3.10.1_rc2.ebuild 4362 RMD160 79cf63b8cd9173d1f5bb43e862c2eae7912925af SHA1 0566a067fb67b50db9e410a779f98e5003032e04 SHA256 4ebb2cb190a7cf04341db05ab81b5d05299689bf95f2d2933690f1db744d6b17
-MD5 3e22140ac967d0032a493e343d15edeb ocaml-3.10.1_rc2.ebuild 4362
-RMD160 79cf63b8cd9173d1f5bb43e862c2eae7912925af ocaml-3.10.1_rc2.ebuild 4362
-SHA256 4ebb2cb190a7cf04341db05ab81b5d05299689bf95f2d2933690f1db744d6b17 ocaml-3.10.1_rc2.ebuild 4362
-MISC ChangeLog 20958 RMD160 4cd5c54de5727a2f2333fa4308ed77e908175ec8 SHA1 51666655d6d2059e14d788ebbf52e328c3f1f08b SHA256 4cb06191b64aaa824b7435cd1a28e8c3080b161b2740dc9abb29b2ddd512f8f8
-MD5 03806d1798bdcea3f6dfbc407fa884ec ChangeLog 20958
-RMD160 4cd5c54de5727a2f2333fa4308ed77e908175ec8 ChangeLog 20958
-SHA256 4cb06191b64aaa824b7435cd1a28e8c3080b161b2740dc9abb29b2ddd512f8f8 ChangeLog 20958
+EBUILD ocaml-3.10.0.ebuild 4293 RMD160 683454fba848d847b8f1323dbfebe4b40413afba SHA1 d826b1f8886024d1cc5ef855a5424f918d13742f SHA256 2180960ff245e08cde634064215f080a0f6b976bfc994247abea7eb8ceb489b0
+MD5 c2b9c50ada42ea7e907a72a42c6d06e5 ocaml-3.10.0.ebuild 4293
+RMD160 683454fba848d847b8f1323dbfebe4b40413afba ocaml-3.10.0.ebuild 4293
+SHA256 2180960ff245e08cde634064215f080a0f6b976bfc994247abea7eb8ceb489b0 ocaml-3.10.0.ebuild 4293
+EBUILD ocaml-3.10.1_rc2.ebuild 4374 RMD160 4455b10992dedcce7ca60dc442b591ade147ebf1 SHA1 31015819119a2eeb29177a70916bbf256cd41219 SHA256 b8f0043fd4d66b5bad122fa20ba5131462e41d2383bbd04f212fa5ecc027b2b9
+MD5 9baf96665e50a54d08f221f26b4100b4 ocaml-3.10.1_rc2.ebuild 4374
+RMD160 4455b10992dedcce7ca60dc442b591ade147ebf1 ocaml-3.10.1_rc2.ebuild 4374
+SHA256 b8f0043fd4d66b5bad122fa20ba5131462e41d2383bbd04f212fa5ecc027b2b9 ocaml-3.10.1_rc2.ebuild 4374
+MISC ChangeLog 21102 RMD160 2bbc39fc16191006e83e7c192cc885f52566d1b7 SHA1 c937500911176db830c399bc5dc181687833bff1 SHA256 6385d7aa9752caad94e9b58a3dea0ca9cb8bfa20e288ad9b532c375b4c69e74e
+MD5 92627d9ca2bddc4ca2ce77202a574664 ChangeLog 21102
+RMD160 2bbc39fc16191006e83e7c192cc885f52566d1b7 ChangeLog 21102
+SHA256 6385d7aa9752caad94e9b58a3dea0ca9cb8bfa20e288ad9b532c375b4c69e74e ChangeLog 21102
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
 MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
 RMD160 dfaa057e679b01302a807c75a32a910098b26809 metadata.xml 155
@@ -114,7 +114,7 @@ SHA256 78b89e514ad03c48176d98edb989a190f6c592f69f67f2a66f8b24ab056e008c files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEYEARECAAYFAkd72XQACgkQvFcC4BYPU0o6bwCfTP2UmPXwQNXX9CTnESB1Fyyv
-ImQAnRhmTotKjb/SYifXqIiejbpWN4IK
-=BJ4D
+iEYEARECAAYFAkd9I7IACgkQvFcC4BYPU0o6eQCgyxGd/THvZETa/E8ZwmSN2bLP
+qaYAniyjI+KqGJTU1QlC6dtRniS5Icv+
+=NMax
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ocaml/ocaml-3.10.0.ebuild b/dev-lang/ocaml/ocaml-3.10.0.ebuild
index c8d7ce42ad61..df6259a967d3 100644
--- a/dev-lang/ocaml/ocaml-3.10.0.ebuild
+++ b/dev-lang/ocaml/ocaml-3.10.0.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.0.ebuild,v 1.10 2007/12/20 20:24:12 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.10.0.ebuild,v 1.11 2008/01/03 18:04:24 aballier Exp $
 
 inherit flag-o-matic eutils multilib versionator toolchain-funcs
 
+EAPI="1"
+
 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)/${P}.tar.gz"
@@ -11,7 +13,7 @@ SRC_URI="http://caml.inria.fr/distrib/ocaml-$( get_version_component_range 1-2)/
 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"
+IUSE="emacs gdbm latex ncurses +ocamlopt tk X xemacs"
 
 DEPEND="tk? ( >=dev-lang/tk-3.3.3 )
 	ncurses? ( sys-libs/ncurses )
@@ -79,8 +81,8 @@ src_compile() {
 
 	make world || die "make world failed!"
 
-	# Native code generation is unsupported on some archs
-	if ! use ppc64 ; then
+	# 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
diff --git a/dev-lang/ocaml/ocaml-3.10.1_rc2.ebuild b/dev-lang/ocaml/ocaml-3.10.1_rc2.ebuild
index ff820e4b25b3..23b8429af0ab 100644
--- a/dev-lang/ocaml/ocaml-3.10.1_rc2.ebuild
+++ b/dev-lang/ocaml/ocaml-3.10.1_rc2.ebuild
@@ -1,9 +1,11 @@
 # 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.1_rc2.ebuild,v 1.1 2008/01/02 17:27:01 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.10.1_rc2.ebuild,v 1.2 2008/01/03 18:04:24 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/"
@@ -12,7 +14,7 @@ SRC_URI="http://caml.inria.fr/distrib/ocaml-$( get_version_component_range 1-2)/
 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"
+IUSE="emacs gdbm latex ncurses +ocamlopt tk X xemacs"
 
 DEPEND="tk? ( >=dev-lang/tk-3.3.3 )
 	ncurses? ( sys-libs/ncurses )
@@ -81,8 +83,8 @@ src_compile() {
 
 	make world || die "make world failed!"
 
-	# Native code generation is unsupported on some archs
-	if ! use ppc64 ; then
+	# 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