moved from USE flag tcltk to tk, see bug 17808; added check for TEXMFSITE and install there to avoid possible collisions, see bug 169178, reported by Sebastian Schubert <sebastian-schubert@gmx.de>

Package-Manager: portage-2.1.2.2

5 files changed, 209 insertions, 18 deletions

diff --git a/sci-mathematics/maxima/ChangeLog b/sci-mathematics/maxima/ChangeLog
index d070a49d0641..8b9c02cfd820 100644
--- a/sci-mathematics/maxima/ChangeLog
+++ b/sci-mathematics/maxima/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-mathematics/maxima
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.25 2007/03/08 07:12:41 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.26 2007/04/16 08:51:11 opfer Exp $
+
+*maxima-5.11.0-r1 (16 Apr 2007)
+
+  16 Apr 2007; Christian Faulhammer <opfer@gentoo.org> maxima-5.9.3.ebuild,
+  +maxima-5.11.0-r1.ebuild:
+  moved from USE flag tcltk to tk, see bug 17808; added check for TEXMFSITE
+  and install there to avoid possible collisions, see bug 169178, reported by
+  Sebastian Schubert <sebastian-schubert@gmx.de>
 
   08 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
   files/50maxima-gentoo.el:
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index bfbe27097cca..7e85841fa0b8 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -57,6 +57,10 @@ EBUILD maxima-5.10.0.ebuild 3357 RMD160 590b4d546b9a74e685f7e689ff91db78fb243ca8
 MD5 1f64a324683dd020af4d7854d90536a7 maxima-5.10.0.ebuild 3357
 RMD160 590b4d546b9a74e685f7e689ff91db78fb243ca8 maxima-5.10.0.ebuild 3357
 SHA256 6b063137ed6739921e2b2d098c8d3ffa1255872ca23d5c0c56dcf641c7d0fecd maxima-5.10.0.ebuild 3357
+EBUILD maxima-5.11.0-r1.ebuild 5175 RMD160 69674a83a680b165c783551ae9f7cb12a1f0f9c1 SHA1 48628330d6a5f1aa5184992c9565149193614075 SHA256 6dfdee5e23dfb3bf5703205c496c389b0f325ec2e56f94aca8c504ab7e7aa777
+MD5 4ebcb1829d7568f889ce8a6b9be54e14 maxima-5.11.0-r1.ebuild 5175
+RMD160 69674a83a680b165c783551ae9f7cb12a1f0f9c1 maxima-5.11.0-r1.ebuild 5175
+SHA256 6dfdee5e23dfb3bf5703205c496c389b0f325ec2e56f94aca8c504ab7e7aa777 maxima-5.11.0-r1.ebuild 5175
 EBUILD maxima-5.11.0.ebuild 3714 RMD160 e9f2d27a468a0ad813320b890c138bf520f7a4d4 SHA1 52b1689eb248b2fde32e03bcc8c0a9bcb4f44939 SHA256 91f451af146a47d2672bb8b6d1d89d20ec14ecbd9cb7b12dc3baa87d3fe72c38
 MD5 f09788f286deec03f84382094e2fb13e maxima-5.11.0.ebuild 3714
 RMD160 e9f2d27a468a0ad813320b890c138bf520f7a4d4 maxima-5.11.0.ebuild 3714
@@ -69,14 +73,14 @@ EBUILD maxima-5.9.1.ebuild 2532 RMD160 a4145d603c61df84ece22b2a06631f487904c514
 MD5 a5bd93bd68dec962956ea5ed64b5c276 maxima-5.9.1.ebuild 2532
 RMD160 a4145d603c61df84ece22b2a06631f487904c514 maxima-5.9.1.ebuild 2532
 SHA256 6bbb7dc68d8bc64954ee7e621a4c3afc26a8b777c6cea8eb7e50210fa1083bcc maxima-5.9.1.ebuild 2532
