From 96025f9fa46afa50e945b36cfef84fb5a805ed10 Mon Sep 17 00:00:00 2001
From: Ulrich Müller <ulm@gentoo.org>
Date: Sat, 6 Mar 2010 08:50:00 +0000
Subject: Fix test for Emacs version in maxima.el, bug 307349. Package-Manager:
 portage-2.2_rc63/cvs/Linux i686

---
 sci-mathematics/maxima/ChangeLog                   |   8 +-
 sci-mathematics/maxima/Manifest                    |  13 +-
 .../maxima/files/maxima-5.20.1-emacs-version.patch |  12 ++
 sci-mathematics/maxima/maxima-5.20.1-r1.ebuild     | 190 +++++++++++++++++++++
 sci-mathematics/maxima/maxima-5.20.1.ebuild        | 188 --------------------
 5 files changed, 216 insertions(+), 195 deletions(-)
 create mode 100644 sci-mathematics/maxima/files/maxima-5.20.1-emacs-version.patch
 create mode 100644 sci-mathematics/maxima/maxima-5.20.1-r1.ebuild
 delete mode 100644 sci-mathematics/maxima/maxima-5.20.1.ebuild

(limited to 'sci-mathematics/maxima')

diff --git a/sci-mathematics/maxima/ChangeLog b/sci-mathematics/maxima/ChangeLog
index 5d3e0a3206d5..8b34c4951b63 100644
--- a/sci-mathematics/maxima/ChangeLog
+++ b/sci-mathematics/maxima/ChangeLog
@@ -1,6 +1,12 @@
 # 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.75 2010/01/14 01:00:04 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.76 2010/03/06 08:49:59 ulm Exp $
+
+*maxima-5.20.1-r1 (06 Mar 2010)
+
+  06 Mar 2010; Ulrich Mueller <ulm@gentoo.org> -maxima-5.20.1.ebuild,
+  +maxima-5.20.1-r1.ebuild, +files/maxima-5.20.1-emacs-version.patch:
+  Fix test for Emacs version in maxima.el, bug 307349.
 
   14 Jan 2010; Sébastien Fabbro <bicatali@gentoo.org>
   -maxima-5.14.0.ebuild, -maxima-5.17.1-r1.ebuild, maxima-5.18.1.ebuild,
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index a8a9d19ddd94..a13bfa4bdd79 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX 50maxima-gentoo.el 439 RMD160 bdddca04f2232ad764dc6093ba4d0a1b71862879 SHA1 8e4394313e0f2a36b8d57b0eac1feb0d7853cee9 SHA256 134313e42f134e51283764e44c9a174a4010b319ac9c31822c2e7051d186de49
 AUX maxima-5.19.1-no-init-files.patch 2805 RMD160 c5932e0da4dcf07510fc98239137e73fab753546 SHA1 82b7069e9362798a6ff5acc7d7875f9aebf9a2c7 SHA256 bb46f6049c34b32c905761b113bc8a99ec7e157bb6730bb0535d8858caba400b
+AUX maxima-5.20.1-emacs-version.patch 377 RMD160 36b54a1bac70989c02baa98dd25c6d674882c3cb SHA1 51e9f41225a54e87a5d827afa3f82a95ec7ae251 SHA256 57841a01de59f736515b38f110dbb0d0c451c30f9e0770c246e5ec1c555f2080
 AUX maxima-clozurecl.patch 344 RMD160 721bc62c071025b3d70ea75c0fd78da4845739bf SHA1 c9d881b5bcf335b078fa47cab23bd6bfb230f1f0 SHA256 0565ba0fe102b6f7e835d2543d8e2f4a5580d588f5864918889e62bacfc8c143
 AUX maxima-no-init-files.patch 2626 RMD160 ffc34cc7e1d6ade44b100252233e83aa7e383744 SHA1 97497929054fcf6924ac56006c9c4ad28c7b443d SHA256 58b82fa1cdcc2eafc0f912541b350ae7aec8c492be5f6b0ce2174ae01f399d88
 AUX maxima-xdg-utils.patch 1090 RMD160 964f5d858b7521b5a3794705999a7fcbddd937e2 SHA1 576ff7b80737a60f71d3e5df0c2cf84161c63627 SHA256 99c600c4c7e813305da375a4afa4a5e7ea6aa4ec9f1ecc051b9c913281af53ea
