Fix LD_LIBRARY_PATH in tm_mupad_help, bug #337532

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

5 files changed, 30 insertions, 21 deletions

diff --git a/app-office/texmacs/ChangeLog b/app-office/texmacs/ChangeLog
index 6b12d46cf339..3e26858d35f5 100644
--- a/app-office/texmacs/ChangeLog
+++ b/app-office/texmacs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/texmacs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.90 2011/03/07 17:32:48 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.91 2011/03/17 20:21:24 grozin Exp $
+
+*texmacs-1.0.7.10-r1 (17 Mar 2011)
+
+  17 Mar 2011; Andrey Grozin <grozin@gentoo.org> +texmacs-1.0.7.2-r1.ebuild,
+  -texmacs-1.0.7.9.ebuild, -texmacs-1.0.7.10.ebuild,
+  +texmacs-1.0.7.10-r1.ebuild, +files/texmacs-mupad.patch:
+  Fix LD_LIBRARY_PATH in tm_mupad_help, bug #337532
 
 *texmacs-1.0.7.10 (07 Mar 2011)
 
diff --git a/app-office/texmacs/Manifest b/app-office/texmacs/Manifest
index 1f5c1edbd57e..2302d1117f22 100644
--- a/app-office/texmacs/Manifest
+++ b/app-office/texmacs/Manifest
@@ -1,12 +1,12 @@
 AUX TeXmacs.desktop 268 RMD160 92ca6c7c75a6e1edd671c2e5f766140382107ebb SHA1 f917105f37a16393ff8f6e1be111a9f00733de41 SHA256 9872d60c5080260a3dcc842cf1f74557954b0830b204ffc0e255f7ee52a13825
 AUX texmacs-ldflags.patch 3389 RMD160 981eec8bff794ed4f619a24fbda000ffe5d9f03c SHA1 caf6d40badfd07ec897ad323b95b49a1f65d80e4 SHA256 23e0514e1bfaed93c60b0ceae050dd6dbf0dfebb43fb08712c4db5b6288d6b3a
+AUX texmacs-mupad.patch 693 RMD160 5d4c2c2139393391f44a08c0671824a2eaf10e22 SHA1 aed3295d14fca58a219d0084790ffebca2f14e5b SHA256 c01e7c28847d0f66721438b764de66f806ec5980d4d27afb9ed4e0414364d714
 AUX texmacs-strip.patch 710 RMD160 98f02d72e91fa00785af0702029edab26beb0a18 SHA1 1fff9b3aff919cf2cc48656748eb69d9e9e4af34 SHA256 851e6c9468d2db87d7c19b1041ab94a88dc7894af74edc06dec8f8b4b52eb701
 DIST TeXmacs-1.0.7.10-src.tar.gz 6224318 RMD160 972d225bc2ce8836de02d7312b822ed6d248e91a SHA1 12491496e68b62aa07369748770771a8c2378129 SHA256 7616c5ccf3f5b9fee889559925bbce6ade0103c6032fe29def2497733255f809
 DIST TeXmacs-1.0.7.2-src.tar.gz 4763348 RMD160 06c8a9c93f79a576daf365ec229e98229f8563d0 SHA1 f011f4ef2b36b3f6531ecdadf96800105301b45d SHA256 98ca44418f4d4644bdee03add2e2baf18f0839d4d8336189ff4a095329f7a2ba
-DIST TeXmacs-1.0.7.9-src.tar.gz 6187387 RMD160 04c97399b8d1651c1b9adf1e43d7d1fddc7cb307 SHA1 738a559b912b36df3308ee4586d99fcf9c83b03a SHA256 95919f8edd5e0b9636668046f9fa9e1b2c9d6fad09e16485dfa21a3537d63e20
 DIST TeXmacs-600dpi-fonts.tar.gz 2899193 RMD160 b5a27a59ed0c178f94836b828d12d3534b506582 SHA1 0a3a279b842b63f55449856690483d07c6e1219c SHA256 e8eeb3c97a1405fd037b0567f683a6d2225d47c7829893b9768bd6c1c707cc81
-EBUILD texmacs-1.0.7.10.ebuild 1827 RMD160 667ab7edbf2a25f18e766c640f076e87f0fcad2e SHA1 c2fd857ec0916b89124305a03604154825a2bc43 SHA256 71da3aa858e7e4cc6c640109936aebfdba228650a89297e7d46527389eff1d8d
+EBUILD texmacs-1.0.7.10-r1.ebuild 1924 RMD160 1c78a755bc3e4a4ed433bd043b8ce66c26a45f49 SHA1 72fe6753a0a6b2a3148c71d1199356d848fa08bb SHA256 bfd1685a3f7c854eeb0b735396becff595e6bfac280a9771b05a379072ab529b
+EBUILD texmacs-1.0.7.2-r1.ebuild 1614 RMD160 eb6cd18079d873b756c11560199d145a56369a60 SHA1 065494dd815d51afd99f115d36fdc0932bf25afb SHA256 7565fc479720353245a613641eb3238c85d8319297e5be555861f9da334477f1
 EBUILD texmacs-1.0.7.2.ebuild 1510 RMD160 8e1ea648de6ad086162eec65d92b8c271dd0d0bc SHA1 fe2e7bdbc2a598280406c4a8a408ee3da3b80b59 SHA256 12de1ee6ba7a5a21085e29df0db741a63dd96290936b2f5fb1fd26c95f042859