-EBUILD maxima-5.9.3.ebuild 3697 RMD160 17f6dd2ae0383e0cf325bcd176f87d2418f42f02 SHA1 145f2dbbfc7276fca05ab8d0e63d5cdb8e4cbb5c SHA256 bae587b50e697b26d1d72f4d7e92f7d69b32cfa419135265a9fb8b58590252cc
-MD5 011ac815579bb74f333da6c63bf30dc4 maxima-5.9.3.ebuild 3697
-RMD160 17f6dd2ae0383e0cf325bcd176f87d2418f42f02 maxima-5.9.3.ebuild 3697
-SHA256 bae587b50e697b26d1d72f4d7e92f7d69b32cfa419135265a9fb8b58590252cc maxima-5.9.3.ebuild 3697
-MISC ChangeLog 7418 RMD160 e091d08c42a291590d064b415ff1a9b534b93835 SHA1 0652be39d3364003668c1458ebca241613dad768 SHA256 483a4f7a0637fd033e802dca10fee654a1cf2777f846ad5c48bc1c483ca76100
-MD5 0c54290feac23f282792dbf933d8c404 ChangeLog 7418
-RMD160 e091d08c42a291590d064b415ff1a9b534b93835 ChangeLog 7418
-SHA256 483a4f7a0637fd033e802dca10fee654a1cf2777f846ad5c48bc1c483ca76100 ChangeLog 7418
+EBUILD maxima-5.9.3.ebuild 3681 RMD160 d686ba7a2e320c7ed1dedde4b008ecd5b7dca543 SHA1 9c7d13e8d53282a3cf1263166412f2403a46bd6b SHA256 a5a05f65bb0598b03d3d80cc2ce4754dc17e5c8117b6059d435ed0d4757dc8c1
+MD5 beb2d63d616e44465ae8ceee1d5b9dac maxima-5.9.3.ebuild 3681
+RMD160 d686ba7a2e320c7ed1dedde4b008ecd5b7dca543 maxima-5.9.3.ebuild 3681
+SHA256 a5a05f65bb0598b03d3d80cc2ce4754dc17e5c8117b6059d435ed0d4757dc8c1 maxima-5.9.3.ebuild 3681
+MISC ChangeLog 7759 RMD160 4b7cc5e3edc52e8560bd39dd4e0974271d7d22e8 SHA1 de58fd2086337b9f184f214df67f1c7818f9b193 SHA256 84ffc4122d5aa4550ad773ebdbba06d289ea3aece05ebba52af698ab4c8d1b95
+MD5 2588081e447f877da17ccef42fe5f6f7 ChangeLog 7759
+RMD160 4b7cc5e3edc52e8560bd39dd4e0974271d7d22e8 ChangeLog 7759
+SHA256 84ffc4122d5aa4550ad773ebdbba06d289ea3aece05ebba52af698ab4c8d1b95 ChangeLog 7759
 MISC metadata.xml 737 RMD160 6f833e02ea5b87a66064c32e7c35889c63c96649 SHA1 bff378e387662ce5e4c4168c74ee7ff1493c41a4 SHA256 9deb0b30538b6d35c0877384b97620eda2dde0bf3b4c702ccdadb007e868daef
 MD5 747fd88897ef9ae5002fa891864f42aa metadata.xml 737
 RMD160 6f833e02ea5b87a66064c32e7c35889c63c96649 metadata.xml 737
@@ -87,6 +91,9 @@ SHA256 ab33482322ef3a77e32e2a7a9f34d4d34793c28ad21dbb0178ebf94473d0469f files/di
 MD5 9487bc28719928f5d7c6f6e4f20905ed files/digest-maxima-5.11.0 247
 RMD160 5cbac65993f23d21c8cdb91bad2ba8269271cd16 files/digest-maxima-5.11.0 247
 SHA256 63214925ce0a71acd450b8c4a8e5ac2535f9e11a37e88e8a8427d12f70c1dd85 files/digest-maxima-5.11.0 247
+MD5 9487bc28719928f5d7c6f6e4f20905ed files/digest-maxima-5.11.0-r1 247
+RMD160 5cbac65993f23d21c8cdb91bad2ba8269271cd16 files/digest-maxima-5.11.0-r1 247
+SHA256 63214925ce0a71acd450b8c4a8e5ac2535f9e11a37e88e8a8427d12f70c1dd85 files/digest-maxima-5.11.0-r1 247
 MD5 ef493f2f9d7c8570ac06239a94707fae files/digest-maxima-5.9.1 241
 RMD160 ca6bee5d10da060eff2d678ed90099d3f50fa198 files/digest-maxima-5.9.1 241
 SHA256 c9f64acc636ed728a8c03269f4e58f16cb6b335b25c49fc4f7e308d06629d687 files/digest-maxima-5.9.1 241
