8 files changed, 84 insertions, 12 deletions
diff --git a/app-office/texmacs/ChangeLog b/app-office/texmacs/ChangeLog
index 9bfdb6a5224e..5aa1e8d572c8 100644
--- a/app-office/texmacs/ChangeLog
+++ b/app-office/texmacs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-office/texmacs
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.26 2004/08/28 14:59:00 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.27 2004/10/09 21:59:05 usata Exp $
+
+*texmacs-1.0.4.3 (10 Oct 2004)
+*texmacs-1.0.4-r1 (10 Oct 2004)
+
+  10 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> -texmacs-1.0.3.10.ebuild,
+  +texmacs-1.0.4-r1.ebuild, texmacs-1.0.4.1.ebuild, +texmacs-1.0.4.3.ebuild,
+  texmacs-1.0.4.ebuild:
+  Version bumped.
 
 *texmacs-1.0.4.1 (28 Aug 2004)
 
diff --git a/app-office/texmacs/Manifest b/app-office/texmacs/Manifest
index 220c0a5ac493..f2b46026dc84 100644
--- a/app-office/texmacs/Manifest
+++ b/app-office/texmacs/Manifest
@@ -1,11 +1,13 @@
 MD5 6a269f4f9eeade43bb25008647db04e3 ChangeLog 4284
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-MD5 4f0af60677249ea57fb46a0f4543bd16 texmacs-1.0.4.ebuild 1473
+MD5 d9a454dd3e2bbd6b0230ef35ce19f7db texmacs-1.0.4.ebuild 1471
 MD5 df6d5ef9f9fb8bad1b279f4c20037b17 texmacs-1.0.4.1.ebuild 1539
 MD5 826de5c24c99ac9a7729841a0c7d3d7e texmacs-1.0.3-r1.ebuild 1463
-MD5 3dfd61abe95482a071e8eed8e02ac166 texmacs-1.0.3.10.ebuild 1540
+MD5 17fa34e9e8ea9eeb03db8620a65c61d5 texmacs-1.0.4-r1.ebuild 1473
+MD5 df6d5ef9f9fb8bad1b279f4c20037b17 texmacs-1.0.4.3.ebuild 1539
 MD5 6c1335b256982ee1f6daac8ccbf4aae6 files/digest-texmacs-1.0.4 146
 MD5 01892c5e808927f7326557387c1c6997 files/digest-texmacs-1.0.4.1 145
+MD5 6a01145afda09629a7954638b8383116 files/digest-texmacs-1.0.4.3 145
 MD5 6e7c1518893b302b2ac067f9787872f7 files/digest-texmacs-1.0.3-r1 146
 MD5 2d501a8fe39616f98bc65ec3f7343548 files/TeXmacs.desktop 266
-MD5 5a1d9104cb49c5f6d1f14b6adb861d1e files/digest-texmacs-1.0.3.10 146
+MD5 bf93b125609bba4a0caf22c50fd0c084 files/digest-texmacs-1.0.4-r1 146
diff --git a/app-office/texmacs/files/digest-texmacs-1.0.3.10 b/app-office/texmacs/files/digest-texmacs-1.0.4-r1
index 9328672b0542..4a7f8b6d8d46 100644
--- a/app-office/texmacs/files/digest-texmacs-1.0.3.10
+++ b/app-office/texmacs/files/digest-texmacs-1.0.4-r1
@@ -1,2 +1,2 @@
-MD5 6c6ba9710e9bf3b816c1dec17017080b TeXmacs-1.0.3.10-src.tar.gz 2528039
+MD5 6f2a65e4c643a98fadbe6ee3cd5c5cb4 TeXmacs-1.0.4-R3-src.tar.gz 2456451
 MD5 945dfd3f76b20082aeea8131d87a260f TeXmacs-600dpi-fonts.tar.gz 2899193
