Version bump

(Portage version: 2.2_rc8/cvs/Linux 2.6.25-tuxonice-r1 i686)

4 files changed, 45 insertions, 37 deletions

diff --git a/app-office/texmacs/ChangeLog b/app-office/texmacs/ChangeLog
index b085174723dd..046fa1cfd150 100644
--- a/app-office/texmacs/ChangeLog
+++ b/app-office/texmacs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/texmacs
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.63 2008/08/03 12:43:23 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.64 2008/08/19 05:43:37 grozin Exp $
+
+*texmacs-1.0.6.15 (19 Aug 2008)
+
+  19 Aug 2008; Andrey Grozin <grozin@gentoo.org>
+  -files/texmacs-1.0.6.14.patch, +files/texmacs-1.0.6.15.patch,
+  metadata.xml, -texmacs-1.0.6.14.ebuild, +texmacs-1.0.6.15.ebuild:
+  Version bump
 
   03 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/app-office/texmacs/files/texmacs-1.0.6.14.patch b/app-office/texmacs/files/texmacs-1.0.6.15.patch
index 50c1355f95a6..f5ba63325d91 100644
--- a/app-office/texmacs/files/texmacs-1.0.6.14.patch
+++ b/app-office/texmacs/files/texmacs-1.0.6.15.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
---- 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 @@
+diff -r -U2 TeXmacs-1.0.6.15-src.orig/plugins/maxima/bin/maxima_detect TeXmacs-1.0.6.15-src/plugins/maxima/bin/maxima_detect
+--- TeXmacs-1.0.6.15-src.orig/plugins/maxima/bin/maxima_detect	2008-08-16 23:30:29.000000000 +0700
++++ TeXmacs-1.0.6.15-src/plugins/maxima/bin/maxima_detect	2008-08-19 09:33:46.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
@@ -44,7 +40,7 @@ diff --recursive -U2 TeXmacs-1.0.6.14-src.orig/plugins/maxima/bin/maxima_detect
 -version 5.13
 -version 5.14" >/dev/null
 +        max_ver `maxima --list-avail | \
-+          grep '^version [a-z0-9\.]\+, lisp [a-z]\+$' |\
++          grep '^version [A-Za-z0-9\.]\+, lisp [A_Za-z0-9]\+$' |\
 +          sed -e 's/^version \([0-9]\+\)\.\([0-9]\+\)\.\([0-9]\+\).*$/\1 \2 \3/'`
 +
 +        GOOD=no
@@ -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
---- 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
+diff -r -U2 TeXmacs-1.0.6.15-src.orig/plugins/maxima/bin/tm_maxima TeXmacs-1.0.6.15-src/plugins/maxima/bin/tm_maxima
+--- TeXmacs-1.0.6.15-src.orig/plugins/maxima/bin/tm_maxima	2008-08-16 23:30:29.000000000 +0700
++++ TeXmacs-1.0.6.15-src/plugins/maxima/bin/tm_maxima	2008-08-19 09:29:44.000000000 +0700
 @@ -5,4 +5,5 @@
  
  case $1 in
diff --git a/app-office/texmacs/metadata.xml b/app-office/texmacs/metadata.xml
index e4e1220aed47..097ebee27427 100644
--- a/app-office/texmacs/metadata.xml
+++ b/app-office/texmacs/metadata.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<herd>sci</herd>
+<maintainer>
+        <email>grozin@gentoo.org</email>
+        <name>Andrey Grozin</name>
+</maintainer>
 <use>
   <flag name='netpbm'>Add support for <pkg>media-libs/netpbm</pkg></flag>
 </use>
diff --git a/app-office/texmacs/texmacs-1.0.6.14.ebuild b/app-office/texmacs/texmacs-1.0.6.15.ebuild
index c2650f722965..23c36a0d2cdb 100644
--- a/app-office/texmacs/texmacs-1.0.6.14.ebuild
+++ b/app-office/texmacs/texmacs-1.0.6.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.14.ebuild,v 1.5 2008/05/28 14:58:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.6.15.ebuild,v 1.1 2008/08/19 05:43:37 grozin Exp $
 inherit eutils
 MY_P=${P/tex/TeX}-src
 DESCRIPTION="Wysiwyg text processor with high-quality maths"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.texmacs.org/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="imlib jpeg svg netpbm spell"
-KEYWORDS="alpha amd64 ppc sparc x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="virtual/latex-base
 	virtual/ghostscript
@@ -42,7 +42,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}.patch
+	epatch "${FILESDIR}"/${PF}.patch
 }
 
 src_compile() {