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@gentoo.org>

diff --git a/sci-misc/flashdot/flashdot-1.1.4.ebuild b/sci-misc/flashdot/flashdot-1.1.4.ebuild
index 13938ad805d84db1d4c0d6aa53d4b74f26956c24..fe83fa9eefbcff67b8eb53788ef66aec090d8adb 100644 (file)
--- 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 8f23be731dae180ccf6a033c251c0a641b82a277..dfc0a9a765e14c2abc3f8834555193439b0e1064 100644 (file)
--- 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>tomka@gentoo.org</email>
-<name>Thomas Kahle</name>
-</maintainer>
-<herd>sci</herd>
-<longdescription lang="en">
+       <maintainer>
+               <email>tomka@gentoo.org</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>