commit: 5c5d388cd7a9888abe57ea54570fb11ee71acc50 Author: Justin Lecher <jlec <AT> gentoo <DOT> org> AuthorDate: Mon Nov 23 10:35:19 2015 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Mon Nov 23 10:46:39 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c5d388c
sci-misc/flashdot: Move use() call to local scope bump EAPI to 5 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=566554 Package-Manager: portage-2.2.25 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> sci-misc/flashdot/flashdot-1.1.4.ebuild | 25 ++++++++++++------------- sci-misc/flashdot/metadata.xml | 12 ++++++------ 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/sci-misc/flashdot/flashdot-1.1.4.ebuild b/sci-misc/flashdot/flashdot-1.1.4.ebuild index 13938ad..fe83fa9 100644 --- a/sci-misc/flashdot/flashdot-1.1.4.ebuild +++ b/sci-misc/flashdot/flashdot-1.1.4.ebuild @@ -1,34 +1,33 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=2 +EAPI=5 DESCRIPTION="Generator for psychophysical experiments" HOMEPAGE="http://www.flashdot.info/"; -SRC_URI="mirror://gentoo/${P}.tar.bz2 - https://dev.gentoo.org/~tomka/files/${P}.tar.bz2"; +SRC_URI=" + mirror://gentoo/${P}.tar.bz2 + https://dev.gentoo.org/~tomka/files/${P}.tar.bz2"; +SLOT="0" LICENSE="GPL-2" KEYWORDS="~amd64 ~x86" -SLOT="0" - IUSE="+ocamlopt" -DEPEND=">=dev-lang/ocaml-3.10[ocamlopt?] +DEPEND=" + >=dev-lang/ocaml-3.10[ocamlopt?] dev-ml/ocamlsdl dev-ml/ocamlgsl dev-ml/lablgl[glut] x11-apps/xdpyinfo" RDEPEND="${DEPEND}" -MAKEOPTS="-j1 VERSION=${PV}" -use ocamlopt || MAKEOPTS="${MAKEOPTS} TARGETS=flashdot_bytecode BYTECODENAME=flashdot" - -src_compile() { - emake ${MAKEOPTS} || die "emake failed" +src_prepare() { + MAKEOPTS+=" -j1 VERSION=${PV}" + use ocamlopt || MAKEOPTS+=" TARGETS=flashdot_bytecode BYTECODENAME=flashdot" } src_install() { - emake ${MAKEOPTS} DESTDIR="${D}" CALLMODE=script install || die "install failed" + emake DESTDIR="${D}" CALLMODE=script install } diff --git a/sci-misc/flashdot/metadata.xml b/sci-misc/flashdot/metadata.xml index 8f23be7..dfc0a9a 100644 --- a/sci-misc/flashdot/metadata.xml +++ b/sci-misc/flashdot/metadata.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> -<maintainer> -<email>[email protected]</email> -<name>Thomas Kahle</name> -</maintainer> -<herd>sci</herd> -<longdescription lang="en"> + <maintainer> + <email>[email protected]</email> + <name>Thomas Kahle</name> + </maintainer> + <herd>sci</herd> + <longdescription lang="en"> FlashDot is a program for generating and presenting visual perceptual experiments that require a high temporal precision. </longdescription>