@@ -11,13 +12,13 @@ DIST maxima-5.19.2.tar.gz 20572069 RMD160 648ac2033f8e7c64671d95cb0ff5f0a73c9c11
 DIST maxima-5.20.1.tar.gz 20655669 RMD160 eb4a277f9fdc889132292ef8daf7b7b58143152c SHA1 2e4f1de880dbbaf6f7bf01f807269951a1a3ff49 SHA256 cc2430ad6b895fb730ee2a7b8df4852c2b6d09a5a8bb715bdba783982c470bd9
 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.ebuild 4479 RMD160 eb064055e5090db9c62d382556a6d5b026974441 SHA1 002ec6c732db58ab22814a96f5e365965d7f0368 SHA256 fdd7a09c5c9037c0c70ceb306a5220a8c3e7f8db174479560c101c9acd4f6c46
-MISC ChangeLog 16841 RMD160 c3e5ffc38614b5f2b140b6317602a361c9f7f30c SHA1 28b2fd79bd61f5679bcf34228b100b2f385bc63b SHA256 87c4241656aa0b50ae31d25d2abdd50bac0ea3966d65e5243636fdee3c1db0de
+EBUILD maxima-5.20.1-r1.ebuild 4525 RMD160 0fa306f56369474b486a8bfc24d4f3f08ada56a0 SHA1 91c7f3494930b4106be443ea73fb7b96b61a27c0 SHA256 c77b639de8424a75d74c35cc92bf0596537681c4e23e313b3ea5327920373e0d
+MISC ChangeLog 17065 RMD160 dc6defe85889cfeba5485d318f99500499acc631 SHA1 d1dfeabdc9cb4e68125745f033880596e7a09adf SHA256 dd6d4e193650c9092b39ca0573d407ae90f5a85311d08226b2d290dd9adb9624
 MISC metadata.xml 1305 RMD160 f122993d0ee80a6dfdab27259d69301c609aaba0 SHA1 a647a1d994e0f0e54459c13a254d1be27eebffda SHA256 b82b31cf0892ff000778cb002578d135f119a14024ee0b4c5d206381ca3e796a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v1.4.10 (GNU/Linux)
 
