Dont run make bootstrap for src_test, it deletes ocamlopt, upstream does not provide a clean test suite, if we want one we definitely should not use make bootstrap, closes bug #159237 and bug #177706

Package-Manager: portage-2.1.2.7

4 files changed, 25 insertions, 28 deletions

diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index 1ea693415012..889cdb78810b 100644
--- a/dev-lang/ocaml/ChangeLog
+++ b/dev-lang/ocaml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/ocaml
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.100 2007/05/11 19:12:07 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.101 2007/05/11 19:42:00 aballier Exp $
+
+  11 May 2007; Alexis Ballier <aballier@gentoo.org> ocaml-3.09.3.ebuild,
+  ocaml-3.09.3-r1.ebuild:
+  Dont run make bootstrap for src_test, it deletes ocamlopt, upstream does not
+  provide a clean test suite, if we want one we definitely should not use make
+  bootstrap, closes bug #159237 and bug #177706
 
   11 May 2007; Alexis Ballier <aballier@gentoo.org>
   -files/ocaml-3.08.3-gcc4.patch, -ocaml-3.08.3.ebuild, ocaml-3.08.4.ebuild,
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 782c9586e3fc..9af77c5cb118 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -32,18 +32,18 @@ EBUILD ocaml-3.09.2.ebuild 2402 RMD160 6bc854705b08c0ef5e9d05d6e6009d6c463f2d33
 MD5 8cb80568d2fffd2db8db680e611b1323 ocaml-3.09.2.ebuild 2402
 RMD160 6bc854705b08c0ef5e9d05d6e6009d6c463f2d33 ocaml-3.09.2.ebuild 2402
 SHA256 8144897559ad397542ece72e1d503d561add45cf8ac3daab8c2fd1020e38a030 ocaml-3.09.2.ebuild 2402
-EBUILD ocaml-3.09.3-r1.ebuild 4604 RMD160 2544c649bc02a210617333b60a055a329fa42b61 SHA1 83807b054de5dbda1a2f1fd71f69a55aa3b0ca90 SHA256 8c1fcccd80b9a452cfeeafd4598c77c909e7a45d15d8702d8c7beb35be8db539
-MD5 5de3d5e51ccec855c200e2a8bd82fea7 ocaml-3.09.3-r1.ebuild 4604
-RMD160 2544c649bc02a210617333b60a055a329fa42b61 ocaml-3.09.3-r1.ebuild 4604
-SHA256 8c1fcccd80b9a452cfeeafd4598c77c909e7a45d15d8702d8c7beb35be8db539 ocaml-3.09.3-r1.ebuild 4604
-EBUILD ocaml-3.09.3.ebuild 2534 RMD160 f37fa7e4ddeb0cdf9026c6cfb9e9438d38722504 SHA1 a8a93633033fc7c2efe9fc8470223ad90d065152 SHA256 251bf61f5483314179947004159d023bd846d66f7a6dab4299db4293dadee14d
-MD5 9629164cca5ba04887c0087f6cfc9bc2 ocaml-3.09.3.ebuild 2534
-RMD160 f37fa7e4ddeb0cdf9026c6cfb9e9438d38722504 ocaml-3.09.3.ebuild 2534
-SHA256 251bf61f5483314179947004159d023bd846d66f7a6dab4299db4293dadee14d ocaml-3.09.3.ebuild 2534
-MISC ChangeLog 15651 RMD160 238caa310211b0015b723e55739a9bd91d479529 SHA1 aa49aa3a6d183005f646b8f2feeba06be45c1d63 SHA256 70d6c4c694af9fc22a567b637fe2bf1978f34ca3466f5292d882e58b59b834b2
-MD5 e86a7f9d89bba2c7d3c85dc48e77da53 ChangeLog 15651
-RMD160 238caa310211b0015b723e55739a9bd91d479529 ChangeLog 15651
-SHA256 70d6c4c694af9fc22a567b637fe2bf1978f34ca3466f5292d882e58b59b834b2 ChangeLog 15651
+EBUILD ocaml-3.09.3-r1.ebuild 4558 RMD160 7770f41176a7feef6a09d44ca1de5283b8e12acb SHA1 839baa3c351ac8e5cc1c9234d97745c8407bb2db SHA256 b701a837fb8e17f7c44b0904b67a2bbff071eb6a85a97be9474eb956a518d5f7
+MD5 7620dc6b605b3e71dd6d7509ef4bd1e1 ocaml-3.09.3-r1.ebuild 4558
+RMD160 7770f41176a7feef6a09d44ca1de5283b8e12acb ocaml-3.09.3-r1.ebuild 4558
+SHA256 b701a837fb8e17f7c44b0904b67a2bbff071eb6a85a97be9474eb956a518d5f7 ocaml-3.09.3-r1.ebuild 4558
+EBUILD ocaml-3.09.3.ebuild 2502 RMD160 2a015120aec3b6ce103ffeebdae265e1ced4aa49 SHA1 44bdb0801fe812386f53a75b3ba376ae1b54eee6 SHA256 fad524f73b1a807254283cc48dc742f18a8fec1a5b3123a86435a014cbc2125f
+MD5 e44a3de37fac8ae24a87c9f1d4019c7a ocaml-3.09.3.ebuild 2502
+RMD160 2a015120aec3b6ce103ffeebdae265e1ced4aa49 ocaml-3.09.3.ebuild 2502
+SHA256 fad524f73b1a807254283cc48dc742f18a8fec1a5b3123a86435a014cbc2125f ocaml-3.09.3.ebuild 2502
+MISC ChangeLog 15957 RMD160 c7560445bc57408ad3bfa6981aba4d0619607a94 SHA1 f3f163a8063e12efa0b966a681be559d383f5c3a SHA256 640e43c70fa36b45c2d7bfb7bd185c62f7097c175a7a5a7b9672795f68bd4742
+MD5 5329eb81ecfb99bd139d63b466d0a45e ChangeLog 15957
+RMD160 c7560445bc57408ad3bfa6981aba4d0619607a94 ChangeLog 15957
+SHA256 640e43c70fa36b45c2d7bfb7bd185c62f7097c175a7a5a7b9672795f68bd4742 ChangeLog 15957
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
 MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
 RMD160 dfaa057e679b01302a807c75a32a910098b26809 metadata.xml 155