diff --git a/app-office/texmacs/files/digest-texmacs-1.0.4.3 b/app-office/texmacs/files/digest-texmacs-1.0.4.3
new file mode 100644
index 000000000000..ea697de71d64
--- /dev/null
+++ b/app-office/texmacs/files/digest-texmacs-1.0.4.3
@@ -0,0 +1,2 @@
+MD5 44c227be5a61cbca53cf59e0b957ba25 TeXmacs-1.0.4.3-src.tar.gz 2626939
+MD5 945dfd3f76b20082aeea8131d87a260f TeXmacs-600dpi-fonts.tar.gz 2899193
diff --git a/app-office/texmacs/texmacs-1.0.4-r1.ebuild b/app-office/texmacs/texmacs-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..cc746a79e6aa
--- /dev/null
+++ b/app-office/texmacs/texmacs-1.0.4-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2004 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.1 2004/10/09 21:59:05 usata 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-util/guile-1.4
+	>=sys-apps/sed-4
+	virtual/x11
+	spell? ( >=app-text/ispell-3.2 )"
+
+DEPEND="${RDEPEND}
+	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 COPYING LICENSE
+
+	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.4.1.ebuild b/app-office/texmacs/texmacs-1.0.4.1.ebuild
index 28a0b7044761..d68b93af967e 100644
--- a/app-office/texmacs/texmacs-1.0.4.1.ebuild
+++ b/app-office/texmacs/texmacs-1.0.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.1.ebuild,v 1.1 2004/08/28 14:59:00 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.4.1.ebuild,v 1.2 2004/10/09 21:59:05 usata Exp $
 
 # although flag-o-matic functions in portage, we should inherit it
 inherit flag-o-matic
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 IUSE="spell"
-# TeXmacs 1.0.X -> stable release, TeXmacs 1.0.X.Y -> development release
+# TeXmacs 1.0.X-r? -> stable release, TeXmacs 1.0.X.Y -> development release
 KEYWORDS="~x86 ~ppc ~alpha ~sparc"
 
 RDEPEND="virtual/tetex
diff --git a/app-office/texmacs/texmacs-1.0.3.10.ebuild b/app-office/texmacs/texmacs-1.0.4.3.ebuild
index 017fe068ecf3..152029a75165 100644
--- a/app-office/texmacs/texmacs-1.0.3.10.ebuild
+++ b/app-office/texmacs/texmacs-1.0.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.3.10.ebuild,v 1.1 2004/07/07 00:31:15 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.4.3.ebuild,v 1.1 2004/10/09 21:59:05 usata Exp $
 
 # although flag-o-matic functions in portage, we should inherit it
 inherit flag-o-matic
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 IUSE="spell"
-# TeXmacs 1.0.X -> stable release, TeXmacs 1.0.X.Y -> development release
+# TeXmacs 1.0.X-r? -> stable release, TeXmacs 1.0.X.Y -> development release
 KEYWORDS="~x86 ~ppc ~alpha ~sparc"
 
 RDEPEND="virtual/tetex
diff --git a/app-office/texmacs/texmacs-1.0.4.ebuild b/app-office/texmacs/texmacs-1.0.4.ebuild
index 408d130b4f7a..9d6f2a1fdf25 100644
--- a/app-office/texmacs/texmacs-1.0.4.ebuild
+++ b/app-office/texmacs/texmacs-1.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.ebuild,v 1.1 2004/08/28 14:59:00 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.4.ebuild,v 1.2 2004/10/09 21:59:05 usata Exp $
 
 inherit flag-o-matic
 
@@ -15,8 +15,8 @@ LICENSE="GPL-2"
 
 SLOT="0"
 IUSE="spell"
-# TeXmacs 1.0.X -> stable release, TeXmacs 1.0.X.Y -> development release
-KEYWORDS="~x86 ~ppc ~alpha ~sparc"
+# TeXmacs 1.0.X-r? -> stable release, TeXmacs 1.0.X.Y -> development release
+KEYWORDS="x86 ppc ~alpha ~sparc"
 
 RDEPEND="virtual/tetex
 	>=dev-util/guile-1.4