Path to texmf-site now hard-coded

(Portage version: 2.2_rc16/cvs/Linux 2.6.26-tuxonice i686)

2 files changed, 10 insertions, 42 deletions

diff --git a/sci-mathematics/maxima/ChangeLog b/sci-mathematics/maxima/ChangeLog
index 74270f823d49..436dfd4ea5ea 100644
--- a/sci-mathematics/maxima/ChangeLog
+++ b/sci-mathematics/maxima/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-mathematics/maxima
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.59 2008/09/03 03:03:38 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.60 2008/11/29 04:02:07 grozin Exp $
+
+  29 Nov 2008; Andrey Grozin <grozin@gentoo.org> maxima-5.16.3.ebuild:
+  Path to texmf-site now hard-coded
 
   03 Sep 2008; Alexis Ballier <aballier@gentoo.org> maxima-5.15.0-r1.ebuild,
   maxima-5.16.3.ebuild:
diff --git a/sci-mathematics/maxima/maxima-5.16.3.ebuild b/sci-mathematics/maxima/maxima-5.16.3.ebuild
index e9de25a70fd6..1409c5e809e4 100644
--- a/sci-mathematics/maxima/maxima-5.16.3.ebuild
+++ b/sci-mathematics/maxima/maxima-5.16.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.16.3.ebuild,v 1.2 2008/09/03 03:03:38 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.16.3.ebuild,v 1.3 2008/11/29 04:02:07 grozin Exp $
 inherit eutils elisp-common
 
 DESCRIPTION="Free computer algebra environment based on Macsyma"
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 AECA"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 # Supported lisps with readline
 SUPP_RL="gcl clisp"
@@ -62,6 +62,8 @@ RDEPEND="${RDEPEND}
 DEPEND="${RDEPEND}
 	sys-apps/texinfo"
 
+TEXMF=/usr/share/texmf-site
+
 pkg_setup() {
 	LISPS=""
 
@@ -89,43 +91,6 @@ pkg_setup() {
 		ewarn "Please use gcl from http://repo.or.cz/w/gentoo-lisp-overlay.git"
 	fi
 
-	# Calculating MAXIMA_TEXMFDIR
-	if use latex; then
-		local TEXMFPATH="$(kpsewhich -var-value=TEXMFSITE)"
-		local TEXMFCONFIGFILE="$(kpsewhich texmf.cnf)"
-
-		if [ -z "${TEXMFPATH}" ]; then
-			eerror "You haven't defined the TEXMFSITE variable in your TeX config."
-			eerror "Please do so in the file ${TEXMFCONFIGFILE:-/var/lib/texmf/web2c/texmf.cnf}"
-			die "Define TEXMFSITE in TeX configuration!"
-		else
-			# go through the colon separated list of directories
-			# (maybe only one) provided in the variable
-			# TEXMFPATH (generated from TEXMFSITE from TeX's config)
-			# and choose only the first entry.
-			# All entries are separated by colons, even when defined
-			# with semi-colons, kpsewhich changes
-			# the output to a generic format, so IFS has to be redefined.
-			local IFS="${IFS}:"
-
-			for strippedpath in ${TEXMFPATH}; do
-				if [ -d ${strippedpath} ]; then
-					MAXIMA_TEXMFDIR="${strippedpath}"
-					break
-				fi
-			done
-
-			# verify if an existing path was chosen to prevent from
-			# installing into the wrong directory
-			if [ -z ${MAXIMA_TEXMFDIR} ]; then
-				eerror "TEXMFSITE does not contain any existing directory."
-				eerror "Please define an existing directory in your TeX config file"
-				eerror "${TEXMFCONFIGFILE:-/var/lib/texmf/web2c/texmf.cnf} or create at least one of the there specified directories"
-				die "TEXMFSITE variable did not contain an existing directory"
-			fi
-		fi
-	fi
-
 	if use X && ! built_with_use sci-visualization/gnuplot gd wxwindows; then
 		elog "To benefit full plotting capability of maxima,"
 		elog "enable the gd USE flag for sci-visualization/gnuplot"
@@ -175,7 +140,7 @@ src_compile() {
 		done
 	fi
 
-	econf ${myconf} || die "econf failed"
+	econf ${myconf}
 	emake || die "emake failed"
 }
 
@@ -187,7 +152,7 @@ src_install() {
 		"Science;Math;Education"
 
 	if use latex; then
-		insinto "${MAXIMA_TEXMFDIR}"/tex/latex/emaxima
+		insinto ${TEXMF}/tex/latex/emaxima
 		doins interfaces/emacs/emaxima/emaxima.sty
 	fi