Version bump

(Portage version: 2.2.0_alpha125/cvs/Linux i686)

4 files changed, 133 insertions, 1 deletions

diff --git a/app-office/texmacs/ChangeLog b/app-office/texmacs/ChangeLog
index 7243f9668295..0a101c03282c 100644
--- a/app-office/texmacs/ChangeLog
+++ b/app-office/texmacs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/texmacs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.103 2012/05/21 18:38:03 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.104 2012/09/13 06:40:30 grozin Exp $
+
+*texmacs-1.0.7.16 (13 Sep 2012)
+
+  13 Sep 2012; Andrey Grozin <grozin@gentoo.org> +texmacs-1.0.7.16.ebuild,
+  +files/texmacs-mime.patch, +files/texmacs-plugins.patch:
+  Version bump
 
   21 May 2012; Kacper Kowalik <xarthisius@gentoo.org>
   texmacs-1.0.7.15-r1.ebuild, texmacs-1.0.7.2-r1.ebuild:
diff --git a/app-office/texmacs/files/texmacs-mime.patch b/app-office/texmacs/files/texmacs-mime.patch
new file mode 100644
index 000000000000..6d572bf60ebe
--- /dev/null
+++ b/app-office/texmacs/files/texmacs-mime.patch
@@ -0,0 +1,11 @@
+diff -r -U1 TeXmacs-1.0.7.16-src.orig/Makefile.in TeXmacs-1.0.7.16-src/Makefile.in
+--- TeXmacs-1.0.7.16-src.orig/Makefile.in	2012-07-09 21:33:36.000000000 +0700
++++ TeXmacs-1.0.7.16-src/Makefile.in	2012-09-13 12:27:29.000000000 +0700
+@@ -181,3 +181,2 @@
+ 	$(CP) $(tmdir)/misc/mime/texmacs.xml $(DESTDIR)$(datadir)/mime/packages
+-	@update-mime-database $(DESTDIR)$(datadir)/mime/ 2>/dev/null || :
+ 	$(MKDIR) $(DESTDIR)$(datadir)/pixmaps
+@@ -228,3 +227,2 @@
+ 	$(RM) $(datadir)/mime/packages/texmacs.xml
+-	@update-mime-database $(DESTDIR)$(datadir)/mime/ 2>/dev/null || :
+ 	$(RM) $(datadir)/pixmaps/TeXmacs.xpm
diff --git a/app-office/texmacs/files/texmacs-plugins.patch b/app-office/texmacs/files/texmacs-plugins.patch
new file mode 100644
index 000000000000..bb6197ff8bf4
--- /dev/null
+++ b/app-office/texmacs/files/texmacs-plugins.patch
@@ -0,0 +1,48 @@
+diff -r -U1 TeXmacs-1.0.7.16-src.orig/plugins/axiom/Makefile TeXmacs-1.0.7.16-src/plugins/axiom/Makefile
+--- TeXmacs-1.0.7.16-src.orig/plugins/axiom/Makefile	2010-12-18 01:02:16.000000000 +0600
++++ TeXmacs-1.0.7.16-src/plugins/axiom/Makefile	2012-09-13 00:38:53.000000000 +0700
+@@ -16,3 +16,3 @@
+ bin/tm_axiom: src/tm_axiom.c
+-	$(CC) $(CPPFLAGS) $(CFLAGS) src/tm_axiom.c -o bin/tm_axiom
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) src/tm_axiom.c -o bin/tm_axiom
+ 
+diff -r -U1 TeXmacs-1.0.7.16-src.orig/plugins/graphviz/Makefile TeXmacs-1.0.7.16-src/plugins/graphviz/Makefile
+--- TeXmacs-1.0.7.16-src.orig/plugins/graphviz/Makefile	2010-12-18 01:02:15.000000000 +0600
++++ TeXmacs-1.0.7.16-src/plugins/graphviz/Makefile	2012-09-13 00:38:58.000000000 +0700
+@@ -16,3 +16,3 @@
+ bin/tm_graphviz: src/tm_graphviz.c
+-	$(CC) $(CPPFLAGS) $(CFLAGS) src/tm_graphviz.c -o bin/tm_graphviz
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) src/tm_graphviz.c -o bin/tm_graphviz
+ 
+diff -r -U1 TeXmacs-1.0.7.16-src.orig/plugins/maple/Makefile TeXmacs-1.0.7.16-src/plugins/maple/Makefile
+--- TeXmacs-1.0.7.16-src.orig/plugins/maple/Makefile	2010-12-18 01:02:16.000000000 +0600
++++ TeXmacs-1.0.7.16-src/plugins/maple/Makefile	2012-09-13 00:39:59.000000000 +0700
+@@ -17,3 +17,3 @@
+ bin/tm_maple_5: src/tm_maple_5.cpp
+-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) src/tm_maple_5.cpp -o bin/tm_maple_5
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) src/tm_maple_5.cpp -o bin/tm_maple_5
+ 
+diff -r -U1 TeXmacs-1.0.7.16-src.orig/plugins/mathematica/Makefile TeXmacs-1.0.7.16-src/plugins/mathematica/Makefile
+--- TeXmacs-1.0.7.16-src.orig/plugins/mathematica/Makefile	2010-12-18 01:02:15.000000000 +0600
++++ TeXmacs-1.0.7.16-src/plugins/mathematica/Makefile	2012-09-13 00:40:18.000000000 +0700
+@@ -14,3 +14,3 @@
+ bin/realpath: src/realpath.c
+-	$(CC) $(CPPFLAGS) $(CFLAGS) src/realpath.c -o bin/realpath
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) src/realpath.c -o bin/realpath
+ 
+diff -r -U1 TeXmacs-1.0.7.16-src.orig/plugins/r/Makefile TeXmacs-1.0.7.16-src/plugins/r/Makefile
+--- TeXmacs-1.0.7.16-src.orig/plugins/r/Makefile	2010-12-18 01:02:16.000000000 +0600
++++ TeXmacs-1.0.7.16-src/plugins/r/Makefile	2012-09-13 00:41:16.000000000 +0700
+@@ -16,3 +16,3 @@
+ bin/tm_r: src/tm_r.c
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -I../../src/System src/tm_r.c -o bin/tm_r -lutil
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -I../../src/System src/tm_r.c -o bin/tm_r -lutil
+ 
+diff -r -U1 TeXmacs-1.0.7.16-src.orig/plugins/shell/Makefile TeXmacs-1.0.7.16-src/plugins/shell/Makefile
+--- TeXmacs-1.0.7.16-src.orig/plugins/shell/Makefile	2010-12-18 01:02:15.000000000 +0600
++++ TeXmacs-1.0.7.16-src/plugins/shell/Makefile	2012-09-13 00:41:57.000000000 +0700
+@@ -16,3 +16,3 @@
+ bin/tm_shell: src/tm_shell.cpp
+-	$(CXX) $(CPPFLAGS) $(CXXFLAGS)  -I../../src/System  -lutil src/tm_shell.cpp -o bin/tm_shell
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)  -I../../src/System  -lutil src/tm_shell.cpp -o bin/tm_shell
+ 
diff --git a/app-office/texmacs/texmacs-1.0.7.16.ebuild b/app-office/texmacs/texmacs-1.0.7.16.ebuild
new file mode 100644
index 000000000000..9c530dba4143
--- /dev/null
+++ b/app-office/texmacs/texmacs-1.0.7.16.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2012 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.16.ebuild,v 1.1 2012/09/13 06:40:30 grozin Exp $
+
+EAPI=4
+
+inherit autotools eutils fdo-mime
+
+MY_P=${P/tex/TeX}-src
+
+DESCRIPTION="Wysiwyg text processor with high-quality maths"
+HOMEPAGE="http://www.texmacs.org/"
+SRC_URI="ftp://ftp.texmacs.org/pub/TeXmacs/tmftp/source/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="imlib jpeg netpbm qt4 svg spell"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-scheme/guile[deprecated]
+	virtual/latex-base
+	app-text/ghostscript-gpl
+	media-libs/freetype
+	x11-libs/libXext
+	x11-apps/xmodmap
+	qt4? ( x11-libs/qt-gui:4 )
+	imlib? ( media-libs/imlib2 )
+	jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) )
+	svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
+	netpbm? ( media-libs/netpbm )
+	spell? ( app-text/aspell )"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# respect LDFLAGS, bug #338459
+	epatch "${FILESDIR}"/${PN}-plugins.patch
+
+	# dont update mime database
+	epatch "${FILESDIR}"/${PN}-mime.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with imlib imlib2) \
+		--enable-optimize="${CXXFLAGS}" \
+		$(use_enable qt4 qt)
+}
+
+src_install() {
+	default
+	domenu "${FILESDIR}"/TeXmacs.desktop
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}