Backport Prefix changes to 5.20.1-r2, keyworded appropriately, bug #341987

Package-Manager: portage-2.2.01.17133-prefix/cvs/Darwin powerpc

3 files changed, 13 insertions, 10 deletions

diff --git a/sci-mathematics/maxima/ChangeLog b/sci-mathematics/maxima/ChangeLog
index c40cd3ce8096..bc47830db8c5 100644
--- a/sci-mathematics/maxima/ChangeLog
+++ b/sci-mathematics/maxima/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-mathematics/maxima
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.82 2010/09/17 11:23:55 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.83 2010/10/31 19:17:41 grobian Exp $
+
+  31 Oct 2010; Fabian Groffen <grobian@gentoo.org> maxima-5.20.1-r2.ebuild:
+  Backport Prefix changes to 5.20.1-r2, keyworded appropriately, bug #341987
 
 *maxima-5.22.1 (17 Sep 2010)
 
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index acf2464df1e6..7200ed4ea1e3 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -19,8 +19,8 @@ DIST maxima-5.21.1.tar.gz 21371967 RMD160 8892d142fd59aa756ba77d124340f075a1785b
 DIST maxima-5.22.1.tar.gz 21468277 RMD160 fdadee41f26fbed4d760386752002513059f8485 SHA1 a547321221a37a1a83cb53ed607d3397e7f0722e SHA256 981ae0b0e8b729e649082b1fe99d5a9ee07cfa68962e8d15f5431a95e9d8b969
 EBUILD maxima-5.18.1.ebuild 4200 RMD160 bb72c55e6752c9df03441e315d02fa6c23507347 SHA1 43ebda024310395ebb10e6da8329610cc964a5e2 SHA256 3d326b70d8951163b70c7129c1ec3dbb8af67f1b0d3718662a8d6f723fe361f1
 EBUILD maxima-5.19.2.ebuild 4349 RMD160 1d5d96b26d80aa86f46a22b41967a3b0faa6d7e0 SHA1 91a37a8c838c74fcea8175de71ee53f393f56546 SHA256 7d636ec1966a99b319c42122781dcc37ddbc3d46735dcf7183a1b940fe621237
-EBUILD maxima-5.20.1-r2.ebuild 4634 RMD160 f67e491c8580d8a76c071b739ae3513aac6a5468 SHA1 bf319fec2ecc2f56e88a1a0790b8267e71c0598a SHA256 bfb9e1f31426f32bfefecbef9a0e2a2777a5afb7031a9e02777c1244e034d178
+EBUILD maxima-5.20.1-r2.ebuild 4730 RMD160 85168a03f6717b98799f76478ffffcd015826c38 SHA1 ad2b45df1183f5f158c9495963b0a7f04a966d4f SHA256 9d06ee18e55d627c78d02ecd524d5d0168f203b1db32b7762dca4c6362b8311c
 EBUILD maxima-5.21.1-r1.ebuild 4666 RMD160 ced13c6036484ca4f585bf7f8bfd3efef349f940 SHA1 d8cb40a71c16577bc6873ab9fe875142a886d381 SHA256 e2082903828a0160eebc40128565d7e379992f57d3d32b2bd9c93c8c8eab6e2c
 EBUILD maxima-5.22.1.ebuild 4432 RMD160 7fbcf425929fd0743cd98d1c5f82cd0f087ca759 SHA1 2384678d94d4358de4053e795aff6f37632fdb25 SHA256 60be686ea30d3bc1c07b124d2e4506d1307d4a0eedebb3706c870d0f35618ae2
-MISC ChangeLog 18482 RMD160 17f14783260ed2cd978bb166d1aed6332db5f216 SHA1 950d19208e69da0c141ac624cbc5e77dca7450b9 SHA256 039c0cd592db4f240c507c29f049a0986d9875eaabc06ed00b6b82df0471f65b
+MISC ChangeLog 18637 RMD160 8ce2ac38b7c991131d5b28f0aaff51716f57573e SHA1 bbaa78c72dfb53f24d439f34b0617634a6243c86 SHA256 6aad69f42ae3c7e85ca76d335ff654521cb637e833a091f20049054e17abca4d
 MISC metadata.xml 1538 RMD160 d8fdc903bc508232d729789ccfb5068b82bebc12 SHA1 1e54225d047c1e0b45df832e37fe5342a8eee70a SHA256 282f77d990621305ef1c88510b0c2a26dfd39806207179e59bab2bdae06eed5c
diff --git a/sci-mathematics/maxima/maxima-5.20.1-r2.ebuild b/sci-mathematics/maxima/maxima-5.20.1-r2.ebuild
index d931fbc18c57..362c2e7d1f11 100644
--- a/sci-mathematics/maxima/maxima-5.20.1-r2.ebuild
+++ b/sci-mathematics/maxima/maxima-5.20.1-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.20.1-r2.ebuild,v 1.1 2010/04/12 11:58:46 grozin Exp $
-EAPI=2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.20.1-r2.ebuild,v 1.2 2010/10/31 19:17:41 grobian Exp $
+EAPI=3
 inherit eutils elisp-common
 
 DESCRIPTION="Free computer algebra environment based on Macsyma"
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64  ~ppc ~sparc ~x86"
+KEYWORDS="~amd64  ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 # Supported lisps with readline
 SUPP_RL="gcl clisp"
@@ -73,7 +73,7 @@ RDEPEND="${RDEPEND}
 DEPEND="${RDEPEND}
 	sys-apps/texinfo"
 
-TEXMF=/usr/share/texmf-site
+TEXMF="${EPREFIX}"/usr/share/texmf-site
 NO_INIT_PATCH_PV="5.19.1"
 
 pkg_setup() {
@@ -148,11 +148,11 @@ src_configure() {
 		done
 	fi
 
-	econf ${myconf}
+	econf ${myconf} --with-lispdir="${SITELISP}/${PN}"
 }
 
 src_install() {
-	einstall emacsdir="${D}${SITELISP}/${PN}" || die "einstall failed"
+	einstall emacsdir="${ED}${SITELISP}/${PN}" || die "einstall failed"
 
 	use tk && make_desktop_entry xmaxima xmaxima \
 		/usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
@@ -177,7 +177,7 @@ src_install() {
 
 pkg_preinst() {
 	# some lisps do not read compress info files (bug #176411)
-	for infofile in "${D}"/usr/share/info/*.bz2 ; do
+	for infofile in "${ED}"/usr/share/info/*.bz2 ; do
 		bunzip2 "${infofile}"
 	done
 }