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

[Justin Lecher]

commit:     24e501d725b556c73f727cadeb14f933a6ef24db
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 14:02:42 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 14:02:42 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=24e501d7

sci-mathematics/gap: Fix SRC_URI

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-mathematics/gap/gap-4.4.12.ebuild | 17 ++++++++---------
 sci-mathematics/gap/metadata.xml      |  4 +++-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/sci-mathematics/gap/gap-4.4.12.ebuild b/sci-mathematics/gap/gap-4.4.12.ebuild
index 3409326..4d7eb00 100644
--- a/sci-mathematics/gap/gap-4.4.12.ebuild
+++ b/sci-mathematics/gap/gap-4.4.12.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=3
+EAPI=5
 
 inherit elisp-common versionator
 
@@ -16,8 +16,8 @@ PV2=${PV1}p${PV2}
 DESCRIPTION="System for computational discrete algebra"
 HOMEPAGE="http://www.gap-system.org/"
 SRC_URI="
-	ftp://ftp.gap-system.org/pub/gap/gap4/tar.bz2/${PN}${PV2}.tar.bz2
-	xtom? ( ftp://ftp.gap-system.org/pub/gap/gap4/tar.bz2/xtom${XTOM_VERSION}.tar.bz2 )"
+	ftp://ftp.gap-system.org/pub/gap/gap44/tar.bz2/${PN}${PV2}.tar.bz2
+	xtom? ( ftp://ftp.gap-system.org/pub/gap/gap44/tar.bz2/xtom${XTOM_VERSION}.tar.bz2 )"
 
 SLOT="0"
 IUSE="emacs vim-syntax xtom"
@@ -32,11 +32,11 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}"/${PN}${PV1}
 
 src_compile() {
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" compile || die "emake failed"
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" compile
 }
 
 src_test() {
-	emake teststandard || die "test failed"
+	emake teststandard
 }
 
 src_install() {
@@ -50,9 +50,8 @@ src_install() {
 		-e "s|@target@-@CC@|/usr/libexec/${PN}|" \
 		-e "s|@EXEEXT@||" \
 		-e 's|$GAP_DIR/bin/||' \
-		gap.shi > gap
-	exeinto /usr/bin
-	doexe gap
+		gap.shi > gap || doe
+	dobin gap
 
 	if use emacs ; then
 		elisp-site-file-install etc/emacs/gap-mode.el

diff --git a/sci-mathematics/gap/metadata.xml b/sci-mathematics/gap/metadata.xml
index 10dd89a..fa3b4e9 100644
--- a/sci-mathematics/gap/metadata.xml
+++ b/sci-mathematics/gap/metadata.xml
@@ -16,5 +16,7 @@
   representations, rings, vector spaces, algebras, combinatorial
   structures, and more.
 </longdescription>
-  <use><flag name="xtom">Automatically generated description for xtom</flag></use>
+  <use>
+    <flag name="xtom">Automatically generated description for xtom</flag>
+  </use>
 </pkgmetadata>