aballier 15/03/17 15:58:49 Modified: ocamlsdl-0.9.1.ebuild ChangeLog Log: fix build without ocamlopt, bug #543532 Signed-off-by: [email protected] (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path 1.5 dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild?r1=1.4&r2=1.5 Index: ocamlsdl-0.9.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ocamlsdl-0.9.1.ebuild 3 Mar 2013 14:48:44 -0000 1.4 +++ ocamlsdl-0.9.1.ebuild 17 Mar 2015 15:58:49 -0000 1.5 @@ -1,10 +1,10 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild,v 1.4 2013/03/03 14:48:44 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlsdl/ocamlsdl-0.9.1.ebuild,v 1.5 2015/03/17 15:58:49 aballier Exp $ EAPI=5 -inherit findlib +inherit findlib eutils DESCRIPTION="OCaml SDL Bindings" @@ -14,10 +14,10 @@ SLOT="0/${PV}" KEYWORDS="~amd64 ppc x86" -IUSE="doc opengl truetype" #noimage nomixer +IUSE="doc +ocamlopt opengl truetype" #noimage nomixer RDEPEND=" - >=dev-lang/ocaml-3.04:= + >=dev-lang/ocaml-3.12:=[ocamlopt=] >=media-libs/libsdl-1.2 opengl? ( >=dev-ml/lablgl-0.98:= ) >=media-libs/sdl-mixer-1.2 @@ -26,6 +26,10 @@ " DEPEND="${RDEPEND}" +src_prepare() { + epatch "${FILESDIR}/ocamlopt.patch" +} + src_configure() { myconf="" if use opengl; then 1.25 dev-ml/ocamlsdl/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ml/ocamlsdl/ChangeLog?rev=1.25&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ml/ocamlsdl/ChangeLog?rev=1.25&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ml/ocamlsdl/ChangeLog?r1=1.24&r2=1.25 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-ml/ocamlsdl/ChangeLog,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- ChangeLog 3 Mar 2013 14:48:44 -0000 1.24 +++ ChangeLog 17 Mar 2015 15:58:49 -0000 1.25 @@ -1,6 +1,10 @@ # ChangeLog for dev-ml/ocamlsdl -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlsdl/ChangeLog,v 1.24 2013/03/03 14:48:44 aballier Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlsdl/ChangeLog,v 1.25 2015/03/17 15:58:49 aballier Exp $ + + 17 Mar 2015; Alexis Ballier <[email protected]> ocamlsdl-0.9.1.ebuild, + +files/ocamlopt.patch: + fix build without ocamlopt, bug #543532 03 Mar 2013; Alexis Ballier <[email protected]> ocamlsdl-0.9.1.ebuild: eapi5: define subslot and use slot deps. cosmetics.
