Version bump, a new experimental Qt port added with USE=qt4

(Portage version: 2.2_rc12/cvs/Linux 2.6.26-tuxonice i686)

6 files changed, 102 insertions, 180 deletions

diff --git a/app-office/texmacs/ChangeLog b/app-office/texmacs/ChangeLog
index d7da71b67884..7060d916d931 100644
--- a/app-office/texmacs/ChangeLog
+++ b/app-office/texmacs/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-office/texmacs
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.66 2008/09/03 21:26:23 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.67 2008/11/02 07:14:43 grozin Exp $
+
+*texmacs-1.0.7 (02 Nov 2008)
+
+  02 Nov 2008; Andrey Grozin <grozin@gentoo.org>
+  -files/texmacs-1.0.6-gcc-4.1.patch,
+  -files/texmacs-1.0.6-maxima-5.9.3.patch,
+  +files/texmacs-1.0.7-autotroll.patch, +files/texmacs-1.0.7-strip.patch,
+  +texmacs-1.0.7.ebuild:
+  Version bump, a new experimental Qt port added with USE=qt4
 
   03 Sep 2008; Christian Faulhammer <opfer@gentoo.org>
   -texmacs-1.0.6-r1.ebuild:
diff --git a/app-office/texmacs/files/texmacs-1.0.6-gcc-4.1.patch b/app-office/texmacs/files/texmacs-1.0.6-gcc-4.1.patch
deleted file mode 100644
index 7c684b3160dc..000000000000
--- a/app-office/texmacs/files/texmacs-1.0.6-gcc-4.1.patch
+++ /dev/null
@@ -1,107 +0,0 @@
---- texmacs-1.0.6.orig/src/Classes/Atomic/parse_string.hpp
-+++ texmacs-1.0.6/src/Classes/Atomic/parse_string.hpp
-@@ -48,4 +48,6 @@
- };
- CONCRETE_CODE(parse_string);
- 
-+bool test (parse_string s, string what);
-+
- #endif // defined PARSE_STRING_H
-only in patch2:
-unchanged:
---- texmacs-1.0.6.orig/src/System/Classes/url.hpp
-+++ texmacs-1.0.6/src/System/Classes/url.hpp
-@@ -42,6 +42,8 @@
- };
- CONCRETE_CODE(url);
- 
-+inline url as_url (tree t);
-+
- ostream& operator << (ostream& out, url u);
- string as_string (url u, int type= URL_SYSTEM);
- 
-only in patch2:
-unchanged:
---- texmacs-1.0.6.orig/src/Typeset/boxes.hpp
-+++ texmacs-1.0.6/src/Typeset/boxes.hpp
-@@ -252,6 +252,8 @@
- };
- ABSTRACT_NULL_CODE(box);
- 
-+void make_eps (url dest, ::display dis, box b, int dpi);
-+
- extern int box_count;
- inline box_rep::box_rep (path ip2):
-   x0(0), y0(0), x1(0), y1(0), x2(0), y2(0), x3(0), y3(0), x4(0), y4(0),
-only in patch2:
-unchanged:
---- texmacs-1.0.6.orig/src/Typeset/env.hpp
-+++ texmacs-1.0.6/src/Typeset/env.hpp
-@@ -433,5 +433,6 @@
- tree texmacs_exec (edit_env env, tree cmd);
- void extract_format (tree fm, tree* r, int n);
- tree load_inclusion (url u); // implemented in tm_file.cpp
-+ostream& operator << (ostream& out, edit_env env);
- 
- #endif // defined ENV_H
-only in patch2:
-unchanged:
---- texmacs-1.0.6.orig/src/Typeset/Bridge/bridge.hpp
-+++ texmacs-1.0.6/src/Typeset/Bridge/bridge.hpp
-@@ -73,6 +73,7 @@
- };
- ABSTRACT_NULL_CODE(bridge);
- 
-+bridge make_bridge (typesetter ttt, tree st, path ip);
- ostream& operator << (ostream& out, bridge br);
- extern bridge nil_bridge;
- tree substitute (tree t, path p, tree u);
-only in patch2:
-unchanged:
---- texmacs-1.0.6.orig/src/Typeset/Concat/concater.hpp
-+++ texmacs-1.0.6/src/Typeset/Concat/concater.hpp
-@@ -169,6 +169,9 @@
-   friend array<line_item> typeset_marker (edit_env env, path ip);
- };
- 
-+array<line_item> typeset_concat (edit_env env, tree t, path ip);
-+array<line_item> typeset_marker (edit_env env, path ip);
-+
- typedef concater_rep* concater;
- 
- #endif // defined CONCATER_H
-only in patch2:
-unchanged:
---- texmacs-1.0.6.orig/src/Window/ps_device.hpp
-+++ texmacs-1.0.6/src/Window/ps_device.hpp
-@@ -102,4 +102,8 @@
-   virtual void apply_shadow (SI x1, SI y1, SI x2, SI y2) = 0;
- };
- 
-+void abs_round (SI& l);
-+void abs_round (SI& x, SI& y);
-+void abs_outer_round (SI& x1, SI& y1, SI& x2, SI& y2);
-+
- #endif // defined PS_DEVICE_H
-only in patch2:
-unchanged:
---- texmacs-1.0.6.orig/src/Window/Widget/Basic/basic_widget.cpp
-+++ texmacs-1.0.6/src/Window/Widget/Basic/basic_widget.cpp
-@@ -259,7 +259,7 @@
- test_window_attached (event ev, widget w) {
-   if (!w->attached ()) {
-     cerr << "\n" << HRULE << "\n";
--    cerr << ev << " was sent to\n" << w;
-+    cerr << (tree)ev << " was sent to\n" << w;
-     cerr << HRULE << "\n";
-     fatal_error ("widget was not yet attached to window",
- 		 "basic_widget::handle", "basic_diwget.cpp");
-@@ -268,7 +268,7 @@
- 
- bool
- basic_widget_rep::handle (event ev) {
--  if (DEBUG_EVENTS) cout << "TeXmacs] " << ev << "\n";
-+  if (DEBUG_EVENTS) cout << "TeXmacs] " << (tree)ev << "\n";
-   // " ---> " << widget(this) << "\n";
-   if (attached ()) win->set_origin (ox, oy);
-   switch (ev->type) {
diff --git a/app-office/texmacs/files/texmacs-1.0.6-maxima-5.9.3.patch b/app-office/texmacs/files/texmacs-1.0.6-maxima-5.9.3.patch
deleted file mode 100644
index a652c00de457..000000000000
--- a/app-office/texmacs/files/texmacs-1.0.6-maxima-5.9.3.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -urN TeXmacs-1.0.6-src.orig/plugins/maxima/bin/maxima_detect TeXmacs-1.0.6-src/plugins/maxima/bin/maxima_detect
---- TeXmacs-1.0.6-src.orig/plugins/maxima/bin/maxima_detect	2005-12-02 19:08:07.000000000 +0100
-+++ TeXmacs-1.0.6-src/plugins/maxima/bin/maxima_detect	2006-04-20 20:29:21.000000000 +0200
-@@ -46,9 +46,10 @@
-     if [ "$1" ]
-     then
-       if $MAXIMA --list-avail | grep -F "version 5.9.1
--version 5.9.2" >/dev/null
-+version 5.9.2
-+version 5.9.3" >/dev/null
-       then
--        # 5.9.1 or 5.9.2
-+        # 5.9.1 or 5.9.2 or 5.9.3
-         maxima -d | grep -F 'maxima-htmldir=' | sed -e 's/maxima-htmldir=/"/' \
-         -e 's|$|/maxima_toc.html"|'
-       else
-diff -urN TeXmacs-1.0.6-src.orig/plugins/maxima/bin/tm_maxima TeXmacs-1.0.6-src/plugins/maxima/bin/tm_maxima
---- TeXmacs-1.0.6-src.orig/plugins/maxima/bin/tm_maxima	2005-12-02 19:08:07.000000000 +0100
-+++ TeXmacs-1.0.6-src/plugins/maxima/bin/tm_maxima	2006-04-20 20:29:21.000000000 +0200
-@@ -14,6 +14,6 @@
-   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*) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.9.2.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";;
-   *) echo -e "\2latex:\\red Unsupported version of maxima: $1\5"
- esac
-diff -urN TeXmacs-1.0.6-src.orig/plugins/maxima/lisp/texmacs-maxima-5.9.2.lisp TeXmacs-1.0.6-src/plugins/maxima/lisp/texmacs-maxima-5.9.2.lisp
---- TeXmacs-1.0.6-src.orig/plugins/maxima/lisp/texmacs-maxima-5.9.2.lisp	2005-12-02 19:08:07.000000000 +0100
-+++ TeXmacs-1.0.6-src/plugins/maxima/lisp/texmacs-maxima-5.9.2.lisp	2006-04-20 20:29:36.000000000 +0200
-@@ -5,7 +5,7 @@
- (setf *alt-display2d* 'texmacs)
- (setf *prompt-prefix* "channel:promptlatex:\\red ")
- (setf *prompt-suffix* "\\black")
--(setf *general-display-prefix* "verbatim:")
-+;(setf *general-display-prefix* "verbatim:")
- (setf *maxima-prolog* "verbatim:")
- (setf *maxima-epilog* "latex:\\red The end\\black")
- #-gcl(setf *debug-io* (make-two-way-stream *standard-input* *standard-output*))
-@@ -19,32 +19,6 @@
-   (format () "~A(~A~D) ~A" *prompt-prefix* 
-     (tex-stripdollar $inchar) $linenum *prompt-suffix*))
- 
--(defun retrieve (msg flag &aux (print? nil))
--  (declare (special msg flag print?))
--  (or (eq flag 'noprint) (setq print? t))
--  (cond ((not print?) 
--	 (setq print? t)
--	 (princ *prompt-prefix*)
--	 (princ *prompt-suffix*))
--	((null msg)
--	 (princ *prompt-prefix*)
--	 (princ *prompt-suffix*))
--	((atom msg) 
--	 (format t "~a~a~a" *prompt-prefix* msg *prompt-suffix*) 
--	 (mterpri))
--	((eq flag t)
--	 (princ *prompt-prefix*) 
--	 (mapc #'princ (cdr msg)) 
--	 (princ *prompt-suffix*)
--	 (mterpri))
--	(t 
--	 (princ *prompt-prefix*)
--	 (displa msg) 
--	 (princ *prompt-suffix*)
--	 (mterpri)))
--  (let ((res (mread-noprompt *query-io* nil)))
--       (princ *general-display-prefix*) res))
--
- (declare-top
- 	 (special lop rop ccol $gcprint $inchar)
- 	 (*expr tex-lbp tex-rbp))
diff --git a/app-office/texmacs/files/texmacs-1.0.7-autotroll.patch b/app-office/texmacs/files/texmacs-1.0.7-autotroll.patch
new file mode 100644
index 000000000000..8c956cdcdce0
--- /dev/null
+++ b/app-office/texmacs/files/texmacs-1.0.7-autotroll.patch
@@ -0,0 +1,10 @@
+diff -r -U2 TeXmacs-1.0.7-src.orig/misc/autotroll/autotroll.m4 TeXmacs-1.0.7-src/misc/autotroll/autotroll.m4
+--- TeXmacs-1.0.7-src.orig/misc/autotroll/autotroll.m4	2008-10-16 13:41:18.000000000 +0700
++++ TeXmacs-1.0.7-src/misc/autotroll/autotroll.m4	2008-11-02 18:03:26.000000000 +0600
+@@ -241,5 +241,5 @@
+   sed 's/^/| /' "$pro_file" >&AS_MESSAGE_LOG_FD
+ 
+-  if $QMAKE -spec macx-g++ ; then :; else
++  if $QMAKE -spec linux-g++ ; then :; else
+     AC_MSG_ERROR([Calling $QMAKE failed.])
+   fi
diff --git a/app-office/texmacs/files/texmacs-1.0.7-strip.patch b/app-office/texmacs/files/texmacs-1.0.7-strip.patch
new file mode 100644
index 000000000000..838d770685ae
--- /dev/null
+++ b/app-office/texmacs/files/texmacs-1.0.7-strip.patch
@@ -0,0 +1,11 @@
+diff -r -U2 TeXmacs-1.0.7-src.orig/Makefile.in TeXmacs-1.0.7-src/Makefile.in
+--- TeXmacs-1.0.7-src.orig/Makefile.in	2008-10-16 13:41:18.000000000 +0700
++++ TeXmacs-1.0.7-src/Makefile.in	2008-11-02 18:20:51.000000000 +0600
+@@ -129,7 +129,5 @@
+ 	$(CP) $(tmdir)/plugins/*/bin/* $(DESTDIR)$(tmbin)/bin
+ 	$(CP) $(tmdir)/plugins/*/lib/*.$(so) $(DESTDIR)$(tmbin)/lib 2>/dev/null || :
+-	$(STRIP) $(DESTDIR)$(tmbin)/bin/texmacs.bin
+ 	$(CP) $(tmdir)/lib/*.$(so) $(DESTDIR)$(tmbin)/lib 2>/dev/null || :
+-	$(STRIP) $(DESTDIR)$(tmbin)/lib/*.$(so) 2>/dev/null || :
+ 	$(CHMOD) 755 $(DESTDIR)$(tmbin)/bin/*
+ 	$(CHMOD) 755 $(DESTDIR)$(tmbin)/lib/*.$(so) 2>/dev/null || :
diff --git a/app-office/texmacs/texmacs-1.0.7.ebuild b/app-office/texmacs/texmacs-1.0.7.ebuild
new file mode 100644
index 000000000000..de871d44004f
--- /dev/null
+++ b/app-office/texmacs/texmacs-1.0.7.ebuild
@@ -0,0 +1,71 @@
+# 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.7.ebuild,v 1.1 2008/11/02 07:14:43 grozin Exp $
+EAPI=1
+inherit autotools
+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 netpbm -qt4 svg spell"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="virtual/latex-base
+	virtual/ghostscript
+	>=dev-scheme/guile-1.4
+	media-libs/freetype
+	x11-libs/libXext
+	qt4? ( x11-libs/qt-gui:4 )
+	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 use qt4; then
+		ewarn "Qt port is highly experimental"
+		ewarn "If you want a stable TeXmacs, emerge with USE=-qt4"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# macx-g++ -> linux-g++
+	epatch "${FILESDIR}"/${P}-autotroll.patch
+
+	# don't strip
+	epatch "${FILESDIR}"/${P}-strip.patch
+
+	eautoreconf
+}
+
+
+src_compile() {
+	econf $(use_with imlib imlib2) \
+		--enable-optimize="${CXXFLAGS}" \
+		$(use_enable qt4 qt)
+	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"
+}