Version bump; removed unused erroneous file in 1.0.7.16-r1 (closing #459430)

(Portage version: 2.2.0_alpha169/cvs/Linux i686, signed Manifest commit with key 0x3AFFCE974D34BD8C!)

5 files changed, 34 insertions, 71 deletions

diff --git a/app-office/texmacs/ChangeLog b/app-office/texmacs/ChangeLog
index ba9333f62f28..9b280619370c 100644
--- a/app-office/texmacs/ChangeLog
+++ b/app-office/texmacs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/texmacs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.106 2013/03/02 19:37:54 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.107 2013/03/23 10:01:03 grozin Exp $
+
+*texmacs-1.0.7.18 (23 Mar 2013)
+
+  23 Mar 2013; Andrey Grozin <grozin@gentoo.org> -texmacs-1.0.7.15-r1.ebuild,
+  -files/texmacs-1.0.7.15-tm-files.patch, texmacs-1.0.7.16-r1.ebuild,
+  +texmacs-1.0.7.18.ebuild, -files/texmacs-ldflags.patch:
+  Version bump; removed unused erroneous file in 1.0.7.16-r1 (closing #459430)
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> texmacs-1.0.7.15-r1.ebuild,
   texmacs-1.0.7.16-r1.ebuild:
diff --git a/app-office/texmacs/files/texmacs-1.0.7.15-tm-files.patch b/app-office/texmacs/files/texmacs-1.0.7.15-tm-files.patch
deleted file mode 100644
index 5c14bb3bb836..000000000000
--- a/app-office/texmacs/files/texmacs-1.0.7.15-tm-files.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-diff -r -U1 TeXmacs-1.0.7.15-src.orig/TeXmacs/progs/texmacs/texmacs/tm-files.scm TeXmacs-1.0.7.15-src/TeXmacs/progs/texmacs/texmacs/tm-files.scm
---- TeXmacs-1.0.7.15-src.orig/TeXmacs/progs/texmacs/texmacs/tm-files.scm	2012-03-18 16:12:44.000000000 +0700
-+++ TeXmacs-1.0.7.15-src/TeXmacs/progs/texmacs/texmacs/tm-files.scm	2012-05-02 22:39:52.000000000 +0700
-@@ -206,2 +206,2 @@
-   (deprecated-function "get-name-buffer-path" "path->buffer")
--  (path->buffer name))
-+  (path->buffer p))
diff --git a/app-office/texmacs/files/texmacs-ldflags.patch b/app-office/texmacs/files/texmacs-ldflags.patch
deleted file mode 100644
index f0e632beb8b4..000000000000
--- a/app-office/texmacs/files/texmacs-ldflags.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -r -U1 TeXmacs-1.0.7.7-src.orig/plugins/axiom/Makefile TeXmacs-1.0.7.7-src/plugins/axiom/Makefile
---- TeXmacs-1.0.7.7-src.orig/plugins/axiom/Makefile	2010-10-23 02:38:00.000000000 +0700
-+++ TeXmacs-1.0.7.7-src/plugins/axiom/Makefile	2010-10-31 18:26:17.000000000 +0600
-@@ -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.7-src.orig/plugins/graphviz/Makefile TeXmacs-1.0.7.7-src/plugins/graphviz/Makefile
---- TeXmacs-1.0.7.7-src.orig/plugins/graphviz/Makefile	2010-10-23 02:38:00.000000000 +0700
-+++ TeXmacs-1.0.7.7-src/plugins/graphviz/Makefile	2010-10-31 18:29:34.000000000 +0600
-@@ -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.7-src.orig/plugins/maple/Makefile TeXmacs-1.0.7.7-src/plugins/maple/Makefile
---- TeXmacs-1.0.7.7-src.orig/plugins/maple/Makefile	2010-10-23 02:38:00.000000000 +0700
-+++ TeXmacs-1.0.7.7-src/plugins/maple/Makefile	2010-10-31 18:30:26.000000000 +0600
-@@ -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.7-src.orig/plugins/mathematica/Makefile TeXmacs-1.0.7.7-src/plugins/mathematica/Makefile
---- TeXmacs-1.0.7.7-src.orig/plugins/mathematica/Makefile	2010-10-23 02:38:00.000000000 +0700
-+++ TeXmacs-1.0.7.7-src/plugins/mathematica/Makefile	2010-10-31 18:31:09.000000000 +0600
-@@ -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.7-src.orig/plugins/maxima/Makefile TeXmacs-1.0.7.7-src/plugins/maxima/Makefile
---- TeXmacs-1.0.7.7-src.orig/plugins/maxima/Makefile	2010-10-23 02:38:00.000000000 +0700
-+++ TeXmacs-1.0.7.7-src/plugins/maxima/Makefile	2010-10-31 18:32:01.000000000 +0600
-@@ -16,3 +16,3 @@
- bin/maxima_filter: src/maxima_filter.c
--	$(CC) $(CPPFLAGS) $(CFLAGS) src/maxima_filter.c -o bin/maxima_filter
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) src/maxima_filter.c -o bin/maxima_filter
- 
-diff -r -U1 TeXmacs-1.0.7.7-src.orig/plugins/r/Makefile TeXmacs-1.0.7.7-src/plugins/r/Makefile
---- TeXmacs-1.0.7.7-src.orig/plugins/r/Makefile	2010-10-23 02:38:00.000000000 +0700
-+++ TeXmacs-1.0.7.7-src/plugins/r/Makefile	2010-10-31 18:32:47.000000000 +0600
-@@ -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.7-src.orig/plugins/shell/Makefile TeXmacs-1.0.7.7-src/plugins/shell/Makefile
---- TeXmacs-1.0.7.7-src.orig/plugins/shell/Makefile	2010-10-23 02:38:00.000000000 +0700
-+++ TeXmacs-1.0.7.7-src/plugins/shell/Makefile	2010-10-31 18:34:16.000000000 +0600
-@@ -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-r1.ebuild b/app-office/texmacs/texmacs-1.0.7.16-r1.ebuild
index 92c0fe27c148..20eccab9c76c 100644
--- a/app-office/texmacs/texmacs-1.0.7.16-r1.ebuild
+++ b/app-office/texmacs/texmacs-1.0.7.16-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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-r1.ebuild,v 1.2 2013/03/02 19:37:54 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.7.16-r1.ebuild,v 1.3 2013/03/23 10:01:03 grozin Exp $
 
 EAPI=4
 
