texmacs-1.0.6.7: version bump

git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@424 32389bae-6d03-0410-99cf-db05cde120eb

9 files changed, 34 insertions, 300 deletions

diff --git a/app-office/texmacs/ChangeLog b/app-office/texmacs/ChangeLog
index 34d36d113..de237fe10 100644
--- a/app-office/texmacs/ChangeLog
+++ b/app-office/texmacs/ChangeLog
@@ -2,6 +2,20 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*texmacs-1.0.6.7 (26 Dec 2006)
+
+  26 Dec 2006; Andrey Grozin <A.G.Grozin@inp.nsk.su>
+  +texmacs-1.0.6.6.ebuild -texmacs-1.0.6.2.ebuild -texmacs-1.0.6.3.ebuild
+  -texmacs-1.0.6.4.ebuild -texmacs-1.0.6.5.ebuild:
+  Version bump; USE flag aspell removed (now TeXmacs uses
+  either ispell or aspell automatically); cleaning up old versions
+
+*texmacs-1.0.6.6 (22 August 2006)
+
+  22 August 2006; Andrey Grozin <A.G.Grozin@inp.nsk.su>
+  +texmacs-1.0.6.6.ebuild:
+  Version bump
+
 *texmacs-1.0.6.5 (8 August 2006)
 
   8 August 2006; Andrey Grozin <A.G.Grozin@inp.nsk.su>
diff --git a/app-office/texmacs/Manifest b/app-office/texmacs/Manifest
index be5e1b938..795a5e370 100644
--- a/app-office/texmacs/Manifest
+++ b/app-office/texmacs/Manifest
@@ -2,52 +2,28 @@ AUX TeXmacs.desktop 267 RMD160 9c538fb430c4e496a9571e84d0c1622c16279045 SHA1 bac
 MD5 235442e11a960e89fe244ad6307eccf5 files/TeXmacs.desktop 267
 RMD160 9c538fb430c4e496a9571e84d0c1622c16279045 files/TeXmacs.desktop 267
 SHA256 f6292ac99e7adc8efd006df2dc458b4f8bc075dd5c4be2b8fdeb30a63198ff08 files/TeXmacs.desktop 267
-DIST TeXmacs-1.0.6.2-src.tar.gz 3739356 RMD160 8acc43e1af94f62c29c72e511faa56a45b3f446e SHA1 cf6c6e05aac16543425070fdba77e061f90b8eaa SHA256 2a54952afa9393e227b7812ecee5d4ebb3017da4f9f7712217301a47ea0dd100
-DIST TeXmacs-1.0.6.3-src.tar.gz 3772545 RMD160 9015ae8ee09fe8be0c04d3b9fb03163d01978d5e SHA1 099653f0814ee60a2921507acc6f6e73f0752615 SHA256 f6f04ae977a30e926a842db632ac6f7e95b4b538863d3dccbf37078a88513a28
-DIST TeXmacs-1.0.6.4-src.tar.gz 3780474 RMD160 d890e0d0debe9ced76ec800e129ea8a13a57162d SHA1 49f28124d1eb153ded0aa058d194ef0cc31c00ba SHA256 a72be5fdc51a8f620250fe52e850f5b6cb56c4fd9074f7e6dc37c0f788af43ed
-DIST TeXmacs-1.0.6.5-src.tar.gz 3782401 RMD160 4d83e98072cee30e06119d401cc01c942c4cb5b9 SHA1 7f8d8e7f67ef7cffddc53cd39419ea04422fe3c6 SHA256 f728fe30bcac51d2fb4bda225a60ea63a81dbbbc588d0c223f01809458c75f5c
 DIST TeXmacs-1.0.6.6-src.tar.gz 3789730 RMD160 587d671fb0732a3cd80e0452a039518c2a4a7b4e SHA1 07df6d2a624c43a1b39d770c7ac3c390311876e9 SHA256 253f1d1dba7f4b5405d7d55253c35942ce8cc38dcd9e8f10e4ac5cb65cd8928d
+DIST TeXmacs-1.0.6.7-src.tar.gz 3801955 RMD160 0dd5d1a71dcdaa7404e9cddc29c2e34e3685e9d0 SHA1 5dc396cb1cee2c1c189deddaba44547cb0931b5b SHA256 6df5520a8a16a00d7dc8973a87a5eade7841b6337ae8e43c70ec3e8ca17fd206
 DIST TeXmacs-600dpi-fonts.tar.gz 2899193 RMD160 b5a27a59ed0c178f94836b828d12d3534b506582 SHA1 0a3a279b842b63f55449856690483d07c6e1219c SHA256 e8eeb3c97a1405fd037b0567f683a6d2225d47c7829893b9768bd6c1c707cc81
