Version bump and removal of old versions

(Portage version: 2.1.4.4)

6 files changed, 189 insertions, 134 deletions

diff --git a/app-office/texmacs/ChangeLog b/app-office/texmacs/ChangeLog
index b890411d53a7..62dc575cdd5f 100644
--- a/app-office/texmacs/ChangeLog
+++ b/app-office/texmacs/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-office/texmacs
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.57 2007/07/22 10:02:33 calchan Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.58 2008/03/22 13:55:42 graaff Exp $
+
+*texmacs-1.0.6.14 (22 Mar 2008)
+
+  22 Mar 2008; Hans de Graaff <graaff@gentoo.org>
+  +files/texmacs-1.0.6.14.patch, -texmacs-1.0.4-r1.ebuild,
+  -texmacs-1.0.5.6.ebuild, +texmacs-1.0.6.14.ebuild:
+  Copy ebuild and associated files written by Andrey Grozin
+  <A.G.Grozin@inp.nsk.su> from science overlay on behalf of the
+  treecleaners, bug #163907, since the previous version does not even compile
+  anymore.
 
   22 Jul 2007; Denis Dupeyron <calchan@gentoo.org> texmacs-1.0.4-r1.ebuild,
   texmacs-1.0.5.6.ebuild, texmacs-1.0.6-r1.ebuild:
diff --git a/app-office/texmacs/files/TeXmacs.desktop b/app-office/texmacs/files/TeXmacs.desktop
index f51ffe60412b..24344ee56e35 100644
--- a/app-office/texmacs/files/TeXmacs.desktop
+++ b/app-office/texmacs/files/TeXmacs.desktop
@@ -7,4 +7,4 @@ Icon=/usr/share/TeXmacs/misc/pixmaps/TeXmacs.xpm
 Name=TeXmacs
 GenericName=Scientific Word Processor
 Comment=A scientific word processing application.
-Categories=Application;Office;WordProcessor
+Categories=Application;Office;WordProcessor;
diff --git a/app-office/texmacs/files/texmacs-1.0.6.14.patch b/app-office/texmacs/files/texmacs-1.0.6.14.patch
new file mode 100644
index 000000000000..50c1355f95a6
--- /dev/null
+++ b/app-office/texmacs/files/texmacs-1.0.6.14.patch
@@ -0,0 +1,113 @@
+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 @@
+ }
+ 
++# 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 ]
++    then
++      if [ $3 -gt $V3 ]
++      then V3=$3
++      fi
++    fi
++  fi
++
++  shift; shift; shift
++  max_ver $@
++}
++
+ if [ $OSTYPE = "cygwin" ] ; then EXT='.bat'; else EXT=''; fi
+ MAXIMA=`which maxima$EXT 2>/dev/null`
+@@ -57,16 +83,28 @@
+       if [ "$1" ]
+       then
+-        if $MAXIMA --list-avail | grep -F "version 5.9.1
+-version 5.9.2
+-version 5.9.3
+-version 5.10
+-version 5.11
+-version 5.12
+-version 5.13
+-version 5.14" >/dev/null
++        max_ver `maxima --list-avail | \
++          grep '^version [a-z0-9\.]\+, lisp [a-z]\+$' |\
++          sed -e 's/^version \([0-9]\+\)\.\([0-9]\+\)\.\([0-9]\+\).*$/\1 \2 \3/'`
++
++        GOOD=no
++        if [ $V1 -gt 5 ]
++        then GOOD=yes
++        elif [ $V1 -eq 5 ]
++        then
++          if [ $V2 -gt 9 ]
++          then GOOD=yes
++          elif [ $V2 -eq 9 ]
++          then
++            if [ $V3 -gt 0 ]
++            then GOOD=yes
++            fi
++          fi
++        fi
++
++        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 \
+-          's/maxima-htmldir=/"/' -e 's|$|/maxima_toc.html"|'
++            's/maxima-htmldir=/"/' -e 's|$|/maxima_toc.html"|'
+         else
+           # 5.9.0
+@@ -74,6 +112,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"/'
++        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
+@@ -5,4 +5,5 @@
+ 
+ case $1 in
++  cygwin) exec maxima.bat -p "`echo $TEXMACS_MAXIMA_PATH/texmacs-maxima-5.11.0.lisp|cygpath --windows -f -`";;
+   5.6)
+     case $2 in
+@@ -11,14 +12,9 @@
+       clisp) exec maxima -i "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.6.lisp" \
+           | maxima_filter;;
+-      *) echo -e "\2latex:\\red Unsupported lisp for old maxima: $2\5"
+     esac;;
+-  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* | 5.9.3*) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.9.2.lisp";;
++  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.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.* | 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 -`";;
+-  *) echo -e "\2latex:\\red Unsupported version of maxima: $1\5"
++  *) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.11.0.lisp";;
+ esac
diff --git a/app-office/texmacs/texmacs-1.0.4-r1.ebuild b/app-office/texmacs/texmacs-1.0.4-r1.ebuild
deleted file mode 100644
index f29e63b355ea..000000000000
--- a/app-office/texmacs/texmacs-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.4-r1.ebuild,v 1.10 2007/07/22 10:02:33 calchan Exp $
-
-inherit flag-o-matic
-
-MY_P=${P/tex/TeX}-R3-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"
-# TeXmacs 1.0.X-r? -> stable release, TeXmacs 1.0.X.Y -> development release
-KEYWORDS="x86 ppc alpha sparc"
-
-RDEPEND="virtual/tetex
-	>=dev-scheme/guile-1.4
-	>=sys-apps/sed-4
-	media-libs/freetype
-	x11-libs/libX11
-	x11-libs/libICE
-	media-libs/imlib2
-	spell? ( >=app-text/ispell-3.2 )"
-
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	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
-	emake -j1 || die
-
-}
-
-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.5.6.ebuild b/app-office/texmacs/texmacs-1.0.5.6.ebuild
deleted file mode 100644
index e88360aa97b7..000000000000
--- a/app-office/texmacs/texmacs-1.0.5.6.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.5.6.ebuild,v 1.7 2007/07/22 10:02:33 calchan 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-scheme/guile-1.4
-	>=sys-apps/sed-4
-	media-libs/freetype
-	x11-libs/libX11
-	x11-libs/libICE
-	media-libs/imlib2
-	spell? ( >=app-text/ispell-3.2 )"
-
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	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/
-
-}
diff --git a/app-office/texmacs/texmacs-1.0.6.14.ebuild b/app-office/texmacs/texmacs-1.0.6.14.ebuild
new file mode 100644
index 000000000000..160e21878108
--- /dev/null
+++ b/app-office/texmacs/texmacs-1.0.6.14.ebuild
@@ -0,0 +1,63 @@
+# 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.1 2008/03/22 13:55:42 graaff Exp $
+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 ~alpha ~ppc ~sparc"
+
+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}"/${P}.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"
+}