gentoo resync : 27.03.2018

4 files changed, 9 insertions, 211 deletions

diff --git a/sci-mathematics/fricas/Manifest b/sci-mathematics/fricas/Manifest
index cfca3e1d8016..3aabefcd8bf0 100644
--- a/sci-mathematics/fricas/Manifest
+++ b/sci-mathematics/fricas/Manifest
@@ -1,10 +1,6 @@
 AUX 64fricas-gentoo.el 101 BLAKE2B 7d2499931132bd7bf32b528cbc6b09127af060b879ebea93421206f6f5fbe685b070624e507390902d7cfc7cd06a5988ca2df9959b2549736be912b731990c21 SHA512 be36ef5bfb525aa054cd3881ece83d47ee3a9cb7ef1b0c26215d449ddcad8f9f57045b29ab9063a62f43caa764abb251e5fcd04cf1d15bcc423e40d9e69239ef
-DIST fricas-1.3.0-full.tar.bz2 10459788 BLAKE2B 93f57290fa17b25688454fba3f54bbc6de7aaf4e336fcd3117011a49a2d8705c3df07f1dd79472f7fe879bc8f2087c65eca6638229156e15b51534c5f054e09b SHA512 fd084c3d3ada76424b0159eff76660872da63c1e25f392d98bc7175b37c05fe23a117587addc89828ff38a368f5161d34febcc269f530710ff7da6b53860653f
-DIST fricas-1.3.1-full.tar.bz2 10522387 BLAKE2B c1315bbb30ac94fe2b1b612a053f378f7d044111ba8d0405fd35e80902cd269b515f61d184b025b707b01d74aed26bf093e9af166b8b4f10d50e2ce0357d26b2 SHA512 d492686fc03ed704cc015ec0ba250ab7928b637ff6ef8cf1aa924190e7fe22bd63a512074439dbf7ce44dce786d51ad5e27857522a1e21136b4b8d6cf014c486
 DIST fricas-1.3.2-full.tar.bz2 10523665 BLAKE2B 23de3147177e7c3c75dafa6de0f4f17432f323512aa38aef85e27c8cf1b9e335009870dc608219f0e1c4f53f1790a41b00b915aedd71633459f789cfda9f5244 SHA512 679dffbe8a991d4ae3d6667a6163337ffa24d48b9d1d776ba1a39569cb3b9f17e8d484075746b75b7eb6bbe5b9d26af3e526850a19118274988b9e88ad52a679
 DIST fricas-1.3.3-full.tar.bz2 10506559 BLAKE2B 1a9822f0a94db5c7e7a3e2a52287b475c382caaaf9c5e1830621a17b6634f6f72958f0c81995463d135b4567a74c588f33c88d51a83b0a8749479d65645de4bc SHA512 74ac88ffbbacba33883498a75382ef351003ce8499f6b458367ca0de3041a9bba496693eb90f798945aa6e11c5072137227efa385ee6d8e2051f93dfea6d7fbe
-EBUILD fricas-1.3.0-r1.ebuild 2322 BLAKE2B b2078111ec3527e042b7c179f484b90ae01f1865965ad924c5046fd92178603def67a9d628bd2ad27d65a58b0db2addc36d7ce9b75aa1403283fea0b00a451e3 SHA512 4b72e71db211c6cd967e6b8a7f43cb8aa98c52386670e8df74ffae7b0828aebfee7dafd0522d33864f06a75bea7eaa373043ababa1aa65aafb115ec38d2580ab
-EBUILD fricas-1.3.1.ebuild 2275 BLAKE2B e62916911609c835507f0d2a31d9707c6d183896d5ef21df6fbdcb9dfa9c405f3f4f5a876366719a6a1dd81ef62fd47cd021d329777cb6a50f4a5203226179d6 SHA512 d80fb7f6677b064ad61e022c654c6a9123cec5082ca62f7b3dd594484cd3d532609dcc9a23b9dcb3a32bec14d65f857d74b122f371d8da9b41e833193cdc3150
 EBUILD fricas-1.3.2.ebuild 2275 BLAKE2B e62916911609c835507f0d2a31d9707c6d183896d5ef21df6fbdcb9dfa9c405f3f4f5a876366719a6a1dd81ef62fd47cd021d329777cb6a50f4a5203226179d6 SHA512 d80fb7f6677b064ad61e022c654c6a9123cec5082ca62f7b3dd594484cd3d532609dcc9a23b9dcb3a32bec14d65f857d74b122f371d8da9b41e833193cdc3150