-EBUILD texmacs-1.0.6.2.ebuild 1792 RMD160 6cd8067ca6b46cb176a30d9e327aeb51fdadb357 SHA1 f1f4ef12368ac54fd3411e26649e728086239bb1 SHA256 47801e0394c00f2cf57c53d2405ee4aa5c0d10f6554d321f260089f22f0d1e94
-MD5 98cf9c17a447054d5cb92c8ff162a01c texmacs-1.0.6.2.ebuild 1792
-RMD160 6cd8067ca6b46cb176a30d9e327aeb51fdadb357 texmacs-1.0.6.2.ebuild 1792
-SHA256 47801e0394c00f2cf57c53d2405ee4aa5c0d10f6554d321f260089f22f0d1e94 texmacs-1.0.6.2.ebuild 1792
-EBUILD texmacs-1.0.6.3.ebuild 1792 RMD160 6cd8067ca6b46cb176a30d9e327aeb51fdadb357 SHA1 f1f4ef12368ac54fd3411e26649e728086239bb1 SHA256 47801e0394c00f2cf57c53d2405ee4aa5c0d10f6554d321f260089f22f0d1e94
-MD5 98cf9c17a447054d5cb92c8ff162a01c texmacs-1.0.6.3.ebuild 1792
-RMD160 6cd8067ca6b46cb176a30d9e327aeb51fdadb357 texmacs-1.0.6.3.ebuild 1792
-SHA256 47801e0394c00f2cf57c53d2405ee4aa5c0d10f6554d321f260089f22f0d1e94 texmacs-1.0.6.3.ebuild 1792
-EBUILD texmacs-1.0.6.4.ebuild 1792 RMD160 6cd8067ca6b46cb176a30d9e327aeb51fdadb357 SHA1 f1f4ef12368ac54fd3411e26649e728086239bb1 SHA256 47801e0394c00f2cf57c53d2405ee4aa5c0d10f6554d321f260089f22f0d1e94
-MD5 98cf9c17a447054d5cb92c8ff162a01c texmacs-1.0.6.4.ebuild 1792
-RMD160 6cd8067ca6b46cb176a30d9e327aeb51fdadb357 texmacs-1.0.6.4.ebuild 1792
-SHA256 47801e0394c00f2cf57c53d2405ee4aa5c0d10f6554d321f260089f22f0d1e94 texmacs-1.0.6.4.ebuild 1792
-EBUILD texmacs-1.0.6.5.ebuild 1792 RMD160 6cd8067ca6b46cb176a30d9e327aeb51fdadb357 SHA1 f1f4ef12368ac54fd3411e26649e728086239bb1 SHA256 47801e0394c00f2cf57c53d2405ee4aa5c0d10f6554d321f260089f22f0d1e94
-MD5 98cf9c17a447054d5cb92c8ff162a01c texmacs-1.0.6.5.ebuild 1792
-RMD160 6cd8067ca6b46cb176a30d9e327aeb51fdadb357 texmacs-1.0.6.5.ebuild 1792
-SHA256 47801e0394c00f2cf57c53d2405ee4aa5c0d10f6554d321f260089f22f0d1e94 texmacs-1.0.6.5.ebuild 1792
 EBUILD texmacs-1.0.6.6.ebuild 1792 RMD160 6cd8067ca6b46cb176a30d9e327aeb51fdadb357 SHA1 f1f4ef12368ac54fd3411e26649e728086239bb1 SHA256 47801e0394c00f2cf57c53d2405ee4aa5c0d10f6554d321f260089f22f0d1e94
 MD5 98cf9c17a447054d5cb92c8ff162a01c texmacs-1.0.6.6.ebuild 1792
 RMD160 6cd8067ca6b46cb176a30d9e327aeb51fdadb357 texmacs-1.0.6.6.ebuild 1792
 SHA256 47801e0394c00f2cf57c53d2405ee4aa5c0d10f6554d321f260089f22f0d1e94 texmacs-1.0.6.6.ebuild 1792
