Add support for disabling ocamlopt

Package-Manager: portage-2.1.4_rc14

3 files changed, 43 insertions, 19 deletions

diff --git a/app-misc/ledit/ChangeLog b/app-misc/ledit/ChangeLog
index 41b8a1282c20..41ed54ade51a 100644
--- a/app-misc/ledit/ChangeLog
+++ b/app-misc/ledit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-misc/ledit
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ledit/ChangeLog,v 1.15 2007/11/20 13:24:01 aballier Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ledit/ChangeLog,v 1.16 2008/01/02 19:31:41 aballier Exp $
+
+  02 Jan 2008; Alexis Ballier <aballier@gentoo.org> ledit-1.15.ebuild:
+  Add support for disabling ocamlopt
 
   20 Nov 2007; Alexis Ballier <aballier@gentoo.org> ledit-1.15.ebuild:
   take ocaml deps down to 3.09, works fine if camlp5 is installed
diff --git a/app-misc/ledit/Manifest b/app-misc/ledit/Manifest
index f69e32cb6f74..24be680bd9d2 100644
--- a/app-misc/ledit/Manifest
+++ b/app-misc/ledit/Manifest
@@ -15,14 +15,14 @@ EBUILD ledit-1.11.ebuild 698 RMD160 1785bafda343c8fe3f03633b0b169264edd3d2ca SHA
 MD5 3c72c518ee1aafc2149a168ac6e5bd24 ledit-1.11.ebuild 698
 RMD160 1785bafda343c8fe3f03633b0b169264edd3d2ca ledit-1.11.ebuild 698
 SHA256 b72e5b56688d81a9061ddaeb29ef11a5bd3cbdd37553a7ae6fefb2a7653abd3d ledit-1.11.ebuild 698
-EBUILD ledit-1.15.ebuild 706 RMD160 d7f00a12263813aa01fca7e973498803ca672764 SHA1 d15e3d86c0b1f0d30734263038d36482f92f7204 SHA256 9c4d17de2fac5a3cb545432e2fd22648cd512fe4f527bb91f9102aa117a2bb90
-MD5 1020d500d5f0ee2023ce245b30c7964f ledit-1.15.ebuild 706
-RMD160 d7f00a12263813aa01fca7e973498803ca672764 ledit-1.15.ebuild 706
-SHA256 9c4d17de2fac5a3cb545432e2fd22648cd512fe4f527bb91f9102aa117a2bb90 ledit-1.15.ebuild 706
-MISC ChangeLog 1817 RMD160 291e2ffffe706de7a1e0f54c88f53af6a7c5ab80 SHA1 3d5a87f1e2caedc463e43bcd4c2b3187d3cc04ad SHA256 62b20a270b2c87622157ffc12221afcaecc01219a0b86c7f92aaf046590db3b7
-MD5 cda23a17c94cdce54abb7b196dad871a ChangeLog 1817
-RMD160 291e2ffffe706de7a1e0f54c88f53af6a7c5ab80 ChangeLog 1817
-SHA256 62b20a270b2c87622157ffc12221afcaecc01219a0b86c7f92aaf046590db3b7 ChangeLog 1817
+EBUILD ledit-1.15.ebuild 1327 RMD160 e4b801a63625e1188049a4b1cf2e3db9b80d6b36 SHA1 80c25e88c0df7e70a96989a7df7d5ffec553ac0b SHA256 fd7ee259aee25074f6811516fe08ff2378a590d3716c0bbd7017643c0b0e0d0b
+MD5 a4882f2e0fe63291b0254238f17f2129 ledit-1.15.ebuild 1327
+RMD160 e4b801a63625e1188049a4b1cf2e3db9b80d6b36 ledit-1.15.ebuild 1327
+SHA256 fd7ee259aee25074f6811516fe08ff2378a590d3716c0bbd7017643c0b0e0d0b ledit-1.15.ebuild 1327
+MISC ChangeLog 1926 RMD160 89aefc6e4cd7c83ebc57de4015598a93623139c7 SHA1 d63b422b549a8bafc0405161cb8e6d5b22d74845 SHA256 cf9b2134edf7d72a304d06b8ef3dbfaa0137595853549ac20fad49260f7bc53f
+MD5 b51fd9c8aac8ffae10075e5991100b65 ChangeLog 1926
+RMD160 89aefc6e4cd7c83ebc57de4015598a93623139c7 ChangeLog 1926
+SHA256 cf9b2134edf7d72a304d06b8ef3dbfaa0137595853549ac20fad49260f7bc53f ChangeLog 1926
 MISC metadata.xml 157 RMD160 30153301a2a5cca5547a6e47941aae2895837613 SHA1 66e87d50f913856e703f3ee29841b03332af40db SHA256 d14b8b08774f2a40f42d70ff40b1b4f1c4725e7095d702143a32909553eac799
 MD5 648a541494aceee26dbcfd76164f37ea metadata.xml 157
 RMD160 30153301a2a5cca5547a6e47941aae2895837613 metadata.xml 157