@@ -63,7 +63,7 @@ SHA256 19708f759185ed39623e03921462ba20fb6f3533268673d2bcd7dd07cef57350 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGRL+dvFcC4BYPU0oRAmONAJ4mzqeIsBtrtgmjjjcqHwpsZPibQQCZAddx
-MDEVifK5ScIkIw4gkubr7lQ=
-=TL65
+iD8DBQFGRMadvFcC4BYPU0oRAmoZAKCSKecRnuVwJid8cacHR00nhxsBEQCgqoih
+d4HHXsTtYJUCo1E3wmBf8CE=
+=HEln
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ocaml/ocaml-3.09.3-r1.ebuild b/dev-lang/ocaml/ocaml-3.09.3-r1.ebuild
index b1655054f7e8..236a6fa8eef4 100644
--- a/dev-lang/ocaml/ocaml-3.09.3-r1.ebuild
+++ b/dev-lang/ocaml/ocaml-3.09.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.09.3-r1.ebuild,v 1.3 2007/05/11 19:12:07 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.09.3-r1.ebuild,v 1.4 2007/05/11 19:42:00 aballier Exp $
 
 inherit flag-o-matic eutils multilib pax-utils versionator toolchain-funcs
 
@@ -15,8 +15,7 @@ IUSE="tk latex"
 
 DEPEND="tk? ( >=dev-lang/tk-3.3.3 )"
 
-# ocaml deletes the *.opt files when running bootstrap
-RESTRICT="test"
+# ocaml deletes the *.opt files when running make bootstrap
 
 QA_EXECSTACK="/usr/lib/ocaml/compiler-*"
 
@@ -81,10 +80,6 @@ src_compile() {
 	fi
 }
 
-#src_test() {
-#	make bootstrap
-#}
-
 src_install() {
 	make BINDIR="${D}"/usr/bin \
 		LIBDIR="${D}"/usr/$(get_libdir)/ocaml \
diff --git a/dev-lang/ocaml/ocaml-3.09.3.ebuild b/dev-lang/ocaml/ocaml-3.09.3.ebuild
index dd28c3dbfcdd..c70401e0e41b 100644
--- a/dev-lang/ocaml/ocaml-3.09.3.ebuild
+++ b/dev-lang/ocaml/ocaml-3.09.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.09.3.ebuild,v 1.10 2007/05/11 19:12:07 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.09.3.ebuild,v 1.11 2007/05/11 19:42:00 aballier Exp $
 
 inherit flag-o-matic eutils multilib
 
@@ -55,10 +55,6 @@ src_compile() {
 	fi
 }
 
-src_test() {
-	make bootstrap
-}
-
 src_install() {
 	make BINDIR=${D}/usr/bin \
 		LIBDIR=${D}/usr/$(get_libdir)/ocaml \