Version bumped, closing bug #38894. Removed old versions.

8 files changed, 52 insertions, 36 deletions

diff --git a/app-office/texmacs/ChangeLog b/app-office/texmacs/ChangeLog
index a52c220762a1..0d502cd3dd71 100644
--- a/app-office/texmacs/ChangeLog
+++ b/app-office/texmacs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/texmacs
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.15 2003/12/09 18:04:15 lanius Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.16 2004/02/20 19:50:21 usata Exp $
+
+*texmacs-1.0.3.3 (21 Feb 2004)
+
+  21 Feb 2004; Mamoru KOMACHI <usata@gentoo.org> texmacs-1.0.1-r1.ebuild,
+  texmacs-1.0.1.23.ebuild, texmacs-1.0.1.ebuild, texmacs-1.0.2.4.ebuild,
+  texmacs-1.0.3.3.ebuild, texmacs-1.0.3.ebuild:
+  Version bumped, closing bug #38894. Removed old versions.
 
   09 Dec 2003; Heinrich Wendel <lanius@gentoo.org> texmacs-1.0.1-r1.ebuild,
   texmacs-1.0.1.23.ebuild, texmacs-1.0.1.ebuild, texmacs-1.0.2.4.ebuild:
diff --git a/app-office/texmacs/Manifest b/app-office/texmacs/Manifest
index 6fbb5095f8e6..fa251881764c 100644
--- a/app-office/texmacs/Manifest
+++ b/app-office/texmacs/Manifest
@@ -1,10 +1,10 @@
-MD5 6a39d70fb56219a19ff348e071f142e4 texmacs-1.0.1-r1.ebuild 1140
-MD5 f30cd0fcefa66e5aaec4e7b4272bc92d texmacs-1.0.2.4.ebuild 1361
-MD5 53fe9a2836b7e1df98e0abd871321e31 texmacs-1.0.1.ebuild 1087
-MD5 183abfd3541c364704651fe706d81b1f ChangeLog 2355
-MD5 60a589a247e98514add6b545712c6838 texmacs-1.0.1.23.ebuild 1347
+MD5 cad78f59e9bb6261004cf2a5f8d5ea02 texmacs-1.0.1-r1.ebuild 1138
+MD5 85c3ee46b7b132c532c474bd7e4ea419 texmacs-1.0.2.4.ebuild 1359
+MD5 df882566dcd9f6189f0880f5e3783bb4 ChangeLog 2642
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-MD5 178b97edbe1c37c4beaff0858088c7b7 files/digest-texmacs-1.0.1.23 146
+MD5 ff762ad60e918c1fa086fc431abbb271 texmacs-1.0.3.3.ebuild 1440
+MD5 2dbaf04d27a95eb96cb54a3015c0c846 texmacs-1.0.3.ebuild 1438
 MD5 e66f431d3e08f7c71c8b3838c9601369 files/digest-texmacs-1.0.1-r1 143
-MD5 e66f431d3e08f7c71c8b3838c9601369 files/digest-texmacs-1.0.1 143
 MD5 84de4a6e8d3ad40ed81d967f650f746c files/digest-texmacs-1.0.2.4 145
+MD5 b7d1f65b54396b6907be634a202a1064 files/digest-texmacs-1.0.3.3 145
+MD5 b0fd9c4133c7bab877f8d650b0b4353c files/digest-texmacs-1.0.3 143
diff --git a/app-office/texmacs/files/digest-texmacs-1.0.1 b/app-office/texmacs/files/digest-texmacs-1.0.3
index ba5365260962..7e9e5ddc96d2 100644
--- a/app-office/texmacs/files/digest-texmacs-1.0.1
+++ b/app-office/texmacs/files/digest-texmacs-1.0.3
@@ -1,2 +1,2 @@
-MD5 5fad9e869c50899ce2723248f9666f63 TeXmacs-1.0.1-src.tar.gz 1642354
+MD5 833928d728a4f720971284fc8afbc6f4 TeXmacs-1.0.3-src.tar.gz 2352776
 MD5 945dfd3f76b20082aeea8131d87a260f TeXmacs-600dpi-fonts.tar.gz 2899193
diff --git a/app-office/texmacs/files/digest-texmacs-1.0.1.23 b/app-office/texmacs/files/digest-texmacs-1.0.3.3
index b7583d1c7925..2698310317d6 100644
--- a/app-office/texmacs/files/digest-texmacs-1.0.1.23
+++ b/app-office/texmacs/files/digest-texmacs-1.0.3.3
@@ -1,2 +1,2 @@
-MD5 69104f6cef7c563e4ee30b8eb794252f TeXmacs-1.0.1.23-src.tar.gz 2373499
+MD5 b5444b739812af707be3516aa6aa487d TeXmacs-1.0.3.3-src.tar.gz 2393415
 MD5 945dfd3f76b20082aeea8131d87a260f TeXmacs-600dpi-fonts.tar.gz 2899193
