Version bump

(Portage version: 2.2.0_alpha184/cvs/Linux i686, signed Manifest commit with key 0x3AFFCE974D34BD8C!)

6 files changed, 16 insertions, 153 deletions

diff --git a/sci-mathematics/fricas/ChangeLog b/sci-mathematics/fricas/ChangeLog
index 7a58e405e96d..357ec6a0e831 100644
--- a/sci-mathematics/fricas/ChangeLog
+++ b/sci-mathematics/fricas/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/fricas
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/fricas/ChangeLog,v 1.19 2013/04/30 16:22:04 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/fricas/ChangeLog,v 1.20 2013/06/26 17:30:31 grozin Exp $
+
+*fricas-1.2.1 (26 Jun 2013)
+
+  26 Jun 2013; Andrey Grozin <grozin@gentoo.org> -fricas-1.1.7-r1.ebuild,
+  -fricas-1.1.8.ebuild, +fricas-1.2.1.ebuild, -files/fricas-1.1.7.patch,
+  -files/fricas-sbcl.patch:
+  Version bump
 
   30 Apr 2013; Andrey Grozin <grozin@gentoo.org> fricas-1.2.0.ebuild,
   +files/fricas-1.2.0-noinit.patch, metadata.xml:
diff --git a/sci-mathematics/fricas/files/fricas-1.1.7.patch b/sci-mathematics/fricas/files/fricas-1.1.7.patch
deleted file mode 100644
index c2af6d923e01..000000000000
--- a/sci-mathematics/fricas/files/fricas-1.1.7.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -r -U1 fricas-1.1.7.orig/src/graph/view3D/smoothShade3d.c fricas-1.1.7/src/graph/view3D/smoothShade3d.c
---- fricas-1.1.7.orig/src/graph/view3D/smoothShade3d.c	2012-06-19 08:17:01.000000000 +0700
-+++ fricas-1.1.7/src/graph/view3D/smoothShade3d.c	2012-06-22 13:38:49.000000000 +0700
-@@ -753,3 +753,3 @@
-   /* axes label for X */
--  if ((int)axesZ[0][0] >= (int)axesZ[0][2]) {
-+  if ((int)axesZ[0][0] >= (int)axesZ[0][1]) {
-     if (axesXY[0][2] < axesXY[0][0]) xcoord2 = axesXY[0][2]-5;
diff --git a/sci-mathematics/fricas/files/fricas-sbcl.patch b/sci-mathematics/fricas/files/fricas-sbcl.patch
deleted file mode 100644
index 73754c5dcf4e..000000000000
--- a/sci-mathematics/fricas/files/fricas-sbcl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -r -U2 fricas-1.1.7.orig/configure.ac fricas-1.1.7/configure.ac
---- fricas-1.1.7.orig/configure.ac	2012-06-19 08:17:01.000000000 +0700
-+++ fricas-1.1.7/configure.ac	2012-08-05 11:18:22.000000000 +0700
-@@ -243,4 +243,9 @@
- fi
- 
-+## Work-around for broken sbcl in Gentoo
-+if test $FRICAS_LISP = sbcl ; then
-+    FRICAS_LISP="$FRICAS_LISP --no-sysinit --no-userinit"
-+fi
-+
- AC_ARG_WITH([lisp-flavor],
-             [AS_HELP_STRING([--with-lisp-flavor=F],
diff --git a/sci-mathematics/fricas/fricas-1.1.7-r1.ebuild b/sci-mathematics/fricas/fricas-1.1.7-r1.ebuild
deleted file mode 100644
index b265dea4e69e..000000000000
--- a/sci-mathematics/fricas/fricas-1.1.7-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/fricas/fricas-1.1.7-r1.ebuild,v 1.2 2012/08/05 05:28:50 grozin Exp $
-EAPI=4
-inherit eutils multilib elisp-common autotools
-
-DESCRIPTION="FriCAS is a fork of Axiom computer algebra system"
-HOMEPAGE="http://${PN}.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-full.tar.bz2"
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# Supported lisps, number 0 is the default
-LISPS=( sbcl cmucl     gcl ecl    clisp clozurecl )
-# . means just dev-lisp/${LISP}; foo-x.y.z means >=dev-lisp/foo-x.y.z
-DEPS=(  .    cmucl-20b .   ecls-9 .     .         )
-# command name: . means just ${LISP}
-COMS=(  .    lisp      .   .      .     ccl       )
-
-IUSE="${LISPS[*]} X emacs gmp"
-RDEPEND="X? ( x11-libs/libXpm x11-libs/libICE )
-	emacs? ( virtual/emacs )
-	gmp? ( dev-libs/gmp )"
-
-# Generating lisp deps
-n=${#LISPS[*]}
-for ((n--; n > 0; n--)); do
-	LISP=${LISPS[$n]}
-	DEP=${DEPS[$n]}
-	if [ "${DEP}" = "." ]; then
-		DEP="dev-lisp/${LISP}"
-	else
-		DEP=">=dev-lisp/${DEP}"
-	fi
-	RDEPEND="${RDEPEND} ${LISP}? ( ${DEP} ) !${LISP}? ("
-done
-RDEPEND="${RDEPEND} dev-lisp/${LISPS[0]}"
-n=${#LISPS[*]}
-for ((n--; n > 0; n--)); do
-	RDEPEND="${RDEPEND} )"
-done
-
-DEPEND="${RDEPEND}"
-
-# necessary for clisp and gcl
-RESTRICT="strip"
-
-src_prepare() {
-	# fix a bug in src/graph/view3D/smoothShade3d.c
-	epatch "${FILESDIR}"/${P}.patch
-
-	# workaround for broken sbcl
-	epatch "${FILESDIR}"/${PN}-sbcl.patch
-	eautoreconf
-}
-
-src_configure() {
-	local LISP n
-	LISP=sbcl
-	n=${#LISPS[*]}
-	for ((n--; n > 0; n--)); do
-		if use ${LISPS[$n]}; then
-			LISP=${COMS[$n]}
-			if [ "${LISP}" = "." ]; then
-				LISP=${LISPS[$n]}
-			fi
-		fi
-	done
-	einfo "Using lisp: ${LISP}"
-
-	# aldor is not yet in portage
-	econf --disable-aldor --with-lisp=${LISP} $(use_with X x) $(use_with gmp)
-}
-
-src_compile() {
-	# bug #300132
-	emake -j1
-}
-
-src_test() {
-	emake -j1 all-input
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	dodoc README FAQ
-
-	if use emacs; then
-		sed -e "s|(setq load-path (cons (quote \"/usr/$(get_libdir)/fricas/emacs\") load-path)) ||" \
-			-i "${D}"/usr/bin/efricas \
-			|| die "sed efricas failed"
-		elisp-install ${PN} "${D}"/usr/$(get_libdir)/${PN}/emacs/*.el
-		elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
-	else
-		rm "${D}"/usr/bin/efricas || die "rm efricas failed"
-	fi
-	rm -r "${D}"/usr/$(get_libdir)/${PN}/emacs || die "rm -r emacs failed"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-mathematics/fricas/fricas-1.1.8.ebuild b/sci-mathematics/fricas/fricas-1.2.1.ebuild
index 617cfa1cd077..7d1f609fd070 100644
--- a/sci-mathematics/fricas/fricas-1.1.8.ebuild
+++ b/sci-mathematics/fricas/fricas-1.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/fricas/fricas-1.1.8.ebuild,v 1.1 2012/09/18 15:32:40 grozin Exp $
-EAPI=4
-inherit eutils multilib elisp-common autotools
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/fricas/fricas-1.2.1.ebuild,v 1.1 2013/06/26 17:30:31 grozin Exp $
+EAPI=5
+inherit multilib elisp-common
 
 DESCRIPTION="FriCAS is a fork of Axiom computer algebra system"
 HOMEPAGE="http://${PN}.sourceforge.net/"
@@ -12,11 +12,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 # Supported lisps, number 0 is the default
-LISPS=( sbcl cmucl     gcl ecl    clisp clozurecl )
-# . means just dev-lisp/${LISP}; foo-x.y.z means >=dev-lisp/foo-x.y.z
-DEPS=(  .    cmucl-20b .   ecls-9 .     .         )
+LISPS=( sbcl cmucl     gcl ecls   clisp clozurecl )
 # command name: . means just ${LISP}
-COMS=(  .    lisp      .   .      .     ccl       )
+COMS=(  .    lisp      .   ecl    .     ccl       )
 
 IUSE="${LISPS[*]} X emacs gmp"
 RDEPEND="X? ( x11-libs/libXpm x11-libs/libICE )
@@ -27,15 +25,9 @@ RDEPEND="X? ( x11-libs/libXpm x11-libs/libICE )
 n=${#LISPS[*]}
 for ((n--; n > 0; n--)); do
 	LISP=${LISPS[$n]}
-	DEP=${DEPS[$n]}
-	if [ "${DEP}" = "." ]; then
-		DEP="dev-lisp/${LISP}"
-	else
-		DEP=">=dev-lisp/${DEP}"
-	fi
-	RDEPEND="${RDEPEND} ${LISP}? ( ${DEP} ) !${LISP}? ("
+	RDEPEND="${RDEPEND} ${LISP}? ( dev-lisp/${LISP}:= ) !${LISP}? ("
 done
-RDEPEND="${RDEPEND} dev-lisp/${LISPS[0]}"
+RDEPEND="${RDEPEND} dev-lisp/${LISPS[0]}:="
 n=${#LISPS[*]}
 for ((n--; n > 0; n--)); do
 	RDEPEND="${RDEPEND} )"
@@ -46,12 +38,6 @@ DEPEND="${RDEPEND}"
 # necessary for clisp and gcl
 RESTRICT="strip"
 
-src_prepare() {
-	# workaround for broken sbcl
-	epatch "${FILESDIR}"/${PN}-sbcl.patch
-	eautoreconf
-}
-
 src_configure() {
 	local LISP n
 	LISP=sbcl
diff --git a/sci-mathematics/fricas/metadata.xml b/sci-mathematics/fricas/metadata.xml
index 4e58d5435894..91b9b2cab9f3 100644
--- a/sci-mathematics/fricas/metadata.xml
+++ b/sci-mathematics/fricas/metadata.xml
@@ -18,8 +18,6 @@ FriCAS is a fork of Axiom computer algebra system.
     (<pkg>dev-lisp/gcl</pkg>)</flag>
   <flag name='sbcl'>Add support for Steel Bank Common Lisp
     (<pkg>dev-lisp/sbcl</pkg>)</flag>
-  <flag name='ecl'>Add support for Embeddable Common Lisp
-    (<pkg>dev-lisp/ecls</pkg>)</flag>
   <flag name='ecls'>Add support for Embeddable Common Lisp
     (<pkg>dev-lisp/ecls</pkg>)</flag>
   <flag name='clozurecl'>Add support for Clozure Common Lisp