From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Qf940-0002tb-8P for garchives@archives.gentoo.org; Fri, 08 Jul 2011 11:17:43 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7E57521C03C; Fri, 8 Jul 2011 11:17:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3FEBB21C03C for ; Fri, 8 Jul 2011 11:17:33 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A7FCF2AC0E5 for ; Fri, 8 Jul 2011 11:17:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 122EF8003D for ; Fri, 8 Jul 2011 11:17:32 +0000 (UTC) From: "Thomas Kahle" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Kahle" Message-ID: <9151dea2ac3c386ffe6a5c8244f22d649478c518.tom111@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-mathematics/Macaulay2/, sci-mathematics/Macaulay2/files/ X-VCS-Repository: proj/sci X-VCS-Files: sci-mathematics/Macaulay2/ChangeLog sci-mathematics/Macaulay2/Macaulay2-1.3.1-r4.ebuild sci-mathematics/Macaulay2/Macaulay2-9999.ebuild sci-mathematics/Macaulay2/files/1.4-paths-of-external-programs.patch sci-mathematics/Macaulay2/files/respect-CFLAGS.patch X-VCS-Directories: sci-mathematics/Macaulay2/ sci-mathematics/Macaulay2/files/ X-VCS-Committer: tom111 X-VCS-Committer-Name: Thomas Kahle X-VCS-Revision: 9151dea2ac3c386ffe6a5c8244f22d649478c518 Date: Fri, 8 Jul 2011 11:17:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 14e4a8441f4aa963d4ed5534a6a0d361 commit: 9151dea2ac3c386ffe6a5c8244f22d649478c518 Author: Thomas Kahle gentoo org> AuthorDate: Fri Jul 8 11:17:12 2011 +0000 Commit: Thomas Kahle gmx de> CommitDate: Fri Jul 8 11:17:12 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D9151dea2 Removed old version and fixed deps of live version (Portage version: 2.1.10.4/git/Linux i686, signed Manifest commit with ke= y 0x914769A1) --- sci-mathematics/Macaulay2/ChangeLog | 5 + .../Macaulay2/Macaulay2-1.3.1-r4.ebuild | 135 --------------= ------ sci-mathematics/Macaulay2/Macaulay2-9999.ebuild | 2 +- .../files/1.4-paths-of-external-programs.patch | 61 --------- .../Macaulay2/files/respect-CFLAGS.patch | 14 -- 5 files changed, 6 insertions(+), 211 deletions(-) diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaul= ay2/ChangeLog index 1b3395e..80813e5 100644 --- a/sci-mathematics/Macaulay2/ChangeLog +++ b/sci-mathematics/Macaulay2/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 + 08 Jul 2011; Thomas Kahle + -files/1.4-paths-of-external-programs.patch, -Macaulay2-1.3.1-r4.ebuil= d, + Macaulay2-9999.ebuild, -files/respect-CFLAGS.patch: + Removed old, fixed deps of live version + 07 Mar 2011; Justin Lecher Macaulay2-1.3.1-r4.ebuild= , Macaulay2-9999.ebuild: Correct Slots for gtk 3 introduction to tree diff --git a/sci-mathematics/Macaulay2/Macaulay2-1.3.1-r4.ebuild b/sci-ma= thematics/Macaulay2/Macaulay2-1.3.1-r4.ebuild deleted file mode 100644 index 6df19f4..0000000 --- a/sci-mathematics/Macaulay2/Macaulay2-1.3.1-r4.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3D"2" - -inherit autotools elisp-common eutils - -MY_REV=3D"r10737" - -DESCRIPTION=3D"Research tool for commutative algebra and algebraic geome= try" -HOMEPAGE=3D"http://www.math.uiuc.edu/Macaulay2/" -SRC_BASE=3D"http://www.math.uiuc.edu/${PN}/Downloads/" -SRC_URI=3D" - ${SRC_BASE}/SourceCode/Macaulay2-${PV}-${MY_REV}.bz2 -> ${P}.tar.bz2 - ${SRC_BASE}/OtherSourceCode/1.3/factory-3-1-0.tar.gz - ${SRC_BASE}/OtherSourceCode/1.3/libfac-3-1-0.tar.gz" - -SLOT=3D"0" -LICENSE=3D"GPL-2" -KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"emacs optimization" - -DEPEND=3D" - sys-libs/gdbm - >=3Ddev-libs/ntl-5.5.2 - >=3Ddev-libs/boehm-gc-7.1 - >=3Dsci-mathematics/pari-2.3.4[gmp] - >=3Dsys-libs/readline-6.0 - dev-libs/libxml2:2 - sci-mathematics/frobby - sci-mathematics/4ti2 - =3Ddev-libs/mpfr-2.4.1 - >=3Dsci-libs/mpir-1.3.1[cxx] - virtual/blas - virtual/lapack - dev-util/ctags - sys-libs/ncurses - sys-process/time - emacs? ( virtual/emacs )" -RDEPEND=3D"${DEPEND}" - -SITEFILE=3D70Macaulay2-gentoo.el - -S=3D"${WORKDIR}/${PN}-${PV}-${MY_REV}" - -RESTRICT=3D"mirror" - -pkg_setup () { - tc-export CC CPP CXX -} - -src_prepare() { - # Patching .m2 files to look for external programs in - # /usr/bin - epatch "${FILESDIR}"/paths-of-dependencies.patch - - if ! use optimization ; then - epatch "${FILESDIR}"/respect-CFLAGS.patch - fi - - # Fixing make warnings about unavailable jobserver: - sed -i "s/\$(MAKE)/+ \$(MAKE)/g" "${S}"/distributions/Makefile.in - - # Factory and libfac are statically linked libraries which (in this fla= vor) - # are not used by any other program. We build them internally and don't= install them - # Permission was granted to tomka by bicatali on IRC. - mkdir "${S}/BUILD/tarfiles" || die "Creation of directory failed" - cp "${DISTDIR}/factory-3-1-0.tar.gz" "${S}/BUILD/tarfiles/" \ - || die "copy failed" - cp "${DISTDIR}/libfac-3-1-0.tar.gz" "${S}/BUILD/tarfiles/" \ - || die "copy failed" - - eautoreconf -} - -src_configure (){ - - # Recommended in bug #268064 Possibly unecessary - # but should not hurt anybody. - if ! use emacs; then - tags=3D"ctags" - fi - - CPPFLAGS=3D"-I/usr/include/frobby" \ - ./configure --prefix=3D"${D}/usr" \ - --disable-encap \ - --disable-strip \ - --enable-build-libraries=3D"factory libfac" \ - --with-unbuilt-programs=3D"4ti2 gfan normaliz" \ - || die "failed to configure Macaulay" -} - -src_compile() { - # Parallel build not supported yet - emake -j1 || die "failed to build Macaulay" - - if use emacs; then - cd "${S}/Macaulay2/emacs" - elisp-compile *.el || die "elisp-compile failed" - fi -} - -src_test() { - emake check || die "tests failed" -} - -src_install () { - # Parallel install not supported yet - emake -j1 install || die "install failed" - - # Remove emacs files and install them in the - # correct place if use emacs - - rm -rf "${D}"/usr/share/emacs/site-lisp - if use emacs; then - cd "${S}/Macaulay2/emacs" - elisp-install ${PN} *.elc *.el || die "elisp-install failed" - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi -} - -pkg_postinst() { - if use emacs; then - elisp-site-regen - elog "If you want to set a hot key for Macaulay2 in Emacs add a line s= imilar to" - elog "(global-set-key [ f12 ] 'M2)" - elog "in order to set it to F12 (or choose a different one)." - fi -} -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild b/sci-mathem= atics/Macaulay2/Macaulay2-9999.ebuild index fd77a71..67c914a 100644 --- a/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild +++ b/sci-mathematics/Macaulay2/Macaulay2-9999.ebuild @@ -30,7 +30,7 @@ DEPEND=3D" sci-mathematics/frobby sci-mathematics/4ti2 sci-mathematics/nauty - >=3Dsci-mathematics/normaliz-2.5 + >=3Dsci-mathematics/normaliz-2.7 sci-mathematics/gfan >=3Ddev-libs/mpfr-3.0.0 >=3Dsci-libs/mpir-2.1.1[cxx] diff --git a/sci-mathematics/Macaulay2/files/1.4-paths-of-external-progra= ms.patch b/sci-mathematics/Macaulay2/files/1.4-paths-of-external-programs= .patch deleted file mode 100644 index 9b16e5a..0000000 --- a/sci-mathematics/Macaulay2/files/1.4-paths-of-external-programs.patc= h +++ /dev/null @@ -1,61 +0,0 @@ -diff -U 3 -dHrN M2source.orig/Macaulay2/packages/FourTiTwo.m2 M2source.p= atches/Macaulay2/packages/FourTiTwo.m2 ---- M2source.orig/Macaulay2/packages/FourTiTwo.m2 2010-09-19 02:32:45.00= 0000000 +0200 -+++ M2source.patches/Macaulay2/packages/FourTiTwo.m2 2010-09-19 02:37:25= .000000000 +0200 -@@ -47,7 +47,7 @@ -=20 - path'4ti2 =3D (options FourTiTwo).Configuration#"path" - -- NOTE: the absolute path should be put into the .init file for 4ti2 i= nside the .Macaulay2 directory. --if path'4ti2 =3D=3D "" then path'4ti2 =3D prefixDirectory | currentLayo= ut#"programs" -+if path'4ti2 =3D=3D "" then path'4ti2 =3D "/usr/bin/" -=20 - getFilename =3D () -> ( - filename :=3D temporaryFileName(); -diff -U 3 -dHrN M2source.orig/Macaulay2/packages/gfanInterface.m2 M2sour= ce.patches/Macaulay2/packages/gfanInterface.m2 ---- M2source.orig/Macaulay2/packages/gfanInterface.m2 2010-09-19 02:32:4= 5.000000000 +0200 -+++ M2source.patches/Macaulay2/packages/gfanInterface.m2 2010-09-19 02:3= 8:08.000000000 +0200 -@@ -26,7 +26,7 @@ - } -=20 - gfan'path =3D gfanInterface#Options#Configuration#"path" --if gfan'path =3D=3D "" then gfan'path =3D prefixDirectory | currentLayo= ut#"programs" -+if gfan'path =3D=3D "" then gfan'path =3D "/usr/bin/" - if instance(gfan'path, String) then gfan'path =3D {gfan'path} - if not instance(gfan'path,List) then error "expected configuration opti= on gfan'path to be a list of strings or a string" - gfan'path =3D join( -diff -U 3 -dHrN M2source.orig/Macaulay2/packages/Nauty.m2 M2source.patch= es/Macaulay2/packages/Nauty.m2 ---- M2source.orig/Macaulay2/packages/Nauty.m2 2010-09-19 02:33:04.000000= 000 +0200 -+++ M2source.patches/Macaulay2/packages/Nauty.m2 2010-09-19 02:40:46.000= 000000 +0200 -@@ -27,7 +27,8 @@ - -- Check the ~/.Macaulay2/init-Nauty.m2 file for the absolute path. - -- If it's not there, then use the M2-Programs directory. - nauty'path =3D (options Nauty).Configuration#"path"; --if nauty'path =3D=3D "" then nauty'path =3D prefixDirectory | currentLa= yout#"programs"; -+if nauty'path =3D=3D "" then nauty'path =3D "/usr/bin/"; -+ -=20 - ------------------- - -- Exports -diff -U 3 -dHrN M2source.orig/Macaulay2/packages/Normaliz.m2 M2source.pa= tches/Macaulay2/packages/Normaliz.m2 ---- M2source.orig/Macaulay2/packages/Normaliz.m2 2010-09-19 02:33:04.000= 000000 +0200 -+++ M2source.patches/Macaulay2/packages/Normaliz.m2 2010-09-19 02:39:12.= 000000000 +0200 -@@ -156,7 +156,7 @@ - nmzExec=3D"norm64"; - ); - -- return nmzExec; -- return prefixDirectory | currentLayout#"programs" | nmzExec; -+ return "/usr/bin/" | nmzExec; - ); -=20 -=20 -diff -U 3 -dHrN M2source.orig/Macaulay2/packages/StatePolytope.m2 M2sour= ce.patches/Macaulay2/packages/StatePolytope.m2 ---- M2source.orig/Macaulay2/packages/StatePolytope.m2 2010-09-19 02:32:4= 6.000000000 +0200 -+++ M2source.patches/Macaulay2/packages/StatePolytope.m2 2010-09-19 02:3= 8:39.000000000 +0200 -@@ -31,7 +31,7 @@ -=20 -=20 - gfanCommand =3D (options StatePolytope)#Configuration#"gfan command" --if gfanCommand =3D=3D=3D "gfan" then gfanCommand =3D prefixDirectory | = currentLayout#"programs" | gfanCommand -+if gfanCommand =3D=3D=3D "gfan" then gfanCommand =3D "/usr/bin/" | gfan= Command - gfanCommand =3D "!" | gfanCommand -=20 - --The next two functions print out the ring and the ideal in the format= required by gfan diff --git a/sci-mathematics/Macaulay2/files/respect-CFLAGS.patch b/sci-m= athematics/Macaulay2/files/respect-CFLAGS.patch deleted file mode 100644 index f774f60..0000000 --- a/sci-mathematics/Macaulay2/files/respect-CFLAGS.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- configure.ac.orig 2010-07-12 20:13:09.000000000 +0200 -+++ configure.ac 2010-07-12 20:13:20.000000000 +0200 -@@ -193,11 +193,6 @@ - else M2_CPPFLAGS=3D"$M2_CPPFLAGS -DNDEBUG" - fi -=20 --if test "$OPTIMIZE" =3D yes --then CFLAGS=3D"$CFLAGS -O3" -- CXXFLAGS=3D"$CFLAGS -O3" --fi -- - AC_PROG_CC() # set CFLAGS before this - AC_SUBST(GCC) # gets set to yes or no by AC_PROG_CC - AC_PROG_CXX() # set CXXFLAGS before this