-MISC ChangeLog 7828 RMD160 235b334af6c9d2c3494872a71d7e95ce4a3c11cb SHA1 515f3f2006afa74308f7c37a4a8b240c91cf47bf SHA256 675ee4a2cacc07c530f9d5a3f4accb35473b5fd3b2e740f13d3bd54e07450c60
-MD5 dd48c4ff6dc130e926b615015f5452e1 ChangeLog 7828
-RMD160 235b334af6c9d2c3494872a71d7e95ce4a3c11cb ChangeLog 7828
-SHA256 675ee4a2cacc07c530f9d5a3f4accb35473b5fd3b2e740f13d3bd54e07450c60 ChangeLog 7828
+EBUILD texmacs-1.0.6.7.ebuild 1649 RMD160 51b160dfc510f2ce7565120304f6984fde517ad6 SHA1 d80b1ee97b2aeff98432a68e3f1a7bd851224e71 SHA256 ee45a50262372f3bb32bd0bf4440c326fd0b5f509840640e18cce35a44bcfe1d
+MD5 28b0570f912e6ecfcb19a310a24fad73 texmacs-1.0.6.7.ebuild 1649
+RMD160 51b160dfc510f2ce7565120304f6984fde517ad6 texmacs-1.0.6.7.ebuild 1649
+SHA256 ee45a50262372f3bb32bd0bf4440c326fd0b5f509840640e18cce35a44bcfe1d texmacs-1.0.6.7.ebuild 1649
+MISC ChangeLog 8298 RMD160 7d90bccca2b74de0e3b6c89c04fdd5559b289508 SHA1 a0864244c7fb83b4dd77db39abfac35f0254a264 SHA256 552344319e1e7b0d6ae6ab829b26bc87abde65e7de12e6a935c915b836923984
+MD5 0759232a432e3c937ed5ed012eeabbfc ChangeLog 8298
+RMD160 7d90bccca2b74de0e3b6c89c04fdd5559b289508 ChangeLog 8298
+SHA256 552344319e1e7b0d6ae6ab829b26bc87abde65e7de12e6a935c915b836923984 ChangeLog 8298
 MISC metadata.xml 447 RMD160 e29f6d98fb4ed38a56ef9415b5ce356f7660b8b5 SHA1 45c581010bad5fedc2ad5e2cb01722e51b618269 SHA256 65665d792841d785709329fb8d2770006cc9888a992b0ce64f5572f4b25520ab
 MD5 97b4c157ab6219cb08b82945f14b5aa3 metadata.xml 447
 RMD160 e29f6d98fb4ed38a56ef9415b5ce356f7660b8b5 metadata.xml 447
 SHA256 65665d792841d785709329fb8d2770006cc9888a992b0ce64f5572f4b25520ab metadata.xml 447
