From 1356e4fc90e208e2588efd0a7acb639f390edffd Mon Sep 17 00:00:00 2001 From: Markus Dittrich Date: Mon, 31 Mar 2008 12:58:24 +0000 Subject: Version bump and removed old version. (Portage version: 2.1.4.4) --- sci-mathematics/axiom/ChangeLog | 12 ++- sci-mathematics/axiom/axiom-200803.ebuild | 72 +++++++++++++++++ sci-mathematics/axiom/axiom-3.9-r1.ebuild | 89 ---------------------- ...cl-2.6.7.fix-configure.in-gentoo.Makefile.patch | 25 ------ .../gcl-2.6.7.fix-configure.in-gentoo.patch.input | 40 ---------- ....7.fix-out-of-build-root-compile.Makefile.patch | 33 -------- ...2.6.7.fix-out-of-build-root-compile.patch.input | 24 ------ 7 files changed, 83 insertions(+), 212 deletions(-) create mode 100644 sci-mathematics/axiom/axiom-200803.ebuild delete mode 100644 sci-mathematics/axiom/axiom-3.9-r1.ebuild delete mode 100644 sci-mathematics/axiom/files/gcl-2.6.7.fix-configure.in-gentoo.Makefile.patch delete mode 100644 sci-mathematics/axiom/files/gcl-2.6.7.fix-configure.in-gentoo.patch.input delete mode 100644 sci-mathematics/axiom/files/gcl-2.6.7.fix-out-of-build-root-compile.Makefile.patch delete mode 100644 sci-mathematics/axiom/files/gcl-2.6.7.fix-out-of-build-root-compile.patch.input (limited to 'sci-mathematics/axiom') diff --git a/sci-mathematics/axiom/ChangeLog b/sci-mathematics/axiom/ChangeLog index a2dfe853205c..b15afcf28fbc 100644 --- a/sci-mathematics/axiom/ChangeLog +++ b/sci-mathematics/axiom/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for sci-mathematics/axiom # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/ChangeLog,v 1.16 2008/02/01 17:26:12 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/ChangeLog,v 1.17 2008/03/31 12:58:24 markusle Exp $ + +*axiom-200803 (30 Mar 2008) + + 30 Mar 2008; Markus Dittrich + -files/gcl-2.6.7.fix-configure.in-gentoo.Makefile.patch, + -files/gcl-2.6.7.fix-configure.in-gentoo.patch.input, + -files/gcl-2.6.7.fix-out-of-build-root-compile.Makefile.patch, + -files/gcl-2.6.7.fix-out-of-build-root-compile.patch.input, + -axiom-3.9-r1.ebuild, +axiom-200803.ebuild: + Version bump and removed old version. 01 Feb 2008; Markus Dittrich +files/axiom-200711-gcl-configure.patch, axiom-200711.ebuild: diff --git a/sci-mathematics/axiom/axiom-200803.ebuild b/sci-mathematics/axiom/axiom-200803.ebuild new file mode 100644 index 000000000000..b555f600e9ef --- /dev/null +++ b/sci-mathematics/axiom/axiom-200803.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/axiom-200803.ebuild,v 1.1 2008/03/31 12:58:24 markusle Exp $ + +inherit eutils multilib flag-o-matic + +DESCRIPTION="Axiom is a general purpose Computer Algebra system" +HOMEPAGE="http://axiom.axiom-developer.org/" +SRC_URI="http://www.axiom-developer.org/axiom-website/downloads/${PN}-mar2008-src.tgz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +# NOTE: Do not strip since this seems to remove some crucial +# runtime paths as well, thereby, breaking axiom +RESTRICT="strip" + +DEPEND="virtual/latex-base + x11-libs/libXaw" + +S="${WORKDIR}"/${PN} + +src_unpack() { + unpack ${A} + cd "${S}" + + cp "${FILESDIR}"/noweb-2.9-insecure-tmp-file.patch.input \ + "${S}"/zips/noweb-2.9-insecure-tmp-file.patch \ + || die "Failed to fix noweb" + 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!" +} + +src_compile() { + # lots of strict-aliasing badness + append-flags -fno-strict-aliasing + + ./configure || die "Failed to configure" + # use gcl 2.6.7 + sed -e "s:GCLVERSION=gcl-2.6.8pre$:GCLVERSION=gcl-2.6.7:" \ + -i Makefile.pamphlet Makefile \ + || die "Failed to select proper gcl" + + # fix libXpm.a location + sed -e "s:X11R6/lib:$(get_libdir):g" -i Makefile.pamphlet \ + || die "Failed to fix libXpm lib paths" + + # Let the fun begin... + AXIOM="${S}"/mnt/linux emake -j1 || die +} + +src_install() { + make DESTDIR="${D}"/opt/axiom COMMAND="${D}"/opt/axiom/mnt/linux/bin/axiom install \ + || die 'Failed to install Axiom!' + + mv "${D}"/opt/axiom/mnt/linux/* "${D}"/opt/axiom + rm -fr "${D}"/opt/axiom/mnt + + dodir /usr/bin + dosym /opt/axiom/bin/axiom /usr/bin/axiom + + sed -e "2d;3i AXIOM=/opt/axiom" \ + -i "${D}"/opt/axiom/bin/axiom \ + || die "Failed to patch axiom runscript!" + + dodoc changelog readme faq +} diff --git a/sci-mathematics/axiom/axiom-3.9-r1.ebuild b/sci-mathematics/axiom/axiom-3.9-r1.ebuild deleted file mode 100644 index 528d68fd3708..000000000000 --- a/sci-mathematics/axiom/axiom-3.9-r1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/axiom-3.9-r1.ebuild,v 1.6 2008/01/23 16:42:25 markusle Exp $ - -inherit eutils - -DESCRIPTION="Axiom is a general purpose Computer Algebra system" -HOMEPAGE="http://axiom.axiom-developer.org/" -SRC_URI="http://axiom.axiom-developer.org/axiom-website/DOWNLOADS/axiom-Sept2005-src.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="virtual/tetex - x11-libs/libXaw" - -S="${WORKDIR}/axiom" - -src_setenv() { - export AXIOM=`pwd`/mnt/linux - export PATH=${AXIOM}/bin:${PATH} -} - -src_compile() { - src_setenv - - # Patch the lsp Makefile since GCL goes kaboom with newer BFDs - # from Portage, so we need to use the BFD distributed with GCL for - # things to compile and work. - sed -i -e 's/--enable-statsysbfd/--enable-locbfd --disable-statsysbfd/' Makefile.pamphlet || die 'Failed to patch the lsp Makefile!' - - # Fix gcl so the "real" Axiom can compile code after we're out of the chroot - cp "${FILESDIR}"/gcl-2.6.7.fix-out-of-build-root-compile.patch.input "${S}"/zips/gcl-2.6.7.fix-out-of-build-root-compile.patch - cp "${FILESDIR}"/gcl-2.6.7.fix-configure.in-gentoo.patch.input "${S}"/zips/gcl-2.6.7.fix-configure.in-gentoo.patch - cp "${FILESDIR}"/noweb-2.9-insecure-tmp-file.patch.input "${S}"/zips/noweb-2.9-insecure-tmp-file.patch - epatch "${FILESDIR}"/gcl-2.6.7.fix-out-of-build-root-compile.Makefile.patch || die 'Failed to patch the lsp pamphlet!' - epatch "${FILESDIR}"/gcl-2.6.7.fix-configure.in-gentoo.Makefile.patch || die 'Failed to patch the lsp pamphlet!' - epatch "${FILESDIR}"/noweb-2.9-insecure-tmp-file.Makefile.patch || die 'Failed to patch noweb security issue!' - - # Sandbox happiness, fix noweb - cd "${WORKDIR}" - mkdir noweb - cd noweb - tar zxf "${S}"/zips/noweb-2.10a.tgz - sed -i -e 's/-texhash || echo "Program texhash not found or failed"//' src/Makefile* "${S}"/zips/noweb.src.Makefile* - tar czf "${S}"/zips/noweb-2.10a.tgz * - cd "${S}" - rm "${WORKDIR}"/noweb -rf - - # Fix compile bugs (if sed fails, it's fixed; so we don't || die :-]) - # (plasmaroo; 20050116) - sed -e 's/struct termio ptermio;/struct termios ptermio;/' -i src/clef/edible.c.pamphlet - mkdir src/graph/viewports - - # Fix include paths for libXpm - # (Bug #143738) - sed -i -e '/^XLIB=/s:/X11R6::g' Makefile.pamphlet || die "Failed to fix XLIB in Makefile.pamphlet" - - # Let the fun begin... - ./configure - make || die # -jX breaks -} - -src_install() { - src_setenv - - dodir /usr/bin - einstall INSTALL="${D}"/opt/axiom COMMAND="${D}"/usr/bin/axiom || die 'Failed to install Axiom!' - sed -e '2d;3i AXIOM=/opt/axiom' -i "${D}"/usr/bin/axiom "${D}"/opt/axiom/mnt/linux/bin/axiom || die 'Failed to patch axiom runscript!' - cat <<- EOF > "${D}"/usr/bin/AXIOMsys - #!/bin/sh - - AXIOM=/opt/axiom - export AXIOM - PATH=\${AXIOM}/bin:\${PATH} - export PATH - exec \$AXIOM/bin/AXIOMsys \$* - EOF - - # Get rid of /mnt/linux - cd "${D}"/opt/axiom - mv mnt/linux/* . - rm -rf mnt - - sed -e 's/AXIOMsys/sman/g' "${D}"/usr/bin/axiom > "${D}"/usr/bin/sman - chmod +x "${D}"/usr/bin/sman - chmod +x "${D}"/usr/bin/AXIOMsys -} diff --git a/sci-mathematics/axiom/files/gcl-2.6.7.fix-configure.in-gentoo.Makefile.patch b/sci-mathematics/axiom/files/gcl-2.6.7.fix-configure.in-gentoo.Makefile.patch deleted file mode 100644 index 8e525ed934a7..000000000000 --- a/sci-mathematics/axiom/files/gcl-2.6.7.fix-configure.in-gentoo.Makefile.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- lsp/Makefile.pamphlet~ 2006-01-13 18:16:07.000000000 +0000 -+++ lsp/Makefile.pamphlet 2006-01-13 18:15:33.000000000 +0000 -@@ -16,6 +16,14 @@ - - Patches are applied to the distribution before we do the configure. - \section{Gnu Common Lisp 2.6.7} -+\subsubsection{fix-configure.in-gentoo.patch} -+Fix a strange configure peculiarity; Gentoo bug #118633. Patch backported -+from the gcl fix by Matthew Kennedy. -+<>= -+ @(cd ${GCLVERSION} ; \ -+ echo 30 applying fix-configure.in-gentoo.patch ; \ -+ ${PATCH} <${SPD}/zips/${GCLVERSION}.fix-configure.in-gentoo.patch ) -+@ - \subsubsection{fix-out-of-build-root-compile.patch} - GCL's compiler system includes a -I flag in the gcc args; - which causes issues if does not exist at a later date and -@@ -1031,6 +1039,7 @@ - <> - <> - <> -+<> - <> - @echo 13 finished system build on `date` | tee >gcldir - diff --git a/sci-mathematics/axiom/files/gcl-2.6.7.fix-configure.in-gentoo.patch.input b/sci-mathematics/axiom/files/gcl-2.6.7.fix-configure.in-gentoo.patch.input deleted file mode 100644 index b4f21ad68802..000000000000 --- a/sci-mathematics/axiom/files/gcl-2.6.7.fix-configure.in-gentoo.patch.input +++ /dev/null @@ -1,40 +0,0 @@ ---- gcl-2.6.7/configure~ 2005-01-15 19:17:17.000000000 +0000 -+++ gcl-2.6.7/configure 2006-01-13 18:13:29.000000000 +0000 -@@ -1697,11 +1697,9 @@ - done - test -n "$MAKEINFO" || MAKEINFO=""false"" - -- -- --if test -f /usr/lib/NextStep/software_version; then -- system=NEXTSTEP-`${AWK} '/3/,/3/' /usr/lib/NextStep/software_version` --else -+# if test -f /usr/lib/NextStep/software_version; then -+# system=NEXTSTEP-`${AWK} '/3/,/3/' /usr/lib/NextStep/software_version` -+# else - system=`uname -s`-`uname -r` - if test "$?" -ne 0 ; then - echo "$ac_t""unknown (can't find uname command)" 1>&6 -@@ -1710,15 +1708,15 @@ - # Special check for weird MP-RAS system (uname returns weird - # results, and the version is kept in special file). - -- if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then -- system=MP-RAS-`${AWK} '{print $3}' /etc/.relid'` -- fi -- if test "`uname -s`" = "AIX" ; then -- system=AIX-`uname -v`.`uname -r` -- fi -+ # if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then -+ # system=MP-RAS-`${AWK} '{print $3}' /etc/.relid'` -+ # fi -+ # if test "`uname -s`" = "AIX" ; then -+ # system=AIX-`uname -v`.`uname -r` -+ # fi - echo "$ac_t""$system" 1>&6 - fi --fi -+# fi - - # sysconf - diff --git a/sci-mathematics/axiom/files/gcl-2.6.7.fix-out-of-build-root-compile.Makefile.patch b/sci-mathematics/axiom/files/gcl-2.6.7.fix-out-of-build-root-compile.Makefile.patch deleted file mode 100644 index bc4e3fa8b5ec..000000000000 --- a/sci-mathematics/axiom/files/gcl-2.6.7.fix-out-of-build-root-compile.Makefile.patch +++ /dev/null @@ -1,33 +0,0 @@ -Index: Makefile.pamphlet -=================================================================== -RCS file: /cvsroot/axiom/axiom/lsp/Makefile.pamphlet,v -retrieving revision 1.16 -diff -u -r1.16 Makefile.pamphlet ---- lsp/Makefile.pamphlet 5 Sep 2005 23:44:08 -0000 1.16 -+++ lsp/Makefile.pamphlet 4 Dec 2005 21:25:58 -0000 -@@ -15,6 +15,17 @@ - over the gcl Makefiles. - - Patches are applied to the distribution before we do the configure. -+\section{Gnu Common Lisp 2.6.7} -+\subsubsection{fix-out-of-build-root-compile.patch} -+GCL's compiler system includes a -I flag in the gcc args; -+which causes issues if does not exist at a later date and -+the Axiom user invokes a command that requires compilation - the gcc call -+will fail and this patch rectifies the issue. Dec 4 2005, Tim Yamin. -+<>= -+ @(cd ${GCLVERSION}/cmpnew ; \ -+ echo 29 applying fix-out-of-build-root-compile patch ; \ -+ ${PATCH} <${SPD}/zips/${GCLVERSION}.fix-out-of-build-root-compile.patch ) -+@ - \section{Gnu Common Lisp 2.6.7pre} - \subsection{run-process patch} - The gcl-2.6.6.h.linux.h.patch has been accepted into the mainline lisp -@@ -1019,6 +1030,7 @@ - <> - <> - <> -+<> - <> - @echo 13 finished system build on `date` | tee >gcldir - diff --git a/sci-mathematics/axiom/files/gcl-2.6.7.fix-out-of-build-root-compile.patch.input b/sci-mathematics/axiom/files/gcl-2.6.7.fix-out-of-build-root-compile.patch.input deleted file mode 100644 index 9b73a20026ab..000000000000 --- a/sci-mathematics/axiom/files/gcl-2.6.7.fix-out-of-build-root-compile.patch.input +++ /dev/null @@ -1,24 +0,0 @@ ---- gcl_cmpmain.lsp 2005-05-06 22:56:55.000000000 +0100 -+++ gcl_cmpmain.lsp.new 2005-12-04 20:56:31.000000000 +0000 -@@ -545,9 +545,8 @@ - (setq na (namestring - (make-pathname :name name :type (pathname-type(first args))))) - #+(or dos winnt) -- (format nil "~a -I~a ~a ~a -c -w ~s -o ~s" -+ (format nil "~a ~a ~a -c -w ~s -o ~s" - *cc* -- (concatenate 'string si::*system-directory* "../h") - (if (and (boundp '*c-debug*) *c-debug*) " -g " "") - (case *speed* - (3 *opt-three* ) -@@ -558,9 +557,8 @@ - ) - - #-(or dos winnt) -- (format nil "~a -I~a ~a ~a -c ~s -o ~s ~a" -+ (format nil "~a ~a ~a -c ~s -o ~s ~a" - *cc* -- (concatenate 'string si::*system-directory* "../h") - (if (and (boundp '*c-debug*) *c-debug*) " -g " "") - (case *speed* - (3 *opt-three* ) -- cgit v1.2.3-65-gdbad