diff options
Diffstat (limited to 'app-office')
-rw-r--r-- | app-office/texmacs/ChangeLog | 8 | ||||
-rw-r--r-- | app-office/texmacs/Manifest | 9 | ||||
-rw-r--r-- | app-office/texmacs/files/texmacs-1.0.6.14-r1.patch (renamed from app-office/texmacs/files/texmacs-1.0.6.14.patch) | 55 | ||||
-rw-r--r-- | app-office/texmacs/files/texmacs-maxima-5.14.0.patch | 24 | ||||
-rw-r--r-- | app-office/texmacs/texmacs-1.0.6.12-r1.ebuild | 63 | ||||
-rw-r--r-- | app-office/texmacs/texmacs-1.0.6.14-r1.ebuild (renamed from app-office/texmacs/texmacs-1.0.6.14.ebuild) | 2 |
6 files changed, 38 insertions, 123 deletions
diff --git a/app-office/texmacs/ChangeLog b/app-office/texmacs/ChangeLog index 2b2cd53fb..8c9708065 100644 --- a/app-office/texmacs/ChangeLog +++ b/app-office/texmacs/ChangeLog @@ -2,6 +2,14 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*texmacs-1.0.6.14-r1 (29 Apr 2008) +29 Apr 2008; Andrey Grozin <A.G.Grozin@inp.nsk.su> + +texmacs-1.0.6.14-r1.ebuild, +files/texmacs-1.0.6.14-r1.patch, + -texmacs-1.0.6.12-r1.ebuild, -texmacs-1.0.6.14.ebuild, + -texmacs-maxima-5.14.0.patch: + A new version of the patch to support maxima-5.15.0; + cleaning old versions + *texmacs-1.0.6.14 (21 Mar 2008) 21 Mar 2008; Andrey Grozin <A.G.Grozin@inp.nsk.su> +texmacs-1.0.6.14.ebuild, +files/texmacs-1.0.6.14.patch, diff --git a/app-office/texmacs/Manifest b/app-office/texmacs/Manifest index 07ea9c2c6..6a84aed1e 100644 --- a/app-office/texmacs/Manifest +++ b/app-office/texmacs/Manifest @@ -1,10 +1,7 @@ AUX TeXmacs.desktop 267 RMD160 9c538fb430c4e496a9571e84d0c1622c16279045 SHA1 baca78d1d4965ee4075158953a4c3fed26e855eb SHA256 f6292ac99e7adc8efd006df2dc458b4f8bc075dd5c4be2b8fdeb30a63198ff08 -AUX texmacs-1.0.6.14.patch 4063 RMD160 133add3a5060c3eeddbe1e1275b8928d8d9a8fd8 SHA1 77a604dcc32070798d4108f35af1286b75a791c6 SHA256 450e9a2ce3bc51bc6e5787344aa65c6eee95f6410a752012851c2346b713ccc5 -AUX texmacs-maxima-5.14.0.patch 1591 RMD160 586582af7b7868a001f5891a70b7d4457beac055 SHA1 6979af5888ee29078667ec1b94e2164056cea8b7 SHA256 cb978cee2451c8a5a5405705aa114b024a54e0c66cd129f84d39ebd3a95cb29a -DIST TeXmacs-1.0.6.12-src.tar.gz 4215464 RMD160 c1d53d8e20f0d701f1e2fb602753d7d85ae7fb53 SHA1 3fbddeb824703c61b5d4a193c4097f68305f9063 SHA256 7a90d5dd2a5d38753371dd37474034d361df019424f5c5b285b30c493adbe6a5 +AUX texmacs-1.0.6.14-r1.patch 4128 RMD160 90db536e4060e5f8d74516714516f7e239022672 SHA1 8f939b809a42a4b4b901a55ce42ff3332ac51a6d SHA256 66060f0ae84d135f7096b4da8278c09dc4b4e41810c78262b96ba410771ad7e0 DIST TeXmacs-1.0.6.14-src.tar.gz 4313953 RMD160 1558176e93527367907cc461fe6075d4c508e23a SHA1 bab1a969be883608f5ffbaef9994d6b86c43226e SHA256 6912e66665fc8f0be3510930a280f407ef29959765b5caa89cc93886df3eee1c DIST TeXmacs-600dpi-fonts.tar.gz 2899193 RMD160 b5a27a59ed0c178f94836b828d12d3534b506582 SHA1 0a3a279b842b63f55449856690483d07c6e1219c SHA256 e8eeb3c97a1405fd037b0567f683a6d2225d47c7829893b9768bd6c1c707cc81 -EBUILD texmacs-1.0.6.12-r1.ebuild 1639 RMD160 8a0491d6ae0195e04705814f435c237c8ef64422 SHA1 b7617eb66b6fd51b0209d7de3ca5b2327b6e6ce4 SHA256 88b4a29f99c1bc1bcd28f9ed6ee7d6af7c24392a34cb2eaddaadcba5d18e0ac3 -EBUILD texmacs-1.0.6.14.ebuild 1624 RMD160 ee81e39188dd25d606d41b8f1be7df985c011150 SHA1 6cee7a85474e15aa7fbcfe0141973ead7751e2ce SHA256 c0bbf59b8375f19c1939ae2b5eb40cc5da44b654c311bd3bf90d7d41f0be1e52 -MISC ChangeLog 9954 RMD160 12fa636ee73ccf73f72bbcdd3c3cb151cc44b885 SHA1 641a1e89d0cd4e6da14b59c104d3b78a5bd65b76 SHA256 37f319762e6216e4897837a566281084e42c211d2f09416ecad20b9e63a64c90 +EBUILD texmacs-1.0.6.14-r1.ebuild 1625 RMD160 5b4b81ca02addf6d642c882d9404ba2b8f64a057 SHA1 748d2a89e043ec83d2141eac4bf1d832617ad8fe SHA256 a20d107ba3ca9bbde2fbece5abec51d1ebb58d0fda7bcdeda8d7ddc0f93eadd5 +MISC ChangeLog 10274 RMD160 c3c4953343d79760fa266607ca4603f72605de9f SHA1 2b7fd223073b9b28c3fc5fdeeccc89f9e4453b7a SHA256 1b70eca30bb63b200d36a406928dc658484b987f3e42a861205dd7abec49651a MISC metadata.xml 447 RMD160 e29f6d98fb4ed38a56ef9415b5ce356f7660b8b5 SHA1 45c581010bad5fedc2ad5e2cb01722e51b618269 SHA256 65665d792841d785709329fb8d2770006cc9888a992b0ce64f5572f4b25520ab diff --git a/app-office/texmacs/files/texmacs-1.0.6.14.patch b/app-office/texmacs/files/texmacs-1.0.6.14-r1.patch index 50c1355f9..1372cda9e 100644 --- a/app-office/texmacs/files/texmacs-1.0.6.14.patch +++ b/app-office/texmacs/files/texmacs-1.0.6.14-r1.patch @@ -1,38 +1,34 @@ -diff --recursive -U2 TeXmacs-1.0.6.14-src.orig/plugins/maxima/bin/maxima_detect TeXmacs-1.0.6.14-src/plugins/maxima/bin/maxima_detect +diff -U2 --recursive TeXmacs-1.0.6.14-src.orig/plugins/maxima/bin/maxima_detect TeXmacs-1.0.6.14-src/plugins/maxima/bin/maxima_detect --- TeXmacs-1.0.6.14-src.orig/plugins/maxima/bin/maxima_detect 2008-03-19 23:16:36.000000000 +0600 -+++ TeXmacs-1.0.6.14-src/plugins/maxima/bin/maxima_detect 2008-03-22 10:12:13.000000000 +0600 -@@ -37,4 +37,30 @@ ++++ TeXmacs-1.0.6.14-src/plugins/maxima/bin/maxima_detect 2008-04-30 09:18:08.000000000 +0700 +@@ -37,4 +37,26 @@ } +# maximum version +V1=0; V2=0; V3=0 + +max_ver() { -+ if [ -z "$1" ]; then -+ return -+ fi -+ -+ if [ $1 -gt $V1 ] -+ then V1=$1; V2=$2; V3=$3 -+ elif [ $1 -eq $V1 ] -+ then -+ if [ $2 -gt $V2 ] -+ then V2=$2; V3=$3 -+ elif [ $2 -eq $V2 ] ++ while [ -n "$1" ]; do ++ if [ $1 -gt $V1 ] ++ then V1=$1; V2=$2; V3=$3 ++ elif [ $1 -eq $V1 ] + then -+ if [ $3 -gt $V3 ] -+ then V3=$3 ++ if [ $2 -gt $V2 ] ++ then V2=$2; V3=$3 ++ elif [ $2 -eq $V2 ] ++ then ++ if [ $3 -gt $V3 ] ++ then V3=$3 ++ fi + fi + fi -+ fi -+ -+ shift; shift; shift -+ max_ver $@ ++ shift; shift; shift ++ done +} + if [ $OSTYPE = "cygwin" ] ; then EXT='.bat'; else EXT=''; fi MAXIMA=`which maxima$EXT 2>/dev/null` -@@ -57,16 +83,28 @@ +@@ -57,16 +79,28 @@ if [ "$1" ] then - if $MAXIMA --list-avail | grep -F "version 5.9.1 @@ -65,27 +61,28 @@ diff --recursive -U2 TeXmacs-1.0.6.14-src.orig/plugins/maxima/bin/maxima_detect + if [ $GOOD = yes ] then - # 5.9.1 or 5.9.2 or 5.9.3 or 5.10 or 5.11 or 5.12 or 5.13 or 5.14 -+ # 5.9.1 or later - maxima -d | grep -F 'maxima-htmldir=' | sed -e \ +- maxima -d | grep -F 'maxima-htmldir=' | sed -e \ - 's/maxima-htmldir=/"/' -e 's|$|/maxima_toc.html"|' -+ 's/maxima-htmldir=/"/' -e 's|$|/maxima_toc.html"|' ++ # 5.9.1 or later ++ maxima -d | grep -F 'maxima-htmldir=' |\ ++ sed -e 's/maxima-htmldir=/"/' -e 's|$|/maxima_toc.html"|' else # 5.9.0 -@@ -74,6 +112,9 @@ +@@ -74,6 +108,9 @@ fi else - maxima --list-avail | sed -e '1d' -e 's/version /"/' \ - -e 's/, lisp / /' -e 's/$/"/' -e '2s/^/(/' -e '$s/$/)/' + echo '(' + maxima --list-avail |\ -+ grep '^version [a-z0-9\.]\+, lisp [a-z]\+$' |\ -+ sed -e 's/^version \([a-z0-9\.]\+\), lisp \([a-z]\+\)$/"\1 \2"/' ++ grep '^version [a-z0-9\.]\+, lisp [a-zA-Z0-9]\+$' |\ ++ sed -e 's/^version \([a-z0-9\.]\+\), lisp \([a-zA_Z0-9]\+\)$/"\1 \2"/' + echo ')' fi else -diff --recursive -U2 TeXmacs-1.0.6.14-src.orig/plugins/maxima/bin/tm_maxima TeXmacs-1.0.6.14-src/plugins/maxima/bin/tm_maxima +diff -U2 --recursive TeXmacs-1.0.6.14-src.orig/plugins/maxima/bin/tm_maxima TeXmacs-1.0.6.14-src/plugins/maxima/bin/tm_maxima --- TeXmacs-1.0.6.14-src.orig/plugins/maxima/bin/tm_maxima 2008-03-19 23:16:36.000000000 +0600 -+++ TeXmacs-1.0.6.14-src/plugins/maxima/bin/tm_maxima 2008-03-22 10:12:13.000000000 +0600 ++++ TeXmacs-1.0.6.14-src/plugins/maxima/bin/tm_maxima 2008-04-30 09:15:19.000000000 +0700 @@ -5,4 +5,5 @@ case $1 in diff --git a/app-office/texmacs/files/texmacs-maxima-5.14.0.patch b/app-office/texmacs/files/texmacs-maxima-5.14.0.patch deleted file mode 100644 index 0281cf9bf..000000000 --- a/app-office/texmacs/files/texmacs-maxima-5.14.0.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -U2 --recursive TeXmacs-1.0.6.12-src-orig/plugins/maxima/bin/maxima_detect TeXmacs-1.0.6.12-src/plugins/maxima/bin/maxima_detect ---- TeXmacs-1.0.6.12-src-orig/plugins/maxima/bin/maxima_detect 2007-11-05 15:21:32.000000000 +0600 -+++ TeXmacs-1.0.6.12-src/plugins/maxima/bin/maxima_detect 2008-01-09 04:43:10.000000000 +0600 -@@ -63,7 +63,8 @@ - version 5.11 - version 5.12 --version 5.13" >/dev/null -+version 5.13 -+version 5.14" >/dev/null - then -- # 5.9.1 or 5.9.2 or 5.9.3 or 5.10 or 5.11 or 5.12 or 5.13 -+ # 5.9.1 or 5.9.2 or 5.9.3 or 5.10 or 5.11 or 5.12 or 5.13 or 5.14 - maxima -d | grep -F 'maxima-htmldir=' | sed -e \ - 's/maxima-htmldir=/"/' -e 's|$|/maxima_toc.html"|' -diff -U2 --recursive TeXmacs-1.0.6.12-src-orig/plugins/maxima/bin/tm_maxima TeXmacs-1.0.6.12-src/plugins/maxima/bin/tm_maxima ---- TeXmacs-1.0.6.12-src-orig/plugins/maxima/bin/tm_maxima 2007-11-05 15:21:32.000000000 +0600 -+++ TeXmacs-1.0.6.12-src/plugins/maxima/bin/tm_maxima 2008-01-09 04:43:10.000000000 +0600 -@@ -18,5 +18,5 @@ - 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";; - 5.10.*) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.10.0.lisp";; -- 5.11.* | 5.12.* | 5.13.*) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.11.0.lisp";; -+ 5.11.* | 5.12.* | 5.13.* | 5.14.*) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.11.0.lisp";; - cygwin) - exec maxima.bat -p "`echo $TEXMACS_MAXIMA_PATH/texmacs-maxima-5.11.0.lisp|cygpath --windows -f -`";; diff --git a/app-office/texmacs/texmacs-1.0.6.12-r1.ebuild b/app-office/texmacs/texmacs-1.0.6.12-r1.ebuild deleted file mode 100644 index 087821715..000000000 --- a/app-office/texmacs/texmacs-1.0.6.12-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ -inherit eutils -MY_P=${P/tex/TeX}-src -DESCRIPTION="Wysiwyg text processor with high-quality maths" - -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="imlib jpeg svg netpbm spell" -KEYWORDS="~amd64 ~x86" - -RDEPEND="virtual/latex-base - virtual/ghostscript - >=dev-scheme/guile-1.4 - media-libs/freetype - x11-libs/libXext - imlib? ( media-libs/imlib2 ) - jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) ) - svg? ( || ( media-gfx/inkscape gnome-base/librsvg ) ) - netpbm? ( media-libs/netpbm ) - spell? ( || ( >=app-text/ispell-3.2 >=app-text/aspell-0.5 ) )" - -DEPEND="${RDEPEND} - x11-proto/xproto" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if has_version ">=dev-scheme/guile-1.8"; then - if ! built_with_use dev-scheme/guile deprecated; then - eerror "Please re-emerge dev-scheme/guile with the USE flag +deprecated" - die "Bad guile version" - fi - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-maxima-5.14.0.patch -} - -src_compile() { - econf $(use_with imlib imlib2 ) \ - --enable-optimize="${CXXFLAGS}" \ - || die "econf failed" - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc TODO || die "dodoc failed" - domenu "${FILESDIR}/TeXmacs.desktop" || die "domenu failed" - - # now install the fonts - insinto /usr/share/texmf - doins -r "${WORKDIR}/fonts" || die "installing fonts failed" -} diff --git a/app-office/texmacs/texmacs-1.0.6.14.ebuild b/app-office/texmacs/texmacs-1.0.6.14-r1.ebuild index 9ff2aa66f..55ae29cb8 100644 --- a/app-office/texmacs/texmacs-1.0.6.14.ebuild +++ b/app-office/texmacs/texmacs-1.0.6.14-r1.ebuild @@ -42,7 +42,7 @@ pkg_setup() { src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/${P}.patch + epatch "${FILESDIR}"/${PF}.patch } src_compile() { |