-MD5 1629de15d031fe94b2be954abc096f0d files/digest-texmacs-1.0.6.2 527
-RMD160 06c39283415ba435a9d913b6044aad5a07fadfcd files/digest-texmacs-1.0.6.2 527
-SHA256 2f177696612e0118fc04e9f4417792cfdfff075a3af09da9e78e9691020972fe files/digest-texmacs-1.0.6.2 527
-MD5 66ea7fe6d6733f149ae6ff3a6c99d27a files/digest-texmacs-1.0.6.3 527
-RMD160 5104bd11642b0a62303bca7e815f1581157f1486 files/digest-texmacs-1.0.6.3 527
-SHA256 1731205c2a08fe04888082fab956b53fcb3deec04f328769b7f6b5d1ae304d5b files/digest-texmacs-1.0.6.3 527
-MD5 0f9f6816359c7380df733789fb58d926 files/digest-texmacs-1.0.6.4 527
-RMD160 514b0c266833b85b6fc196f70c23d6c87b83e332 files/digest-texmacs-1.0.6.4 527
-SHA256 ce47617a724e3748cd1275738e1aafd4665008d3ffa00206544f8579f2740285 files/digest-texmacs-1.0.6.4 527
-MD5 142dfbad0854f44ed1fd509f55f34099 files/digest-texmacs-1.0.6.5 455
-RMD160 dbbacbbc10cd12ee1babe7fea8ed7f8bd20cc045 files/digest-texmacs-1.0.6.5 455
-SHA256 8b39934d861ae3bce0fbc4a29070a650c3632198a7481a58ac607709d41fccc0 files/digest-texmacs-1.0.6.5 455
-MD5 3464bd4ec236d512addd68dce0e746bd files/digest-texmacs-1.0.6.6 455
-RMD160 b66e99b7ee3d2b4c07e5ec46b003e77b0fd066e1 files/digest-texmacs-1.0.6.6 455
-SHA256 8f25756ee7a77494c730e33c9117820c5ca94f5e4a58a81b9f9764baa3dbef34 files/digest-texmacs-1.0.6.6 455
+MD5 19e9dd0072325da5d9a4b427e27f7676 files/digest-texmacs-1.0.6.6 527
+RMD160 3f2b8aa1b26e6203409db6b6e94dc47efc72968c files/digest-texmacs-1.0.6.6 527
+SHA256 5827502a03492c92fb0b207d87df6369b3d9360b689ee40e29b36d37d3e89f27 files/digest-texmacs-1.0.6.6 527
+MD5 59613b256c815478114bc2e596799761 files/digest-texmacs-1.0.6.7 527
+RMD160 9f632596d9a1b8e5226cb8abe8d03b63b96b7ae4 files/digest-texmacs-1.0.6.7 527
+SHA256 15089ce77ad427a7e06b68ed684696830808e0e776f90f77dbd7ecbd923a3424 files/digest-texmacs-1.0.6.7 527
diff --git a/app-office/texmacs/files/digest-texmacs-1.0.6.3 b/app-office/texmacs/files/digest-texmacs-1.0.6.3
deleted file mode 100644
index 06a69c473..000000000
--- a/app-office/texmacs/files/digest-texmacs-1.0.6.3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 e4cbb7cb5e6f259a649c01c2081d30b5 TeXmacs-1.0.6.3-src.tar.gz 3772545
-RMD160 9015ae8ee09fe8be0c04d3b9fb03163d01978d5e TeXmacs-1.0.6.3-src.tar.gz 3772545
-SHA256 f6f04ae977a30e926a842db632ac6f7e95b4b538863d3dccbf37078a88513a28 TeXmacs-1.0.6.3-src.tar.gz 3772545
-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.4 b/app-office/texmacs/files/digest-texmacs-1.0.6.4
deleted file mode 100644
index bb0126e65..000000000
--- a/app-office/texmacs/files/digest-texmacs-1.0.6.4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 c42e8dff99e9f7c5cc8e22efcaf220fb TeXmacs-1.0.6.4-src.tar.gz 3780474
-RMD160 d890e0d0debe9ced76ec800e129ea8a13a57162d TeXmacs-1.0.6.4-src.tar.gz 3780474
-SHA256 a72be5fdc51a8f620250fe52e850f5b6cb56c4fd9074f7e6dc37c0f788af43ed TeXmacs-1.0.6.4-src.tar.gz 3780474
-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.2 b/app-office/texmacs/files/digest-texmacs-1.0.6.7
index 61f09b602..d341acd88 100644
--- a/app-office/texmacs/files/digest-texmacs-1.0.6.2
+++ b/app-office/texmacs/files/digest-texmacs-1.0.6.7
@@ -1,6 +1,6 @@
-MD5 9f38c2a547b9508b7b263eaf12b2ed97 TeXmacs-1.0.6.2-src.tar.gz 3739356
-RMD160 8acc43e1af94f62c29c72e511faa56a45b3f446e TeXmacs-1.0.6.2-src.tar.gz 3739356
-SHA256 2a54952afa9393e227b7812ecee5d4ebb3017da4f9f7712217301a47ea0dd100 TeXmacs-1.0.6.2-src.tar.gz 3739356
+MD5 baa7ef9969aeecab9460b2bead7302ae TeXmacs-1.0.6.7-src.tar.gz 3801955
+RMD160 0dd5d1a71dcdaa7404e9cddc29c2e34e3685e9d0 TeXmacs-1.0.6.7-src.tar.gz 3801955
+SHA256 6df5520a8a16a00d7dc8973a87a5eade7841b6337ae8e43c70ec3e8ca17fd206 TeXmacs-1.0.6.7-src.tar.gz 3801955
 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/texmacs-1.0.6.2.ebuild b/app-office/texmacs/texmacs-1.0.6.2.ebuild
