Version bump and removal of old versions

Package-Manager: portage-2.1.4.4

7 files changed, 204 insertions, 140 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/Manifest b/app-office/texmacs/Manifest
index 3d1be957165a..5f13480f5340 100644
--- a/app-office/texmacs/Manifest
+++ b/app-office/texmacs/Manifest
@@ -1,12 +1,21 @@
-AUX TeXmacs.desktop 267 RMD160 9c538fb430c4e496a9571e84d0c1622c16279045 SHA1 baca78d1d4965ee4075158953a4c3fed26e855eb SHA256 f6292ac99e7adc8efd006df2dc458b4f8bc075dd5c4be2b8fdeb30a63198ff08
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX TeXmacs.desktop 268 RMD160 92ca6c7c75a6e1edd671c2e5f766140382107ebb SHA1 f917105f37a16393ff8f6e1be111a9f00733de41 SHA256 9872d60c5080260a3dcc842cf1f74557954b0830b204ffc0e255f7ee52a13825
 AUX texmacs-1.0.6-gcc-4.1.patch 3178 RMD160 9d1751b8ad20c4f0d66d1f1ce07b94332b44ded5 SHA1 73566ca36669826f5378484b54e98bbcfd49cf2c SHA256 551e4b3cbff71b53e3f0d7cf10da20f284f779c7835a765cf7a859afebe95040
 AUX texmacs-1.0.6-maxima-5.9.3.patch 3124 RMD160 5f2e3a770f6c4262e4590cf19f76c6f68dc04f6a SHA1 3ee2b964d65d3210bc13d4ecfb00533779e05c5e SHA256 9bb18a81fb457894ff72c09ca0dc569859e373ae6beda2a7ee10f2924114bd68
-DIST TeXmacs-1.0.4-R3-src.tar.gz 2456451 RMD160 e2ab64cbba94a76de96aa11a4cc4cea4c5225198 SHA1 326892dce172c619865a060e83a0c8f9510c0533 SHA256 f31181440f217163ff1fbd356464274e0c5d6db3bc340f910d93f770aa641d2b
-DIST TeXmacs-1.0.5.6-src.tar.gz 2994800 RMD160 69a57882a34d206827538b09d7de4fc099062232 SHA1 932a0299b16a1056bfa1886035e79e4e0471d4ac SHA256 808ecfdaf35b7f13c20568bad3dea6bd5005cd1b14a96cddcc83e91dcd668354
+AUX texmacs-1.0.6.14.patch 4063 RMD160 133add3a5060c3eeddbe1e1275b8928d8d9a8fd8 SHA1 77a604dcc32070798d4108f35af1286b75a791c6 SHA256 450e9a2ce3bc51bc6e5787344aa65c6eee95f6410a752012851c2346b713ccc5
 DIST TeXmacs-1.0.6-src.tar.gz 3617687 RMD160 c7825cd81eee2f76864ae6559fecb2e8ac45ebd5 SHA1 8ff6d97880f529d85575b792df778cb856f00c21 SHA256 27734426db5f678a122eb765299e4050361bb59e15b5705b2e8eafef48d0bc16
+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.4-r1.ebuild 1542 RMD160 98e8117dc2ebae649df67c2aa443f8c99ba5931a SHA1 8c4dd65db8b8a74869408862405ef21b0299df8e SHA256 8d270368ab0ddca8581af509160a52c8d14bc60607cbab05ab88083c4733056b
-EBUILD texmacs-1.0.5.6.ebuild 1689 RMD160 8a315de50a696e888214f413dc9684a4c75bf08b SHA1 95759524e88223cc9695b5d335ebcab62ffc6df8 SHA256 da32967030714263e4ae3c821ed0daabe4abb57dd0805dfbd15d9a289b82e4f9
 EBUILD texmacs-1.0.6-r1.ebuild 1882 RMD160 780f8875ea59de7ba6f994d7d23d167198788e1a SHA1 e3c081b4c30e62eace1fb2f66a3737ab2723531b SHA256 5679d0cdf3bff221874fb82a74dae85a826766510618b579a4ce1f1998c264b5
-MISC ChangeLog 8864 RMD160 0417f644b601c98112dc19133ddf4746430ea658 SHA1 9a2de8867f087fb7352259bb91332215309f124c SHA256 032f95e2a36778f7385a7feab7efbc23592a34b63d3f37e085b261dc9ef8ba94
+EBUILD texmacs-1.0.6.14.ebuild 1747 RMD160 7f20e053d039ed2ed9b7b7d7368c52c8c93c124f SHA1 6929fd400aefcb5e086cb55520b55fcea3a5c157 SHA256 7941438c75f07d866e0ba6ac6f539a996325d70ea5555d899dd0cf9655f16bb8
+MISC ChangeLog 9272 RMD160 224c911c38978c4774c0baf26a40a5eb918166c2 SHA1 33fd2e2da32fc0d5f41b52fcfd500ee8e86368fc SHA256 b8c076a65582ae2b347472071b2e094e29130eae0c8b460fb62710914141d7db
 MISC metadata.xml 156 RMD160 2bf6b2ed9ff0fcef1e902cf093ccf4ae2dcc70a0 SHA1 e9260cd53905d8569cf3327ded4c6d01653fc389 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH5Q/rQUozDL2JlH4RAs/ZAJ0efnnhUb0PJf1Hu73ma4/LQ9vHhACcCKuR
+j3UXaHm3PqwM3vjPlSt4+s4=
+=W4m4
+-----END PGP SIGNATURE-----
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"
+}