commit: 7e412f805a25a6838d6909eb1739c40f6bcf4636 Author: Justin Lecher <jlec <AT> gentoo <DOT> org> AuthorDate: Wed Nov 12 15:07:11 2014 +0000 Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org> CommitDate: Wed Nov 12 15:07:11 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7e412f80
sci-mathematics/axiom: Bump to EAPI=5 Package-Manager: portage-2.2.14 --- sci-mathematics/axiom/ChangeLog | 6 +++++- sci-mathematics/axiom/axiom-201009.ebuild | 31 +++++++++++++------------------ sci-mathematics/axiom/metadata.xml | 2 +- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/sci-mathematics/axiom/ChangeLog b/sci-mathematics/axiom/ChangeLog index a8d64e4..42d2b2f 100644 --- a/sci-mathematics/axiom/ChangeLog +++ b/sci-mathematics/axiom/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for sci-mathematics/axiom -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/ChangeLog,v 1.22 2008/08/30 13:17:33 markusle Exp $ + 12 Nov 2014; Justin Lecher <[email protected]> axiom-201009.ebuild, + metadata.xml: + Bump to EAPI=5 + 25 Jun 2011; Justin Lecher <[email protected]> axiom-201009.ebuild, metadata.xml: RDEPEND is not explicitly assigned -> fixed diff --git a/sci-mathematics/axiom/axiom-201009.ebuild b/sci-mathematics/axiom/axiom-201009.ebuild index 6246371..58323f1 100644 --- a/sci-mathematics/axiom/axiom-201009.ebuild +++ b/sci-mathematics/axiom/axiom-201009.ebuild @@ -2,6 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ +EAPI=5 + inherit eutils flag-o-matic multilib DESCRIPTION="Axiom is a general purpose Computer Algebra system" @@ -57,10 +59,7 @@ S="${WORKDIR}"/${PN} # fi # } -src_unpack() { - unpack ${A} - cd "${S}" - +src_prepare() { ## How weird, axiom ships these patches, but does not apply them. ## So, we keep our gentoo patches around. cp "${FILESDIR}"/noweb-2.9-insecure-tmp-file.patch.input \ @@ -69,16 +68,13 @@ src_unpack() { # cp "${FILESDIR}"/${PN}-200711-gcl-configure.patch \ # "${S}"/zips/gcl-2.6.7.configure.in.patch \ # || die "Failed to fix gcl-2.6.7 configure" - epatch "${FILESDIR}"/noweb-2.9-insecure-tmp-file.Makefile.patch \ - || die "Failed to patch noweb security issue!" -} + epatch "${FILESDIR}"/noweb-2.9-insecure-tmp-file.Makefile.patch -src_compile() { # lots of strict-aliasing badness append-flags -fno-strict-aliasing +} - econf || die "Failed to configure" - +src_compile() { ## I believe 2.6.8_pre4 can be used now. # use gcl 2.6.7 # sed -e "s:GCLVERSION=gcl-2.6.8pre$:GCLVERSION=gcl-2.6.7:" \ @@ -94,22 +90,21 @@ src_compile() { unset ABI # Let the fun begin... - AXIOM="${S}"/mnt/linux emake -j1 || die "emake failed" + AXIOM="${S}"/mnt/linux emake -j1 } src_install() { - emake DESTDIR="${D}"/opt/axiom COMMAND="${D}"/opt/axiom/mnt/linux/bin/axiom install \ - || die 'Failed to install Axiom!' + emake DESTDIR="${ED}"/opt/axiom COMMAND="${ED}"/opt/axiom/mnt/linux/bin/axiom install - mv "${D}"/opt/axiom/mnt/linux/* "${D}"/opt/axiom \ + mv "${ED}"/opt/axiom/mnt/linux/* "${ED}"/opt/axiom \ || die "Failed to mv axiom into its final destination path." - rm -fr "${D}"/opt/axiom/mnt \ + rm -fr "${ED}"/opt/axiom/mnt \ || die "Failed to remove old directory." - dodir /usr/bin - dosym /opt/axiom/bin/axiom /usr/bin/axiom + dosym ../../axiom/bin/axiom /usr/bin/axiom - sed -e "2d;3i AXIOM=/opt/axiom" \ + sed \ + -e "2d;3i AXIOM=/opt/axiom" \ -i "${D}"/opt/axiom/bin/axiom \ || die "Failed to patch axiom runscript!" diff --git a/sci-mathematics/axiom/metadata.xml b/sci-mathematics/axiom/metadata.xml index 2b0bd53..66aa9fe 100644 --- a/sci-mathematics/axiom/metadata.xml +++ b/sci-mathematics/axiom/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <herd>sci-mathematics</herd> + <herd>sci-mathematics</herd> </pkgmetadata>
