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

[Justin Lecher]

commit:     4b9addc4dd28084358bf882eb81e2a3dd9747d34
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  4 16:16:18 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Dec  4 16:16:18 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4b9addc4

sci-mathematics/kayali: Bump EAPI to 5; Bump to python-single-r1 eclass

Package-Manager: portage-2.2.7

---
 sci-mathematics/kayali/ChangeLog           |  6 ++++-
 sci-mathematics/kayali/kayali-0.3.2.ebuild | 43 +++++++++++++++++-------------
 sci-mathematics/kayali/metadata.xml        |  4 +--
 3 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/sci-mathematics/kayali/ChangeLog b/sci-mathematics/kayali/ChangeLog
index fea15a0..293899f 100644
--- a/sci-mathematics/kayali/ChangeLog
+++ b/sci-mathematics/kayali/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-mathematics/kayali
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Dec 2013; Justin Lecher <jlec@g.o> kayali-0.3.2.ebuild,
+  metadata.xml:
+  Bump EAPI to 5; Bump to python-single-r1 eclass
+
   14 Oct 2010; François Bissey <f.r.bissey@×××××××××.nz>
   kayali-0.3.2.ebuild:
   Remove non-working doins

diff --git a/sci-mathematics/kayali/kayali-0.3.2.ebuild b/sci-mathematics/kayali/kayali-0.3.2.ebuild
index 539b8da..4456253 100644
--- a/sci-mathematics/kayali/kayali-0.3.2.ebuild
+++ b/sci-mathematics/kayali/kayali-0.3.2.ebuild
@@ -1,28 +1,30 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
+EAPI=5
 
-PYTHON_DEPEND="2"
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit eutils python
+inherit eutils python-single-r1
 
 DESCRIPTION="Qt front-end for Computer Algebra System mainly maxima"
 HOMEPAGE="http://kayali.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
-DEPEND=""
-RDEPEND="sci-mathematics/maxima
-	>=dev-python/PyQt4-4.1
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	sci-mathematics/maxima
+	>=dev-python/PyQt4-4.1[${PYTHON_USEDEP}]
 	media-gfx/imagemagick
-	>=dev-python/reportlab-2.0
+	>=dev-python/reportlab-2.0[${PYTHON_USEDEP}]
 	>=sci-visualization/gnuplot-4.0"
 
 # is a GUI, testing done simply by launching application
@@ -32,7 +34,7 @@ RESTRICT="test"
 S=${WORKDIR}/${PN}
 
 pkg_setup() {
-	python_set_active_version 2
+	python-single-r1_pkg_setup
 }
 
 src_compile() {
@@ -40,19 +42,22 @@ src_compile() {
 }
 
 src_install() {
-	INSTALL_DIR="${EPREFIX}"/usr/share/${PN}
+	local INSTALL_DIR="${EPREFIX}"/usr/share/${PN}
+
 	cat >> "${T}"/kayali <<- EOF
 	#!${EPREFIX}/bin/sh
 	cd ${INSTALL_DIR}
-	exec $(PYTHON) -OOt kayali.py $@
+	exec ${EPYTHON} -OOt kayali.py $@
 	EOF
-	dobin "${T}"/kayali || die
+
+	dobin "${T}"/kayali
 	insinto ${INSTALL_DIR}
-	doins *.py *.txt *.in* maximab.bat maxima.g || die
-	doins -r engines icons pdf qt4gui *uic || die
+	doins *.py *.txt *.in* maximab.bat maxima.g
+	doins -r engines icons pdf qt4gui *uic
+
+	python_optimize ${INSTALL_DIR}
+
 	make_desktop_entry kayali kayali kayali.svg
-	if use doc; then
-		dohtml html/* || die
-	fi
-	dodoc README || die
+	use doc && dohtml html/*
+	dodoc README
 }

diff --git a/sci-mathematics/kayali/metadata.xml b/sci-mathematics/kayali/metadata.xml
index bad9916..82fef4f 100644
--- a/sci-mathematics/kayali/metadata.xml
+++ b/sci-mathematics/kayali/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
-<longdescription lang="en">
+  <herd>sci-mathematics</herd>
+  <longdescription lang="en">
 kayali is a Qt based Computer Algebra System (CAS) that can also be
 used as an advanced replacement for KDE KCalc. It is essentially a
 front end GUI forMaxima (and is easily extended to other CAS