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

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26-tuxonice i686

7 files changed, 107 insertions, 193 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/Manifest b/app-office/texmacs/Manifest
index 02e013d884ff..a27d52936808 100644
--- a/app-office/texmacs/Manifest
+++ b/app-office/texmacs/Manifest
@@ -1,22 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX TeXmacs.desktop 268 RMD160 92ca6c7c75a6e1edd671c2e5f766140382107ebb SHA1 f917105f37a16393ff8f6e1be111a9f00733de41 SHA256 9872d60c5080260a3dcc842cf1f74557954b0830b204ffc0e255f7ee52a13825
-AUX texmacs-1.0.6-gcc-4.1.patch 3178 RMD160 9d1751b8ad20c4f0d66d1f1ce07b94332b44ded5 SHA1 73566ca36669826f5378484b54e98bbcfd49cf2c SHA256 551e4b3cbff71b53e3f0d7cf10da20f284f779c7835a765cf7a859afebe95040
-AUX texmacs-1.0.6-maxima-5.9.3.patch 3124 RMD160 5f2e3a770f6c4262e4590cf19f76c6f68dc04f6a SHA1 3ee2b964d65d3210bc13d4ecfb00533779e05c5e SHA256 9bb18a81fb457894ff72c09ca0dc569859e373ae6beda2a7ee10f2924114bd68
 AUX texmacs-1.0.6.14.patch 4119 RMD160 c22e021dd215e7d450054d4c64b891faff0202b2 SHA1 66b0232e93e9b4697ce73cbcc10b8a8cba88ce0b SHA256 271c02834b01e0516834710267808373b2533bfd79f600c1421cfe38bae61ef3
 AUX texmacs-1.0.6.15.patch 4119 RMD160 eaf4e5fc525f766c6713c23311c520a02f3d78da SHA1 c84e9611ad45d3547976fd150a9e86f30523385a SHA256 0c1dde310ce67cdb401b57ace68e757d6ce0b7b3432b806f79359f4d7d3d68ca
+AUX texmacs-1.0.7-autotroll.patch 494 RMD160 a7eb8b258d075de65c4071952f8957845d0e2a85 SHA1 f1c9d2952f053ab10784e46c8fc465654f799cde SHA256 f34ecde85c09e4ce70bea5e8f153284e3350e0da0bfc97be72b4b4c84049b102
+AUX texmacs-1.0.7-strip.patch 654 RMD160 75bb27ab53171bacea9f0d1063703c4df1094f0f SHA1 2e1ee04c1a0f7227748c2b690b63fb8490667b82 SHA256 795bc0c53f97be9ce182ac6b8a2a7e67d35e1eab51b7936e406eee637c20cefd
 DIST TeXmacs-1.0.6.14-src.tar.gz 4313953 RMD160 1558176e93527367907cc461fe6075d4c508e23a SHA1 bab1a969be883608f5ffbaef9994d6b86c43226e SHA256 6912e66665fc8f0be3510930a280f407ef29959765b5caa89cc93886df3eee1c
 DIST TeXmacs-1.0.6.15-src.tar.gz 4456301 RMD160 97388fd96f110bd97ff5386e50b37530c24822ee SHA1 bd11a9176c7a3627322a374cd27d5eecfcd2527f SHA256 905c740907739530973d0aaac65f2973de73c29bc2574c4dcda8db230c1ec1ac
+DIST TeXmacs-1.0.7-src.tar.gz 4595103 RMD160 15eccb478ecd3204d817533eec1a6cc982c257ac SHA1 aea77447930d847e5419814b3b3e5719be18c72b SHA256 bbd435e262a9f67b87215c6c81f91f1b6c29e8c19087e31cb9d611c6afb2bec9
 DIST TeXmacs-600dpi-fonts.tar.gz 2899193 RMD160 b5a27a59ed0c178f94836b828d12d3534b506582 SHA1 0a3a279b842b63f55449856690483d07c6e1219c SHA256 e8eeb3c97a1405fd037b0567f683a6d2225d47c7829893b9768bd6c1c707cc81
 EBUILD texmacs-1.0.6.14.ebuild 1744 RMD160 e95a8829a36adb8416401f5fa487bb648aebb5bb SHA1 7e210b4bb0cdd95fb7d1f1af94d01b1df5515107 SHA256 6548b1ab8a219d98b3c702641ce29df4f37fd5e3fdb3e4e6b5583f7cce83cb00
 EBUILD texmacs-1.0.6.15.ebuild 1748 RMD160 778f1b9e46abbc95e20d75a48a3af3ffb57c29d4 SHA1 e8ad6fd8e52f100f81d3f14c81b6e21739711215 SHA256 ba5ac823aa79789be9c6508b506ad089e9f6ad41258945589d35d20fef3ab129
-MISC ChangeLog 10312 RMD160 9dd5837998c688f6b6aa80c49b953f6351b18ca9 SHA1 cb4b38dd5ce48e60204aef3b637d7111a84186a6 SHA256 9039d86737212304ded7ae0614da75f81863d157a79a6f4d38124e93d489f513
+EBUILD texmacs-1.0.7.ebuild 1800 RMD160 3e769f4e0d31ccd7839287ebe0b86bbc6ebd499f SHA1 1c4d2e48f2cf52662c125661570bbb7da3db4897 SHA256 e52c74855a5245f5b5e716703028f74fb23e9b6b761bdddf271b65e60c39c117
+MISC ChangeLog 10635 RMD160 22e7551ac9c634b096a9909507987a453dfc7c37 SHA1 b4dc433ad61949861d5231387bd20649b53b386b SHA256 20845e3a237a37a06f14f8c9852d20b4fc51a71d8af261eaf8914a59ba4b1b49
 MISC metadata.xml 346 RMD160 2c1ba8a5aa56c0547c8ca42baca77d46bdd5e6e7 SHA1 1fd3a62650f23d156dac006d2051b3fb22e57057 SHA256 992c947e112a6a4244e57336294ce5020079f90612f2d0093879a85814928813
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAki/ATEACgkQNQqtfCuFneNJHgCggqys++qF5+uE4912Y5qWrRwP
-UfcAn2B9GFz/dUhxvP0A3ol64RS9T+Zm
-=eidl
------END PGP SIGNATURE-----
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"
+}