From 115dcc7054f5934a2c8e26fd8a8eed5f3e29e9ce Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 28 Mar 2023 09:49:11 +0100 Subject: gentoo auto-resync : 28:03:2023 - 09:49:10 --- sci-mathematics/Manifest.gz | Bin 18520 -> 18522 bytes sci-mathematics/fricas/Manifest | 5 +- .../fricas/files/fricas-sbcl-2.3.2.patch | 18 ++++ sci-mathematics/fricas/fricas-1.3.7.ebuild | 110 -------------------- sci-mathematics/fricas/fricas-1.3.8-r1.ebuild | 112 +++++++++++++++++++++ sci-mathematics/fricas/fricas-1.3.8.ebuild | 110 -------------------- 6 files changed, 132 insertions(+), 223 deletions(-) create mode 100644 sci-mathematics/fricas/files/fricas-sbcl-2.3.2.patch delete mode 100644 sci-mathematics/fricas/fricas-1.3.7.ebuild create mode 100644 sci-mathematics/fricas/fricas-1.3.8-r1.ebuild delete mode 100644 sci-mathematics/fricas/fricas-1.3.8.ebuild (limited to 'sci-mathematics') diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz index 297bffb2b31e..b326ff1b18c2 100644 Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ diff --git a/sci-mathematics/fricas/Manifest b/sci-mathematics/fricas/Manifest index 245a51fd6236..3ac82aa60cea 100644 --- a/sci-mathematics/fricas/Manifest +++ b/sci-mathematics/fricas/Manifest @@ -1,6 +1,5 @@ AUX 64fricas-gentoo.el 101 BLAKE2B 7d2499931132bd7bf32b528cbc6b09127af060b879ebea93421206f6f5fbe685b070624e507390902d7cfc7cd06a5988ca2df9959b2549736be912b731990c21 SHA512 be36ef5bfb525aa054cd3881ece83d47ee3a9cb7ef1b0c26215d449ddcad8f9f57045b29ab9063a62f43caa764abb251e5fcd04cf1d15bcc423e40d9e69239ef -DIST fricas-1.3.7-full.tar.bz2 38008318 BLAKE2B 079a0e2739c0f28c7fb76681e9562802cd7d6f16a0a0bcd8310bb11a6678b2aeabca9cc8effdf81d9464742bf4a20d07845f870717326afbd87feb48fe408493 SHA512 fd3742eb56c279adcdbae62a8eb5843781d0da4318f1b6e55310a9ac243c712b24fef214414c8d656b222be890ec4d9d30ad243b77b8eeaeea95e0ae3dda890a +AUX fricas-sbcl-2.3.2.patch 656 BLAKE2B 2b4e2ade98651f221461991464d70eb0e0ec3d534c0f9e0b98f790506acf94a2cc7eae9d8b20ab704c1dba156301b2703b9a5d1b78296f4f1eafa9d2cda091ea SHA512 e5134750092b4efd517311b1734d39cd4c2617e390d5228df7e393a2b95b1ccbd68119d5fb3e9322ddc6a346d5741ac41db8912306ea8b97960482fdb04c2c23 DIST fricas-1.3.8-full.tar.bz2 10878913 BLAKE2B 214eecd430a2b758a10d985f512f3c79f6b12de35bc29e8f0a3fd296fe871b2e9a6b362060cbeec317dc355bd3c661fcab44087feeaa092fe6afcdebd0fb94a8 SHA512 330554f9dc36b47451195e3dee88fe26a80ab2bf9b6750d651cd53c5ba16b9c9736176936c7c69e699685be25aa62b6a099ed7340913e946a4f5e53579835dbb -EBUILD fricas-1.3.7.ebuild 2447 BLAKE2B a4c1076388669c9111d3b69b6ffd22912e9b8b7d5804476bfde79640adcc9f120ced193681adf9da61a0415f71cb50744358b8028d75ae956fce96984ddecb51 SHA512 1bc746d4b70581438919a80981fb4d7188672913f764dc86b32122d033dd87baa7266a422a442826aeae463247ccb661ed0cfddaf72ddeafd6b54f732684c526 -EBUILD fricas-1.3.8.ebuild 2438 BLAKE2B c9e54be9e363b91a4e20771653ff8896757adfc3395f4ebb5ee53b111236b1bf0b56bf351661d685d8951d07c2dd520c5fecde612f4e76a897256d29508022ff SHA512 a48ef90d0d288db16105d9addd72c25f741e9a58a2ed9a2904a15886e7c8f3a8f5b2bccb2da5f27d6a11722fea209f20d8ceb0ef611c89ef274093bf0e353654 +EBUILD fricas-1.3.8-r1.ebuild 2482 BLAKE2B 12cce9ebee31e563a3d97a54946e86fa2d55f2ee0255d45842d53c6ca9ef3edfb022af348e0972bedb10bd65bfcb458a19b6c83033264237b6babe75d40095be SHA512 7343b47b81d586ffa560882974dc40cf2a102ace0430f93229494f086e8fe88d40692d9d0299706e2bd9701a41b2aac63c074031b0f55aa39f90d55fe915490c MISC metadata.xml 1062 BLAKE2B 06f8df085a48986321da6e195d8c13463929b5f49ee55ee683846e5a2a3281dd722a06339e4550cbf1d928b05fdf41b6a623777aa858146d81fac178700f7c15 SHA512 9848d78cf0ac1db0258213a48f47caf3380e1b2b64be8c3e33ae8d3b53543ba81ebd7eb0e470559bc97a14571cb4e82721d83ff50b9f01129933385eacf5e0ad diff --git a/sci-mathematics/fricas/files/fricas-sbcl-2.3.2.patch b/sci-mathematics/fricas/files/fricas-sbcl-2.3.2.patch new file mode 100644 index 000000000000..f5dd949abaa2 --- /dev/null +++ b/sci-mathematics/fricas/files/fricas-sbcl-2.3.2.patch @@ -0,0 +1,18 @@ +diff --git a/src/lisp/fricas-package.lisp b/src/lisp/fricas-package.lisp +index c0dfc4ef5..37e1afc1e 100644 +--- a/src/lisp/fricas-package.lisp ++++ b/src/lisp/fricas-package.lisp +@@ -34,7 +34,12 @@ + #+gcl + (shadow "QUIT") + +-(do-symbols (x "FRICAS-LISP") (export (list x))) ++;;; We use uninterned symbols because at this point we do not ++;;; want to add symbols to FRICAS-LISP ++(let ((#1=#:ls nil)) ++ (do-symbols (#2=#:el "FRICAS-LISP") (setf #1# (cons #2# #1#))) ++ (mapcar (lambda (#3=#:x) (export (list #3#))) #1#) ++) + + (export '(quit chdir |getEnv| |getCLArgs| |load_quietly| get-current-directory + trim-directory-name pad-directory-name diff --git a/sci-mathematics/fricas/fricas-1.3.7.ebuild b/sci-mathematics/fricas/fricas-1.3.7.ebuild deleted file mode 100644 index eefad5493a0a..000000000000 --- a/sci-mathematics/fricas/fricas-1.3.7.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit multilib elisp-common - -DESCRIPTION="FriCAS is a fork of Axiom computer algebra system" -HOMEPAGE="http://fricas.sourceforge.net/ - https://github.com/fricas/fricas - https://fricas.github.io/" -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? ( >=app-editors/emacs-23.1:* ) - 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 GMP - 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}" - - # 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) ${GMP} -} - -src_compile() { - # bug #300132 - emake -j1 -} - -src_test() { - emake -j1 all-input -} - -src_install() { - emake -j1 DESTDIR="${D}" install - dodoc README.rst 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.8-r1.ebuild b/sci-mathematics/fricas/fricas-1.3.8-r1.ebuild new file mode 100644 index 000000000000..056e10ba687e --- /dev/null +++ b/sci-mathematics/fricas/fricas-1.3.8-r1.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit elisp-common + +DESCRIPTION="FriCAS is a fork of Axiom computer algebra system" +HOMEPAGE="http://fricas.sourceforge.net/ + https://github.com/fricas/fricas + https://fricas.github.io/" +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? ( >=app-editors/emacs-23.1:* ) + 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" + +PATCHES=( "${FILESDIR}"/${PN}-sbcl-2.3.2.patch ) + +src_configure() { + local LISP n GMP + 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}" + + # 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) ${GMP} +} + +src_compile() { + # bug #300132 + emake -j1 +} + +src_test() { + emake -j1 all-input +} + +src_install() { + emake -j1 DESTDIR="${D}" install + dodoc README.rst 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.8.ebuild b/sci-mathematics/fricas/fricas-1.3.8.ebuild deleted file mode 100644 index 2d11d0c22808..000000000000 --- a/sci-mathematics/fricas/fricas-1.3.8.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit elisp-common - -DESCRIPTION="FriCAS is a fork of Axiom computer algebra system" -HOMEPAGE="http://fricas.sourceforge.net/ - https://github.com/fricas/fricas - https://fricas.github.io/" -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? ( >=app-editors/emacs-23.1:* ) - 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 GMP - 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}" - - # 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) ${GMP} -} - -src_compile() { - # bug #300132 - emake -j1 -} - -src_test() { - emake -j1 all-input -} - -src_install() { - emake -j1 DESTDIR="${D}" install - dodoc README.rst 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 -} -- cgit v1.2.3