allow to build without ocamlopt, dont install license

Package-Manager: portage-2.1.4_rc14

3 files changed, 51 insertions, 16 deletions

diff --git a/dev-ml/facile/ChangeLog b/dev-ml/facile/ChangeLog
index 0023f0cf22fe..6893291f0d2b 100644
--- a/dev-ml/facile/ChangeLog
+++ b/dev-ml/facile/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ml/facile
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/facile/ChangeLog,v 1.7 2007/10/23 21:17:52 jer Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/facile/ChangeLog,v 1.8 2008/01/06 18:11:08 aballier Exp $
+
+  06 Jan 2008; Alexis Ballier <aballier@gentoo.org> facile-1.1.ebuild:
+  allow to build without ocamlopt, dont install license
 
   23 Oct 2007; Jeroen Roovers <jer@gentoo.org> facile-1.1.ebuild:
   Marked ~hppa (bug #196551). Added src_test (because it works).
diff --git a/dev-ml/facile/Manifest b/dev-ml/facile/Manifest
index fdde4f06f047..135bfa0cbdac 100644
--- a/dev-ml/facile/Manifest
+++ b/dev-ml/facile/Manifest
@@ -1,16 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX facile-1.1-make.patch 1613 RMD160 e569e44b0a6af07c0893c571eb3a7d176a7f8585 SHA1 391cccee28101143d65e65cc9738164b04b4eca0 SHA256 6e1ed39d10b9dd6824ac2754570efc41d7a4c53ee339df8ebd2d3f96417b3f06
 MD5 2740076bfa8d4211bac8b4b8d6f3aea0 files/facile-1.1-make.patch 1613
 RMD160 e569e44b0a6af07c0893c571eb3a7d176a7f8585 files/facile-1.1-make.patch 1613
 SHA256 6e1ed39d10b9dd6824ac2754570efc41d7a4c53ee339df8ebd2d3f96417b3f06 files/facile-1.1-make.patch 1613
 DIST facile-1.1.tar.gz 96343 RMD160 1ed7b8f916e34889bb67f06b6a9d6a121d69fe32 SHA1 31dea6e19542292c9ccb41515b0ec7ecd103bb80 SHA256 a87a6ba7869104f85828c19a9681758bd1d01c816581ba09ac483739ad4ae5ca
-EBUILD facile-1.1.ebuild 1132 RMD160 e5956b54760202bff2ece51879e3572d5b40cf10 SHA1 c25a2a32d4576b1fc31de6eef734354ad0843c82 SHA256 4cb8ce9eaa3f9dd40545af680594194ad3b41b762927883b148b00c53ea13128
-MD5 1a668f8e67cfd6bb30b9a7f21c551501 facile-1.1.ebuild 1132
-RMD160 e5956b54760202bff2ece51879e3572d5b40cf10 facile-1.1.ebuild 1132
-SHA256 4cb8ce9eaa3f9dd40545af680594194ad3b41b762927883b148b00c53ea13128 facile-1.1.ebuild 1132
-MISC ChangeLog 1497 RMD160 f14c888221b08a324a36b98e154bf74fc0ea182f SHA1 c2d3dd06c03a63990bbc3ee29852ae955266eed9 SHA256 4cf9fb94467981db0eebde1da07ec014bdac199e42552c523b54422361b2467d
-MD5 67b33486ce0973479fe178712823903d ChangeLog 1497
-RMD160 f14c888221b08a324a36b98e154bf74fc0ea182f ChangeLog 1497
-SHA256 4cf9fb94467981db0eebde1da07ec014bdac199e42552c523b54422361b2467d ChangeLog 1497
+EBUILD facile-1.1.ebuild 2015 RMD160 7c33bb09edb629d0f83456f26bf38300b2645b38 SHA1 16c00152e4a98e47a0f4562cb240ff26f95a5d1e SHA256 709bc8b737917e95707bd8ce9e17aa13e18aad1f1b886af4eec28daaef97f106
+MD5 6bf60512060c80afabe65d06c4bf8790 facile-1.1.ebuild 2015
+RMD160 7c33bb09edb629d0f83456f26bf38300b2645b38 facile-1.1.ebuild 2015
+SHA256 709bc8b737917e95707bd8ce9e17aa13e18aad1f1b886af4eec28daaef97f106 facile-1.1.ebuild 2015
+MISC ChangeLog 1630 RMD160 e584e08170f68607f1a7dbfa83eb1cda8bc21066 SHA1 869546b6720ce3db05b8e20c429c1af14a7676f2 SHA256 b00732d96f2ba3da7604660b601f38ab2545011ee20d764e6a245cf0404c8a7e
+MD5 6f7e9750ccfce66fb98a3b3dc5494565 ChangeLog 1630
+RMD160 e584e08170f68607f1a7dbfa83eb1cda8bc21066 ChangeLog 1630
+SHA256 b00732d96f2ba3da7604660b601f38ab2545011ee20d764e6a245cf0404c8a7e ChangeLog 1630
 MISC metadata.xml 172 RMD160 e2cd94e573a70360026089d04a69c0f5ea6e47db SHA1 150b276d48304002290b10c0eb43df6858c8e729 SHA256 667504f38af7bc26d7a585a40d28365d53e5154178847ec85f44baa9ebbb91d5
 MD5 1aee63f07c0b9c4a24d284f63c3a45ea metadata.xml 172
 RMD160 e2cd94e573a70360026089d04a69c0f5ea6e47db metadata.xml 172
@@ -18,3 +21,10 @@ SHA256 667504f38af7bc26d7a585a40d28365d53e5154178847ec85f44baa9ebbb91d5 metadata
 MD5 5f721764155106c70848e1bf17995204 files/digest-facile-1.1 229
 RMD160 a51a18ac52c9f62a433b3b4185b0d526bc4373f3 files/digest-facile-1.1 229
 SHA256 099fcfee06ea98f50bb67c1ff55b2e0428225a7dd699f074107e8b17909f3558 files/digest-facile-1.1 229
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkeBGc8ACgkQvFcC4BYPU0qTSQCgzCCtDp8M0KwZaz2DtKWUHOXw
+CIUAoL+lynIKbOXEA1xjDb88O5PYWxRP
+=W81P
+-----END PGP SIGNATURE-----
diff --git a/dev-ml/facile/facile-1.1.ebuild b/dev-ml/facile/facile-1.1.ebuild
index 15530f829859..e27341552e7e 100644
--- a/dev-ml/facile/facile-1.1.ebuild
+++ b/dev-ml/facile/facile-1.1.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-ml/facile/facile-1.1.ebuild,v 1.7 2007/10/23 21:17:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/facile/facile-1.1.ebuild,v 1.8 2008/01/06 18:11:08 aballier Exp $
 
 inherit eutils
 
+EAPI="1"
+
 DESCRIPTION="FaCiLe is a constraint programming library on integer and integer set finite domains written in OCaml."
 HOMEPAGE="http://www.recherche.enac.fr/log/facile/"
 SRC_URI="http://www.recherche.enac.fr/log/facile/distrib/${P}.tar.gz"
@@ -13,10 +15,20 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
+IUSE="+ocamlopt"
+
+RDEPEND=">=dev-lang/ocaml-3.09.3-r1"
+DEPEND="${RDEPEND}
+	 sys-apps/sed"
 
-DEPEND=">=dev-lang/ocaml-3.09.3-r1"
-RDEPEND="${DEPEND}"
+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_unpack() {
 	unpack ${A}
@@ -24,6 +36,16 @@ src_unpack() {
 
 	# Fix building on FreeBSD
 	epatch "${FILESDIR}/${P}"-make.patch
+	# Disable building native code objects if we dont have/want ocamlopt
+	if ! use ocamlopt; then
+		sed -i -e 's/\.opt//' src/Makefile || die "failed to change native code compiler to bytecode ones"
+		sed -i -e 's/ facile\.cmxa//' src/Makefile || die "failed to remove native code objects"
+		sed -i -e 's/\.opt/.out/g' \
+			-e 's: src/facile\.cmxa::'\
+			-e 's: src/facile\.a::'\
+			-e 's:^.*facile\.cmxa::'\
+			-e 's:^.*facile\.a::' Makefile || die "failed to remove native code objects"
+	fi
 }
 
 src_compile(){
@@ -39,5 +61,5 @@ src_test() {
 src_install(){
 	dodir $(ocamlc -where)
 	emake install || die "Installation failed"
-	dodoc LICENSE README || die "installing docs failed"
+	dodoc README || die "installing docs failed"
 }