Version bumped. Added static USE flag. This closes bug #71195.

6 files changed, 20 insertions, 79 deletions

diff --git a/app-office/texmacs/ChangeLog b/app-office/texmacs/ChangeLog
index 352dfffc85fa..072de6b442b5 100644
--- a/app-office/texmacs/ChangeLog
+++ b/app-office/texmacs/ChangeLog
@@ -1,6 +1,12 @@
 # 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.28 2004/11/04 11:57:48 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.29 2004/11/15 03:09:35 usata Exp $
+
+*texmacs-1.0.4.4 (15 Nov 2004)
+
+  15 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> -texmacs-1.0.3-r1.ebuild,
+  +texmacs-1.0.4.4.ebuild, -texmacs-1.0.4.ebuild:
+  Version bumped. Added static USE flag. This closes bug #71195.
 
   04 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> texmacs-1.0.4-r1.ebuild,
   -texmacs-1.0.4.1.ebuild:
diff --git a/app-office/texmacs/Manifest b/app-office/texmacs/Manifest
index ae0ca80abed4..4e364f7f82bf 100644
--- a/app-office/texmacs/Manifest
+++ b/app-office/texmacs/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 769c40ecaf362dbd6ca1d708972e3a27 ChangeLog 4693
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
 MD5 f3b4fdd0ce8f532149d660c48220006a texmacs-1.0.4.ebuild 1474
+MD5 b2daba45c637c9329c72879f3ef05955 texmacs-1.0.4.4.ebuild 1542
 MD5 826de5c24c99ac9a7729841a0c7d3d7e texmacs-1.0.3-r1.ebuild 1463
 MD5 46d7b75e973732b017f82f38b367702c texmacs-1.0.4-r1.ebuild 1476
 MD5 b2daba45c637c9329c72879f3ef05955 texmacs-1.0.4.3.ebuild 1542
 MD5 6c1335b256982ee1f6daac8ccbf4aae6 files/digest-texmacs-1.0.4 146
+MD5 c4a7d1c9a093d6a8f2d9e8ad1edaf03d files/digest-texmacs-1.0.4.4 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 bf93b125609bba4a0caf22c50fd0c084 files/digest-texmacs-1.0.4-r1 146
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBihfEVWNWqTUmv+0RAhjNAJ9AHDmK0SlK9ePHH/aOWYCVY0804gCeIPN8
-NG8mLDt3Bt61Xpdcj7wCWFo=
-=C50o
------END PGP SIGNATURE-----
diff --git a/app-office/texmacs/files/digest-texmacs-1.0.4 b/app-office/texmacs/files/digest-texmacs-1.0.4
deleted file mode 100644
index c44bb61e001c..000000000000
--- a/app-office/texmacs/files/digest-texmacs-1.0.4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 62869c522ae939c485c6f04144c0feeb TeXmacs-1.0.4-R2-src.tar.gz 2588230
-MD5 945dfd3f76b20082aeea8131d87a260f TeXmacs-600dpi-fonts.tar.gz 2899193
diff --git a/app-office/texmacs/files/digest-texmacs-1.0.3-r1 b/app-office/texmacs/files/digest-texmacs-1.0.4.4
index a92439b5e75f..dcc5f73e4032 100644
--- a/app-office/texmacs/files/digest-texmacs-1.0.3-r1
+++ b/app-office/texmacs/files/digest-texmacs-1.0.4.4
@@ -1,2 +1,2 @@
-MD5 ba3c9b7238e65e957353cb65dceb8f3b TeXmacs-1.0.3-R2-src.tar.gz 2359143
+MD5 5212c0850a8d6308e8629b75a1f954b5 TeXmacs-1.0.4.4-src.tar.gz 2639689
 MD5 945dfd3f76b20082aeea8131d87a260f TeXmacs-600dpi-fonts.tar.gz 2899193
diff --git a/app-office/texmacs/texmacs-1.0.3-r1.ebuild b/app-office/texmacs/texmacs-1.0.3-r1.ebuild
deleted file mode 100644
index feeca1b05992..000000000000
--- a/app-office/texmacs/texmacs-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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-r1.ebuild,v 1.3 2004/06/24 22:45:55 agriffis Exp $
-
-inherit flag-o-matic
-
-MY_P=${P/tex/TeX}-R2-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 -> stable release, TeXmacs 1.0.X.Y -> development release
-KEYWORDS="x86 ppc"
-
-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.ebuild b/app-office/texmacs/texmacs-1.0.4.4.ebuild
index 9d6f2a1fdf25..b4206b11fb9c 100644
--- a/app-office/texmacs/texmacs-1.0.4.ebuild
+++ b/app-office/texmacs/texmacs-1.0.4.4.ebuild
@@ -1,10 +1,11 @@
 # 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.2 2004/10/09 21:59:05 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.4.4.ebuild,v 1.1 2004/11/15 03:09:35 usata Exp $
 
+# although flag-o-matic functions in portage, we should inherit it
 inherit flag-o-matic
 
-MY_P=${P/tex/TeX}-R2-src
+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."
@@ -14,9 +15,9 @@ HOMEPAGE="http://www.texmacs.org/"
 LICENSE="GPL-2"
 
 SLOT="0"
-IUSE="spell"
+IUSE="spell static"
 # TeXmacs 1.0.X-r? -> stable release, TeXmacs 1.0.X.Y -> development release
-KEYWORDS="x86 ppc ~alpha ~sparc"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc"
 
 RDEPEND="virtual/tetex
 	>=dev-util/guile-1.4
@@ -39,7 +40,11 @@ src_compile() {
 	# and now replace the detected optimisations with our safer ones
 	sed -i "s:\(^CXXOPTIMIZE = \).*:\1${CXXFLAGS}:" src/common.makefile
 	# emake b0rked
-	emake -j1 || die
+	if use static ; then
+		emake -j1 STATIC_TEXMACS || die
+	else
+		emake -j1 || die
+	fi
 
 }