diff --git a/app-office/texmacs/texmacs-1.0.1-r1.ebuild b/app-office/texmacs/texmacs-1.0.1-r1.ebuild
index bf961f9c870f..d74f3315da4a 100644
--- a/app-office/texmacs/texmacs-1.0.1-r1.ebuild
+++ b/app-office/texmacs/texmacs-1.0.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.1-r1.ebuild,v 1.4 2003/12/09 18:04:15 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.1-r1.ebuild,v 1.5 2004/02/20 19:50:21 usata Exp $
 
 inherit flag-o-matic
 
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 IUSE="spell"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 
 RDEPEND="virtual/tetex
 	>=dev-util/guile-1.3.4
diff --git a/app-office/texmacs/texmacs-1.0.2.4.ebuild b/app-office/texmacs/texmacs-1.0.2.4.ebuild
index 56dc4a90c519..11c0ef599bfc 100644
--- a/app-office/texmacs/texmacs-1.0.2.4.ebuild
+++ b/app-office/texmacs/texmacs-1.0.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.2.4.ebuild,v 1.2 2003/12/09 18:04:15 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.2.4.ebuild,v 1.3 2004/02/20 19:50:21 usata Exp $
 
 # flag-o-matic functions now in portage, no need to inherit it
 
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 IUSE="spell"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 
 RDEPEND="virtual/tetex
 	>=dev-util/guile-1.4
diff --git a/app-office/texmacs/texmacs-1.0.1.ebuild b/app-office/texmacs/texmacs-1.0.3.3.ebuild
index 22be533d1c5a..420e21dbf2e0 100644
--- a/app-office/texmacs/texmacs-1.0.1.ebuild
+++ b/app-office/texmacs/texmacs-1.0.3.3.ebuild
@@ -1,50 +1,57 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.1.ebuild,v 1.9 2003/12/09 18:04:15 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.3.3.ebuild,v 1.1 2004/02/20 19:50:21 usata Exp $
 
-inherit flag-o-matic
+# flag-o-matic functions now in portage, no need to inherit it
 
 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"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
+IUSE="spell"
+# TeXmacs 1.0.X -> stable release, TeXmacs 1.0.X.Y -> development release
+KEYWORDS="~x86 ~ppc"
 
-DEPEND="virtual/tetex
-	>=dev-util/guile-1.3.4
-	=sys-apps/sed-4*
-	virtual/x11"
+RDEPEND="virtual/tetex
+	>=dev-util/guile-1.4
+	>=sys-apps/sed-4
+	virtual/x11
+	spell? ( >=app-text/ispell-3.2 )"
 
-RDEPEND="${DEPEND}
+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
+	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
 
-	cd ${S}
-	make || die
 }
 
 
 src_install() {
 
 	make DESTDIR=${D} install || die
+	dodoc COMPILE COPYING LICENSE
 
+	# now install the fonts
 	cd ${WORKDIR}
 	dodir /usr/share/texmf
 	cp -r fonts ${D}/usr/share/texmf/
 
-	cd ${S}
-	dodoc COMPILE COPYING LICENSE
 }
diff --git a/app-office/texmacs/texmacs-1.0.1.23.ebuild b/app-office/texmacs/texmacs-1.0.3.ebuild
index 3878b0e0f995..22184c875507 100644
--- a/app-office/texmacs/texmacs-1.0.1.23.ebuild
+++ b/app-office/texmacs/texmacs-1.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.1.23.ebuild,v 1.3 2003/12/09 18:04:15 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.3.ebuild,v 1.1 2004/02/20 19:50:21 usata Exp $
 
 # flag-o-matic functions now in portage, no need to inherit it
 
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 IUSE="spell"
+# TeXmacs 1.0.X -> stable release, TeXmacs 1.0.X.Y -> development release
 KEYWORDS="~x86 ~ppc"
 
 RDEPEND="virtual/tetex
@@ -23,7 +24,7 @@ RDEPEND="virtual/tetex
 	virtual/x11
 	spell? ( >=app-text/ispell-3.2 )"
 
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
 	virtual/ghostscript"
 
 src_compile() {
@@ -37,7 +38,8 @@ src_compile() {
 	econf || die
 	# and now replace the detected optimisations with our safer ones
 	sed -i "s:\(^CXXOPTIMIZE = \).*:\1${CXXFLAGS}:" src/common.makefile
-	emake || die
+	# emake b0rked
+	emake -j1 || die
 
 }