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

Package-Manager: portage-2.2.0_alpha2/cvs/Linux i686

9 files changed, 145 insertions, 40 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/Manifest b/app-office/texmacs/Manifest
index e51b18ccd8ee..0264d31a0fb7 100644
--- a/app-office/texmacs/Manifest
+++ b/app-office/texmacs/Manifest
@@ -1,13 +1,14 @@
 AUX TeXmacs.desktop 268 RMD160 92ca6c7c75a6e1edd671c2e5f766140382107ebb SHA1 f917105f37a16393ff8f6e1be111a9f00733de41 SHA256 9872d60c5080260a3dcc842cf1f74557954b0830b204ffc0e255f7ee52a13825
-AUX texmacs-1.0.7.2-strip.patch 710 RMD160 98f02d72e91fa00785af0702029edab26beb0a18 SHA1 1fff9b3aff919cf2cc48656748eb69d9e9e4af34 SHA256 851e6c9468d2db87d7c19b1041ab94a88dc7894af74edc06dec8f8b4b52eb701
-AUX texmacs-1.0.7.5-strip.patch 710 RMD160 98f02d72e91fa00785af0702029edab26beb0a18 SHA1 1fff9b3aff919cf2cc48656748eb69d9e9e4af34 SHA256 851e6c9468d2db87d7c19b1041ab94a88dc7894af74edc06dec8f8b4b52eb701
-AUX texmacs-1.0.7.6-strip.patch 710 RMD160 98f02d72e91fa00785af0702029edab26beb0a18 SHA1 1fff9b3aff919cf2cc48656748eb69d9e9e4af34 SHA256 851e6c9468d2db87d7c19b1041ab94a88dc7894af74edc06dec8f8b4b52eb701
+AUX texmacs-ldflags.patch 3389 RMD160 981eec8bff794ed4f619a24fbda000ffe5d9f03c SHA1 caf6d40badfd07ec897ad323b95b49a1f65d80e4 SHA256 23e0514e1bfaed93c60b0ceae050dd6dbf0dfebb43fb08712c4db5b6288d6b3a
+AUX texmacs-strip.patch 710 RMD160 98f02d72e91fa00785af0702029edab26beb0a18 SHA1 1fff9b3aff919cf2cc48656748eb69d9e9e4af34 SHA256 851e6c9468d2db87d7c19b1041ab94a88dc7894af74edc06dec8f8b4b52eb701
 DIST TeXmacs-1.0.7.2-src.tar.gz 4763348 RMD160 06c8a9c93f79a576daf365ec229e98229f8563d0 SHA1 f011f4ef2b36b3f6531ecdadf96800105301b45d SHA256 98ca44418f4d4644bdee03add2e2baf18f0839d4d8336189ff4a095329f7a2ba
 DIST TeXmacs-1.0.7.5-src.tar.gz 5676891 RMD160 929a84c51ccaf23dc2ed9f037667a0743f0bc2da SHA1 df1a78e556439ab1db1587aee66c4dc914245342 SHA256 34ecb117092465485433eab3c745a59d9383b7a7dd57ba33444b119ec261d370
 DIST TeXmacs-1.0.7.6-src.tar.gz 5684288 RMD160 926ee849d73550988b8d5c3eb3c134cfe1a74de1 SHA1 9d1cbcc8e8a7afa091f3819f1a5d1f4d33c0e2ec SHA256 50d7e3973f4d39f01977945e5a79a7d4f3b7850d11af0a520cbfda14d5f09874
+DIST TeXmacs-1.0.7.7-src.tar.gz 5758524 RMD160 95d0bd16cac6ce4d85215b706b4029f4f921ad3a SHA1 93e8b24fe978e8f825c7898cf201bf1e962d41ef SHA256 c135379640dc4ff897e0d86db024706cbc650d45ac661a09128347dd12caa3d0
 DIST TeXmacs-600dpi-fonts.tar.gz 2899193 RMD160 b5a27a59ed0c178f94836b828d12d3534b506582 SHA1 0a3a279b842b63f55449856690483d07c6e1219c SHA256 e8eeb3c97a1405fd037b0567f683a6d2225d47c7829893b9768bd6c1c707cc81
-EBUILD texmacs-1.0.7.2.ebuild 1503 RMD160 8c6f916dcf74a204d4debfbaedd76cec573303ba SHA1 6a54a8ca64da6cbb18073401f9111163ddce3417 SHA256 ed6df98243897084235a9b1751309b94228456b23af77ea2f63ebac6c8aaf1e7
+EBUILD texmacs-1.0.7.2.ebuild 1507 RMD160 2537533cdc873a174f77a4ba78a19b78a09e72ef SHA1 cadd84af65d6dcfcd7b79b3ab11e37d17f9035df SHA256 463c539fa5bb4734b8de842ae0cb210a500bdf9e54104db7ee07b2d21026e50a
 EBUILD texmacs-1.0.7.5.ebuild 1747 RMD160 289892b88de4a43d415326a75af50983f2b34b07 SHA1 2c8a6c912bf4410d166569a4a8b30e3e2ba74503 SHA256 41edb5f94d6ad9ec02ef80a0d21205edf342589277b1eb982633d93cde9f508b
-EBUILD texmacs-1.0.7.6.ebuild 1747 RMD160 74f2f16d02f1f68cf2221959f11baf96babc2763 SHA1 d4a63a94e3a7075cb5b50001734c42025466682e SHA256 48d2975332b4a811b6cb763c80708bd75cf415041d47cac22396600b9536c483
-MISC ChangeLog 13536 RMD160 a42d4174d4afbed87b3d97fac003b99cb8577c6d SHA1 3067420698bd083e34c1620aeaaa41a3b18ebb81 SHA256 905c5611c418d01bd56dc7fdc85e091c6e8b8817b5ecddb165c094474d7631b1
+EBUILD texmacs-1.0.7.6.ebuild 1748 RMD160 ff72c7ec95aaedfe86fc0e55959b02bc35bb47fa SHA1 069c4bb2600c5d34c48e8f29874ee5d482981635 SHA256 7ff706656362ddd7904f06e2813dd077a15db1bd89231cfe37fd61825dc029ee
+EBUILD texmacs-1.0.7.7.ebuild 1823 RMD160 dfa1495e27afed3395121f031ac0e761b3bbdc56 SHA1 36e9353a93c2b6f37f2e415c59498b4795c1fd58 SHA256 be9faf45bd2a611ef2788d07695037e151793607d6ee5afc2ff1092fb8fee276
+MISC ChangeLog 13931 RMD160 17a35004b3541d3c303ad20a39686efaa3f0aed8 SHA1 6e66b2a991e5bd2843094f3c21c7916bd33b70dd SHA256 e7224c7bf35eeb217a28507a303bd7dee95b4c4eaa320f484ce82506ee8cd626
 MISC metadata.xml 346 RMD160 2c1ba8a5aa56c0547c8ca42baca77d46bdd5e6e7 SHA1 1fd3a62650f23d156dac006d2051b3fb22e57057 SHA256 992c947e112a6a4244e57336294ce5020079f90612f2d0093879a85814928813
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"
+}