@@ -35,6 +35,9 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	# this file is included in the tarball erroneously
+	rm -f plugins/maxima/bin/maxima_filter
+
 	# respect LDFLAGS, bug #338459
 	epatch "${FILESDIR}"/${PN}-plugins.patch
 
diff --git a/app-office/texmacs/texmacs-1.0.7.15-r1.ebuild b/app-office/texmacs/texmacs-1.0.7.18.ebuild
index a4a3060de5d7..0230afc22132 100644
--- a/app-office/texmacs/texmacs-1.0.7.15-r1.ebuild
+++ b/app-office/texmacs/texmacs-1.0.7.18.ebuild
@@ -1,16 +1,19 @@
 # Copyright 1999-2013 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.15-r1.ebuild,v 1.3 2013/03/02 19:37:54 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.7.18.ebuild,v 1.1 2013/03/23 10:01:03 grozin Exp $
 
 EAPI=4
 
-inherit autotools eutils
+inherit autotools eutils fdo-mime gnome2-utils
 
 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"
+# Due to some changes at ftp.texmacs.org, files can no longer be fetched by wget,
+# only by wget --no-passive-ftp
+#SRC_URI="ftp://ftp.texmacs.org/pub/TeXmacs/tmftp/source/${MY_P}.tar.gz"
+SRC_URI="http://dev.gentoo.org/~grozin/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -36,9 +39,10 @@ S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	# respect LDFLAGS, bug #338459
-	epatch "${FILESDIR}"/${PN}-ldflags.patch
-	# fix a typo in tm-files.scm
-	epatch "${FILESDIR}"/${P}-tm-files.patch
+	epatch "${FILESDIR}"/${PN}-plugins.patch
+
+	# dont update mime and desktop databases and icon cache
+	epatch "${FILESDIR}"/${PN}-updates.patch
 
 	eautoreconf
 }
@@ -54,3 +58,15 @@ src_install() {
 	default
 	domenu "${FILESDIR}"/TeXmacs.desktop
 }
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}