From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1JBZxn-0002N6-TT for garchives@archives.gentoo.org; Sun, 06 Jan 2008 18:11:12 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D9C4BE02DF; Sun, 6 Jan 2008 18:11:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 934EDE02DF for ; Sun, 6 Jan 2008 18:11:10 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 1F1F765570 for ; Sun, 6 Jan 2008 18:11:10 +0000 (UTC) Received: from aballier by stork.gentoo.org with local (Exim 4.68) (envelope-from ) id 1JBZxk-0007Oy-PY for gentoo-commits@lists.gentoo.org; Sun, 06 Jan 2008 18:11:08 +0000 From: "Alexis Ballier (aballier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, aballier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in dev-ml/facile: facile-1.1.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: facile-1.1.ebuild ChangeLog X-VCS-Directories: dev-ml/facile X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier Content-Type: text/plain; charset=utf8 Message-Id: Sender: Alexis Ballier Date: Sun, 06 Jan 2008 18:11:08 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 504fb720-1631-4b9c-a776-6b6070f7d32c X-Archives-Hash: 0e86871be2f17b1a3f5dad95f37793ad aballier 08/01/06 18:11:08 Modified: facile-1.1.ebuild ChangeLog Log: allow to build without ocamlopt, dont install license (Portage version: 2.1.4_rc14) Revision Changes Path 1.8 dev-ml/facile/facile-1.1.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/facile/faci= le-1.1.ebuild?rev=3D1.8&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/facile/faci= le-1.1.ebuild?rev=3D1.8&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/facile/faci= le-1.1.ebuild?r1=3D1.7&r2=3D1.8 Index: facile-1.1.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/dev-ml/facile/facile-1.1.ebuild,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- facile-1.1.ebuild 23 Oct 2007 21:17:52 -0000 1.7 +++ facile-1.1.ebuild 6 Jan 2008 18:11:08 -0000 1.8 @@ -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 $ =20 inherit eutils =20 +EAPI=3D"1" + DESCRIPTION=3D"FaCiLe is a constraint programming library on integer and= integer set finite domains written in OCaml." HOMEPAGE=3D"http://www.recherche.enac.fr/log/facile/" SRC_URI=3D"http://www.recherche.enac.fr/log/facile/distrib/${P}.tar.gz" @@ -13,10 +15,20 @@ SLOT=3D"0" =20 KEYWORDS=3D"~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE=3D"" +IUSE=3D"+ocamlopt" =20 -DEPEND=3D">=3Ddev-lang/ocaml-3.09.3-r1" -RDEPEND=3D"${DEPEND}" +RDEPEND=3D">=3Ddev-lang/ocaml-3.09.3-r1" +DEPEND=3D"${RDEPEND} + sys-apps/sed" + +pkg_setup() { + if use ocamlopt && ! built_with_use --missing true dev-lang/ocaml ocaml= opt; 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 +} =20 src_unpack() { unpack ${A} @@ -24,6 +36,16 @@ =20 # 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 cod= e compiler to bytecode ones" + sed -i -e 's/ facile\.cmxa//' src/Makefile || die "failed to remove na= tive 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 o= bjects" + fi } =20 src_compile(){ @@ -39,5 +61,5 @@ src_install(){ dodir $(ocamlc -where) emake install || die "Installation failed" - dodoc LICENSE README || die "installing docs failed" + dodoc README || die "installing docs failed" } 1.8 dev-ml/facile/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/facile/Chan= geLog?rev=3D1.8&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/facile/Chan= geLog?rev=3D1.8&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ml/facile/Chan= geLog?r1=3D1.7&r2=3D1.8 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/dev-ml/facile/ChangeLog,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ChangeLog 23 Oct 2007 21:17:52 -0000 1.7 +++ ChangeLog 6 Jan 2008 18:11:08 -0000 1.8 @@ -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 facile-1.1.ebuild: + allow to build without ocamlopt, dont install license =20 23 Oct 2007; Jeroen Roovers facile-1.1.ebuild: Marked ~hppa (bug #196551). Added src_test (because it works). --=20 gentoo-commits@lists.gentoo.org mailing list