ocamlopt is required here, there is no option to disable it sanely

Package-Manager: portage-2.1.4_rc14

3 files changed, 28 insertions, 16 deletions

diff --git a/dev-ml/camlimages/ChangeLog b/dev-ml/camlimages/ChangeLog
index fb77e39856e1..edf9d72bd7f8 100644
--- a/dev-ml/camlimages/ChangeLog
+++ b/dev-ml/camlimages/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ml/camlimages
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/ChangeLog,v 1.8 2007/02/09 02:45:11 flameeyes Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/ChangeLog,v 1.9 2008/01/03 20:36:50 aballier Exp $
+
+  03 Jan 2008; Alexis Ballier <aballier@gentoo.org> camlimages-2.20.ebuild:
+  ocamlopt is required here, there is no option to disable it sanely
 
   09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/dev-ml/camlimages/Manifest b/dev-ml/camlimages/Manifest
index c9dc86f5c58d..794d3745ca83 100644
--- a/dev-ml/camlimages/Manifest
+++ b/dev-ml/camlimages/Manifest
@@ -10,14 +10,14 @@ MD5 f8272d66ad86ec1812b000fe5ff46f8e files/camlimages-2.20-ocaml-3.09.diff 385
 RMD160 b235b80d0e972a9c05c1f6acbdff335775c0a4e5 files/camlimages-2.20-ocaml-3.09.diff 385
 SHA256 5666ac67637d63fd40248ae2ead4ab6a9ab8b96139a670926ba28f186ed5027f files/camlimages-2.20-ocaml-3.09.diff 385
 DIST camlimages-2.2.tgz 1385525 RMD160 0f108ef3da565aeb0ab10d00e45819399af36d8c SHA1 bc0062739be5ca9236f28145f17f840bf3f295ee SHA256 9b8861d7b8c6752ad33ef2af5c486efa626b19ad9ea190641a736384629f1026
-EBUILD camlimages-2.20.ebuild 1359 RMD160 65c29899f55684c8f33ac287d33bc765c20db523 SHA1 3a9b73b938d2cb116c186770d6399eed98780d5e SHA256 e26ea912061f844d562ae5d2bd5dc5f5661cfeef2c0bbb619e1639b09a2a02e2
-MD5 07bbe2d2b3f3fc02c73a81be25684bfa camlimages-2.20.ebuild 1359
-RMD160 65c29899f55684c8f33ac287d33bc765c20db523 camlimages-2.20.ebuild 1359
-SHA256 e26ea912061f844d562ae5d2bd5dc5f5661cfeef2c0bbb619e1639b09a2a02e2 camlimages-2.20.ebuild 1359
-MISC ChangeLog 1654 RMD160 a2abc51505cee109b44d8fc53e62d0406e9451aa SHA1 2fc7e4aa0ea230a4273254ecd4fbd65be3dd3545 SHA256 3c1307dd8d36adbcfadb108ea3c1ab4e992bcf72a172894d6acb2d4e43b40c1b
-MD5 1a5687abb9908bf9c21b916a8fa8905f ChangeLog 1654
-RMD160 a2abc51505cee109b44d8fc53e62d0406e9451aa ChangeLog 1654
-SHA256 3c1307dd8d36adbcfadb108ea3c1ab4e992bcf72a172894d6acb2d4e43b40c1b ChangeLog 1654
+EBUILD camlimages-2.20.ebuild 1706 RMD160 92cea61ef912c660fd9e28c39e586dfde2ea0643 SHA1 8f4af053531e6e60007eb60cc8bbfa1d91317e23 SHA256 db67a71b81d3d307c3427a4024bd668ec08cc9367f21e5892e7914befcb58c65
+MD5 c2906b6567a866a5976bcfb32477c80a camlimages-2.20.ebuild 1706
+RMD160 92cea61ef912c660fd9e28c39e586dfde2ea0643 camlimages-2.20.ebuild 1706
+SHA256 db67a71b81d3d307c3427a4024bd668ec08cc9367f21e5892e7914befcb58c65 camlimages-2.20.ebuild 1706
+MISC ChangeLog 1799 RMD160 8d5c730aca85d0d5f1fd6e03c5ebf4b6206791f7 SHA1 52ebcff4481e8451e6b24f2b4f4a2433b8460bb1 SHA256 1d0d492ca380c4e0e3b8b40d86ebb867b78abb59d8063a60719a9382c79488e5
+MD5 4f66fcad8a412be0befbc718a3e22fa4 ChangeLog 1799
+RMD160 8d5c730aca85d0d5f1fd6e03c5ebf4b6206791f7 ChangeLog 1799
+SHA256 1d0d492ca380c4e0e3b8b40d86ebb867b78abb59d8063a60719a9382c79488e5 ChangeLog 1799
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
 MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
 RMD160 dfaa057e679b01302a807c75a32a910098b26809 metadata.xml 155
@@ -26,9 +26,9 @@ MD5 a2b0ca6c7075a874c496eb03b3142132 files/digest-camlimages-2.20 238
 RMD160 6e2ba431718f102e8e571bd43612cb172ce3fc52 files/digest-camlimages-2.20 238
 SHA256 b1e886955276729e8d9426d560c906c6ca179ce1573f84d5d44b32b072bbb137 files/digest-camlimages-2.20 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFFy+A+AiZjviIA2XgRAvwkAJ41WwiuWdAhjQyaoMusLL3bh051JQCguTpt
-cXrEkHI3SdLafPwhwjm/Rr8=
-=7tS+
+iEYEARECAAYFAkd9R2wACgkQvFcC4BYPU0oRWgCeMP1gVSneVK920XxQImYjQGWQ
+VRAAn0vzNHzn9mZr2d6zcSxpV3KtRJAR
+=V1Nv
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/camlimages/camlimages-2.20.ebuild b/dev-ml/camlimages/camlimages-2.20.ebuild
index 0514e49c194b..28518f2c2dfe 100644
--- a/dev-ml/camlimages/camlimages-2.20.ebuild
+++ b/dev-ml/camlimages/camlimages-2.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/camlimages-2.20.ebuild,v 1.4 2006/02/04 13:36:17 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/camlimages-2.20.ebuild,v 1.5 2008/01/03 20:36:50 aballier Exp $
 
 inherit findlib eutils
 
@@ -18,6 +18,15 @@ DEPEND=">=dev-lang/ocaml-3.08"
 
 MY_S="${WORKDIR}/${P/20/2}"
 
+pkg_setup() {
+	if ! built_with_use --missing true dev-lang/ocaml ocamlopt; then
+		eerror "${PN} needs to be built with native code support from ocaml"
+		eerror "You first need to have a native code ocaml compiler."
+		eerror "You need to install dev-lang/ocaml with ocamlopt useflag on."
+		die "Please install ocaml with ocamlopt useflag"
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${MY_S}