From 24e501d725b556c73f727cadeb14f933a6ef24db Mon Sep 17 00:00:00 2001
From: Justin Lecher <jlec@gentoo.org>
Date: Mon, 21 Sep 2015 16:02:42 +0200
Subject: sci-mathematics/gap: Fix SRC_URI

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec@gentoo.org>
---
 sci-mathematics/gap/Manifest          |  2 --
 sci-mathematics/gap/gap-4.4.12.ebuild | 17 ++++++++---------
 sci-mathematics/gap/metadata.xml      |  4 +++-
 3 files changed, 11 insertions(+), 12 deletions(-)
 delete mode 100644 sci-mathematics/gap/Manifest

(limited to 'sci-mathematics')

diff --git a/sci-mathematics/gap/Manifest b/sci-mathematics/gap/Manifest
deleted file mode 100644
index 54b5bba2a..000000000
--- a/sci-mathematics/gap/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST gap4r4p12.tar.bz2 47715810 SHA256 5ff56c5eb89b1fd0da9f216dbe1dce8fe44674858b6ad06cb277d36b7960be4d
-DIST xtom1r1p4.tar.bz2 11480845 SHA256 5591dfa222d2fb6c4596c3e5c5347db339e08f209798e4a332a0d902035d4f66
diff --git a/sci-mathematics/gap/gap-4.4.12.ebuild b/sci-mathematics/gap/gap-4.4.12.ebuild
index 34093269a..4d7eb003c 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 10dd89a84..fa3b4e92a 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>
-- 
cgit v1.2.3-65-gdbad