Version bump, bug #338459 fixed, identical patch files combined

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

8 files changed, 138 insertions, 34 deletions

diff --git a/app-office/texmacs/ChangeLog b/app-office/texmacs/ChangeLog
index 2a21f0a6eaee..b388691bf8c6 100644
--- a/app-office/texmacs/ChangeLog
+++ b/app-office/texmacs/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-office/texmacs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.83 2010/09/16 10:20:24 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.84 2010/10/31 05:15:44 grozin Exp $
+
+*texmacs-1.0.7.7 (31 Oct 2010)
+
+  31 Oct 2010; Andrey Grozin <grozin@gentoo.org> texmacs-1.0.7.2.ebuild,
+  -files/texmacs-1.0.7.2-strip.patch, -files/texmacs-1.0.7.5-strip.patch,
+  texmacs-1.0.7.6.ebuild, -files/texmacs-1.0.7.6-strip.patch,
+  +texmacs-1.0.7.7.ebuild, +files/texmacs-ldflags.patch,
+  +files/texmacs-strip.patch:
+  Version bump, bug #338459 fixed, identical patch files combined
 
 *texmacs-1.0.7.6 (16 Sep 2010)
 
diff --git a/app-office/texmacs/files/texmacs-1.0.7.5-strip.patch b/app-office/texmacs/files/texmacs-1.0.7.5-strip.patch
deleted file mode 100644
index b6e660eac900..000000000000
--- a/app-office/texmacs/files/texmacs-1.0.7.5-strip.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: TeXmacs-1.0.7.1-src/Makefile.in
-===================================================================
---- TeXmacs-1.0.7.1-src.orig/Makefile.in
-+++ TeXmacs-1.0.7.1-src/Makefile.in
-@@ -130,9 +130,7 @@ INSTALL:
- 	$(CP) $(tmdir)/bin/tm_gs $(DESTDIR)$(tmbin)/bin
- 	$(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 || :
- 	$(RM) $(DESTDIR)$(tmbin)/lib/*.a
diff --git a/app-office/texmacs/files/texmacs-1.0.7.6-strip.patch b/app-office/texmacs/files/texmacs-1.0.7.6-strip.patch
deleted file mode 100644
index b6e660eac900..000000000000
--- a/app-office/texmacs/files/texmacs-1.0.7.6-strip.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: TeXmacs-1.0.7.1-src/Makefile.in
-===================================================================
---- TeXmacs-1.0.7.1-src.orig/Makefile.in
-+++ TeXmacs-1.0.7.1-src/Makefile.in
-@@ -130,9 +130,7 @@ INSTALL:
- 	$(CP) $(tmdir)/bin/tm_gs $(DESTDIR)$(tmbin)/bin
- 	$(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 || :
- 	$(RM) $(DESTDIR)$(tmbin)/lib/*.a
diff --git a/app-office/texmacs/files/texmacs-ldflags.patch b/app-office/texmacs/files/texmacs-ldflags.patch
new file mode 100644
index 000000000000..f0e632beb8b4
--- /dev/null
+++ b/app-office/texmacs/files/texmacs-ldflags.patch
@@ -0,0 +1,56 @@
+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/files/texmacs-1.0.7.2-strip.patch b/app-office/texmacs/files/texmacs-strip.patch
index b6e660eac900..b6e660eac900 100644
--- a/app-office/texmacs/files/texmacs-1.0.7.2-strip.patch
+++ b/app-office/texmacs/files/texmacs-strip.patch
diff --git a/app-office/texmacs/texmacs-1.0.7.2.ebuild b/app-office/texmacs/texmacs-1.0.7.2.ebuild
index 9ca73ff3f74e..59ee0f0d10b1 100644
--- a/app-office/texmacs/texmacs-1.0.7.2.ebuild
+++ b/app-office/texmacs/texmacs-1.0.7.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.2.ebuild,v 1.7 2009/12/26 17:26:26 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.7.2.ebuild,v 1.8 2010/10/31 05:15:44 grozin Exp $
 EAPI=2
 inherit autotools
 MY_P=${P/tex/TeX}-src
@@ -34,7 +34,7 @@ S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	# don't strip
-	epatch "${FILESDIR}"/${P}-strip.patch
+	epatch "${FILESDIR}"/${PN}-strip.patch
 
 	eautoreconf
 }
diff --git a/app-office/texmacs/texmacs-1.0.7.6.ebuild b/app-office/texmacs/texmacs-1.0.7.6.ebuild
index 917dedb0f7c6..a178af00f28a 100644
--- a/app-office/texmacs/texmacs-1.0.7.6.ebuild
+++ b/app-office/texmacs/texmacs-1.0.7.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.6.ebuild,v 1.1 2010/09/16 10:20:24 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.7.6.ebuild,v 1.2 2010/10/31 05:15:44 grozin Exp $
 EAPI=2
 inherit autotools
 MY_P=${P/tex/TeX}-src
@@ -42,7 +42,7 @@ pkg_setup() {
 
 src_prepare() {
 	# don't strip
-	epatch "${FILESDIR}"/${P}-strip.patch
+	epatch "${FILESDIR}"/${PN}-strip.patch
 
 	eautoreconf
 }
diff --git a/app-office/texmacs/texmacs-1.0.7.7.ebuild b/app-office/texmacs/texmacs-1.0.7.7.ebuild
new file mode 100644
index 000000000000..5461c21bcdd8
--- /dev/null
+++ b/app-office/texmacs/texmacs-1.0.7.7.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2010 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.7.ebuild,v 1.1 2010/10/31 05:15:44 grozin Exp $
+EAPI=2
+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-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 ) )
+	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_prepare() {
+	# don't strip
+	epatch "${FILESDIR}"/${PN}-strip.patch
+
+	# respect LDFLAGS, bug #338459
+	epatch "${FILESDIR}"/${PN}-ldflags.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with imlib imlib2) \
+		--enable-optimize="${CXXFLAGS}" \
+		$(use_enable qt4 qt)
+}
+
+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"
+}