@@ -37,9 +37,9 @@ MD5 f0412c7f8f0035a52b709688ab0c27c6 files/digest-ledit-1.15 220
 RMD160 abcf992d61d75e78556e17d8c904dad7c28d4d88 files/digest-ledit-1.15 220
 SHA256 41d53dfcc215da00a0dde73c24f6785702ac0c9a07539d20ad4edae784ace8f1 files/digest-ledit-1.15 220
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFHQt/6vFcC4BYPU0oRAnjAAKCPMTdKJzrY/49b7w/PxcBMwyb2TgCfeadp
-eQdikScrmeFdY9U6vjRLCdA=
-=zizF
+iEYEARECAAYFAkd75qQACgkQvFcC4BYPU0qn5ACgpm9FW48RIKybUL7s8O1ZdRg8
+Xs8AnjzLve4URr4pQmDOAsXafAj6/bW6
+=KVhX
 -----END PGP SIGNATURE-----
diff --git a/app-misc/ledit/ledit-1.15.ebuild b/app-misc/ledit/ledit-1.15.ebuild
index e733fe939bc6..69c4029005c7 100644
--- a/app-misc/ledit/ledit-1.15.ebuild
+++ b/app-misc/ledit/ledit-1.15.ebuild
@@ -1,10 +1,12 @@
-# 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/app-misc/ledit/ledit-1.15.ebuild,v 1.3 2007/11/20 13:24:01 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ledit/ledit-1.15.ebuild,v 1.4 2008/01/02 19:31:41 aballier Exp $
 
 inherit eutils
 
-IUSE=""
+EAPI="1"
+
+IUSE="+ocamlopt"
 
 DESCRIPTION="A line editor to be used with interactive commands."
 SRC_URI="http://pauillac.inria.fr/~ddr/ledit/${P}.tgz"
@@ -17,15 +19,34 @@ SLOT="0"
 LICENSE="BSD"
 KEYWORDS="~amd64 ~ppc ~x86"
 
+pkg_setup() {
+	if use ocamlopt && ! built_with_use --missing true dev-lang/ocaml ocamlopt; then
+		eerror "In order to build ${PN} 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_compile()
 {
 	emake -j1 all || die "make failed"
-	emake -j1 ledit.opt || die "make failed"
+	if use ocamlopt; then
+		emake -j1 ledit.opt || die "make failed"
+	else
+		# If using bytecode we dont want to strip the binary as it would remove the
+		# bytecode and only leave ocamlrun...
+		export STRIP_MASK="*/bin/*"
+	fi
 }
 
 src_install()
 {
-	newbin ledit.opt ledit
+	if use ocamlopt; then
+		newbin ledit.opt ledit
+	else
+		newbin ledit.out ledit
+	fi
 	doman ledit.1
 	dodoc CHANGES README
 }