commit: ccd96d132a618c8d16664d39ead557a3ec3365db Author: Thomas Kahle <thomas.kahle <AT> ovgu <DOT> de> AuthorDate: Tue Apr 29 06:17:06 2014 +0000 Commit: Thomas Kahle <tom111 <AT> gmx <DOT> de> CommitDate: Tue Apr 29 06:17:06 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ccd96d13
Fix live ebuild Package-Manager: portage-2.2.8-r1 --- sci-mathematics/Macaulay2/ChangeLog | 5 ++++- sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 23 ++++++++++++----------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog index b012ef2..59afbfd 100644 --- a/sci-mathematics/Macaulay2/ChangeLog +++ b/sci-mathematics/Macaulay2/ChangeLog @@ -1,7 +1,10 @@ # ChangeLog for sci-mathematics/Macaulay2 -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 29 Apr 2014; Thomas Kahle <to...@gentoo.org> Macaulay2-9999.ebuild: + Fix live ebuild + 04 Dec 2013; Justin Lecher <j...@gentoo.org> Macaulay2-9999.ebuild: Bump EAPI to 5; Bump to python-single-r1 eclass diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild index 7c39878..b3a6e7f 100644 --- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild +++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild @@ -17,16 +17,16 @@ HOMEPAGE="http://www.math.uiuc.edu/Macaulay2/"; SRC_URI=" ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/${LIBFAC}.tar.gz ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/factory-gftables.tar.gz - http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/trunk/${FACTORY}.tar.gz - http://www.math.uiuc.edu/Macaulay2/Extra/gtest-1.6.0.tar.gz - http://www.mathematik.uni-osnabrueck.de/normaliz/Normaliz2.8/Normaliz2.8.zip"; + ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/${FACTORY}.tar.gz + http://www.math.uiuc.edu/Macaulay2/Downloads/OtherSourceCode/trunk/gtest-1.7.0.tar.gz"; +# http://www.mathematik.uni-osnabrueck.de/normaliz/Normaliz2.8/Normaliz2.8.zip"; # Need normaliz for an up to date normaliz.m2 EGIT_REPO_URI="git://github.com/Macaulay2/M2.git" SLOT="0" LICENSE="GPL-2" KEYWORDS="" -IUSE="debug emacs optimization" +IUSE="debug emacs +optimization" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -68,12 +68,13 @@ S="${WORKDIR}/${PN}-${PV}/" RESTRICT="mirror" src_unpack (){ - unpack "Normaliz2.8.zip" + # unpack "Normaliz2.8.zip" git-r3_src_unpack # Undo one level of directory until git allows to checkout # subdirectories mv "${S}"/M2/* "${S}" || die - rmdir "${S}"/M2 || die + # Need to get rid of this now because install wants this location later + rm -r "${S}/M2" || die } pkg_setup () { @@ -85,9 +86,9 @@ pkg_setup () { src_prepare() { # Put updated Normaliz.m2 in place - cp "${WORKDIR}/Normaliz2.8/Macaulay2/Normaliz.m2" \ - "${S}/Macaulay2/packages" || die - dos2unix "${S}/Macaulay2/packages/Normaliz.m2" || die + # cp "${WORKDIR}/Normaliz2.8/Macaulay2/Normaliz.m2" \ + # "${S}/Macaulay2/packages" || die + # dos2unix "${S}/Macaulay2/packages/Normaliz.m2" || die # Patching .m2 files to look for external programs in # /usr/bin @@ -98,7 +99,6 @@ src_prepare() { # Factory, and libfac are statically linked libraries which (in this flavor) are not used by any # other program. We build them internally and don't install them - mkdir "${S}/BUILD/tarfiles" || die "Creation of directory failed" cp "${DISTDIR}/${FACTORY}.tar.gz" "${S}/BUILD/tarfiles/" \ || die "copy failed" cp "${DISTDIR}/factory-gftables.tar.gz" "${S}/BUILD/tarfiles/" \ @@ -108,7 +108,7 @@ src_prepare() { # Macaulay2 developers want that gtest is built internally because # the documentation says it may fail if build with options not the # same as the tested program. - cp "${DISTDIR}/gtest-1.6.0.tar.gz" "${S}/BUILD/tarfiles/" \ + cp "${DISTDIR}/gtest-1.7.0.tar.gz" "${S}/BUILD/tarfiles/" \ || die "copy failed" eautoreconf @@ -126,6 +126,7 @@ src_configure (){ --prefix="${D}/usr" \ --disable-encap \ --disable-strip \ + --with-issue=Gentoo \ $(use_enable optimization optimize) \ $(use_enable debug) \ --enable-build-libraries="factory libfac" \