deleted file mode 100644
index b6c7575b9..000000000
--- a/app-office/texmacs/texmacs-1.0.6.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# 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="ispell aspell static"
-# TeXmacs 1.0.X-r? -> stable release, TeXmacs 1.0.X.Y -> development release
-KEYWORDS="~x86"
-
-RDEPEND="virtual/tetex
-	>=dev-util/guile-1.4
-	>=sys-apps/sed-4
-	media-libs/freetype
-	|| ( ( x11-libs/libX11
-		   x11-libs/libICE )
-		virtual/x11
-	)
-	media-libs/imlib2
-	ispell? ( >=app-text/ispell-3.2 )
-	aspell? ( >=app-text/aspell-0.5 )"
-
-DEPEND="${RDEPEND}
-	|| ( x11-proto/xproto
-	     virtual/x11 )
-	virtual/ghostscript"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use aspell && sed -i -e 's/ispell -a -d/aspell -a -d/' src/Plugins/Ispell/ispell.cpp
-}
-
-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.4.ebuild b/app-office/texmacs/texmacs-1.0.6.4.ebuild
deleted file mode 100644
index b6c7575b9..000000000
--- a/app-office/texmacs/texmacs-1.0.6.4.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# 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="ispell aspell static"
-# TeXmacs 1.0.X-r? -> stable release, TeXmacs 1.0.X.Y -> development release
-KEYWORDS="~x86"
-
-RDEPEND="virtual/tetex
-	>=dev-util/guile-1.4
-	>=sys-apps/sed-4
-	media-libs/freetype
-	|| ( ( x11-libs/libX11
-		   x11-libs/libICE )
-		virtual/x11
-	)
-	media-libs/imlib2
-	ispell? ( >=app-text/ispell-3.2 )
-	aspell? ( >=app-text/aspell-0.5 )"
-
-DEPEND="${RDEPEND}
-	|| ( x11-proto/xproto
-	     virtual/x11 )
-	virtual/ghostscript"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use aspell && sed -i -e 's/ispell -a -d/aspell -a -d/' src/Plugins/Ispell/ispell.cpp
-}
-
-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.5.ebuild b/app-office/texmacs/texmacs-1.0.6.5.ebuild
deleted file mode 100644
index b6c7575b9..000000000
--- a/app-office/texmacs/texmacs-1.0.6.5.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# 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="ispell aspell static"
-# TeXmacs 1.0.X-r? -> stable release, TeXmacs 1.0.X.Y -> development release
-KEYWORDS="~x86"
-
-RDEPEND="virtual/tetex
-	>=dev-util/guile-1.4
-	>=sys-apps/sed-4
-	media-libs/freetype
-	|| ( ( x11-libs/libX11
-		   x11-libs/libICE )
-		virtual/x11
-	)
-	media-libs/imlib2
-	ispell? ( >=app-text/ispell-3.2 )
-	aspell? ( >=app-text/aspell-0.5 )"
-
-DEPEND="${RDEPEND}
-	|| ( x11-proto/xproto
-	     virtual/x11 )
-	virtual/ghostscript"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use aspell && sed -i -e 's/ispell -a -d/aspell -a -d/' src/Plugins/Ispell/ispell.cpp
-}
-
-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.3.ebuild b/app-office/texmacs/texmacs-1.0.6.7.ebuild
index b6c7575b9..625f7854b 100644
--- a/app-office/texmacs/texmacs-1.0.6.3.ebuild
+++ b/app-office/texmacs/texmacs-1.0.6.7.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.texmacs.org/"
 LICENSE="GPL-2"
 
 SLOT="0"
-IUSE="ispell aspell static"
+IUSE="spell static"
 # TeXmacs 1.0.X-r? -> stable release, TeXmacs 1.0.X.Y -> development release
 KEYWORDS="~x86"
 
@@ -28,20 +28,13 @@ RDEPEND="virtual/tetex
 		virtual/x11
 	)
 	media-libs/imlib2
-	ispell? ( >=app-text/ispell-3.2 )
-	aspell? ( >=app-text/aspell-0.5 )"
+	spell? ( || ( >=app-text/ispell-3.2 >=app-text/aspell-0.5 ) )"
 
 DEPEND="${RDEPEND}
 	|| ( x11-proto/xproto
 	     virtual/x11 )
 	virtual/ghostscript"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use aspell && sed -i -e 's/ispell -a -d/aspell -a -d/' src/Plugins/Ispell/ispell.cpp
-}
-
 src_compile() {
 
 	# we're not trusting texmacs optimisations here, so