From d43af362f3c0902a395177fd509922f815ba9301 Mon Sep 17 00:00:00 2001 From: Martin Ehmsen Date: Thu, 20 Apr 2006 18:55:12 +0000 Subject: patched to work with latest sci-mathematics/maxima, bug #130099. (Portage version: 2.1_pre7-r5) --- app-office/texmacs/ChangeLog | 10 ++- app-office/texmacs/Manifest | 21 +++--- app-office/texmacs/files/digest-texmacs-1.0.6 | 6 -- app-office/texmacs/files/digest-texmacs-1.0.6-r1 | 6 ++ .../texmacs/files/texmacs-1.0.6-maxima-5.9.3.patch | 72 +++++++++++++++++++ app-office/texmacs/texmacs-1.0.6-r1.ebuild | 80 ++++++++++++++++++++++ app-office/texmacs/texmacs-1.0.6.ebuild | 73 -------------------- 7 files changed, 179 insertions(+), 89 deletions(-) delete mode 100644 app-office/texmacs/files/digest-texmacs-1.0.6 create mode 100644 app-office/texmacs/files/digest-texmacs-1.0.6-r1 create mode 100644 app-office/texmacs/files/texmacs-1.0.6-maxima-5.9.3.patch create mode 100644 app-office/texmacs/texmacs-1.0.6-r1.ebuild delete mode 100644 app-office/texmacs/texmacs-1.0.6.ebuild (limited to 'app-office/texmacs') diff --git a/app-office/texmacs/ChangeLog b/app-office/texmacs/ChangeLog index cd56c358733f..33da01bd6ead 100644 --- a/app-office/texmacs/ChangeLog +++ b/app-office/texmacs/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-office/texmacs # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.41 2006/01/29 11:47:43 ehmsen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.42 2006/04/20 18:55:12 ehmsen Exp $ + +*texmacs-1.0.6-r1 (20 Apr 2006) + + 20 Apr 2006; Martin Ehmsen + +files/texmacs-1.0.6-maxima-5.9.3.patch, -texmacs-1.0.6.ebuild, + +texmacs-1.0.6-r1.ebuild: + Added patch to make texmacs work with the latest sci-mathematics/maxima + (5.9.3), bug #130099. 29 Jan 2006; Martin Ehmsen files/TeXmacs.desktop, -texmacs-1.0.5.2.ebuild, +texmacs-1.0.6.ebuild: diff --git a/app-office/texmacs/Manifest b/app-office/texmacs/Manifest index 4bc397885913..6c85d5398c77 100644 --- a/app-office/texmacs/Manifest +++ b/app-office/texmacs/Manifest @@ -1,6 +1,6 @@ -MD5 483bbeff70b7d668a7163aa87fe1cb36 ChangeLog 6739 -RMD160 e2d45f614a3ebf4542414a37eb106a00a327beb0 ChangeLog 6739 -SHA256 0bfb16c6f2a591008f2117b74105e851b32061565de325aeca565d74e8a2ce24 ChangeLog 6739 +MD5 fb0fa0df3196c9be1e496997dc884467 ChangeLog 7014 +RMD160 9289a8bc420543514a64212f1de6f42ef96cddfd ChangeLog 7014 +SHA256 614af3564eeb1799423e46a41d4721363659aa100a45c3032e25b20309977cad ChangeLog 7014 MD5 235442e11a960e89fe244ad6307eccf5 files/TeXmacs.desktop 267 RMD160 9c538fb430c4e496a9571e84d0c1622c16279045 files/TeXmacs.desktop 267 SHA256 f6292ac99e7adc8efd006df2dc458b4f8bc075dd5c4be2b8fdeb30a63198ff08 files/TeXmacs.desktop 267 @@ -10,9 +10,12 @@ SHA256 bae957e5491b221653634297ccbe6ef34ea8033a7fdd01675c66aca8b48d9486 files/di MD5 381e39eb44d0fad159f7759dc7d2c27d files/digest-texmacs-1.0.5.6 145 RMD160 68d43c98825b945867c866747e7e29fbd4da8fd0 files/digest-texmacs-1.0.5.6 145 SHA256 619cf195eddeb15fae50b18e23c7077e294f7d6d383bb4d6465f0dc9348a9ae5 files/digest-texmacs-1.0.5.6 145 -MD5 350e2714fc9a8f3eb31a48de617cd8e8 files/digest-texmacs-1.0.6 521 -RMD160 9cec39440ae8ff8b38cb377c6a2eae5438adc2e0 files/digest-texmacs-1.0.6 521 -SHA256 c238c221d642c684e5f2273747a5a57b36eae686d9f1bd3e4e860f49b5a2c300 files/digest-texmacs-1.0.6 521 +MD5 350e2714fc9a8f3eb31a48de617cd8e8 files/digest-texmacs-1.0.6-r1 521 +RMD160 9cec39440ae8ff8b38cb377c6a2eae5438adc2e0 files/digest-texmacs-1.0.6-r1 521 +SHA256 c238c221d642c684e5f2273747a5a57b36eae686d9f1bd3e4e860f49b5a2c300 files/digest-texmacs-1.0.6-r1 521 +MD5 9b7c2d85c61c9a916d877889fa4ff8bc files/texmacs-1.0.6-maxima-5.9.3.patch 3124 +RMD160 5f2e3a770f6c4262e4590cf19f76c6f68dc04f6a files/texmacs-1.0.6-maxima-5.9.3.patch 3124 +SHA256 9bb18a81fb457894ff72c09ca0dc569859e373ae6beda2a7ee10f2924114bd68 files/texmacs-1.0.6-maxima-5.9.3.patch 3124 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164 RMD160 698422e821458386b8da17baa6014296f8284e0b metadata.xml 164 SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f metadata.xml 164 @@ -22,6 +25,6 @@ SHA256 2781227a8dbd42950d8292c31b36c35b25abd4ab2cb32702eeba2e42dcc09056 texmacs- MD5 fe186cae22126a1e891cd20e335361f6 texmacs-1.0.5.6.ebuild 1763 RMD160 bfed83e7402ddee8c918b4ffabc3936bcfdaec9f texmacs-1.0.5.6.ebuild 1763 SHA256 30da391a90d027b4fdbea2fcf0b3d6a58dc12024ceda8715f0893159b8f3d0fa texmacs-1.0.5.6.ebuild 1763 -MD5 fe941ead395afebb972f94a99bf130a3 texmacs-1.0.6.ebuild 1759 -RMD160 4bcffbe2ca34d4e981fe8a2fc193b069074481aa texmacs-1.0.6.ebuild 1759 -SHA256 1d5e088472d53cf13a637a5c2872dd98cd2e81f73ec146975538435ffe089e3c texmacs-1.0.6.ebuild 1759 +MD5 ec73fb6311f18000a39f2779230732ba texmacs-1.0.6-r1.ebuild 1776 +RMD160 5f84faa206a0b0beaf973b89d9215c3875af5bf2 texmacs-1.0.6-r1.ebuild 1776 +SHA256 10f63e0b58efdea1575cde183a8e6720d986562d2b020eaab967da6b4c528005 texmacs-1.0.6-r1.ebuild 1776 diff --git a/app-office/texmacs/files/digest-texmacs-1.0.6 b/app-office/texmacs/files/digest-texmacs-1.0.6 deleted file mode 100644 index dbf983a3b8ab..000000000000 --- a/app-office/texmacs/files/digest-texmacs-1.0.6 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 7b0a3896fd17cf2e993aa77d15bb6240 TeXmacs-1.0.6-src.tar.gz 3617687 -RMD160 c7825cd81eee2f76864ae6559fecb2e8ac45ebd5 TeXmacs-1.0.6-src.tar.gz 3617687 -SHA256 27734426db5f678a122eb765299e4050361bb59e15b5705b2e8eafef48d0bc16 TeXmacs-1.0.6-src.tar.gz 3617687 -MD5 945dfd3f76b20082aeea8131d87a260f TeXmacs-600dpi-fonts.tar.gz 2899193 -RMD160 b5a27a59ed0c178f94836b828d12d3534b506582 TeXmacs-600dpi-fonts.tar.gz 2899193 -SHA256 e8eeb3c97a1405fd037b0567f683a6d2225d47c7829893b9768bd6c1c707cc81 TeXmacs-600dpi-fonts.tar.gz 2899193 diff --git a/app-office/texmacs/files/digest-texmacs-1.0.6-r1 b/app-office/texmacs/files/digest-texmacs-1.0.6-r1 new file mode 100644 index 000000000000..dbf983a3b8ab --- /dev/null +++ b/app-office/texmacs/files/digest-texmacs-1.0.6-r1 @@ -0,0 +1,6 @@ +MD5 7b0a3896fd17cf2e993aa77d15bb6240 TeXmacs-1.0.6-src.tar.gz 3617687 +RMD160 c7825cd81eee2f76864ae6559fecb2e8ac45ebd5 TeXmacs-1.0.6-src.tar.gz 3617687 +SHA256 27734426db5f678a122eb765299e4050361bb59e15b5705b2e8eafef48d0bc16 TeXmacs-1.0.6-src.tar.gz 3617687 +MD5 945dfd3f76b20082aeea8131d87a260f TeXmacs-600dpi-fonts.tar.gz 2899193 +RMD160 b5a27a59ed0c178f94836b828d12d3534b506582 TeXmacs-600dpi-fonts.tar.gz 2899193 +SHA256 e8eeb3c97a1405fd037b0567f683a6d2225d47c7829893b9768bd6c1c707cc81 TeXmacs-600dpi-fonts.tar.gz 2899193 diff --git a/app-office/texmacs/files/texmacs-1.0.6-maxima-5.9.3.patch b/app-office/texmacs/files/texmacs-1.0.6-maxima-5.9.3.patch new file mode 100644 index 000000000000..a652c00de457 --- /dev/null +++ b/app-office/texmacs/files/texmacs-1.0.6-maxima-5.9.3.patch @@ -0,0 +1,72 @@ +diff -urN TeXmacs-1.0.6-src.orig/plugins/maxima/bin/maxima_detect TeXmacs-1.0.6-src/plugins/maxima/bin/maxima_detect +--- TeXmacs-1.0.6-src.orig/plugins/maxima/bin/maxima_detect 2005-12-02 19:08:07.000000000 +0100 ++++ TeXmacs-1.0.6-src/plugins/maxima/bin/maxima_detect 2006-04-20 20:29:21.000000000 +0200 +@@ -46,9 +46,10 @@ + if [ "$1" ] + then + if $MAXIMA --list-avail | grep -F "version 5.9.1 +-version 5.9.2" >/dev/null ++version 5.9.2 ++version 5.9.3" >/dev/null + then +- # 5.9.1 or 5.9.2 ++ # 5.9.1 or 5.9.2 or 5.9.3 + maxima -d | grep -F 'maxima-htmldir=' | sed -e 's/maxima-htmldir=/"/' \ + -e 's|$|/maxima_toc.html"|' + else +diff -urN TeXmacs-1.0.6-src.orig/plugins/maxima/bin/tm_maxima TeXmacs-1.0.6-src/plugins/maxima/bin/tm_maxima +--- TeXmacs-1.0.6-src.orig/plugins/maxima/bin/tm_maxima 2005-12-02 19:08:07.000000000 +0100 ++++ TeXmacs-1.0.6-src/plugins/maxima/bin/tm_maxima 2006-04-20 20:29:21.000000000 +0200 +@@ -14,6 +14,6 @@ + 5.9.0) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.9.0.lisp" \ + | maxima_filter;; + 5.9.1) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.9.1.lisp";; +- 5.9.1.1* | 5.9.2*) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.9.2.lisp";; ++ 5.9.1.1* | 5.9.2* | 5.9.3) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.9.2.lisp";; + *) echo -e "\2latex:\\red Unsupported version of maxima: $1\5" + esac +diff -urN TeXmacs-1.0.6-src.orig/plugins/maxima/lisp/texmacs-maxima-5.9.2.lisp TeXmacs-1.0.6-src/plugins/maxima/lisp/texmacs-maxima-5.9.2.lisp +--- TeXmacs-1.0.6-src.orig/plugins/maxima/lisp/texmacs-maxima-5.9.2.lisp 2005-12-02 19:08:07.000000000 +0100 ++++ TeXmacs-1.0.6-src/plugins/maxima/lisp/texmacs-maxima-5.9.2.lisp 2006-04-20 20:29:36.000000000 +0200 +@@ -5,7 +5,7 @@ + (setf *alt-display2d* 'texmacs) + (setf *prompt-prefix* "channel:promptlatex:\\red ") + (setf *prompt-suffix* "\\black") +-(setf *general-display-prefix* "verbatim:") ++;(setf *general-display-prefix* "verbatim:") + (setf *maxima-prolog* "verbatim:") + (setf *maxima-epilog* "latex:\\red The end\\black") + #-gcl(setf *debug-io* (make-two-way-stream *standard-input* *standard-output*)) +@@ -19,32 +19,6 @@ + (format () "~A(~A~D) ~A" *prompt-prefix* + (tex-stripdollar $inchar) $linenum *prompt-suffix*)) + +-(defun retrieve (msg flag &aux (print? nil)) +- (declare (special msg flag print?)) +- (or (eq flag 'noprint) (setq print? t)) +- (cond ((not print?) +- (setq print? t) +- (princ *prompt-prefix*) +- (princ *prompt-suffix*)) +- ((null msg) +- (princ *prompt-prefix*) +- (princ *prompt-suffix*)) +- ((atom msg) +- (format t "~a~a~a" *prompt-prefix* msg *prompt-suffix*) +- (mterpri)) +- ((eq flag t) +- (princ *prompt-prefix*) +- (mapc #'princ (cdr msg)) +- (princ *prompt-suffix*) +- (mterpri)) +- (t +- (princ *prompt-prefix*) +- (displa msg) +- (princ *prompt-suffix*) +- (mterpri))) +- (let ((res (mread-noprompt *query-io* nil))) +- (princ *general-display-prefix*) res)) +- + (declare-top + (special lop rop ccol $gcprint $inchar) + (*expr tex-lbp tex-rbp)) diff --git a/app-office/texmacs/texmacs-1.0.6-r1.ebuild b/app-office/texmacs/texmacs-1.0.6-r1.ebuild new file mode 100644 index 000000000000..9553d5955091 --- /dev/null +++ b/app-office/texmacs/texmacs-1.0.6-r1.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.6-r1.ebuild,v 1.1 2006/04/20 18:55:12 ehmsen Exp $ + +# although flag-o-matic functions in portage, we should inherit it +inherit flag-o-matic eutils + +MY_P=${P/tex/TeX}-src +S=${WORKDIR}/${MY_P} + +DESCRIPTION="GNU TeXmacs is a free GUI scientific editor, inspired by TeX and GNU Emacs." +SRC_URI="ftp://ftp.texmacs.org/pub/TeXmacs/targz/${MY_P}.tar.gz + ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-600dpi-fonts.tar.gz" +HOMEPAGE="http://www.texmacs.org/" +LICENSE="GPL-2" + +SLOT="0" +IUSE="spell static" +# TeXmacs 1.0.X-r? -> stable release, TeXmacs 1.0.X.Y -> development release +KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" + +RDEPEND="virtual/tetex + >=dev-util/guile-1.4 + >=sys-apps/sed-4 + media-libs/freetype + sys-devel/libtool + || ( ( x11-libs/libX11 + x11-libs/libICE ) + virtual/x11 + ) + media-libs/imlib2 + spell? ( >=app-text/ispell-3.2 )" + +DEPEND="${RDEPEND} + || ( x11-proto/xproto + virtual/x11 ) + virtual/ghostscript" + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/${P}-maxima-5.9.3.patch" || die "patch failed" +} + +src_compile() { + + # we're not trusting texmacs optimisations here, so + # we only want the following two + strip-flags + append-flags -fno-default-inline + append-flags -fno-inline + + econf || die + # and now replace the detected optimisations with our safer ones + sed -i "s:\(^CXXOPTIMIZE = \).*:\1${CXXFLAGS}:" src/common.makefile + # emake b0rked + if use static ; then + emake -j1 STATIC_TEXMACS || die + else + emake -j1 || die + fi + +} + + +src_install() { + + make DESTDIR=${D} install || die + dodoc COMPILE + + insinto /usr/share/applications + doins ${FILESDIR}/TeXmacs.desktop + + # now install the fonts + cd ${WORKDIR} + dodir /usr/share/texmf + cp -r fonts ${D}/usr/share/texmf/ + +} diff --git a/app-office/texmacs/texmacs-1.0.6.ebuild b/app-office/texmacs/texmacs-1.0.6.ebuild deleted file mode 100644 index cbab609eba24..000000000000 --- a/app-office/texmacs/texmacs-1.0.6.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.6.ebuild,v 1.1 2006/01/29 11:47:43 ehmsen Exp $ - -# although flag-o-matic functions in portage, we should inherit it -inherit flag-o-matic - -MY_P=${P/tex/TeX}-src -S=${WORKDIR}/${MY_P} - -DESCRIPTION="GNU TeXmacs is a free GUI scientific editor, inspired by TeX and GNU Emacs." -SRC_URI="ftp://ftp.texmacs.org/pub/TeXmacs/targz/${MY_P}.tar.gz - ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-600dpi-fonts.tar.gz" -HOMEPAGE="http://www.texmacs.org/" -LICENSE="GPL-2" - -SLOT="0" -IUSE="spell static" -# TeXmacs 1.0.X-r? -> stable release, TeXmacs 1.0.X.Y -> development release -KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" - -RDEPEND="virtual/tetex - >=dev-util/guile-1.4 - >=sys-apps/sed-4 - media-libs/freetype - sys-devel/libtool - || ( ( x11-libs/libX11 - x11-libs/libICE ) - virtual/x11 - ) - media-libs/imlib2 - spell? ( >=app-text/ispell-3.2 )" - -DEPEND="${RDEPEND} - || ( x11-proto/xproto - virtual/x11 ) - virtual/ghostscript" - -src_compile() { - - # we're not trusting texmacs optimisations here, so - # we only want the following two - strip-flags - append-flags -fno-default-inline - append-flags -fno-inline - - econf || die - # and now replace the detected optimisations with our safer ones - sed -i "s:\(^CXXOPTIMIZE = \).*:\1${CXXFLAGS}:" src/common.makefile - # emake b0rked - if use static ; then - emake -j1 STATIC_TEXMACS || die - else - emake -j1 || die - fi - -} - - -src_install() { - - make DESTDIR=${D} install || die - dodoc COMPILE - - insinto /usr/share/applications - doins ${FILESDIR}/TeXmacs.desktop - - # now install the fonts - cd ${WORKDIR} - dodir /usr/share/texmf - cp -r fonts ${D}/usr/share/texmf/ - -} -- cgit v1.2.3-65-gdbad