Fix LD_LIBRARY_PATH in tm_mupad_help, bug #337532

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

4 files changed, 26 insertions, 17 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/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() {