-EBUILD texmacs-1.0.7.9.ebuild 1826 RMD160 88759fc9fa59e38433a86eacac5aa5a9516e48e5 SHA1 2c759cdde910f1d1f26da0090c832f33852269c7 SHA256 70fc43502cac53c8a06f4f04f8ccabb8f536b1dad57dc6a51ede0a0cd4194d7d
-MISC ChangeLog 14849 RMD160 e54259b0a92fbcf18a2aaa8da175db78d843d73f SHA1 d567b270a6d3e5193363ce252336bde146b9bab8 SHA256 46b88a046c837854aa0cb91671f0bc49a08fe72c46af268984110dd10cb69ae1
+MISC ChangeLog 15127 RMD160 f11e1bfd299ab74bf728ecaf6d190277b2219183 SHA1 b31e768a7dcc897008684525d2009cb3458fcbc0 SHA256 e6967ff75db465212b8a3e8c5047d0080e667161086bdadf5775bb5a454fae3e
 MISC metadata.xml 346 RMD160 2c1ba8a5aa56c0547c8ca42baca77d46bdd5e6e7 SHA1 1fd3a62650f23d156dac006d2051b3fb22e57057 SHA256 992c947e112a6a4244e57336294ce5020079f90612f2d0093879a85814928813
diff --git a/app-office/texmacs/files/texmacs-mupad.patch b/app-office/texmacs/files/texmacs-mupad.patch
new file mode 100644
index 000000000000..a6a6b5edbf0d
--- /dev/null
+++ b/app-office/texmacs/files/texmacs-mupad.patch
@@ -0,0 +1,8 @@
+diff -r -U1 TeXmacs-1.0.7.10-src.orig/plugins/mupad/bin/tm_mupad_help TeXmacs-1.0.7.10-src/plugins/mupad/bin/tm_mupad_help
+--- TeXmacs-1.0.7.10-src.orig/plugins/mupad/bin/tm_mupad_help	2011-03-05 16:46:18.000000000 +0600
++++ TeXmacs-1.0.7.10-src/plugins/mupad/bin/tm_mupad_help	2011-03-18 01:56:23.000000000 +0600
+@@ -28,3 +28,3 @@
+ export SYSINFO
+-LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${MuPAD_ROOT_PATH}/${SYSINFO}/lib:/usr/local/X11R6/motif-2.0/lib:/usr/local/X11R6/lib:$MuPAD_ROOT_PATH/$SYSINFO/bin
++LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${MuPAD_ROOT_PATH}/${SYSINFO}/lib:/usr/local/X11R6/motif-2.0/lib:/usr/local/X11R6/lib:$MuPAD_ROOT_PATH/$SYSINFO/bin
+ export LD_LIBRARY_PATH
diff --git a/app-office/texmacs/texmacs-1.0.7.10.ebuild b/app-office/texmacs/texmacs-1.0.7.10-r1.ebuild
index ff3d0bc8142b..892b06ad7170 100644
--- a/app-office/texmacs/texmacs-1.0.7.10.ebuild
+++ b/app-office/texmacs/texmacs-1.0.7.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.10.ebuild,v 1.1 2011/03/07 17:32:48 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.7.10-r1.ebuild,v 1.1 2011/03/17 20:21:24 grozin Exp $
 EAPI=2
 inherit autotools
 MY_P=${P/tex/TeX}-src
@@ -47,6 +47,9 @@ src_prepare() {
 	# respect LDFLAGS, bug #338459
 	epatch "${FILESDIR}"/${PN}-ldflags.patch
 
+	# fix LD_LIBRARY_PATH in tm_mupad_help, bug #337532
+	epatch "${FILESDIR}"/${PN}-mupad.patch
+
 	eautoreconf
 }
 
diff --git a/app-office/texmacs/texmacs-1.0.7.9.ebuild b/app-office/texmacs/texmacs-1.0.7.2-r1.ebuild
index 2ab96e542847..5172bcdd1d2e 100644
--- a/app-office/texmacs/texmacs-1.0.7.9.ebuild
+++ b/app-office/texmacs/texmacs-1.0.7.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.9.ebuild,v 1.2 2011/03/07 12:57:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.7.2-r1.ebuild,v 1.4 2011/03/17 20:21:24 grozin Exp $
 EAPI=2
 inherit autotools
 MY_P=${P/tex/TeX}-src
@@ -13,8 +13,8 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="imlib jpeg netpbm -qt4 svg spell"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="imlib jpeg netpbm svg spell"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 
 RDEPEND="
 	dev-scheme/guile[deprecated]
@@ -23,7 +23,6 @@ RDEPEND="
 	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 ) )
@@ -34,27 +33,19 @@ DEPEND="${RDEPEND}
 
 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
+	# fix LD_LIBRARY_PATH in tm_mupad_help, bug #337532
+	epatch "${FILESDIR}"/${PN}-mupad.patch
 
 	eautoreconf
 }
 
 src_configure() {
 	econf $(use_with imlib imlib2) \
-		--enable-optimize="${CXXFLAGS}" \
-		$(use_enable qt4 qt)
+		--enable-optimize="${CXXFLAGS}"
 }
 
 src_install() {