-iEYEARECAAYFAktOdSYACgkQ1ycZbhPLE2Cm9ACfablrSWQgIRh65eDIwJfhokC1
-QTAAn3e69D0z8+Eztdpij6Dueb9heiO+
-=q30r
+iEYEARECAAYFAkuSF0AACgkQOeoy/oIi7uw+2QCgjtri0r5r/Wniprwu5GMK/mBP
+lScAoOSlquo77BeJzeytv/bg/lvhEVvn
+=TpuR
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/maxima/files/maxima-5.20.1-emacs-version.patch b/sci-mathematics/maxima/files/maxima-5.20.1-emacs-version.patch
new file mode 100644
index 000000000000..d0ab0a5e768d
--- /dev/null
+++ b/sci-mathematics/maxima/files/maxima-5.20.1-emacs-version.patch
@@ -0,0 +1,12 @@
+http://bugs.gentoo.org/307349
+
+--- maxima-5.20.1-orig/interfaces/emacs/emaxima/maxima.el
++++ maxima-5.20.1/interfaces/emacs/emaxima/maxima.el
+@@ -2109,6 +2109,7 @@
+ ;;; The next functions are from comint.el in cvs emacs
+ (if (and
+      (not maxima-running-xemacs)
++     (<= emacs-major-version 21)
+      (or
+       (< emacs-major-version 21)
+       (< emacs-minor-version 3)))
diff --git a/sci-mathematics/maxima/maxima-5.20.1-r1.ebuild b/sci-mathematics/maxima/maxima-5.20.1-r1.ebuild
new file mode 100644
index 000000000000..4b8f12657393
--- /dev/null
+++ b/sci-mathematics/maxima/maxima-5.20.1-r1.ebuild
@@ -0,0 +1,190 @@
+# 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-r1.ebuild,v 1.1 2010/03/06 08:49:59 ulm Exp $
+EAPI=2
+inherit eutils elisp-common
+
+DESCRIPTION="Free computer algebra environment based on Macsyma"
+HOMEPAGE="http://maxima.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64  ~ppc ~sparc ~x86"
+
+# Supported lisps with readline
+SUPP_RL="gcl clisp"
+# Supported lisps without readline
+SUPP_NORL="cmucl sbcl ecl openmcl"
+SUPP_LISPS="${SUPP_RL} ${SUPP_NORL}"
+# Default lisp if none selected
+DEF_LISP="sbcl"
+
+IUSE="latex emacs tk nls unicode xemacs X ${SUPP_LISPS} ${IUSE}"
+
+# Languages
+LANGS="es pt pt_BR"
+for lang in ${LANGS}; do
+	IUSE="${IUSE} linguas_${lang}"
+done
+
+RDEPEND="X? ( x11-misc/xdg-utils
+		 sci-visualization/gnuplot[gd]
+		 tk? ( dev-lang/tk ) )
+	latex? ( virtual/latex-base )
+	emacs? ( virtual/emacs
+		latex? ( app-emacs/auctex ) )
+	xemacs? ( app-editors/xemacs
+		latex? ( app-emacs/auctex ) )"
+
+PDEPEND="emacs? ( app-emacs/imaxima )"
+
+# create lisp dependencies
+for LISP in ${SUPP_LISPS}; do
+	if [ "${LISP}" = "gcl" ]
+	then
+		RDEPEND="${RDEPEND} gcl? ( >=dev-lisp/gcl-2.6.8_pre[ansi] )"
+	else if [ "${LISP}" = "ecl" ]
+	then
+		RDEPEND="${RDEPEND} ecl? ( >=dev-lisp/ecls-9.8.3 )"
+	else if [ "${LISP}" = "openmcl" ]
+	then
+		RDEPEND="${RDEPEND} openmcl? ( dev-lisp/clozurecl )"
+	else
+		RDEPEND="${RDEPEND} ${LISP}? ( dev-lisp/${LISP} )"
+	fi
+	fi
+	fi
+	DEF_DEP="${DEF_DEP} !${LISP}? ( "
+done
+DEF_DEP="${DEF_DEP} dev-lisp/${DEF_LISP}"
+for LISP in ${SUPP_NORL}; do
+	RDEPEND="${RDEPEND} ${LISP}? ( app-misc/rlwrap )"
+	[[ ${LISP} = ${DEF_LISP} ]] && \
+		DEF_DEP="${DEF_DEP} app-misc/rlwrap"
+done
+for LISP in ${SUPP_LISPS}; do
+	DEF_DEP="${DEF_DEP} )"
+done
+
+RDEPEND="${RDEPEND}
+	${DEF_DEP}"
+
+DEPEND="${RDEPEND}
+	sys-apps/texinfo"
+
+TEXMF=/usr/share/texmf-site
+NO_INIT_PATCH_PV="5.19.1"
+
+pkg_setup() {
+	LISPS=""
+
+	for LISP in ${SUPP_LISPS}; do
+		use ${LISP} && LISPS="${LISPS} ${LISP}"
+	done
+
+	RL=""
+
+	for LISP in ${SUPP_NORL}; do
+		use ${LISP} && RL="yes"
+	done
+
+	if [ -z "${LISPS}" ]; then
+		ewarn "No lisp specified in USE flags, choosing ${DEF_LISP} as default"
+		LISPS="${DEF_LISP}"
+		RL="yes"
+	fi
+}
+
+src_prepare() {
+	# use xdg-open to view ps, pdf
+	epatch "${FILESDIR}"/${PN}-xdg-utils.patch
+
+	epatch "${FILESDIR}"/${PN}-${NO_INIT_PATCH_PV}-no-init-files.patch
+
+	# ClozureCL executable name is now ccl
+	epatch "${FILESDIR}"/${PN}-clozurecl.patch
+
+	epatch "${FILESDIR}"/${P}-emacs-version.patch
+
+	# remove rmaxima if not needed
+	if [ -z "${RL}" ]; then
+		sed -e '/^@WIN32_FALSE@bin_SCRIPTS/s/rmaxima//' \
+			-i "${S}"/src/Makefile.in \
+			|| die "sed for rmaxima failed"
+	fi
+
+	# don't install imaxima, since we have a separate package for it
+	sed -i -e '/^SUBDIRS/s/imaxima//' interfaces/emacs/Makefile.in \
+		|| die "sed for imaxima failed"
+}
+
+src_configure() {
+	local myconf=""
+	for LISP in ${LISPS}; do
+		myconf="${myconf} --enable-${LISP}"
+	done
+
+	# remove xmaxima if no tk
+	if use tk; then
+		myconf="${myconf} --with-wish=wish"
+	else
+		myconf="${myconf} --with-wish=none"
+		sed -i \
+			-e '/^SUBDIRS/s/xmaxima//' \
+			interfaces/Makefile.in || die "sed for tk failed"
+	fi
+
+	# enable existing translated doc
+	if use nls; then
+		for lang in ${LANGS}; do
+			if use "linguas_${lang}"; then
+				myconf="${myconf} --enable-lang-${lang}"
+				use unicode && myconf="${myconf} --enable-lang-${lang}-utf8"
+			fi
+		done
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	einstall emacsdir="${D}${SITELISP}/${PN}" || die "einstall failed"
+
+	use tk && make_desktop_entry xmaxima xmaxima \
+		/usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
+		"Science;Math;Education"
+
+	if use latex; then
+		insinto ${TEXMF}/tex/latex/emaxima
+		doins interfaces/emacs/emaxima/emaxima.sty
+	fi
+
+	# do not use dodoc because interfaces can't read compressed files
+	# read COPYING before attempt to remove it from dodoc
+	insinto /usr/share/${PN}/${PV}/doc
+	doins AUTHORS COPYING README README.lisps || die
+	dodir /usr/share/doc
+	dosym ../${PN}/${PV}/doc /usr/share/doc/${PF} || die
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}"/50maxima-gentoo.el || die
+	fi
+}
+
+pkg_preinst() {
+	# some lisps do not read compress info files (bug #176411)
+	for infofile in "${D}"/usr/share/info/*.bz2 ; do
+		bunzip2 "${infofile}"
+	done
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	use latex && mktexlsr
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use latex && mktexlsr
+}
diff --git a/sci-mathematics/maxima/maxima-5.20.1.ebuild b/sci-mathematics/maxima/maxima-5.20.1.ebuild
deleted file mode 100644
index 9f9b23df5842..000000000000
--- a/sci-mathematics/maxima/maxima-5.20.1.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# 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.ebuild,v 1.3 2010/01/14 01:00:04 bicatali Exp $
-EAPI=2
-inherit eutils elisp-common
-
-DESCRIPTION="Free computer algebra environment based on Macsyma"
-HOMEPAGE="http://maxima.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64  ~ppc ~sparc ~x86"
-
-# Supported lisps with readline
-SUPP_RL="gcl clisp"
-# Supported lisps without readline
-SUPP_NORL="cmucl sbcl ecl openmcl"
-SUPP_LISPS="${SUPP_RL} ${SUPP_NORL}"
-# Default lisp if none selected
-DEF_LISP="sbcl"
-
-IUSE="latex emacs tk nls unicode xemacs X ${SUPP_LISPS} ${IUSE}"
-
-# Languages
-LANGS="es pt pt_BR"
-for lang in ${LANGS}; do
-	IUSE="${IUSE} linguas_${lang}"
-done
-
-RDEPEND="X? ( x11-misc/xdg-utils
-		 sci-visualization/gnuplot[gd]
-		 tk? ( dev-lang/tk ) )
-	latex? ( virtual/latex-base )
-	emacs? ( virtual/emacs
-		latex? ( app-emacs/auctex ) )
-	xemacs? ( app-editors/xemacs
-		latex? ( app-emacs/auctex ) )"
-
-PDEPEND="emacs? ( app-emacs/imaxima )"
-
-# create lisp dependencies
-for LISP in ${SUPP_LISPS}; do
-	if [ "${LISP}" = "gcl" ]
-	then
-		RDEPEND="${RDEPEND} gcl? ( >=dev-lisp/gcl-2.6.8_pre[ansi] )"
-	else if [ "${LISP}" = "ecl" ]
-	then
-		RDEPEND="${RDEPEND} ecl? ( >=dev-lisp/ecls-9.8.3 )"
-	else if [ "${LISP}" = "openmcl" ]
-	then
-		RDEPEND="${RDEPEND} openmcl? ( dev-lisp/clozurecl )"
-	else
-		RDEPEND="${RDEPEND} ${LISP}? ( dev-lisp/${LISP} )"
-	fi
-	fi
-	fi
-	DEF_DEP="${DEF_DEP} !${LISP}? ( "
-done
-DEF_DEP="${DEF_DEP} dev-lisp/${DEF_LISP}"
-for LISP in ${SUPP_NORL}; do
-	RDEPEND="${RDEPEND} ${LISP}? ( app-misc/rlwrap )"
-	[[ ${LISP} = ${DEF_LISP} ]] && \
-		DEF_DEP="${DEF_DEP} app-misc/rlwrap"
-done
-for LISP in ${SUPP_LISPS}; do
-	DEF_DEP="${DEF_DEP} )"
-done
-
-RDEPEND="${RDEPEND}
-	${DEF_DEP}"
-
-DEPEND="${RDEPEND}
-	sys-apps/texinfo"
-
-TEXMF=/usr/share/texmf-site
-NO_INIT_PATCH_PV="5.19.1"
-
-pkg_setup() {
-	LISPS=""
-
-	for LISP in ${SUPP_LISPS}; do
-		use ${LISP} && LISPS="${LISPS} ${LISP}"
-	done
-
-	RL=""
-
-	for LISP in ${SUPP_NORL}; do
-		use ${LISP} && RL="yes"
-	done
-
-	if [ -z "${LISPS}" ]; then
-		ewarn "No lisp specified in USE flags, choosing ${DEF_LISP} as default"
-		LISPS="${DEF_LISP}"
-		RL="yes"
-	fi
-}
-
-src_prepare() {
-	# use xdg-open to view ps, pdf
-	epatch "${FILESDIR}"/${PN}-xdg-utils.patch
-
-	epatch "${FILESDIR}"/${PN}-${NO_INIT_PATCH_PV}-no-init-files.patch
-
-	# ClozureCL executable name is now ccl
-	epatch "${FILESDIR}"/${PN}-clozurecl.patch
-
-	# remove rmaxima if not needed
-	if [ -z "${RL}" ]; then
-		sed -e '/^@WIN32_FALSE@bin_SCRIPTS/s/rmaxima//' \
-			-i "${S}"/src/Makefile.in \
-			|| die "sed for rmaxima failed"
-	fi
-
-	# don't install imaxima, since we have a separate package for it
-	sed -i -e '/^SUBDIRS/s/imaxima//' interfaces/emacs/Makefile.in \
-		|| die "sed for imaxima failed"
-}
-
-src_configure() {
-	local myconf=""
-	for LISP in ${LISPS}; do
-		myconf="${myconf} --enable-${LISP}"
-	done
-
-	# remove xmaxima if no tk
-	if use tk; then
-		myconf="${myconf} --with-wish=wish"
-	else
-		myconf="${myconf} --with-wish=none"
-		sed -i \
-			-e '/^SUBDIRS/s/xmaxima//' \
-			interfaces/Makefile.in || die "sed for tk failed"
-	fi
-
-	# enable existing translated doc
-	if use nls; then
-		for lang in ${LANGS}; do
-			if use "linguas_${lang}"; then
-				myconf="${myconf} --enable-lang-${lang}"
-				use unicode && myconf="${myconf} --enable-lang-${lang}-utf8"
-			fi
-		done
-	fi
-
-	econf ${myconf}
-}
-
-src_install() {
-	einstall emacsdir="${D}${SITELISP}/${PN}" || die "einstall failed"
-
-	use tk && make_desktop_entry xmaxima xmaxima \
-		/usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
-		"Science;Math;Education"
-
-	if use latex; then
-		insinto ${TEXMF}/tex/latex/emaxima
-		doins interfaces/emacs/emaxima/emaxima.sty
-	fi
-
-	# do not use dodoc because interfaces can't read compressed files
-	# read COPYING before attempt to remove it from dodoc
-	insinto /usr/share/${PN}/${PV}/doc
-	doins AUTHORS COPYING README README.lisps || die
-	dodir /usr/share/doc
-	dosym ../${PN}/${PV}/doc /usr/share/doc/${PF} || die
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}"/50maxima-gentoo.el || die
-	fi
-}
-
-pkg_preinst() {
-	# some lisps do not read compress info files (bug #176411)
-	for infofile in "${D}"/usr/share/info/*.bz2 ; do
-		bunzip2 "${infofile}"
-	done
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	use latex && mktexlsr
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use latex && mktexlsr
-}
-- 
cgit v1.2.3-65-gdbad