-EBUILD fricas-1.3.3.ebuild 2275 BLAKE2B f9e69a6855f9b6158145224507ff002742e090e9d6a596f4530ff941413f3822af58c26f980b73a733f534a1d74d12076e92d2f57c59c2d7a0d840f9881e379b SHA512 63b4ff19b45aec4ec25e6aa5e75295cc79a42a03f9d1581520249cb038216080f42b51bfe4c4a1d1d7f981a8401cd7ef4d0010de637645e2beefffdc6f58399d
+EBUILD fricas-1.3.3.ebuild 2371 BLAKE2B 43f02e6bc5ba5ae728b4f207c15fbcab4147ec4f889e4f7f20d0383e7a6c2667fe77e69f6cd6864e2afd0bfccd4f375a38e02fc49175101fae8cafdd385b2b02 SHA512 5c3e9f6ad5dde530f6ced61868499332f4d5ba1a51e1629314bdc8829d2d3ecf71fa2a86c5901d42465c6917656e894a309ffb97f88609668fc7491afa8d1ad7
 MISC metadata.xml 1161 BLAKE2B 24d65236e4ad6534747f7295730f0e4a37e6c1a49faf1cef8ca2ed3a87459a21f77a3ff7d69b8487c86bac4cef4300607fac89faf57d3d99c8b6e86d9c7679e9 SHA512 c0555d42cc2d50498b1fa4bbf0fd658332f6ad79aaf0ab207ded28f7463401c901b67f53a1274794db2c0927806501493f99277f5325d52ccfacf5e522cfdfc5
diff --git a/sci-mathematics/fricas/fricas-1.3.0-r1.ebuild b/sci-mathematics/fricas/fricas-1.3.0-r1.ebuild
deleted file mode 100644
index 236d30d11c9b..000000000000
--- a/sci-mathematics/fricas/fricas-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit multilib elisp-common
-
-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 ecls   clisp clozurecl )
-# Version restrictions, . means no restrictions
-REST=( ">=dev-lisp/sbcl-1.3.6:= <dev-lisp/sbcl-1.3.13" . . . . . )
-# command name: . means just ${LISP}
-COMS=(  .    lisp      .   ecl    .     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]}
-	if [ "${REST[$n]}" = "." ]; then
-	    DEP="dev-lisp/${LISP}"
-	else
-	    DEP="${REST[$n]}"
-	fi
-	RDEPEND="${RDEPEND} ${LISP}? ( ${DEP}:= ) !${LISP}? ("
-done
-if [ "${REST[0]}" = "." ]; then
-	DEP="dev-lisp/${LISPS[0]}"
-else
-	DEP="${REST[0]}"
-fi
-RDEPEND="${RDEPEND} ${DEP}:="
-n=${#LISPS[*]}
-for ((n--; n > 0; n--)); do
-	RDEPEND="${RDEPEND} )"
-done
-
-DEPEND="${RDEPEND}"
-
-# necessary for clisp and gcl
-RESTRICT="strip"
-
-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.3.1.ebuild b/sci-mathematics/fricas/fricas-1.3.1.ebuild
deleted file mode 100644
index 7006655bdef7..000000000000
--- a/sci-mathematics/fricas/fricas-1.3.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit multilib elisp-common
-
-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 ecls clisp clozurecl )
-# Version restrictions, . means no restrictions
-REST=(  .    .     .   .    .     . )
-# command name: . means just ${LISP}
-COMS=(  .    lisp  .   ecl  .     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]}
-	if [ "${REST[$n]}" = "." ]; then
-	    DEP="dev-lisp/${LISP}"
-	else
-	    DEP="${REST[$n]}"
-	fi
-	RDEPEND="${RDEPEND} ${LISP}? ( ${DEP}:= ) !${LISP}? ("
-done
-if [ "${REST[0]}" = "." ]; then
-	DEP="dev-lisp/${LISPS[0]}"
-else
-	DEP="${REST[0]}"
-fi
-RDEPEND="${RDEPEND} ${DEP}:="
-n=${#LISPS[*]}
-for ((n--; n > 0; n--)); do
-	RDEPEND="${RDEPEND} )"
-done
-
-DEPEND="${RDEPEND}"
-
-# necessary for clisp and gcl
-RESTRICT="strip"
-
-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.3.3.ebuild b/sci-mathematics/fricas/fricas-1.3.3.ebuild
index 1be321f3f7bd..b844cb78f7b6 100644
--- a/sci-mathematics/fricas/fricas-1.3.3.ebuild
+++ b/sci-mathematics/fricas/fricas-1.3.3.ebuild
@@ -51,7 +51,7 @@ DEPEND="${RDEPEND}"
 RESTRICT="strip"
 
 src_configure() {
-	local LISP n
+	local LISP n GMP
 	LISP=sbcl
 	n=${#LISPS[*]}
 	for ((n--; n > 0; n--)); do
@@ -64,8 +64,14 @@ src_configure() {
 	done
 	einfo "Using lisp: ${LISP}"
 
+	# bug #650788
+	if [[ ${LISP} = sbcl || ${LISP} = ccl ]]
+	then GMP=$(use_with gmp)
+	else GMP=''
+	fi
+
 	# aldor is not yet in portage
-	econf --disable-aldor --with-lisp=${LISP} $(use_with X x) $(use_with gmp)
+	econf --disable-aldor --with-lisp=${LISP} $(use_with X x) ${GMP}
 }
 
 src_compile() {