@@ -99,7 +106,7 @@ SHA256 e91682eae89570d2bb81449c39338148defb3bdda14cd1c815b2c26ca8c92927 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFF77cqNQqtfCuFneMRAnRjAJ44tQf7wBCci0zkwQh2tFWtmw2yZACgntwR
-LiJBFovWCKjMs85IMaw7+i8=
-=EtvW
+iD8DBQFGIzkHNQqtfCuFneMRAp9SAJwKKqoRiZsbDhp/v0crY/3aRSluXgCeK4H7
+WPvLBvEFg/+QSO92+yH23DA=
+=Cm+6
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/maxima/files/digest-maxima-5.11.0-r1 b/sci-mathematics/maxima/files/digest-maxima-5.11.0-r1
new file mode 100644
index 000000000000..706606789654
--- /dev/null
+++ b/sci-mathematics/maxima/files/digest-maxima-5.11.0-r1
@@ -0,0 +1,3 @@
+MD5 d9ae353e8eba9b9d5686e119e59ab88c maxima-5.11.0.tar.gz 13924132
+RMD160 8f7fb1b8bc7438ffdc393a0eb0f86b5efa79ef3e maxima-5.11.0.tar.gz 13924132
+SHA256 7a7259123bd81a7de3609c7e59b561d49e2710a8f7117c42f373afdd6a6786ac maxima-5.11.0.tar.gz 13924132
diff --git a/sci-mathematics/maxima/maxima-5.11.0-r1.ebuild b/sci-mathematics/maxima/maxima-5.11.0-r1.ebuild
new file mode 100644
index 000000000000..c782667cf0e1
--- /dev/null
+++ b/sci-mathematics/maxima/maxima-5.11.0-r1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.11.0-r1.ebuild,v 1.1 2007/04/16 08:51:11 opfer Exp $
+
+inherit eutils elisp-common autotools
+
+DESCRIPTION="Free computer algebra environment based on Macsyma"
+HOMEPAGE="http://maxima.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 AECA"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="cmucl clisp sbcl gcl tetex emacs auctex tk nls unicode"
+
+# rlwrap is recommended for cmucl and sbcl
+RDEPEND=">=sci-visualization/gnuplot-4.0
+	app-text/gv
+	tetex? ( virtual/tetex )
+	emacs? ( virtual/emacs )
+	auctex? ( app-emacs/auctex )
+	clisp? ( >=dev-lisp/clisp-2.33.2-r1 )
+	gcl?   ( >=dev-lisp/gcl-2.6.7 )
+	sbcl?  ( >=dev-lisp/sbcl-0.9.4 app-misc/rlwrap )
+	cmucl? ( >=dev-lisp/cmucl-19a app-misc/rlwrap )
+	!clisp? ( !sbcl? ( !cmucl? ( >=dev-lisp/gcl-2.6.7 ) ) )
+	tk? ( >=dev-lang/tk-8.3.3 )"
+
+DEPEND="${RDEPEND} >=sys-apps/texinfo-4.3"
+
+for lang in es pt; do
+	IUSE="${IUSE} linguas_${lang}"
+done
+
+pkg_setup() {
+# Don't install in the main tree, as this may cause file collisions
+	if use tetex; 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
+}
+
+# chosen apps are hardcoded in maxima source:
+# - ghostview for postscript (changed to gv)
+# - acroread for pdf
+# - xdvi for dvi. this could change, with pain.
+
+src_unpack() {
+	unpack ${A}
+	# replace obsolete netscape with firefox, add opera as choices
+	epatch "${FILESDIR}"/${P}-default-browser.patch
+	# replace ugly ghostview with gv
+	epatch "${FILESDIR}"/${P}-default-psviewer.patch
+	# no debug during compile
+	epatch "${FILESDIR}"/${P}-sbcl-disable-debugger.patch
+	# diff_form autoloading
+	epatch "${FILESDIR}/${P}-diff_form.patch"
+}
+
+src_compile() {
+	# automake version mismatch otherwise (sbcl only)
+	use sbcl && eautoreconf
+
+	# remove rmaxima if neither cmucl nor sbcl
+	if ! use sbcl && ! use cmucl ; then
+		sed -i -e '/^@WIN32_FALSE@bin_SCRIPTS/s/rmaxima//' src/Makefile.in
+	fi
+
+	# remove xmaxima if no tk
+	local myconf=""
+	if use tk; then
+		myconf="${myconf} --with-wish=wish"
+	else
+		myconf="${myconf} --with-wish=none"
+		sed -i -e '/^SUBDIRS/s/xmaxima//' interfaces/Makefile.in
+	fi
+
+	# enable gcl if no other lisp selected
+	if use gcl || (! use cmucl && ! use clisp && ! use sbcl ); then
+		if ! built_with_use dev-lisp/gcl ansi; then
+			eerror "GCL must be installed with ANSI."
+			eerror "Try USE=\"ansi\" emerge gcl"
+			die "This package needs gcl with USE=ansi"
+		fi
+		myconf="${myconf} --enable-gcl"
+	fi
+
+	# enable existing translated doc
+	if use nls; then
+		for lang in es pt; do
+			if use linguas_${lang}; then
+				myconf="${myconf} --enable-lang-${lang}"
+				use unicode && myconf="${myconf} --enable-lang-${lang}-utf8"
+			fi
+		done
+	fi
+
+	econf \
+		$(use_enable cmucl) \
+		$(use_enable clisp) \
+		$(use_enable sbcl) \
+		${myconf} \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	use tk && make_desktop_entry xmaxima xmaxima \
+		/usr/share/${PN}/${PV}/xmaxima/maxima-new.png
+
+	if use emacs; then
+		sed -e "s/PV/${PV}/" "${FILESDIR}"/50maxima-gentoo.el > 50maxima-gentoo.el
+		elisp-site-file-install 50maxima-gentoo.el
+	fi
+
+	if use tetex; then
+		insinto "${MAXIMA_TEXMFDIR}/tex/latex/emaxima"
+		doins interfaces/emacs/emaxima/emaxima.sty
+	fi
+
+	insinto /usr/share/${PN}/${PV}/doc
+	doins AUTHORS ChangeLog COPYING NEWS README*
+	dodir /usr/share/doc
+	dosym /usr/share/${PN}/${PV}/doc /usr/share/doc/${PF}
+}
+
+pkg_preinst() {
+	# some lisp do not gunzip info files on the fly
+	if use cmucl || use clisp || use sbcl; then
+		for infofile in $(ls ${D}/usr/share/info/*.gz); do
+			gunzip ${infofile}
+		done
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	use tetex && mktexlsr
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/sci-mathematics/maxima/maxima-5.9.3.ebuild b/sci-mathematics/maxima/maxima-5.9.3.ebuild
index ddfc21c6039e..60227fab1d95 100644
--- a/sci-mathematics/maxima/maxima-5.9.3.ebuild
+++ b/sci-mathematics/maxima/maxima-5.9.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.9.3.ebuild,v 1.2 2006/07/12 15:34:43 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.9.3.ebuild,v 1.3 2007/04/16 08:51:11 opfer Exp $
 
 inherit eutils elisp-common autotools
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2 AECA"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="cmucl clisp sbcl gcl tetex emacs auctex tcltk nls unicode"
+IUSE="cmucl clisp sbcl gcl tetex emacs auctex tk nls unicode"
 
 DEPEND=">=sys-apps/texinfo-4.3
 	tetex? ( virtual/tetex )
@@ -28,7 +28,7 @@ RDEPEND=">=sci-visualization/gnuplot-4.0
 	app-text/gv
 	sbcl?  ( app-misc/rlwrap )
 	cmucl? ( app-misc/rlwrap )
-	tcltk? ( >=dev-lang/tk-8.3.3 )"
+	tk? ( >=dev-lang/tk-8.3.3 )"
 
 # chosen apps are hardcoded in maxima source:
 # - ghostview for postscript (changed to gv)
@@ -58,7 +58,7 @@ src_compile() {
 
 	# remove xmaxima if no tk
 	local myconf=""
-	if use tcltk; then
+	if use tk; then
 		myconf="${myconf} --with-wish=wish"
 	else
 		myconf="${myconf} --with-wish=none"
@@ -97,7 +97,7 @@ src_compile() {
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 
-	use tcltk && make_desktop_entry xmaxima xmaxima \
+	use tk && make_desktop_entry xmaxima xmaxima \
 		/usr/share/${PN}/${PV}/xmaxima/maxima-new.png
 
 	if use emacs; then