[gentoo-commits] proj/sci:master commit in: sci-mathematics/yorick/

["Justin Lecher" <jlec@gentoo.org>]

commit:     dbb31bc9cc3a078bc7158301305d39b03b54a89a
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  3 17:46:41 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Mar  3 17:46:41 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=dbb31bc9

sci-mathematics/yorick: Move to EAPI=5; add missing multilib.eclass

Package-Manager: portage-2.2.0_alpha164

---
 sci-mathematics/yorick/ChangeLog            |    6 ++++-
 sci-mathematics/yorick/metadata.xml         |   12 +++++-----
 sci-mathematics/yorick/yorick-2.1.06.ebuild |   29 +++++++++++++++-----------
 3 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/sci-mathematics/yorick/ChangeLog b/sci-mathematics/yorick/ChangeLog
index c71cd21..cadcebc 100644
--- a/sci-mathematics/yorick/ChangeLog
+++ b/sci-mathematics/yorick/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-mathematics/yorick
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Mar 2013; Justin Lecher <jlec@gentoo.org> yorick-2.1.06.ebuild,
+  metadata.xml:
+  Move to EAPI=5; add missing multilib.eclass
+
 *yorick-2.1.06 (22 Dec 2010)
 
   22 Dec 2010; Sébastien Fabbro <bicatali@gentoo.org> -yorick-2.1.05.ebuild,

diff --git a/sci-mathematics/yorick/metadata.xml b/sci-mathematics/yorick/metadata.xml
index 1e0e221..754d00e 100644
--- a/sci-mathematics/yorick/metadata.xml
+++ b/sci-mathematics/yorick/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
-<maintainer>
-<email>A.G.Grozin@inp.nsk.su</email>
-<name>Andrey Grozin</name>
-</maintainer>
-<longdescription lang="en">
+  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>A.G.Grozin@inp.nsk.su</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <longdescription lang="en">
 Yorick is a language for scientific computing and rapid prototyping, similar to
 matlab. It can easily call C functions and libraries, has multidimensional arrays
 and built-in plot functions.

diff --git a/sci-mathematics/yorick/yorick-2.1.06.ebuild b/sci-mathematics/yorick/yorick-2.1.06.ebuild
index 1e478d5..941b158 100644
--- a/sci-mathematics/yorick/yorick-2.1.06.ebuild
+++ b/sci-mathematics/yorick/yorick-2.1.06.ebuild
@@ -1,23 +1,27 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
-inherit elisp-common eutils versionator
+EAPI=5
+
+inherit elisp-common eutils multilib versionator
 
 DESCRIPTION="Language for scientific computing and rapid prototyping"
 HOMEPAGE="http://yorick.sourceforge.net/"
-IUSE="emacs"
+SRC_URI="mirror://sourceforge/yorick/${P}.tgz"
+
 SLOT="0"
 LICENSE="BSD"
 KEYWORDS="~amd64 ~x86"
-SRC_URI="mirror://sourceforge/yorick/${P}.tgz"
-DEPEND="x11-proto/xproto
+IUSE="emacs"
+
+RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXau
 	x11-libs/libXdmcp
 	emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
 
 S="${WORKDIR}/${PN}-$(get_version_component_range 1-2 )"
 
@@ -31,17 +35,18 @@ src_configure() {
 
 src_compile() {
 	# makefiles are not robust. (not interested in fixing)
-	make prefix=/usr ysite Y_HOME=/usr/$(get_libdir)/yorick
-	make config
-	emake -j1 || die "emake failed"
+	emake prefix=/usr ysite Y_HOME=/usr/$(get_libdir)/yorick
+	emake config || die
+	emake -j1
 }
 
 src_install() {
-	emake INSTALL_ROOT="${D}" \
+	emake \
+		INSTALL_ROOT="${D}" \
 		Y_BINDIR="${D}"/usr/bin \
 		Y_DOCDIR="${D}"/usr/share/doc/${PF} \
 		Y_INCDIR="${D}"/usr/include/${PN} \
-		install || die "emake install failed"
+		install
 
 	if use emacs; then
 		mv emacs/yorick-auto.el emacs/64yorick-gentoo.el