diff options
Diffstat (limited to 'dev-lisp')
116 files changed, 1239 insertions, 5119 deletions
diff --git a/dev-lisp/abcl/Manifest b/dev-lisp/abcl/Manifest index 96ca2c285a73..3a1678b7d0b4 100644 --- a/dev-lisp/abcl/Manifest +++ b/dev-lisp/abcl/Manifest @@ -1 +1 @@ -DIST abcl-src-1.5.0.tar.gz 1187678 BLAKE2B 4c6993ab90d6fe12e93bf185ecdc16dd5c69ff5c65881e74db51ba9a8167e3a3de4b25ff9971084e92499f654aacec2a07757d100a5977944076476d47c17438 SHA512 d56c23a82103dfebb3361903af096f923738008e551f3b5e07e00f0423c8ade0b07a388b7834b5d79d9191863b38db2c17fa27bffd848d7cba88d6bb67e32db3 +DIST abcl-src-1.9.2.tar.gz 2477992 BLAKE2B b69610ee11e59dc0c408905b3a5f57d23872d80466a2f3aa4828048cb016de371a6f90dace612cb1a0fd71919cd611b4d506b22491c54b3435c80ec27f3642ed SHA512 1b758b26be5dbe00fb75aef0ffca6cdfbbb7982a545c63b6378dbd3d22bed76e15628ee099c5728c3600d67fb74def249195060cc1af1486f6d52fcdb9ce245a diff --git a/dev-lisp/abcl/abcl-1.5.0.ebuild b/dev-lisp/abcl/abcl-1.5.0.ebuild deleted file mode 100644 index e044eb611f12..000000000000 --- a/dev-lisp/abcl/abcl-1.5.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils java-pkg-2 java-ant-2 - -MY_P=${PN}-src-${PV} - -DESCRIPTION="Armed Bear Common Lisp is a Common Lisp implementation for the JVM." -HOMEPAGE="http://common-lisp.net/project/armedbear/" -SRC_URI="http://abcl.org/releases/${PV}/${MY_P}.tar.gz" -RESTRICT="mirror" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND=">=virtual/jdk-1.5" -RDEPEND=">=virtual/jre-1.5" - -S="${WORKDIR}"/${MY_P} - -src_compile() { - eant abcl.compile || die "Can't compile ABCL" - eant abcl.jar || die "Can't make ABCL jar archive" -} - -src_install() { - java-pkg_dojar dist/abcl.jar - java-pkg_dolauncher ${PN} --java_args "-server -Xrs" --main org.armedbear.lisp.Main - dodoc README -} diff --git a/dev-lisp/abcl/abcl-1.9.2.ebuild b/dev-lisp/abcl/abcl-1.9.2.ebuild new file mode 100644 index 000000000000..16040ba68498 --- /dev/null +++ b/dev-lisp/abcl/abcl-1.9.2.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit java-pkg-2 java-ant-2 + +DESCRIPTION="Armed Bear Common Lisp is a Common Lisp implementation for the JVM" +HOMEPAGE="https://abcl.org" +SRC_URI="https://abcl.org/releases/${PV}/abcl-src-${PV}.tar.gz" +S="${WORKDIR}/abcl-src-${PV}" + +LICENSE="GPL-2-with-classpath-exception" +SLOT="0" +KEYWORDS="amd64 x86" + +RDEPEND=">=virtual/jre-1.8:*" +DEPEND=">=virtual/jdk-1.8:*" + +DOCS=( README ) + +src_compile() { + eant abcl.compile + eant abcl.jar || die "Can't make ABCL jar archive" +} + +src_install() { + java-pkg_dojar dist/abcl.jar dist/abcl-contrib.jar + java-pkg_dolauncher ${PN} --java_args "-server -Xrs" --main org.armedbear.lisp.Main + + einstalldocs +} diff --git a/dev-lisp/abcl/metadata.xml b/dev-lisp/abcl/metadata.xml index 0687231d2b7d..66fa0ac73e12 100644 --- a/dev-lisp/abcl/metadata.xml +++ b/dev-lisp/abcl/metadata.xml @@ -1,16 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> - <email>common-lisp@gentoo.org</email> - <name>Gentoo Common Lisp Project</name> + <email>common-lisp@gentoo.org</email> + <name>Gentoo Common Lisp Project</name> </maintainer> <maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> + <email>java@gentoo.org</email> + <name>Java</name> </maintainer> <longdescription> Armed Bear Common Lisp (ABCL) is an implementation of ANSI Common Lisp that runs in a Java virtual machine. </longdescription> + <upstream> + <bugs-to>https://abcl.org/trac/report/1</bugs-to> + <remote-id type="github">armedbear/abcl</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-lisp/alexandria/Manifest b/dev-lisp/alexandria/Manifest index 646c8333fee8..300a98810ff7 100644 --- a/dev-lisp/alexandria/Manifest +++ b/dev-lisp/alexandria/Manifest @@ -1 +1 @@ -DIST alexandria-20171029.tar.bz2 45812 BLAKE2B 812f43483a0b25e4c4d481deec90ac1681a3c76062f5bf43b14530b239b2978e8d0cf735249b1093298db2761dc80a7d81e54da1e763db469b691b60d6db5d20 SHA512 a0a7386af94bae00139e3d06306169883cb1c5498c84d7a6db552a5dfa2ff8516d62609cb8a059c11f4200d507737ba99032d81b5a97112a2f3e7850572060e2 +DIST alexandria-v1.4.tar.gz 57634 BLAKE2B e552d44f0b4db326f09246f88af57ccd233dbb3b4354d2b9a55c8b9ddaf441016010fb4645f32ad0fbc82fb6755957fe7c989c67af62dd04f39baf78478e4b1c SHA512 4343be8eb2bac1924aaa8c890895aa885205af4c84110d7f8ceaf6c9ba1390e6037ffa3697fd1630266aede01bb596fd84c332ca43ded80326795637583332af diff --git a/dev-lisp/alexandria/alexandria-1.4.ebuild b/dev-lisp/alexandria/alexandria-1.4.ebuild new file mode 100644 index 000000000000..e1ecae812700 --- /dev/null +++ b/dev-lisp/alexandria/alexandria-1.4.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit common-lisp-3 + +DESCRIPTION="A collection of portable utilities for Common Lisp" +HOMEPAGE="http://common-lisp.net/project/alexandria/ https://gitlab.common-lisp.net/alexandria/alexandria" +SRC_URI="https://gitlab.common-lisp.net/${PN}/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz" +S="${WORKDIR}/${PN}-v${PV}" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="doc" + +# sbcl is hardcoded in Makefile +BDEPEND="doc? ( + dev-lisp/sbcl + sys-apps/texinfo +) +" + +DOCS=( README AUTHORS ) + +src_compile() { + use doc && emake -C doc +} + +src_install() { + common-lisp-install-sources -t all alexandria-1 alexandria-2 LICENCE + common-lisp-install-asdf + if use doc; then + doinfo doc/${PN}.info + HTML_DOCS=( doc/{"${PN}.html","${PN}.pdf"} ) + fi + einstalldocs +} diff --git a/dev-lisp/alexandria/alexandria-20171029.ebuild b/dev-lisp/alexandria/alexandria-20171029.ebuild deleted file mode 100644 index bd042f0736f8..000000000000 --- a/dev-lisp/alexandria/alexandria-20171029.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit common-lisp-3 eutils - -DESCRIPTION="A collection of portable utilities for Common Lisp" -HOMEPAGE="http://common-lisp.net/project/alexandria/" -if [[ ${PV} == 9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.common-lisp.net/alexandria/alexandria.git" -else - SRC_URI="mirror://gentoo/${P}.tar.bz2" - KEYWORDS="~amd64 ~ppc ~sparc ~x86" -fi - -LICENSE="public-domain" -SLOT="0" -IUSE="doc" - -DEPEND="doc? ( sys-apps/texinfo )" -RDEPEND="" - -src_prepare() { - eapply "${FILESDIR}/${PN}-fix-docstrings.patch" - eapply_user -} - -src_compile() { - use doc && emake -C doc -} - -src_install() { - common-lisp-install-sources -t all *.lisp LICENCE - common-lisp-install-asdf - dodoc README AUTHORS - use doc && doinfo doc/${PN}.info && dodoc doc/{"${PN}.html","${PN}.pdf"} -} diff --git a/dev-lisp/alexandria/files/alexandria-fix-docstrings.patch b/dev-lisp/alexandria/files/alexandria-fix-docstrings.patch deleted file mode 100644 index 747c9e3bf59d..000000000000 --- a/dev-lisp/alexandria/files/alexandria-fix-docstrings.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -Nuar a/doc/docstrings.lisp b/doc/docstrings.lisp ---- a/doc/docstrings.lisp 2016-12-11 00:04:21.272877121 +0100 -+++ b/doc/docstrings.lisp 2016-12-11 00:05:03.752876882 +0100 -@@ -718,7 +718,7 @@ - ;; sbcl.texinfo defines macros that expand @&key and friends to &key. - (mapcar (lambda (name) - (if (member name lambda-list-keywords) -- (format nil "@~A" name) -+ (format nil "~A" name) - name)) - (lambda-list doc))))) - -@@ -833,11 +833,11 @@ - (flet ((macro (name) - (let ((string (string-downcase name))) - (format *texinfo-output* "@macro ~A~%~A~%@end macro~%" string string)))) -- (macro '&allow-other-keys) -- (macro '&optional) -- (macro '&rest) -- (macro '&key) -- (macro '&body))) -+ (macro 'allow-other-keys) -+ (macro 'optional) -+ (macro 'rest) -+ (macro 'key) -+ (macro 'body))) - - (defun generate-includes (directory packages &key (base-package :cl-user)) - "Create files in `directory' containing Texinfo markup of all diff --git a/dev-lisp/alexandria/metadata.xml b/dev-lisp/alexandria/metadata.xml index 937bb81734f3..399d58f7d271 100644 --- a/dev-lisp/alexandria/metadata.xml +++ b/dev-lisp/alexandria/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>common-lisp@gentoo.org</email> diff --git a/dev-lisp/asdf/Manifest b/dev-lisp/asdf/Manifest index 9c87831a7eb5..730b60d701ee 100644 --- a/dev-lisp/asdf/Manifest +++ b/dev-lisp/asdf/Manifest @@ -1,3 +1 @@ -DIST asdf-3.1.5.tar.gz 400359 BLAKE2B 586a66799a37259694baa673f2849e183fac5fedfe5ff5c92529d47fc0954d40b48bbc095db926b9ea2214b551729c269d0925e4396a52310b72fd5f21842f49 SHA512 937d45eabea0853cd1b2e78e84cf33e7b55065857ffcf49fd87ccd60e21ae09c6dc7ab3649d48b37aeb1beaeeaf6c816e5ce035f0283707105296fb976044516 -DIST asdf-3.3.1.tar.gz 479255 BLAKE2B 5161b79741a52721eaa4da80a61bbe51e924967ecb744a087fdcbd99407abcc42faf39eafe6d30af7dd8af751a80caaf23e93ce42aa5f584123a1e8b528cc613 SHA512 bf5efec4518eb5312ce743c0fbe60c587bebfe26c36c833c163d67bf8631e18eeb293f2185e547f6be10da061a17f024d9f4a3a0808727d7b9b3a7d7a0faf133 -DIST asdf-3.3.2.tar.gz 482616 BLAKE2B 860728720ccb02debee6a826d8b27bfd8f5fea3daa529ecfc8d2f5564c77340a38582ccbccf4f311c644bdeccd7348004690929185aa70c3dc0f6b4124616df8 SHA512 f8e065383d6e82754c87d309a8b500ad213e09d1375792fd475eb169d9f880d97b26072e608046d61c83512645781cded09dcff22052e214e8e3639f2a978c74 +DIST asdf-3.3.5.tar.gz 520233 BLAKE2B 59697b9c6a691c43efe47c0e6d9fed5b8a0f2f2432f10cb58a643857bc3d332b730b180d5d13e87656b9106eab7787359ecd3b854447f5d9c8a871b3a1510448 SHA512 27221bbf798c94e427b8e2c0e8ecb5384102dd5f8f5d2cc18c2e3d44e0aa2f3b79538e0f2cb589442eb493abe00c8a63a04f6c1558979b78cd00165c6b33103b diff --git a/dev-lisp/asdf/asdf-3.1.5.ebuild b/dev-lisp/asdf/asdf-3.1.5.ebuild deleted file mode 100644 index 396347e26b05..000000000000 --- a/dev-lisp/asdf/asdf-3.1.5.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils prefix - -DESCRIPTION="ASDF is Another System Definition Facility for Common Lisp" -HOMEPAGE="http://common-lisp.net/project/asdf/" -SRC_URI="http://common-lisp.net/project/${PN}/archives/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PVR}" -KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris" -IUSE="doc" - -DEPEND="!dev-lisp/cl-${PN} - !<dev-lisp/asdf-2.33-r3 - doc? ( virtual/texi2dvi )" -RDEPEND="" -PDEPEND="~dev-lisp/uiop-${PV}" - -#S="${WORKDIR}" - -src_compile() { - make - use doc && make doc -} - -src_install() { - insinto /usr/share/common-lisp/source/${PN} - doins -r build version.lisp-expr - dodoc README.md TODO - dohtml doc/*.{html,css,ico,png} - if use doc; then - dohtml -r doc/index.html - insinto /usr/share/doc/${PF} - #doins doc/${PN}.pdf - fi - - insinto /etc/common-lisp - cd "${T}" - cp "${FILESDIR}"/gentoo-init.lisp "${FILESDIR}"/source-registry.conf . - eprefixify gentoo-init.lisp source-registry.conf - doins gentoo-init.lisp source-registry.conf -} diff --git a/dev-lisp/asdf/asdf-3.3.1.ebuild b/dev-lisp/asdf/asdf-3.3.1.ebuild deleted file mode 100644 index aed7e6593218..000000000000 --- a/dev-lisp/asdf/asdf-3.3.1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils prefix common-lisp-3 - -DESCRIPTION="ASDF is Another System Definition Facility for Common Lisp" -HOMEPAGE="http://common-lisp.net/project/asdf/" -SRC_URI="http://common-lisp.net/project/${PN}/archives/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PVR}" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris" -IUSE="doc" - -DEPEND="!dev-lisp/cl-${PN} - !<dev-lisp/asdf-2.33-r3 - doc? ( virtual/texi2dvi )" -PDEPEND="virtual/commonlisp - ~dev-lisp/uiop-${PV}" - -install_docs() { - (cd doc ; dodoc *.{html,css,ico,png} "${PN}.pdf" ; dodoc -r asdf ) - if has_version ">=dev-lisp/sbcl-1.4.0" ; then - (cd doc ; doinfo "${PN}.info" ) - fi -} - -src_compile() { - emake - use doc && emake -C doc -} - -src_test() { - common-lisp-export-impl-args "$(common-lisp-find-lisp-impl)" - test/run-tests.sh ${CL_BINARY} -} - -src_install() { - insinto "${CLSOURCEROOT}/${PN}" - doins -r build version.lisp-expr - dodoc README.md TODO - use doc && install_docs - insinto /etc/common-lisp - cd "${T}" || die - cp "${FILESDIR}/gentoo-init.lisp" "${FILESDIR}/source-registry.conf" . || die - eprefixify gentoo-init.lisp source-registry.conf - doins gentoo-init.lisp source-registry.conf -} diff --git a/dev-lisp/asdf/asdf-3.3.2-r1.ebuild b/dev-lisp/asdf/asdf-3.3.2-r1.ebuild deleted file mode 100644 index 20b72a58ce0f..000000000000 --- a/dev-lisp/asdf/asdf-3.3.2-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils prefix common-lisp-3 - -DESCRIPTION="ASDF is Another System Definition Facility for Common Lisp" -HOMEPAGE="http://common-lisp.net/project/asdf/" -SRC_URI="http://common-lisp.net/project/${PN}/archives/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PVR}" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris" -IUSE="doc test" -RESTRICT="!test? ( test )" - -DEPEND="!dev-lisp/cl-${PN} - !<dev-lisp/asdf-2.33-r3 - doc? ( virtual/texi2dvi ) - test? ( virtual/commonlisp )" -PDEPEND="virtual/commonlisp - ~dev-lisp/uiop-${PV}" - -install_docs() { - (cd doc ; dodoc *.{html,css,ico,png} "${PN}.pdf" ; dodoc -r asdf ) - if has_version ">=dev-lisp/sbcl-1.4.0" ; then - (cd doc ; doinfo "${PN}.info" ) - fi -} - -src_compile() { - emake - use doc && emake -C doc -} - -src_test() { - common-lisp-export-impl-args "$(common-lisp-find-lisp-impl)" - test/run-tests.sh ${CL_BINARY} -} - -src_install() { - insinto "${CLSOURCEROOT}/${PN}" - doins -r build version.lisp-expr - dodoc README.md TODO - use doc && install_docs - insinto /etc/common-lisp - cd "${T}" || die - cp "${FILESDIR}/gentoo-init.lisp" "${FILESDIR}/source-registry.conf" . || die - eprefixify gentoo-init.lisp source-registry.conf - doins gentoo-init.lisp source-registry.conf -} diff --git a/dev-lisp/asdf/asdf-3.3.2.ebuild b/dev-lisp/asdf/asdf-3.3.2.ebuild deleted file mode 100644 index 24b35b0d2403..000000000000 --- a/dev-lisp/asdf/asdf-3.3.2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils prefix common-lisp-3 - -DESCRIPTION="ASDF is Another System Definition Facility for Common Lisp" -HOMEPAGE="http://common-lisp.net/project/asdf/" -SRC_URI="http://common-lisp.net/project/${PN}/archives/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PVR}" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris" -IUSE="doc" - -DEPEND="!dev-lisp/cl-${PN} - !<dev-lisp/asdf-2.33-r3 - doc? ( virtual/texi2dvi )" -PDEPEND="virtual/commonlisp - ~dev-lisp/uiop-${PV}" - -install_docs() { - (cd doc ; dodoc *.{html,css,ico,png} "${PN}.pdf" ; dodoc -r asdf ) - if has_version ">=dev-lisp/sbcl-1.4.0" ; then - (cd doc ; doinfo "${PN}.info" ) - fi -} - -src_compile() { - emake - use doc && emake -C doc -} - -src_test() { - common-lisp-export-impl-args "$(common-lisp-find-lisp-impl)" - test/run-tests.sh ${CL_BINARY} -} - -src_install() { - insinto "${CLSOURCEROOT}/${PN}" - doins -r build version.lisp-expr - dodoc README.md TODO - use doc && install_docs - insinto /etc/common-lisp - cd "${T}" || die - cp "${FILESDIR}/gentoo-init.lisp" "${FILESDIR}/source-registry.conf" . || die - eprefixify gentoo-init.lisp source-registry.conf - doins gentoo-init.lisp source-registry.conf -} diff --git a/dev-lisp/asdf/asdf-3.3.5-r1.ebuild b/dev-lisp/asdf/asdf-3.3.5-r1.ebuild new file mode 100644 index 000000000000..5cf771e6dcca --- /dev/null +++ b/dev-lisp/asdf/asdf-3.3.5-r1.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit prefix common-lisp-3 + +DESCRIPTION="ASDF is Another System Definition Facility for Common Lisp" +HOMEPAGE="https://asdf.common-lisp.dev/" +SRC_URI="https://asdf.common-lisp.dev/archives/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PVR}" +KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="doc test" +RESTRICT="!test? ( test )" + +BDEPEND="doc? ( virtual/texi2dvi ) + test? ( virtual/commonlisp )" +PDEPEND="virtual/commonlisp + ~dev-lisp/uiop-${PV}" + +PATCHES=( + # bug 841335, drop on next version bump + "${FILESDIR}"/${PN}-3.3.5-test-utilities.patch +) + +install_docs() { + ( + cd doc || die + dodoc *.{html,css,ico,png} ${PN}.pdf + doinfo ${PN}.info + + # texinfo-7 renamed the dir from asdf to asdf_html #883439 + if [[ -d asdf_html ]]; then + dodoc -r asdf_html + else + docinto asdf_html + dodoc -r asdf/. + fi + ) +} + +src_compile() { + emake + + use doc && emake -C doc +} + +src_test() { + common-lisp-export-impl-args "$(common-lisp-find-lisp-impl)" + + rm test/test-program.script || die + + # sbcl in common-lisp.eclass has --non-interactive in the binary name + # which seems to break this? + test/run-tests.sh ${CL_BINARY/--non-interactive/} || die +} + +src_install() { + insinto "${CLSOURCEROOT}/${PN}" + doins -r build version.lisp-expr + + dodoc README.md TODO + use doc && install_docs + + insinto /etc/common-lisp + cd "${T}" || die + cp "${FILESDIR}"/gentoo-init.lisp "${FILESDIR}"/source-registry.conf . || die + eprefixify gentoo-init.lisp source-registry.conf + doins gentoo-init.lisp source-registry.conf +} diff --git a/dev-lisp/asdf/files/asdf-3.3.5-test-utilities.patch b/dev-lisp/asdf/files/asdf-3.3.5-test-utilities.patch new file mode 100644 index 000000000000..d8529d16823d --- /dev/null +++ b/dev-lisp/asdf/files/asdf-3.3.5-test-utilities.patch @@ -0,0 +1,27 @@ +https://bugs.gentoo.org/841335 +Taken from https://github.com/roswell/asdf/commit/fd289d99d1c76601fb310f8ca26a48f807337c8d + +From fd289d99d1c76601fb310f8ca26a48f807337c8d Mon Sep 17 00:00:00 2001 +From: "Robert P. Goldman" <rpgoldman@sift.net> +Date: Fri, 2 Jul 2021 15:57:34 -0500 +Subject: [PATCH] Fix garbled test. + +By accident a bad test slipped into a commit: this was due to my not +understanding how `with-expected-failure` works. +--- + test/test-utilities.script | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/test-utilities.script b/test/test-utilities.script +index 09a03347..b1e00fa5 100644 +--- a/test/test-utilities.script ++++ b/test/test-utilities.script +@@ -342,7 +342,7 @@ + ;; (assert (directory-exists-p oddball-pathname)) + ;; (pathname oddball-namestring) + ;; (assert-equal nil (uiop:subdirectories oddball-namestring)) +-(with-expected-failure ("UIOP:SUBDIRECTORIES does not handle non-standard pathnames.") ++(with-expected-failure (#+(or sbcl cmucl) t) + (assert-equal nil (uiop:subdirectories "/[foo"))) + + (DBG "check to make sure WITH-CURRENT-DIRECTORY checks its parameter for directory pathname") diff --git a/dev-lisp/asdf/metadata.xml b/dev-lisp/asdf/metadata.xml index 7ea645c67e72..4de45c7d62d6 100644 --- a/dev-lisp/asdf/metadata.xml +++ b/dev-lisp/asdf/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>common-lisp@gentoo.org</email> diff --git a/dev-lisp/c2ffi/Manifest b/dev-lisp/c2ffi/Manifest index 35af3e0ca0a2..e9698afaafd0 100644 --- a/dev-lisp/c2ffi/Manifest +++ b/dev-lisp/c2ffi/Manifest @@ -1 +1 @@ -DIST c2ffi-10.0.0.20200527.tar.gz 37554 BLAKE2B b1ebef370083d08513d0f02f8662ba1b090cba991864530c2304ac45e5c74d092f47e9d75a0646ae2f045d346585f371243d8a82bc37fe35f36dee1a75c0812b SHA512 452f2e8d3c81207e74334bc48dcea9bdf2770b4c77884c96abffc69ede20cc770183f363655ae853cddaee95d0512571426c6737d5db0324f7ceebbdf554cdf3 +DIST c2ffi-17.0.0.20240314.tar.gz 44258 BLAKE2B 522fcf2671f5ce6bc0a8bef533da806954cb6083f54ba27455903f618fea2b20eda7a2b7a8fe0f56c8d4904181c84db1031ee824301ff9004aeb1f149b48baf5 SHA512 6e5e8a5809592873edae95c117cf1e5494cc62ecae5ecee6dd4a0928b138f33e60baa2e918aaa6a779e6d89e592f651bb8914795257c6abfe51ee7a56eb70788 diff --git a/dev-lisp/c2ffi/c2ffi-10.0.0.9999.ebuild b/dev-lisp/c2ffi/c2ffi-10.0.0.9999.ebuild deleted file mode 100644 index dac9e0eb3d31..000000000000 --- a/dev-lisp/c2ffi/c2ffi-10.0.0.9999.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 2019-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake git-r3 llvm - -DESCRIPTION="Clang-based FFI wrapper generator for Common Lisp" -HOMEPAGE="https://github.com/rpav/c2ffi" -EGIT_REPO_URI="https://github.com/rpav/c2ffi.git" -EGIT_BRANCH="llvm-10.0.0" - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="" - -DEPEND="sys-devel/clang:10= - sys-devel/llvm:10= -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}"/${PN}-10.0.0.20200527-add-target-link-directories.patch ) diff --git a/dev-lisp/c2ffi/c2ffi-10.0.0.20200527.ebuild b/dev-lisp/c2ffi/c2ffi-17.0.0.20240314.ebuild index 56aaeae61858..f9d9ec225c5e 100644 --- a/dev-lisp/c2ffi/c2ffi-10.0.0.20200527.ebuild +++ b/dev-lisp/c2ffi/c2ffi-17.0.0.20240314.ebuild @@ -1,26 +1,22 @@ -# Copyright 2019-2020 Gentoo Authors +# Copyright 2019-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 +LLVM_MAX_SLOT=17 inherit cmake llvm -MY_COMMIT="a2d1f667b707fb413fc8ab2413446f15cb23de51" +MY_COMMIT="164637979127b2f995930b352d06dea5e9572064" DESCRIPTION="Clang-based FFI wrapper generator for Common Lisp" HOMEPAGE="https://github.com/rpav/c2ffi" SRC_URI="https://github.com/rpav/c2ffi/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/c2ffi-${MY_COMMIT}" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" -IUSE="" -DEPEND="sys-devel/clang:10= - sys-devel/llvm:10= -" +DEPEND="sys-devel/clang:${LLVM_MAX_SLOT} + sys-devel/llvm:${LLVM_MAX_SLOT}" RDEPEND="${DEPEND}" - -S="${WORKDIR}/c2ffi-${MY_COMMIT}" - -PATCHES=( "${FILESDIR}"/${PN}-10.0.0.20200527-add-target-link-directories.patch ) diff --git a/dev-lisp/c2ffi/files/c2ffi-10.0.0.20200527-add-target-link-directories.patch b/dev-lisp/c2ffi/files/c2ffi-10.0.0.20200527-add-target-link-directories.patch deleted file mode 100644 index 2dc4a82413b2..000000000000 --- a/dev-lisp/c2ffi/files/c2ffi-10.0.0.20200527-add-target-link-directories.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2020-06-05 00:21:43.509980270 +0200 -+++ b/CMakeLists.txt 2020-06-05 00:22:08.679979968 +0200 -@@ -36,6 +36,7 @@ - ${LLVM_INCLUDE_DIRS} - ${SOURCE_ROOT}/src/include - ) -+target_link_directories(c2ffi PUBLIC ${LLVM_LIBRARY_DIRS}) - target_link_libraries(c2ffi PUBLIC clang-cpp LLVM) - - set(APP_BIN_DIR "${CMAKE_BINARY_DIR}/bin") diff --git a/dev-lisp/c2ffi/metadata.xml b/dev-lisp/c2ffi/metadata.xml index d30f4079e72f..3350a5603a7e 100644 --- a/dev-lisp/c2ffi/metadata.xml +++ b/dev-lisp/c2ffi/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> +<maintainer type="person" proxied="yes"> <email>h.judt@gmx.at</email> <name>Harald Judt</name> </maintainer> -<maintainer type="project"> +<maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/dev-lisp/cl-ppcre-unicode/cl-ppcre-unicode-2.0.11.ebuild b/dev-lisp/cl-ppcre-unicode/cl-ppcre-unicode-2.0.11.ebuild index 34ef1cfdf678..0a98f781406a 100644 --- a/dev-lisp/cl-ppcre-unicode/cl-ppcre-unicode-2.0.11.ebuild +++ b/dev-lisp/cl-ppcre-unicode/cl-ppcre-unicode-2.0.11.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 inherit common-lisp-3 -DESCRIPTION="CL-PPCRE is a portable regular expression library for Common Lisp." +DESCRIPTION="CL-PPCRE is a portable regular expression library for Common Lisp" HOMEPAGE="http://weitz.de/cl-ppcre/ http://www.cliki.net/cl-ppcre" SRC_URI="https://github.com/edicl/cl-ppcre/archive/v${PV}.tar.gz -> cl-ppcre-${PV}.tar.gz" diff --git a/dev-lisp/cl-ppcre-unicode/cl-ppcre-unicode-2.1.0.ebuild b/dev-lisp/cl-ppcre-unicode/cl-ppcre-unicode-2.1.0.ebuild index 8203612b0edc..140ebc0154d6 100644 --- a/dev-lisp/cl-ppcre-unicode/cl-ppcre-unicode-2.1.0.ebuild +++ b/dev-lisp/cl-ppcre-unicode/cl-ppcre-unicode-2.1.0.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 inherit common-lisp-3 -DESCRIPTION="CL-PPCRE is a portable regular expression library for Common Lisp." +DESCRIPTION="CL-PPCRE is a portable regular expression library for Common Lisp" HOMEPAGE="http://weitz.de/cl-ppcre/ http://www.cliki.net/cl-ppcre" SRC_URI="https://github.com/edicl/cl-ppcre/archive/v${PV}.tar.gz -> cl-ppcre-${PV}.tar.gz" diff --git a/dev-lisp/cl-ppcre-unicode/metadata.xml b/dev-lisp/cl-ppcre-unicode/metadata.xml index f7036b0f160e..a75d4513576b 100644 --- a/dev-lisp/cl-ppcre-unicode/metadata.xml +++ b/dev-lisp/cl-ppcre-unicode/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>common-lisp@gentoo.org</email> diff --git a/dev-lisp/cl-ppcre/cl-ppcre-2.0.11.ebuild b/dev-lisp/cl-ppcre/cl-ppcre-2.0.11.ebuild index df216d535ff0..8a19e08dbe89 100644 --- a/dev-lisp/cl-ppcre/cl-ppcre-2.0.11.ebuild +++ b/dev-lisp/cl-ppcre/cl-ppcre-2.0.11.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 inherit common-lisp-3 -DESCRIPTION="CL-PPCRE is a portable regular expression library for Common Lisp." +DESCRIPTION="CL-PPCRE is a portable regular expression library for Common Lisp" HOMEPAGE="http://weitz.de/cl-ppcre/ http://www.cliki.net/cl-ppcre" SRC_URI="https://github.com/edicl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" diff --git a/dev-lisp/cl-ppcre/cl-ppcre-2.1.0.ebuild b/dev-lisp/cl-ppcre/cl-ppcre-2.1.0.ebuild index 70c99953770f..668039a6537c 100644 --- a/dev-lisp/cl-ppcre/cl-ppcre-2.1.0.ebuild +++ b/dev-lisp/cl-ppcre/cl-ppcre-2.1.0.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 inherit common-lisp-3 -DESCRIPTION="CL-PPCRE is a portable regular expression library for Common Lisp." +DESCRIPTION="CL-PPCRE is a portable regular expression library for Common Lisp" HOMEPAGE="http://weitz.de/cl-ppcre/ http://www.cliki.net/cl-ppcre" SRC_URI="https://github.com/edicl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" diff --git a/dev-lisp/cl-ppcre/metadata.xml b/dev-lisp/cl-ppcre/metadata.xml index 36bca3f8dbdf..0b2858e5e177 100644 --- a/dev-lisp/cl-ppcre/metadata.xml +++ b/dev-lisp/cl-ppcre/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>common-lisp@gentoo.org</email> diff --git a/dev-lisp/cl-unicode/cl-unicode-0.1.5.ebuild b/dev-lisp/cl-unicode/cl-unicode-0.1.5.ebuild index bff440548364..d088c26abc3a 100644 --- a/dev-lisp/cl-unicode/cl-unicode-0.1.5.ebuild +++ b/dev-lisp/cl-unicode/cl-unicode-0.1.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -7,7 +7,7 @@ inherit common-lisp-3 xdg-utils MY_P="v${PV}" -DESCRIPTION="Provides Common Lisp implementations with knowledge about Unicode characters." +DESCRIPTION="Provides Common Lisp implementations with knowledge about Unicode characters" HOMEPAGE="http://weitz.de/cl-unicode/" SRC_URI="https://github.com/edicl/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz" diff --git a/dev-lisp/cl-unicode/metadata.xml b/dev-lisp/cl-unicode/metadata.xml index 739846335fdf..720832fbe22d 100644 --- a/dev-lisp/cl-unicode/metadata.xml +++ b/dev-lisp/cl-unicode/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>common-lisp@gentoo.org</email> diff --git a/dev-lisp/clisp/clisp-2.49.92.ebuild b/dev-lisp/clisp/clisp-2.49.92-r1.ebuild index a9e1a4ab03b8..1b4d379847da 100644 --- a/dev-lisp/clisp/clisp-2.49.92.ebuild +++ b/dev-lisp/clisp/clisp-2.49.92-r1.ebuild @@ -1,36 +1,37 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit eutils flag-o-matic multilib toolchain-funcs xdg-utils +inherit flag-o-matic xdg-utils DESCRIPTION="A portable, bytecode-compiled implementation of Common Lisp" HOMEPAGE="https://clisp.sourceforge.io/" SRC_URI="mirror://gentoo/${P}.tar.bz2" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="2/8" -KEYWORDS="~alpha amd64 ~ia64 ppc ~sparc x86" -IUSE="hyperspec X berkdb dbus fastcgi gdbm gtk +pcre postgres +readline svm -threads +unicode +zlib" +KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86" +IUSE="hyperspec X berkdb dbus fastcgi gdbm gtk +pcre postgres +readline svm threads +unicode +zlib" # "jit" disabled ATM RDEPEND=">=dev-lisp/asdf-2.33-r3 - virtual/libiconv - >=dev-libs/libsigsegv-2.10 - >=dev-libs/ffcall-1.10 - dbus? ( sys-apps/dbus ) - fastcgi? ( dev-libs/fcgi ) - gdbm? ( sys-libs/gdbm:0= ) - gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6 ) - postgres? ( >=dev-db/postgresql-8.0:* ) - readline? ( >=sys-libs/readline-7.0:0= ) - pcre? ( dev-libs/libpcre:3 ) - svm? ( sci-libs/libsvm ) - zlib? ( sys-libs/zlib ) - X? ( x11-libs/libXpm ) - hyperspec? ( dev-lisp/hyperspec ) - berkdb? ( sys-libs/db:4.8 )" + virtual/libcrypt:= + virtual/libiconv + >=dev-libs/libsigsegv-2.10 + >=dev-libs/ffcall-1.10 + dbus? ( sys-apps/dbus ) + fastcgi? ( dev-libs/fcgi ) + gdbm? ( sys-libs/gdbm:0= ) + gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6 ) + postgres? ( >=dev-db/postgresql-8.0:* ) + readline? ( >=sys-libs/readline-7.0:0= ) + pcre? ( dev-libs/libpcre:3 ) + svm? ( sci-libs/libsvm ) + zlib? ( sys-libs/zlib ) + X? ( x11-libs/libXpm ) + hyperspec? ( dev-lisp/hyperspec ) + berkdb? ( sys-libs/db:4.8 )" DEPEND="${RDEPEND} X? ( x11-base/xorg-proto x11-misc/imake )" @@ -64,6 +65,11 @@ src_prepare() { } src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/856103 + # https://gitlab.com/gnu-clisp/clisp/-/issues/49 + filter-lto + # We need this to build on alpha/ia64 if use alpha || use ia64; then replace-flags -O? -O1 @@ -117,7 +123,7 @@ src_configure() { einfo "${configure}" ${configure} || die "./configure failed" - IMPNOTES="file://${ROOT%/}/usr/share/doc/${PN}-${PVR}/html/impnotes.html" + IMPNOTES="file://${EPREFIX}/usr/share/doc/${PN}-${PVR}/html/impnotes.html" sed -i "s,http://clisp.cons.org/impnotes/,${IMPNOTES},g" \ "${BUILDDIR}"/config.lisp || die "Cannot fix link to implementation notes" } @@ -130,11 +136,12 @@ src_compile() { } src_install() { - pushd "${BUILDDIR}" + pushd "${BUILDDIR}" || die make DESTDIR="${D}" prefix="${EPREFIX}"/usr install-bin || die "Installation failed" doman clisp.1 dodoc ../SUMMARY README* ../src/NEWS ../unix/MAGIC.add ../ANNOUNCE - popd - dohtml doc/impnotes.{css,html} doc/regexp.html doc/clisp.png + popd || die dodoc doc/{CLOS-guide,LISP-tutorial}.txt + docinto html + dodoc doc/impnotes.{css,html} doc/regexp.html doc/clisp.png } diff --git a/dev-lisp/clisp/metadata.xml b/dev-lisp/clisp/metadata.xml index 88ea109143fa..44471e4a1c02 100644 --- a/dev-lisp/clisp/metadata.xml +++ b/dev-lisp/clisp/metadata.xml @@ -1,28 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>common-lisp@gentoo.org</email> <name>Gentoo Common Lisp Project</name> </maintainer> <longdescription> -CLISP is a Common Lisp implementation. It mostly supports the Lisp -described in the ANSI Common Lisp standard. It includes an -interpreter, a compiler, almost all of CLOS, a foreign language -interface and a socket interface. An X11 interface is available -through CLX and Garnet. Command line editing is provided by readline. -CLISP runs on microcomputers (OS/2, Windows 95/98/NT/2000/XP, Amiga -500-4000, Acorn RISC PC) as well as on Unix workstations (GNU/Linux, -BSD, SVR4, Sun4, DEC Alpha OSF, HP-UX, NeXTstep, SGI, AIX, Sun3 and -others) and needs only 2 MB of RAM. The user interface comes in -German, English, French, Spanish, Dutch and Russian, and can be -changed at run time. -</longdescription> + CLISP is a Common Lisp implementation. It mostly supports the Lisp + described in the ANSI Common Lisp standard. It includes an + interpreter, a compiler, almost all of CLOS, a foreign language + interface and a socket interface. An X11 interface is available + through CLX and Garnet. Command line editing is provided by readline. + CLISP runs on microcomputers (OS/2, Windows 95/98/NT/2000/XP, Amiga + 500-4000, Acorn RISC PC) as well as on Unix workstations (GNU/Linux, + BSD, SVR4, Sun4, DEC Alpha OSF, HP-UX, NeXTstep, SGI, AIX, Sun3 and + others) and needs only 2 MB of RAM. The user interface comes in + German, English, French, Spanish, Dutch and Russian, and can be + changed at run time. + </longdescription> <use> <flag name="hyperspec">Use local hyperspec instead of online version</flag> <flag name="svm">Build CLISP with support for the Support Vector Machine module</flag> </use> <upstream> <remote-id type="sourceforge">clisp</remote-id> + <remote-id type="gitlab">gnu-clisp/clisp</remote-id> </upstream> </pkgmetadata> diff --git a/dev-lisp/clozurecl/Manifest b/dev-lisp/clozurecl/Manifest index bfc4b91eba63..8b29ee1a98d7 100644 --- a/dev-lisp/clozurecl/Manifest +++ b/dev-lisp/clozurecl/Manifest @@ -1,5 +1,3 @@ -DIST ccl-1.11.5-darwinx86.tar.gz 100515656 BLAKE2B d9ae52f7d0c481211fdf53bf6bb4bb65a66ab60bf1c3548e9f2d502e60906163121a85330e547d15e3d4bcb6ad47564e86dd93b4228a9391558463347011990f SHA512 1016ab9672839d1303809e9f5b849cf36dc300963672dfa5888b75f6dadee3106cd6f1375e544437a92c7307dc8639e423e12663ca157b851925d0e82f0cd4b7 -DIST ccl-1.11.5-linuxarm.tar.gz 40288609 BLAKE2B 5217de314e6c59e5bbee7d5608b4e92088fb57dc0d8a90454ec4653c1710857748776d9a7ee2e89e86613f64fc028aca324ea5cb3bc7eb5e9bc582e2b50766cf SHA512 0305baa66263a2182ba8deb02837287ffb6c1472987d4953caa8839cad6503815ded7fe6bfde72a823b90d3ff86322602ee3d0934e179fb2418e3b049f55be4e -DIST ccl-1.11.5-linuxx86.tar.gz 50652181 BLAKE2B 2ed6e747a72816c6f79f58715261c41a1c3b98fa84ef4ee82ca5683383741777a46a566c7884d7fdc3dcd2e5959dab2f3fde9432945a4dc73bcece8f741ed753 SHA512 b6c16d9bba27a901f942237ed42d6b3e832910951270820a2a3d61afe2a8e7f59d383c854382cfcaa0bf8253c8d624be66d905b4170211ea39a106ca85b9a23d -DIST ccl-1.11.5-solarisx86.tar.gz 59139069 BLAKE2B db1a904dd4e794127e7c966a9734aa92bb0415520a6af35d92008fd785004bd2ea04deb66f600b1d1dd60c0b95519e86d412b208878aaa6c2f9f8c05a27efe38 SHA512 4ae7cee7e35de41ab20d79e073b12b6bd98a23beea95c0de7d882a1f4e1ea3f9f3162844df0578aeeadb671d30a0a488092ee93b35245c693051a4ab9193fc5b -DIST ccl.html 962003 BLAKE2B fc95ec5abbea7c2f5f247293691a5c5a7eddaa049156c38766ec9df4d1920fdee902c89db976cc6687535aef5ddda3c672b62156bf0f61b6369ade548dcb0141 SHA512 0cb9ee8f7eb6007e08241a0797519ff3bfc3d3adc0b5ac86e6a2e9e8b2e316fc421bea3b04159decc0a2b37ff7098147e25266946cc3c1ac367b93e4821a8b64 +DIST ccl-1.12.2-darwinx86.tar.gz 23942873 BLAKE2B 980403852c086c49ed467d391fbcf776b32c9c8cf3352ce71249ccd3cb0548904421ebd20512abef77b888de4a102a0fb19d1117c8a2dd14c3b618feea205f63 SHA512 96ac720ea1f210a89b17ad2a617f55bb04bece3c06bb2433191dab99886a2ad3529716e35624bd4b0d4c9eec2e9ccd80c0d894b75766ac1e361185cd7dfe3e92 +DIST ccl-1.12.2-linuxx86.tar.gz 20997426 BLAKE2B 7bc9037b85964be6363f3082af6abf18d519e9a155edd34f4de495aedb5bfec8f43e4403b3b3bcece17c64bb7a381163bbaa03e1d2b9db9aee0a53deef537cf1 SHA512 4cf6960e41347ae980f8ea7366434a016e2a47a9ae090a77e52a2145233454cc97cd4812851d0368024548c46aa0997abb2791992125b5857a9f5f662890338b +DIST ccl.html 962023 BLAKE2B 6dcda62b4d18e83b3b73d554a4dd4255411944831e99464e20c9840f97bccd1bdf74b1d718620b2f6aa5e4f297e1925dbd3da6c48a5977b517caa194f62a37d4 SHA512 536ae7d858846b20bc9cee52292549ff3c2dd28565fcb3a7a1bf706d4f59799e83389d9ea0e73f943f815515c6bc3aa33222d8afde362bc503786b09eb784230 diff --git a/dev-lisp/clozurecl/clozurecl-1.11.5.ebuild b/dev-lisp/clozurecl/clozurecl-1.12.2.ebuild index 5c3a3d5125c7..6e8d7fa069cd 100644 --- a/dev-lisp/clozurecl/clozurecl-1.11.5.ebuild +++ b/dev-lisp/clozurecl/clozurecl-1.12.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit eutils flag-o-matic multilib toolchain-funcs vcs-clean +inherit toolchain-funcs vcs-clean MY_PN=ccl MY_P=${MY_PN}-${PV} @@ -13,16 +13,12 @@ HOMEPAGE="https://ccl.clozure.com" SRC_URI=" x86? ( https://github.com/Clozure/ccl/releases/download/v${PV}/${MY_P}-linuxx86.tar.gz ) amd64? ( https://github.com/Clozure/ccl/releases/download/v${PV}/${MY_P}-linuxx86.tar.gz ) - arm? ( https://github.com/Clozure/ccl/releases/download/v${PV}/${MY_P}-linuxarm.tar.gz ) - x86-macos? ( https://github.com/Clozure/ccl/releases/download/v${PV}/${MY_P}-darwinx86.tar.gz ) x64-macos? ( https://github.com/Clozure/ccl/releases/download/v${PV}/${MY_P}-darwinx86.tar.gz ) - x86-solaris? ( https://github.com/Clozure/ccl/releases/download/v${PV}/${MY_P}-solarisx86.tar.gz ) - x64-solaris? ( https://github.com/Clozure/ccl/releases/download/v${PV}/${MY_P}-solarisx86.tar.gz ) doc? ( https://ccl.clozure.com/docs/ccl.html )" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="-* amd64 x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="doc" RDEPEND=">=dev-lisp/asdf-2.33-r3:=" @@ -31,32 +27,18 @@ DEPEND="${RDEPEND}" S="${WORKDIR}"/${MY_PN} ENVD="${T}/50ccl" -PATCHES=( "${FILESDIR}"/${P}-no-pie-32.patch ) - src_prepare() { default cp "${EPREFIX}/usr/share/common-lisp/source/asdf/build/asdf.lisp" tools/ || die } src_configure() { - if use x86-macos; then - CCL_RUNTIME=dx86cl; CCL_HEADERS=darwin-x86-headers; CCL_KERNEL=darwinx8632 - elif use x64-macos; then + if use x64-macos; then CCL_RUNTIME=dx86cl64; CCL_HEADERS=darwin-x86-headers64; CCL_KERNEL=darwinx8664 - elif use x86-solaris; then - CCL_RUNTIME=sx86cl; CCL_HEADERS=solarisx86-headers; CCL_KERNEL=solarisx86 - elif use x64-solaris; then - CCL_RUNTIME=sx86cl64; CCL_HEADERS=solarisx64-headers; CCL_KERNEL=solarisx64 elif use x86; then CCL_RUNTIME=lx86cl; CCL_HEADERS=x86-headers; CCL_KERNEL=linuxx8632 elif use amd64; then CCL_RUNTIME=lx86cl64; CCL_HEADERS=x86-headers64; CCL_KERNEL=linuxx8664 - elif use arm; then - CCL_RUNTIME=armcl; CCL_HEADERS=arm-headers; CCL_KERNEL=linuxarm - elif use ppc; then - CCL_RUNTIME=ppccl; CCL_HEADERS=headers; CCL_KERNEL=linuxppc - elif use ppc64; then - CCL_RUNTIME=ppccl64; CCL_HEADERS=headers64; CCL_KERNEL=linuxppc64 fi } diff --git a/dev-lisp/clozurecl/files/clozurecl-1.11.5-no-pie-32.patch b/dev-lisp/clozurecl/files/clozurecl-1.11.5-no-pie-32.patch deleted file mode 100644 index 2396c7a316cf..000000000000 --- a/dev-lisp/clozurecl/files/clozurecl-1.11.5-no-pie-32.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- a/lisp-kernel/linuxx8632/Makefile -+++ b/lisp-kernel/linuxx8632/Makefile -@@ -76,3 +76,3 @@ USE_LINK_SCRIPT = # -T $(LINK_SCRIPT) - ../../lx86cl: $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) Makefile $(LINK_SCRIPT) -- $(CC) -m32 $(CDEBUG) -Wl,--export-dynamic $(HASH_STYLE) -o $@ $(USE_LINK_SCRIPT) $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) -Wl,--no-as-needed $(OSLIBS) -+ $(CC) -m32 $(CDEBUG) -Wl,--export-dynamic $(HASH_STYLE) -no-pie -o $@ $(USE_LINK_SCRIPT) $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) -Wl,--no-as-needed $(OSLIBS) - diff --git a/dev-lisp/clozurecl/metadata.xml b/dev-lisp/clozurecl/metadata.xml index 7ea645c67e72..4de45c7d62d6 100644 --- a/dev-lisp/clozurecl/metadata.xml +++ b/dev-lisp/clozurecl/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>common-lisp@gentoo.org</email> diff --git a/dev-lisp/clx/clx-0.7.5.ebuild b/dev-lisp/clx/clx-0.7.5.ebuild index 8cd18ea3e421..06e69d160335 100644 --- a/dev-lisp/clx/clx-0.7.5.ebuild +++ b/dev-lisp/clx/clx-0.7.5.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit common-lisp-3 eutils +inherit common-lisp-3 -DESCRIPTION="CLX is the Common Lisp interface to the X11 protocol primarily for SBCL." +DESCRIPTION="CLX is the Common Lisp interface to the X11 protocol primarily for SBCL" HOMEPAGE="http://www.cliki.net/CLX" SRC_URI="https://github.com/sharplispers/clx/archive/${PV}.tar.gz -> ${P}.tar.gz" diff --git a/dev-lisp/clx/metadata.xml b/dev-lisp/clx/metadata.xml index 47c41000f413..010d7ab76fca 100644 --- a/dev-lisp/clx/metadata.xml +++ b/dev-lisp/clx/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>common-lisp@gentoo.org</email> diff --git a/dev-lisp/cmucl/cmucl-21c.ebuild b/dev-lisp/cmucl/cmucl-21c.ebuild index 0de64d060786..13481e06b89a 100644 --- a/dev-lisp/cmucl/cmucl-21c.ebuild +++ b/dev-lisp/cmucl/cmucl-21c.ebuild @@ -1,31 +1,32 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils toolchain-funcs multilib +inherit toolchain-funcs MY_PV=${PV:0:3} DESCRIPTION="CMU Common Lisp is an implementation of ANSI Common Lisp" HOMEPAGE="http://www.cons.org/cmucl/" -SRC_URI="http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-src-${MY_PV}.tar.bz2 - http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-${MY_PV}-x86-linux.tar.bz2" +SRC_URI=" + http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-src-${MY_PV}.tar.bz2 + http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-${MY_PV}-x86-linux.tar.bz2 +" +S="${WORKDIR}" LICENSE="public-domain" SLOT="0" -KEYWORDS="x86" +KEYWORDS="-* x86" IUSE="X doc source" CDEPEND=">=dev-lisp/asdf-2.33-r3:= x11-libs/motif:0" DEPEND="${CDEPEND} - sys-devel/bc + app-alternatives/bc doc? ( virtual/latex-base )" RDEPEND="${CDEPEND}" -S="${WORKDIR}" - TARGET=linux-4 src_prepare() { @@ -103,7 +104,7 @@ src_install() { # Documentation dodoc doc/cmucl/README if use doc; then - insinto /usr/share/doc/${PF} - doins src/docs/cmu-user/cmu-user.pdf src/docs/internals/design.pdf + dodoc src/docs/cmu-user/cmu-user.pdf src/docs/internals/design.pdf + docompress -x /usr/share/doc/${PF}/{cmu-user,design}.pdf fi } diff --git a/dev-lisp/cmucl/metadata.xml b/dev-lisp/cmucl/metadata.xml index 914e477a115a..bf312af3c421 100644 --- a/dev-lisp/cmucl/metadata.xml +++ b/dev-lisp/cmucl/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>common-lisp@gentoo.org</email> diff --git a/dev-lisp/ecl/Manifest b/dev-lisp/ecl/Manifest new file mode 100644 index 000000000000..f020518f8618 --- /dev/null +++ b/dev-lisp/ecl/Manifest @@ -0,0 +1,3 @@ +DIST ecl-21.2.1.tgz 7875088 BLAKE2B b8c05fab8ce5892ad9df830e3ad230e1c646bd30bc35243703ace18f1bf963057b132d980c74b364ff30a5b776a8f161e71bfd69d7908970811ab3dddbab1aac SHA512 0849bebe1a8073ea8027cfb172c1d7781d43adb6a8b80585bd08d5674b80422d1648b6fbf718cc17a51c5de6c696514523b4d13a82e8113bf9365c95d3c28648 +DIST ecl-23.9.9.tgz 8129105 BLAKE2B 883454e1b5459b348a2184727dc9d512988f3b8218370cbe01045e5bc401a6785cb736a16592d20ad9fe19e6518056ece5b809323fa7697304f39d31d60021fc SHA512 c8f1dcf2bffad7358c3d4e5bb0924cbb69afaf79871e6444bd780a594e1e96e6c547346b7c9c5184a6b12ce920a6a959334cf2a85c3f3ea0e0c8f22f72fb84df +DIST ecl-24.5.10.tgz 8130112 BLAKE2B 76ee9b4dca68543151e8f8474651e3f2b540017b62ab2ba6e00d64002362045ccf0aad16d0f82d7fd9a7511423aa90f9ddce912bf4b314c7905f6e404b850d1a SHA512 46e6da0f319573e412e54573b3c029179ba9debf48f73828ad5dd0a99c4a0b4ef21f99b411fdab3dc5429242c917553eb3e9794eeac7ec44667cd26fc0dd927e diff --git a/dev-lisp/ecls/ecls-20.4.24.ebuild b/dev-lisp/ecl/ecl-21.2.1-r5.ebuild index e00114ccd8bb..a12f59e6b270 100644 --- a/dev-lisp/ecls/ecls-20.4.24.ebuild +++ b/dev-lisp/ecl/ecl-21.2.1-r5.ebuild @@ -1,50 +1,39 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit eutils multilib - -# test phase only works if ecls already installed #516876 -RESTRICT="test" - -MY_P=ecl-${PV} +inherit readme.gentoo-r1 DESCRIPTION="ECL is an embeddable Common Lisp implementation" HOMEPAGE="https://common-lisp.net/project/ecl/" -SRC_URI="https://common-lisp.net/project/ecl/static/files/release/${MY_P}.tgz" +SRC_URI="https://common-lisp.net/project/ecl/static/files/release/${P}.tgz" LICENSE="BSD-2 LGPL-2.1+" SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="cxx debug emacs gengc precisegc cpu_flags_x86_sse +threads +unicode +libatomic X" +KEYWORDS="amd64 ~ppc ppc64 ~sparc x86 ~amd64-linux" +IUSE="cxx debug emacs gengc precisegc cpu_flags_x86_sse +threads +unicode X" +# test phase only works if ecl already installed #516876 +RESTRICT="test" -CDEPEND="dev-libs/gmp:0 - virtual/libffi - libatomic? ( dev-libs/libatomic_ops ) +RDEPEND="dev-libs/gmp:0= + dev-libs/libffi:= + dev-libs/libatomic_ops >=dev-libs/boehm-gc-7.1[threads?] >=dev-lisp/asdf-2.33-r3:=" -DEPEND="${CDEPEND} +DEPEND="${RDEPEND} app-text/texi2html emacs? ( >=app-editors/emacs-23.1:* >=app-eselect/eselect-emacs-1.12 )" -RDEPEND="${CDEPEND}" -S="${WORKDIR}"/${MY_P} +DOCS=( README.md CHANGELOG ) PATCHES=( "${FILESDIR}/${PN}-16.1.3-headers-gentoo.patch" "${FILESDIR}/${PN}-16.1.3-build.patch" + "${FILESDIR}/${PN}-21.2.1-donotcompressinfo.patch" + "${FILESDIR}/${PN}-21.2.1-ldflags.patch" ) -pkg_setup() { - if use gengc || use precisegc ; then - ewarn "You have enabled the generational garbage collector or" - ewarn "the precise collection routines. These features are not very stable" - ewarn "at the moment and may cause crashes." - ewarn "Don't enable them unless you know what you're doing." - fi -} - src_prepare() { default cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die @@ -52,20 +41,18 @@ src_prepare() { src_configure() { econf \ - --with-system-gmp \ + --enable-gmp=system \ --enable-boehm=system \ - --enable-longdouble=yes \ --with-dffi \ + --enable-libatomic=system \ + --with-defsystem \ $(use_with cxx) \ $(use_enable gengc) \ $(use_enable precisegc) \ $(use_with debug debug-cflags) \ - $(use_enable libatomic libatomic system) \ $(use_with cpu_flags_x86_sse sse) \ $(use_enable threads) \ - $(use_with threads __thread) \ $(use_enable unicode) \ - $(use_with unicode unicode-names) \ $(use_with X x) } @@ -75,22 +62,27 @@ src_compile() { [[ -n ${ETAGS} ]] || die "No etags implementation found" pushd build > /dev/null || die emake ETAGS=${ETAGS} TAGS - popd > /dev/null + popd > /dev/null || die else touch build/TAGS fi - #parallel make fails - emake -j1 + ## for /proc/self/clear_refs (see #867052) + addpredict /proc + + emake } src_install() { - emake DESTDIR="${D}" install + default - dodoc README.md CHANGELOG - dodoc "${FILESDIR}"/README.Gentoo - pushd build/doc + readme.gentoo_create_doc + pushd build/doc > /dev/null || die newman ecl.man ecl.1 newman ecl-config.man ecl-config.1 - popd + popd > /dev/null || die +} + +pkg_postinst() { + readme.gentoo_print_elog } diff --git a/dev-lisp/ecls/ecls-16.1.3.ebuild b/dev-lisp/ecl/ecl-23.9.9-r1.ebuild index e59f26da8f2e..542b691a6db0 100644 --- a/dev-lisp/ecls/ecls-16.1.3.ebuild +++ b/dev-lisp/ecl/ecl-23.9.9-r1.ebuild @@ -1,50 +1,38 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit eutils multilib - -# test phase only works if ecls already installed #516876 -RESTRICT="test" - -MY_P=ecl-${PV} +inherit readme.gentoo-r1 DESCRIPTION="ECL is an embeddable Common Lisp implementation" HOMEPAGE="https://common-lisp.net/project/ecl/" -SRC_URI="https://common-lisp.net/project/ecl/static/files/release/${MY_P}.tgz" +SRC_URI="https://common-lisp.net/project/ecl/static/files/release/${P}.tgz" LICENSE="BSD-2 LGPL-2.1+" SLOT="0/${PV}" -KEYWORDS="amd64 ~ppc ~sparc x86" -IUSE="cxx debug emacs gengc precisegc cpu_flags_x86_sse +threads +unicode +libatomic X" +KEYWORDS="amd64 ~ppc ppc64 ~sparc x86 ~amd64-linux" +IUSE="cxx debug emacs gengc precisegc cpu_flags_x86_sse +threads +unicode X" +# test phase only works if ecl already installed #516876 +RESTRICT="test" -CDEPEND="dev-libs/gmp:0 - virtual/libffi - libatomic? ( dev-libs/libatomic_ops ) +RDEPEND="dev-libs/gmp:0= + dev-libs/libffi:= + dev-libs/libatomic_ops >=dev-libs/boehm-gc-7.1[threads?] >=dev-lisp/asdf-2.33-r3:=" -DEPEND="${CDEPEND} +DEPEND="${RDEPEND} app-text/texi2html emacs? ( >=app-editors/emacs-23.1:* >=app-eselect/eselect-emacs-1.12 )" -RDEPEND="${CDEPEND}" -S="${WORKDIR}"/${MY_P} +DOCS=( README.md CHANGELOG ) PATCHES=( - "${FILESDIR}/${P}-headers-gentoo.patch" - "${FILESDIR}/${P}-build.patch" + "${FILESDIR}/${PN}-16.1.3-headers-gentoo.patch" + "${FILESDIR}/${PN}-16.1.3-build.patch" + "${FILESDIR}/${PN}-21.2.1-donotcompressinfo.patch" ) -pkg_setup() { - if use gengc || use precisegc ; then - ewarn "You have enabled the generational garbage collector or" - ewarn "the precise collection routines. These features are not very stable" - ewarn "at the moment and may cause crashes." - ewarn "Don't enable them unless you know what you're doing." - fi -} - src_prepare() { default cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die @@ -52,20 +40,18 @@ src_prepare() { src_configure() { econf \ - --with-system-gmp \ + --enable-gmp=system \ --enable-boehm=system \ - --enable-longdouble=yes \ --with-dffi \ + --enable-libatomic=system \ + --with-defsystem \ $(use_with cxx) \ $(use_enable gengc) \ $(use_enable precisegc) \ $(use_with debug debug-cflags) \ - $(use_enable libatomic libatomic system) \ $(use_with cpu_flags_x86_sse sse) \ $(use_enable threads) \ - $(use_with threads __thread) \ $(use_enable unicode) \ - $(use_with unicode unicode-names) \ $(use_with X x) } @@ -75,22 +61,27 @@ src_compile() { [[ -n ${ETAGS} ]] || die "No etags implementation found" pushd build > /dev/null || die emake ETAGS=${ETAGS} TAGS - popd > /dev/null + popd > /dev/null || die else touch build/TAGS fi - #parallel make fails - emake -j1 + ## for /proc/self/clear_refs (see #867052) + addpredict /proc + + emake } src_install() { - emake DESTDIR="${D}" install + default - dodoc README.md CHANGELOG - dodoc "${FILESDIR}"/README.Gentoo - pushd build/doc + readme.gentoo_create_doc + pushd build/doc > /dev/null || die newman ecl.man ecl.1 newman ecl-config.man ecl-config.1 - popd + popd > /dev/null || die +} + +pkg_postinst() { + readme.gentoo_print_elog } diff --git a/dev-lisp/ecl/ecl-24.5.10.ebuild b/dev-lisp/ecl/ecl-24.5.10.ebuild new file mode 100644 index 000000000000..c5d2cd2b85a2 --- /dev/null +++ b/dev-lisp/ecl/ecl-24.5.10.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit readme.gentoo-r1 + +DESCRIPTION="ECL is an embeddable Common Lisp implementation" +HOMEPAGE="https://common-lisp.net/project/ecl/" +SRC_URI="https://common-lisp.net/project/ecl/static/files/release/${P}.tgz" + +LICENSE="BSD-2 LGPL-2.1+" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux" +IUSE="cxx debug emacs gengc precisegc cpu_flags_x86_sse +threads +unicode X" +# test phase only works if ecl already installed #516876 +RESTRICT="test" + +RDEPEND="dev-libs/gmp:0= + dev-libs/libffi:= + dev-libs/libatomic_ops + >=dev-libs/boehm-gc-7.1[threads?] + >=dev-lisp/asdf-2.33-r3:=" +DEPEND="${RDEPEND} + app-text/texi2html + emacs? ( >=app-editors/emacs-23.1:* >=app-eselect/eselect-emacs-1.12 )" + +DOCS=( README.md CHANGELOG ) + +PATCHES=( + "${FILESDIR}/${PN}-16.1.3-headers-gentoo.patch" + "${FILESDIR}/${PN}-16.1.3-build.patch" + "${FILESDIR}/${PN}-21.2.1-donotcompressinfo.patch" +) + +src_prepare() { + default + cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die +} + +src_configure() { + econf \ + --enable-gmp=system \ + --enable-boehm=system \ + --with-dffi \ + --enable-libatomic=system \ + --with-defsystem \ + $(use_with cxx) \ + $(use_enable gengc) \ + $(use_enable precisegc) \ + $(use_with debug debug-cflags) \ + $(use_with cpu_flags_x86_sse sse) \ + $(use_enable threads) \ + $(use_enable unicode) \ + $(use_with X x) +} + +src_compile() { + if use emacs; then + local ETAGS=$(eselect --brief etags list | sed -ne '/emacs/{p;q}') + [[ -n ${ETAGS} ]] || die "No etags implementation found" + pushd build > /dev/null || die + emake ETAGS=${ETAGS} TAGS + popd > /dev/null || die + else + touch build/TAGS + fi + + ## for /proc/self/clear_refs (see #867052) + addpredict /proc + + emake +} + +src_install() { + default + + readme.gentoo_create_doc + pushd build/doc > /dev/null || die + newman ecl.man ecl.1 + newman ecl-config.man ecl-config.1 + popd > /dev/null || die +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/dev-lisp/ecls/files/README.Gentoo b/dev-lisp/ecl/files/README.gentoo index 9bb82f220097..c95b6cb75167 100644 --- a/dev-lisp/ecls/files/README.Gentoo +++ b/dev-lisp/ecl/files/README.gentoo @@ -3,13 +3,11 @@ Gentoo GNU/Linux specific notes for ECL --------------------------------------- -This is the README.Gentoo file from /usr/share/doc/@PF@/ directory. - * The Gentoo port includes a patch to ECL's installed header file (ech.h) so that TRUE and FALSE are not redefined if they're already included from elsewhere. This makes it easier to use ECL with other software which defines those C preprocesser symbols (eg. glib-2.0). -If you encounter any problems or have suggestions, use http://bugs.gentoo.org. +If you encounter any problems or have suggestions, use https://bugs.gentoo.org/. Please don't bother the upstream authors unless you are absolutely certain it is not Gentoo-related. diff --git a/dev-lisp/ecls/files/ecls-16.1.3-build.patch b/dev-lisp/ecl/files/ecl-16.1.3-build.patch index ff7d6cd74d8b..ff7d6cd74d8b 100644 --- a/dev-lisp/ecls/files/ecls-16.1.3-build.patch +++ b/dev-lisp/ecl/files/ecl-16.1.3-build.patch diff --git a/dev-lisp/ecls/files/ecls-16.1.3-headers-gentoo.patch b/dev-lisp/ecl/files/ecl-16.1.3-headers-gentoo.patch index 10802aa48803..10802aa48803 100644 --- a/dev-lisp/ecls/files/ecls-16.1.3-headers-gentoo.patch +++ b/dev-lisp/ecl/files/ecl-16.1.3-headers-gentoo.patch diff --git a/dev-lisp/ecl/files/ecl-21.2.1-donotcompressinfo.patch b/dev-lisp/ecl/files/ecl-21.2.1-donotcompressinfo.patch new file mode 100644 index 000000000000..722e5dc7483f --- /dev/null +++ b/dev-lisp/ecl/files/ecl-21.2.1-donotcompressinfo.patch @@ -0,0 +1,35 @@ +diff --git a/src/doc/Makefile.in b/src/doc/Makefile.in +index 5660f41..c2aadbe 100644 +--- a/src/doc/Makefile.in ++++ b/src/doc/Makefile.in +@@ -15,7 +15,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_INFO = @INSTALL_INFO@ + mkinstalldirs = $(top_srcdir)/bdwgc/install-sh -d +-INFO_FILE = ecl.info.gz ++INFO_FILE = ecl.info + MAKEINFO = @MAKEINFO@ + MANUAL_MAKE_TARGET = @MANUAL_MAKE_TARGET@ + MANUAL_INSTALL_TARGET = @MANUAL_INSTALL_TARGET@ +diff --git a/src/doc/manual/Makefile b/src/doc/manual/Makefile +index f82c287..2ff67e0 100644 +--- a/src/doc/manual/Makefile ++++ b/src/doc/manual/Makefile +@@ -5,15 +5,14 @@ FILES= *.txi */*.txi figures/* + all: pdf info html + + pdf: manual.pdf +-info: ecl.info.gz ++info: ecl.info + html: html/index.html + + manual.pdf: $(FILES) + texi2pdf manual.txi + +-ecl.info.gz: $(FILES) ++ecl.info: $(FILES) + $(MAKEINFO) --no-split manual.txi +- gzip < ecl.info > ecl.info.gz + + html/index.html: $(FILES) + $(MAKEINFO) --html --css-include=ecl.css --split=section manual.txi diff --git a/dev-lisp/ecl/files/ecl-21.2.1-ldflags.patch b/dev-lisp/ecl/files/ecl-21.2.1-ldflags.patch new file mode 100644 index 000000000000..5ac4cc5ea793 --- /dev/null +++ b/dev-lisp/ecl/files/ecl-21.2.1-ldflags.patch @@ -0,0 +1,13 @@ +https://bugs.gentoo.org/723162 + +--- ecl-21.2.1/src/c/Makefile.in ++++ ecl-21.2.1/src/c/Makefile.in +@@ -104,7 +104,7 @@ + + $(DPP): $(srcdir)/dpp.c $(srcdir)/symbols_list.h + if test -f ../CROSS-DPP; then touch dpp; else \ +- $(TRUE_CC) -I$(srcdir) -I@true_builddir@ -I./ $(srcdir)/dpp.c @CPPFLAGS@ @CFLAGS@ @ECL_CFLAGS@ -o $@ ; \ ++ $(TRUE_CC) -I$(srcdir) -I@true_builddir@ -I./ $(srcdir)/dpp.c @CPPFLAGS@ @CFLAGS@ @ECL_CFLAGS@ @LDFLAGS@ -o $@ ; \ + fi + + $(OBJS): $(DPP) diff --git a/dev-lisp/ecl/metadata.xml b/dev-lisp/ecl/metadata.xml new file mode 100644 index 000000000000..94495eddf267 --- /dev/null +++ b/dev-lisp/ecl/metadata.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>common-lisp@gentoo.org</email> + <name>Gentoo Common Lisp Project</name> + </maintainer> + <longdescription> + ECL (Embeddable Common Lisp) is an implementation of the Common Lisp language as + described in the X3J13 Ansi specification, featuring CLOS (Common Lisp Object + System), conditions, loops, etc, plus a translator to C, which can produce + standalone executables. + </longdescription> + <use> + <flag name="gengc">Use generational garbage collection (experimental)</flag> + <flag name="precisegc">Use type information during garbage collection (experimental)</flag> + <flag name="unicode">Make the produced lisp support unicode</flag> + </use> + <upstream> + <remote-id type="gitlab">embeddable-common-lisp/ecl</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-lisp/ecls/Manifest b/dev-lisp/ecls/Manifest deleted file mode 100644 index 25e997e45474..000000000000 --- a/dev-lisp/ecls/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ecl-16.1.3.tgz 7459212 BLAKE2B 4f9d6ad2bd92ede4b5b20857b95a48bad5002049e83611865d9cf13e7131adfaad147a31f22f9a3f6a2c06e46db1996aa98135c28b97bf5ef16e17b5eba0dc4b SHA512 5d743f422f6bc24671abf4c739cde8273d08f056906a1ef8aed5145c703b6d52c7fa4b5e0be8c125f32240c20ce053007786bb3ae81cc34d47791f6fae0819c1 -DIST ecl-20.4.24.tgz 7815444 BLAKE2B 11b908b028beaaf9243dc0f2ceaa178918ae4763a907af4424ba21e6bdf3474aaa36c96e9a3ef1ce780e50649c2453b52b7c46b5e9dc1453281dc522417ad78c SHA512 4c127e0d6a99e38f3a926135ae92d92899058c5a5e99b90f28d4a47b58d94ee89a958cfb4bfd2b9e6ad7b3c57867cd13119b2a4dd6bb1aa3bb5ec42a96bfa788 diff --git a/dev-lisp/ecls/metadata.xml b/dev-lisp/ecls/metadata.xml deleted file mode 100644 index 8b14211eb876..000000000000 --- a/dev-lisp/ecls/metadata.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>common-lisp@gentoo.org</email> - <name>Gentoo Common Lisp Project</name> - </maintainer> - <longdescription> -ECL (Embeddable Common Lisp) is an implementation of the Common Lisp language as -described in the X3J13 Ansi specification, featuring CLOS (Common Lisp Object -System), conditions, loops, etc, plus a translator to C, which can produce -standalone executables. -</longdescription> - <use> - <flag name="gengc">Use generational garbage collection (experimental)</flag> - <flag name="precisegc">Use type information during garbage collection (experimental)</flag> - <flag name="libatomic">Use <pkg>dev-libs/libatomic_ops</pkg> library</flag> - </use> - <upstream> - <remote-id type="sourceforge">ecls</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-lisp/flexi-streams/Manifest b/dev-lisp/flexi-streams/Manifest index 0c149de3b037..7db7cf6b772c 100644 --- a/dev-lisp/flexi-streams/Manifest +++ b/dev-lisp/flexi-streams/Manifest @@ -1,2 +1 @@ -DIST flexi-streams-1.0.16.tar.gz 135698 BLAKE2B 9d6d5b064f10d27ce60d5a8a6792b7c36e63d393f64c98148bfd9addd36483e1e4d9e2b699c0ae151c55d88e01bd86fea3197e082b001face2c44206229c3e21 SHA512 66b7c5231616c7a6095a52d6c679717795c9308e33487536a5e1b7f0d25f26aacd2579a76c351f8e16a967a0611456cbc97b3824f4d9cf4875b8e48b0c4f7c78 -DIST flexi-streams-1.0.17.tar.gz 135883 BLAKE2B 96670bffc8b53196d2138bff6bdcaaae74d3a9318bb637cb52914de0905be86d3d5ce40ed3f5f87deec75cbad609d339fc0656f8542ee05edae5c9c342430a90 SHA512 58a19214f74e00948dd5c15453cb68a65ad600a78fd7b637018914446a3953f68efa5e229b3d27e93464d8f273e82aa71d0fafe9b2ace77e40d23c5aea756d49 +DIST flexi-streams-1.0.19.tar.gz 393330 BLAKE2B 755f835ea7fe7edf0fd4ff317463a7ed86289aad428b4bbf461808900a9656711279de362a48c32d5ea8cb9933743b92c28729ad866950200d5d65bd7fab83c1 SHA512 03288868f86ce8c3c4ed63fb5f5f9d809bc0772834ef603793c861d09ad7ffb900c14021f1f1621111e7bd4ee3f0b0653985449391ee250d0f43385abbfdfdfa diff --git a/dev-lisp/flexi-streams/flexi-streams-1.0.16.ebuild b/dev-lisp/flexi-streams/flexi-streams-1.0.16.ebuild deleted file mode 100644 index f9d5b59764d1..000000000000 --- a/dev-lisp/flexi-streams/flexi-streams-1.0.16.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit common-lisp-3 - -DESCRIPTION="Flexible bivalent streams for Common Lisp" -HOMEPAGE="http://weitz.de/flexi-streams/ - http://www.cliki.net/flexi-streams/" -SRC_URI="https://github.com/edicl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 ~ppc ~sparc x86" -IUSE="" - -RDEPEND="!dev-lisp/cl-${PN} - >=dev-lisp/trivial-gray-streams-20060925" - -src_install() { - common-lisp-install-sources *.lisp - common-lisp-install-asdf - dodoc doc/index.html -} diff --git a/dev-lisp/flexi-streams/flexi-streams-1.0.17.ebuild b/dev-lisp/flexi-streams/flexi-streams-1.0.17.ebuild deleted file mode 100644 index 672410b9b419..000000000000 --- a/dev-lisp/flexi-streams/flexi-streams-1.0.17.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit common-lisp-3 - -DESCRIPTION="Flexible bivalent streams for Common Lisp" -HOMEPAGE="http://weitz.de/flexi-streams/ - http://www.cliki.net/flexi-streams/" -SRC_URI="https://github.com/edicl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="" - -RDEPEND="!dev-lisp/cl-${PN} - >=dev-lisp/trivial-gray-streams-20060925" - -src_install() { - common-lisp-install-sources *.lisp - common-lisp-install-asdf - dodoc docs/index.html -} diff --git a/dev-lisp/flexi-streams/flexi-streams-1.0.19.ebuild b/dev-lisp/flexi-streams/flexi-streams-1.0.19.ebuild new file mode 100644 index 000000000000..ba7bb2f4e2d4 --- /dev/null +++ b/dev-lisp/flexi-streams/flexi-streams-1.0.19.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit common-lisp-3 + +DESCRIPTION="Flexible bivalent streams for Common Lisp" +HOMEPAGE=" + http://weitz.de/flexi-streams/ + http://www.cliki.net/flexi-streams/ +" +SRC_URI="https://github.com/edicl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="amd64 ~ppc ~sparc x86" + +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-lisp/trivial-gray-streams-20060925 +" +BDEPEND=" + test? ( + ${RDEPEND} + ) +" + +src_test() { + local -x CL_SOURCE_REGISTRY="${S}:${CLSYSTEMROOT}" + common-lisp-export-impl-args $(common-lisp-find-lisp-impl) + + ${CL_BINARY} ${CL_EVAL} "(asdf:test-system :flexi-streams)" || die +} + +src_install() { + common-lisp-install-sources *.lisp + common-lisp-install-asdf + dodoc docs/index.html +} diff --git a/dev-lisp/flexi-streams/metadata.xml b/dev-lisp/flexi-streams/metadata.xml index aee2b661396a..3b73f947db73 100644 --- a/dev-lisp/flexi-streams/metadata.xml +++ b/dev-lisp/flexi-streams/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>common-lisp@gentoo.org</email> diff --git a/dev-lisp/gcl/Manifest b/dev-lisp/gcl/Manifest index 9694d801852c..8e40b0012d2f 100644 --- a/dev-lisp/gcl/Manifest +++ b/dev-lisp/gcl/Manifest @@ -1,4 +1,4 @@ -DIST gcl-2.6.10-fedora.tar.bz2 695718 BLAKE2B 151cac372f74a971ffb31191a3614d0f7bafca141258af9e1955185f8ed119cbcd3797f2d9bbe5eb5f82e76af4fd0d3e0cf155cd35f305a2c028e40b340b78cf SHA512 3e0ffaec859783443a8941a29302c7a17c9538ef2177d449ad34e24292c174de7bb8760a6d327e08f012773032f0d0a5230b79c7e4b4f5bad8354bf10a28af4c -DIST gcl-2.6.10.tar.gz 5490689 BLAKE2B 46af0cf8a810a82fe2bc2bd46ca1cbe17b74c71eb4af6a06032040900dcad4dd4338883cd9225f0945ae425eba788ac84db9a0ed454779edd86c74a1bb48a947 SHA512 bbaacce712f15130550bcdf7e53edf4df9ab955e84ec701087034115df1c1e657d956853d5db85d7e88709981f9b7fd4c9df7acf6c8588a8ccf5f05e4e666aed -DIST gcl-2.6.12-fedora.tar.bz2 680471 BLAKE2B 0ad96ce0a09bb73ee77456373eb7e50b2325a4f2e042c21120a1c33b2dec2aa10f5485bb1b02e8eb8e77aaaea6e141189d676217f9d139615911d8a77ea5818a SHA512 7640f8370754c889e2db9d047c4476195f949f4d97eafc7ef81761c1a548e24125d6d93381227b55f1840c3d127770995e88bf66f83c6952e121f5fa004e7f1a -DIST gcl-2.6.12.tar.gz 7031837 BLAKE2B afd3f81dd8a712d92883a96399a2e0621b0d38a349904707846bd694892510012fde27f94ec36664c249659a480e7f92c412b3790ecb74247a91ba0cb44aa420 SHA512 e82b5bdded6f846de4ea35a83bc8294043ba6d4fe03ff421f8753e78add1e5e87124782f672cd38ad89bbec1ca7c5ff69fe2621be1552b209516b58b6c97fd20 +DIST gcl-2.6.13_pre99.tar.xz 10030460 BLAKE2B 8750d641062bcad5a124173013d38403f37ad352c7c436e89d4e329d997200be399a100dcefc4ce484e3f85f46e2dd90ee02947e5e728e001782e973c4122b0e SHA512 a3ad2bd639157ca2a80b534e87c169f6e07002a1b9ca8039483cff336af764123dec9e749da045b656b990e0a97c70881c798420ec4bd0e4494f43d0d040e413 +DIST gcl-2.6.14.tar.gz 11725385 BLAKE2B 3e6a7fc359f94897d1062f5e5e31a0ae36f5d24ca0155fd22044cb967f1fd6a0303572dafe25b1a7abbc936db4e8caa93d0e50b1779886e2ba40e148fa868b8f SHA512 1a69f5e8195783c88b618a613253da1089b13e390dd259056df52f1ed95cf0c99358c34d3782c8eb297c07fda74deb7db359e6b9bf94590ee7fc34e94742eb14 +DIST gcl-2.6.15_pre3-spelling.patch.gz 10530 BLAKE2B ce2f4a2a568467c77ef58d6063df4596220a0826e18158e0f3308dc6c4a89451910a2c54a179131a4d0cb5362e7b20ba33691d2a80c02dc81e826d664298c29b SHA512 f72cf9c6607603f548220ee169fdbaf9151ea41f2be03209c258a261c6274b97c78b02e8258b2a2550ff9fcd8ab144a334789f274deedf0fe9f050a10bd54a67 +DIST gcl-Version_2_6_15pre3.tar.gz 11433299 BLAKE2B cee392674f465477d37bcdf724651f88e08b90a74ca3e79a561b99f0e61227332dbee77ed688cda7525341421df262a0a58c325576d6e8a5daaa1122ae36c6e4 SHA512 bf05c3f4ecad74a9e29b25969d3f82d39c9715bfa98c1b734b279a7886e60076ecb5896723fe1888255c4eecf4e5eda60696d25ad6a8e17eb55088b2a37ad3ce diff --git a/dev-lisp/gcl/files/64gcl-gentoo.el b/dev-lisp/gcl/files/64gcl-gentoo.el index 7b7cee00bac8..e5e19f27cdcd 100644 --- a/dev-lisp/gcl/files/64gcl-gentoo.el +++ b/dev-lisp/gcl/files/64gcl-gentoo.el @@ -1,4 +1,3 @@ -;; site-init for dev-lisp/gcl (add-to-list 'load-path "@SITELISP@") (autoload 'run "gcl" "Run GCL." t) (autoload 'gcl-mode "gcl" "GCL mode." t) diff --git a/dev-lisp/gcl/files/gcl-2.6.12-gcc5.patch b/dev-lisp/gcl/files/gcl-2.6.12-gcc5.patch deleted file mode 100644 index 07d3892eb0b6..000000000000 --- a/dev-lisp/gcl/files/gcl-2.6.12-gcc5.patch +++ /dev/null @@ -1,8 +0,0 @@ -diff -r -U1 gcl.orig/makefile gcl/makefile ---- gcl.orig/makefile 2014-10-23 23:29:00.000000000 +0200 -+++ gcl/makefile 2016-02-17 18:10:29.871808118 +0100 -@@ -267,3 +267,3 @@ - $(AWK) 'BEGIN {print "#include \"include.h\"";print "#include \"cmponly.h\"";print "---"} {a=$$1;gsub("\\.\\.\\.","",a);print "\"#define " $$1 "\" " a}' $< |\ -- $(CC) -E -I./$(HDIR) - |\ -+ $(CC) -E -P -I./$(HDIR) - |\ - $(AWK) '/^\-\-\-$$/ {i=1;next} {if (!i) next} {gsub("\"","");print}' >$@ diff --git a/dev-lisp/gcl/files/gcl-2.6.13_pre99-assertion.patch b/dev-lisp/gcl/files/gcl-2.6.13_pre99-assertion.patch new file mode 100644 index 000000000000..e788b62f2bf0 --- /dev/null +++ b/dev-lisp/gcl/files/gcl-2.6.13_pre99-assertion.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/778770 +--- a/h/notcomp.h ++++ b/h/notcomp.h +@@ -299,7 +299,7 @@ + #define coerce_to_filename(a_,b_) coerce_to_filename1(a_,b_,sizeof(b_)) + + #include <errno.h> +-#define massert(a_) ({errno=0;if (!(a_)||errno) assert_error(#a_,__LINE__,__FILE__,__FUNCTION__);}) ++#define massert(a_) ({errno=0;if (!(a_)) assert_error(#a_,__LINE__,__FILE__,__FUNCTION__);}) + + extern bool writable_malloc; + #define writable_malloc_wrap(f_,rt_,a_...) ({rt_ v;bool w=writable_malloc;writable_malloc=1;v=f_(a_);writable_malloc=w;v;}) diff --git a/dev-lisp/gcl/files/gcl-gmp-6.patch b/dev-lisp/gcl/files/gcl-gmp-6.patch deleted file mode 100644 index f66638478af1..000000000000 --- a/dev-lisp/gcl/files/gcl-gmp-6.patch +++ /dev/null @@ -1,8 +0,0 @@ -diff -r -U1 gcl.orig/configure gcl/configure ---- gcl.orig/configure 2013-11-11 21:55:48.000000000 +0700 -+++ gcl/configure 2014-03-30 17:25:04.874994142 +0700 -@@ -5027,3 +5027,3 @@ - int main() { -- #if __GNU_MP_VERSION == 4 || __GNU_MP_VERSION == 5 -+ #if __GNU_MP_VERSION == 4 || __GNU_MP_VERSION == 5 || __GNU_MP_VERSION == 6 - return 0; diff --git a/dev-lisp/gcl/files/gcl-readline-6.3.patch b/dev-lisp/gcl/files/gcl-readline-6.3.patch deleted file mode 100644 index 063c772f1051..000000000000 --- a/dev-lisp/gcl/files/gcl-readline-6.3.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -r -U1 gcl.orig/o/gcl_readline.d gcl/o/gcl_readline.d ---- gcl.orig/o/gcl_readline.d 2013-11-11 21:55:48.000000000 +0700 -+++ gcl/o/gcl_readline.d 2014-03-30 18:29:42.131967005 +0700 -@@ -53,2 +53,9 @@ - -+/* Deprecated CPPFunction disappeared in libreadline-6.3 */ -+#if defined(_RL_FUNCTION_TYPEDEF) -+#define RL_COMPLETION_FUNC_T rl_completion_func_t -+#else -+#define RL_COMPLETION_FUNC_T CPPFunction -+#endif -+ - int readline_on = 0; /* On (1) or off (0) */ -@@ -471,3 +478,3 @@ - #ifdef RL_COMPLETION -- rl_attempted_completion_function = (CPPFunction *)rl_completion; -+ rl_attempted_completion_function = (RL_COMPLETION_FUNC_T *)rl_completion; - #endif diff --git a/dev-lisp/gcl/files/gcl-tcl-8.6.patch b/dev-lisp/gcl/files/gcl-tcl-8.6.patch deleted file mode 100644 index cfbf82e32899..000000000000 --- a/dev-lisp/gcl/files/gcl-tcl-8.6.patch +++ /dev/null @@ -1,103 +0,0 @@ -diff --git a/gcl/gcl-tk/tkMain.c b/gcl/gcl-tk/tkMain.c -index 74475cc..21c6c59 100755 ---- a/gcl/gcl-tk/tkMain.c -+++ b/gcl/gcl-tk/tkMain.c -@@ -42,6 +42,11 @@ - #if (TK_MINOR_VERSION==0 && TK_MAJOR_VERSION==4) - #define TkCreateMainWindow Tk_CreateMainWindow - #endif -+#if TCL_MAJOR_VERSION >= 8 -+#define INTERP_RESULT(interp) Tcl_GetStringResult(interp) -+#else -+#define INTERP_RESULT(interp) (interp)->result -+#endif - - - /*-------------------------------------------------------------------*/ -@@ -276,7 +281,7 @@ TkX_Wish (argc, argv) - - if (Tk_ParseArgv(interp, (Tk_Window) NULL, &argc, (void *)argv, argTable, 0) - != TCL_OK) { -- fprintf(stderr, "%s\n", interp->result); -+ fprintf(stderr, "%s\n", INTERP_RESULT(interp)); - exit(1); - } - if (name == NULL) { -@@ -309,7 +314,7 @@ TkX_Wish (argc, argv) - - /* mainWindow = TkCreateMainWindow(interp, display, name/\* , "Tk" *\/); */ - /* if (mainWindow == NULL) { */ --/* fprintf(stderr, "%s\n", interp->result); */ -+/* fprintf(stderr, "%s\n", INTERP_RESULT(interp)); */ - /* exit(1); */ - /* } */ - /* #ifndef __MINGW32__ */ -@@ -362,7 +367,7 @@ TkX_Wish (argc, argv) - Tcl_FindExecutable ( argv[0] ); - #else - if (Tcl_AppInit(interp) != TCL_OK) { -- fprintf(stderr, "Tcl_AppInit failed: %s\n", interp->result); -+ fprintf(stderr, "Tcl_AppInit failed: %s\n", INTERP_RESULT(interp)); - } - #endif - /* -@@ -372,7 +377,7 @@ TkX_Wish (argc, argv) - if (geometry != NULL) { - code = Tcl_VarEval(interp, "wm geometry . ", geometry, (char *) NULL); - if (code != TCL_OK) { -- fprintf(stderr, "%s\n", interp->result); -+ fprintf(stderr, "%s\n", INTERP_RESULT(interp)); - } - } - -@@ -402,13 +407,13 @@ TkX_Wish (argc, argv) - - fullName = Tcl_TildeSubst(interp, tcl_RcFileName, &buffer); - if (fullName == NULL) { -- fprintf(stderr, "%s\n", interp->result); -+ fprintf(stderr, "%s\n", INTERP_RESULT(interp)); - } else { - f = fopen(fullName, "r"); - if (f != NULL) { - code = Tcl_EvalFile(interp, fullName); - if (code != TCL_OK) { -- fprintf(stderr, "%s\n", interp->result); -+ fprintf(stderr, "%s\n", INTERP_RESULT(interp)); - } - fclose(f); - } -@@ -443,7 +448,7 @@ TkX_Wish (argc, argv) - error: - msg = Tcl_GetVar(interp, "errorInfo", TCL_GLOBAL_ONLY); - if (msg == NULL) { -- msg = interp->result; -+ msg = INTERP_RESULT(interp); - } - dfprintf(stderr, "%s\n", msg); - Tcl_Eval(interp, errorExitCmd); -@@ -566,13 +571,13 @@ StdinProc(clientData, mask) - || code) - { - char buf[4]; -- char *p = buf; -+ char *p = buf, *string; - /*header */ - *p++ = (code ? '1' : '0'); - bcopy(msg->msg_id,p,3); - /* end header */ -- if(sock_write_str2(dsfd, m_reply, buf, 4 , -- interp->result, strlen(interp->result)) -+ string = INTERP_RESULT(interp); -+ if(sock_write_str2(dsfd, m_reply, buf, 4, string, strlen(string)) - < 0) - { /* what do we want to do if the write failed */} - -@@ -752,7 +757,7 @@ guiBindCallback(char *szNameCmdProc, char *szTclObject, char *szModifier,char* a - code = Tcl_Eval(interp, szCmd); - if (code != TCL_OK) - { -- dfprintf(stderr, "TCL Error int bind : %s\n", interp->result); -+ dfprintf(stderr, "TCL Error int bind : %s\n", INTERP_RESULT(interp)); - - } - return code; diff --git a/dev-lisp/gcl/gcl-2.6.10.ebuild b/dev-lisp/gcl/gcl-2.6.10.ebuild deleted file mode 100644 index f81aa30e4b62..000000000000 --- a/dev-lisp/gcl/gcl-2.6.10.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit elisp-common eutils flag-o-matic - -DESCRIPTION="GNU Common Lisp" -HOMEPAGE="https://www.gnu.org/software/gcl/gcl.html" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz https://dev.gentoo.org/~grozin/${P}-fedora.tar.bz2" - -LICENSE="LGPL-2 GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="+ansi athena emacs +readline tk X" - -# See bug #205803 -RESTRICT="strip" - -RDEPEND="emacs? ( >=app-editors/emacs-23.1:* ) - readline? ( sys-libs/readline:= ) - athena? ( x11-libs/libXaw ) - >=dev-libs/gmp-4.1:= - tk? ( dev-lang/tk:= ) - X? ( x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXaw ) - virtual/latex-base" -DEPEND="${RDEPEND} - virtual/texi2dvi - >=app-text/texi2html-1.64 - >=sys-devel/autoconf-2.52" - -S="${WORKDIR}"/${PN} - -src_prepare() { - mv "${WORKDIR}"/fedora/info/* info/ - cp -p /usr/share/texmf-dist/tex/texinfo/texinfo.tex info/ - find . -type f -perm /0111 | xargs chmod a-x - chmod a+x add-defs add-defs1 config.guess config.sub configure install.sh - chmod a+x bin/info bin/info1 gcl-tk/gcltksrv.in gcl-tk/ngcltksrv mp/gcclab - chmod a+x o/egrep-def utils/replace xbin/* - - # fedora patches - epatch "${WORKDIR}"/fedora/fd-leak.patch - epatch "${WORKDIR}"/fedora/latex.patch - epatch "${WORKDIR}"/fedora/texinfo.patch - epatch "${WORKDIR}"/fedora/elisp.patch - epatch "${WORKDIR}"/fedora/rename.patch - epatch "${WORKDIR}"/fedora/getcwd.patch - epatch "${WORKDIR}"/fedora/infrastructure.patch - epatch "${WORKDIR}"/fedora/extension.patch - epatch "${WORKDIR}"/fedora/unrandomize.patch - epatch "${WORKDIR}"/fedora/asm-signal-h.patch - epatch "${WORKDIR}"/fedora/plt.patch - epatch "${WORKDIR}"/fedora/ellipsis.patch - epatch "${WORKDIR}"/fedora/man.patch - epatch "${WORKDIR}"/fedora/reloc-type.patch - epatch "${WORKDIR}"/fedora/largefile.patch - - epatch "${FILESDIR}"/${PN}-tcl-8.6.patch - epatch "${FILESDIR}"/${PN}-gmp-6.patch - epatch "${FILESDIR}"/${PN}-readline-6.3.patch - - sed -e 's|"-fomit-frame-pointer"|""|' -i configure - sed -e 's|@EXT@||g' debian/in.gcl.1 > gcl.1 -} - -src_configure() { - strip-flags - filter-flags -fstack-protector -fstack-protector-all - - local tcl="" - if use tk; then - tcl="--enable-tclconfig=/usr/lib --enable-tkconfig=/usr/lib" - fi - - econf --enable-dynsysgmp \ - --disable-xdr \ - --enable-emacsdir=/usr/share/emacs/site-lisp/gcl \ - --enable-infodir=/usr/share/info \ - $(use_enable readline) \ - $(use_enable ansi) \ - $(use_enable athena xgcl) \ - $(use_with X x) \ - ${tcl} -} - -src_compile() { - emake -j1 - VARTEXFONTS="${T}"/fonts emake -C info gcl.info - if use athena; then - pushd xgcl-2 > /dev/null - pdflatex dwdoc.tex - popd > /dev/null - fi -} - -src_test() { - local make_ansi_tests_clean="rm -f test.out *.fasl *.o *.so *~ *.fn *.x86f *.fasl *.ufsl" - if use ansi; then - cd ansi-tests - - ( make clean && make test-unixport ) \ - || die "make ansi-tests failed!" - - cat "${FILESDIR}/bootstrap-gcl" \ - | ../unixport/saved_ansi_gcl - - cat "${FILESDIR}/bootstrap-gcl" \ - |sed s/bootstrapped_ansi_gcl/bootstrapped_r_ansi_gcl/g \ - | ./bootstrapped_ansi_gcl - - ( ${make_ansi_tests_clean} && \ - echo "(load \"gclload.lsp\")" \ - | ./bootstrapped_r_ansi_gcl ) \ - || die "Phase 2, bootstraped compiler failed in tests" - fi -} - -src_install() { - emake DESTDIR="${D}" install - mv "${D}"usr/share/doc/*.dvi . - rm -rf "${D}"usr/share/doc - rm -rf "${D}"usr/share/emacs - rm -rf "${D}"usr/lib/gcl-*/info - - rm doc/makefile elisp/add-defaults.el - dodoc readme* RELEASE* ChangeLog* doc/* - doman gcl.1 - doinfo info/*.info* - dohtml -r info/gcl-si info/gcl-tk - - if use emacs; then - elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el - elisp-install ${PN} elisp/*.el - fi - - insinto /usr/share/doc/${PF} - doins *.dvi - if use athena; then - pushd xgcl-2 > /dev/null - insinto /usr/share/doc/${PF} - doins *.pdf - popd > /dev/null - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-lisp/gcl/gcl-2.6.12.ebuild b/dev-lisp/gcl/gcl-2.6.12.ebuild deleted file mode 100644 index a0d0b117f64e..000000000000 --- a/dev-lisp/gcl/gcl-2.6.12.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit elisp-common eutils flag-o-matic - -DESCRIPTION="GNU Common Lisp" -HOMEPAGE="https://www.gnu.org/software/gcl/gcl.html" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz https://dev.gentoo.org/~grozin/${P}-fedora.tar.bz2" - -LICENSE="LGPL-2 GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" -IUSE="+ansi athena emacs +readline tk X" - -# See bug #205803 -RESTRICT="strip" - -RDEPEND="emacs? ( >=app-editors/emacs-23.1:* ) - readline? ( sys-libs/readline:= ) - athena? ( x11-libs/libXaw ) - >=dev-libs/gmp-4.1:= - tk? ( dev-lang/tk:= ) - X? ( x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXaw ) - virtual/latex-base" -DEPEND="${RDEPEND} - virtual/texi2dvi - >=app-text/texi2html-1.64 - >=sys-devel/autoconf-2.52" - -S="${WORKDIR}"/${PN} - -src_prepare() { - mv "${WORKDIR}"/fedora/info/* info/ - cp -p /usr/share/texmf-dist/tex/texinfo/texinfo.tex info/ - find . -type f -perm /0111 | xargs chmod a-x - chmod a+x add-defs add-defs1 config.guess config.sub configure install.sh - chmod a+x bin/info bin/info1 gcl-tk/gcltksrv.in gcl-tk/ngcltksrv mp/gcclab - chmod a+x o/egrep-def utils/replace xbin/* - epatch "${FILESDIR}"/${P}-gcc5.patch - - # fedora patches - epatch "${WORKDIR}"/fedora/fd-leak.patch - epatch "${WORKDIR}"/fedora/latex.patch - epatch "${WORKDIR}"/fedora/texinfo.patch - epatch "${WORKDIR}"/fedora/elisp.patch - epatch "${WORKDIR}"/fedora/selinux.patch - epatch "${WORKDIR}"/fedora/rename.patch - epatch "${WORKDIR}"/fedora/getcwd.patch - epatch "${WORKDIR}"/fedora/plt.patch - epatch "${WORKDIR}"/fedora/ellipsis.patch - epatch "${WORKDIR}"/fedora/infrastructure.patch - epatch "${WORKDIR}"/fedora/extension.patch - epatch "${WORKDIR}"/fedora/unrandomize.patch - epatch "${WORKDIR}"/fedora/asm-signal-h.patch - epatch "${WORKDIR}"/fedora/largefile.patch - epatch "${WORKDIR}"/fedora/arm.patch - - epatch_user - - sed -e 's|"-fomit-frame-pointer"|""|' -i configure -} - -src_configure() { - strip-flags - filter-flags -fstack-protector -fstack-protector-all - append-cflags $(test-flags-CC -fgnu89-inline) - - local tcl="" - if use tk; then - tcl="--enable-tclconfig=/usr/lib --enable-tkconfig=/usr/lib" - fi - - econf --enable-dynsysgmp \ - --disable-xdr \ - --enable-emacsdir=/usr/share/emacs/site-lisp/gcl \ - --enable-infodir=/usr/share/info \ - $(use_enable readline) \ - $(use_enable ansi) \ - $(use_enable athena xgcl) \ - $(use_with X x) \ - ${tcl} -} - -src_compile() { - emake -j1 - VARTEXFONTS="${T}"/fonts emake -C info gcl.info - if use athena; then - pushd xgcl-2 > /dev/null - pdflatex dwdoc.tex - popd > /dev/null - fi -} - -src_test() { - local make_ansi_tests_clean="rm -f test.out *.fasl *.o *.so *~ *.fn *.x86f *.fasl *.ufsl" - if use ansi; then - cd ansi-tests - - ( make clean && make test-unixport ) \ - || die "make ansi-tests failed!" - - cat "${FILESDIR}/bootstrap-gcl" \ - | ../unixport/saved_ansi_gcl - - cat "${FILESDIR}/bootstrap-gcl" \ - |sed s/bootstrapped_ansi_gcl/bootstrapped_r_ansi_gcl/g \ - | ./bootstrapped_ansi_gcl - - ( ${make_ansi_tests_clean} && \ - echo "(load \"gclload.lsp\")" \ - | ./bootstrapped_r_ansi_gcl ) \ - || die "Phase 2, bootstraped compiler failed in tests" - fi -} - -src_install() { - emake DESTDIR="${D}" install - rm -rf "${D}"usr/share/doc - rm -rf "${D}"usr/share/emacs - - rm elisp/add-defaults.el - dodoc readme* RELEASE* ChangeLog* doc/* - doman man/man1/gcl.1 - doinfo info/*.info* - dohtml -r info/gcl-si info/gcl-tk - - if use emacs; then - elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el - elisp-install ${PN} elisp/*.el - fi - - insinto /usr/share/doc/${PF} - doins info/*.pdf - if use athena; then - pushd xgcl-2 > /dev/null - insinto /usr/share/doc/${PF} - doins *.pdf - popd > /dev/null - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-lisp/gcl/gcl-2.6.13_pre99.ebuild b/dev-lisp/gcl/gcl-2.6.13_pre99.ebuild new file mode 100644 index 000000000000..1673ab7aa83c --- /dev/null +++ b/dev-lisp/gcl/gcl-2.6.13_pre99.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit elisp-common flag-o-matic + +DESCRIPTION="GNU Common Lisp" +HOMEPAGE="https://www.gnu.org/software/gcl/gcl.html" +SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.xz" + +LICENSE="LGPL-2+ GPL-2+" +SLOT="0" +KEYWORDS="amd64 ~arm ~ppc ppc64 x86" +IUSE="+ansi athena emacs +readline tk X" +RESTRICT="strip" #205803 + +RDEPEND="dev-libs/gmp + virtual/latex-base + emacs? ( app-editors/emacs:= ) + readline? ( sys-libs/readline:= ) + athena? ( x11-libs/libXaw ) + tk? ( dev-lang/tk:= ) + X? ( x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXaw )" +DEPEND="${RDEPEND} + virtual/texi2dvi + app-text/texi2html + >=dev-build/autoconf-2.52" + +PATCHES=( + # bug 778770 + "${FILESDIR}"/${P}-assertion.patch +) + +src_configure() { + strip-flags + filter-flags -fstack-protector -fstack-protector-all + # breaks linking on multiple defined syms + #append-cflags $(test-flags-CC -fgnu89-inline) + + local tcl="" + if use tk; then + tcl="--enable-tclconfig=/usr/lib --enable-tkconfig=/usr/lib" + fi + + econf --enable-dynsysgmp \ + --disable-xdr \ + --enable-emacsdir=/usr/share/emacs/site-lisp/gcl \ + $(use_enable readline) \ + $(use_enable ansi) \ + $(use_enable athena xgcl) \ + $(use_with X x) \ + ${tcl} +} + +src_compile() { + emake -j1 +} + +src_test() { + local make_ansi_tests_clean="rm -f test.out *.fasl *.o *.so *~ *.fn *.x86f *.fasl *.ufsl" + if use ansi; then + cd ansi-tests + + ( make clean && make test-unixport ) \ + || die "make ansi-tests failed!" + + cat "${FILESDIR}/bootstrap-gcl" \ + | ../unixport/saved_ansi_gcl + + cat "${FILESDIR}/bootstrap-gcl" \ + |sed s/bootstrapped_ansi_gcl/bootstrapped_r_ansi_gcl/g \ + | ./bootstrapped_ansi_gcl + + ( ${make_ansi_tests_clean} && \ + echo "(load \"gclload.lsp\")" \ + | ./bootstrapped_r_ansi_gcl ) \ + || die "Phase 2, bootstraped compiler failed in tests" + fi +} + +src_install() { + emake DESTDIR="${D}" install + + rm elisp/add-defaults.el + dodoc readme readme.gmp readme.xgcl ChangeLog doc/* info/*.pdf + dodoc -r info/gcl-si + doman man/man1/gcl.1 + doinfo info/gcl.info* info/gcl-si.info + + use athena && dodoc xgcl-2/*.pdf + + if use tk; then + dodoc -r info/gcl-tk + doinfo info/gcl-tk.info* + fi + + if use emacs; then + elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el + elisp-install ${PN} elisp/*.el + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-lisp/gcl/gcl-2.6.14.ebuild b/dev-lisp/gcl/gcl-2.6.14.ebuild new file mode 100644 index 000000000000..fe5638ac7f2c --- /dev/null +++ b/dev-lisp/gcl/gcl-2.6.14.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit elisp-common flag-o-matic + +DESCRIPTION="GNU Common Lisp" +HOMEPAGE="https://www.gnu.org/software/gcl/gcl.html" +SRC_URI="https://ftp.gnu.org/gnu/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2+ GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ppc64 ~x86" +IUSE="+ansi athena emacs +readline tk X" +RESTRICT="strip" #205803 + +RDEPEND="dev-libs/gmp + virtual/latex-base + emacs? ( app-editors/emacs:= ) + readline? ( sys-libs/readline:= ) + athena? ( x11-libs/libXaw ) + tk? ( dev-lang/tk:= ) + X? ( x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXaw )" +DEPEND="${RDEPEND} + virtual/texi2dvi + app-text/texi2html + >=dev-build/autoconf-2.52" + +src_configure() { + strip-flags + filter-flags -fstack-protector -fstack-protector-all + # breaks linking on multiple defined syms + #append-cflags $(test-flags-CC -fgnu89-inline) + + local tcl="" + if use tk; then + tcl="--enable-tclconfig=/usr/lib --enable-tkconfig=/usr/lib" + fi + + econf --enable-dynsysgmp \ + --disable-xdr \ + --enable-emacsdir=/usr/share/emacs/site-lisp/gcl \ + $(use_enable readline) \ + $(use_enable ansi) \ + $(use_enable athena xgcl) \ + $(use_with X x) \ + ${tcl} +} + +src_compile() { + emake -j1 +} + +src_test() { + local make_ansi_tests_clean="rm -f test.out *.fasl *.o *.so *~ *.fn *.x86f *.fasl *.ufsl" + if use ansi; then + cd ansi-tests + + ( make clean && make test-unixport ) \ + || die "make ansi-tests failed!" + + cat "${FILESDIR}/bootstrap-gcl" \ + | ../unixport/saved_ansi_gcl + + cat "${FILESDIR}/bootstrap-gcl" \ + |sed s/bootstrapped_ansi_gcl/bootstrapped_r_ansi_gcl/g \ + | ./bootstrapped_ansi_gcl + + ( ${make_ansi_tests_clean} && \ + echo "(load \"gclload.lsp\")" \ + | ./bootstrapped_r_ansi_gcl ) \ + || die "Phase 2, bootstraped compiler failed in tests" + fi +} + +src_install() { + emake DESTDIR="${D}" install + + rm elisp/add-defaults.el + dodoc readme readme.gmp readme.xgcl ChangeLog doc/* info/*.pdf + dodoc -r info/gcl-si + doman man/man1/gcl.1 + doinfo info/gcl.info* info/gcl-si.info + + use athena && dodoc xgcl-2/*.pdf + + if use tk; then + dodoc -r info/gcl-tk + doinfo info/gcl-tk.info* + fi + + if use emacs; then + elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el + elisp-install ${PN} elisp/*.el + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-lisp/gcl/gcl-2.6.15_pre3.ebuild b/dev-lisp/gcl/gcl-2.6.15_pre3.ebuild new file mode 100644 index 000000000000..dd6b7e3a812d --- /dev/null +++ b/dev-lisp/gcl/gcl-2.6.15_pre3.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit elisp-common flag-o-matic + +DESCRIPTION="GNU Common Lisp" +HOMEPAGE="https://www.gnu.org/software/gcl/gcl.html" +SRC_URI="http://git.savannah.gnu.org/cgit/gcl.git/snapshot/${PN}-Version_2_6_15pre3.tar.gz + https://dev.gentoo.org/~grozin/${PF}-spelling.patch.gz" + +LICENSE="LGPL-2+ GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" +IUSE="+ansi athena doc emacs +readline tk X" +RESTRICT="strip" #205803 + +RDEPEND="dev-libs/gmp + virtual/latex-base + emacs? ( app-editors/emacs:= ) + readline? ( sys-libs/readline:= ) + athena? ( x11-libs/libXaw ) + tk? ( dev-lang/tk:= ) + X? ( x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXaw )" +DEPEND="${RDEPEND} + virtual/texi2dvi + app-text/texi2html + >=dev-build/autoconf-2.52" + +PATCHES=( "${WORKDIR}"/${PF}-spelling.patch ) +S="${WORKDIR}"/${PN}-Version_2_6_15pre3/${PN} + +src_configure() { + strip-flags + filter-flags -fstack-protector -fstack-protector-all + + local tcl="" + if use tk; then + tcl="--enable-tclconfig=/usr/lib --enable-tkconfig=/usr/lib" + fi + + econf --enable-dynsysgmp \ + --disable-xdr \ + --enable-emacsdir=/usr/share/emacs/site-lisp/gcl \ + $(use_enable readline) \ + $(use_enable ansi) \ + $(use_enable athena xgcl) \ + $(use_with X x) \ + ${tcl} +} + +src_compile() { + emake -j1 +} + +src_test() { + local make_ansi_tests_clean="rm -f test.out *.fasl *.o *.so *~ *.fn *.x86f *.fasl *.ufsl" + if use ansi; then + cd ansi-tests + + ( make clean && make test-unixport ) \ + || die "make ansi-tests failed!" + + cat "${FILESDIR}/bootstrap-gcl" \ + | ../unixport/saved_ansi_gcl + + cat "${FILESDIR}/bootstrap-gcl" \ + |sed s/bootstrapped_ansi_gcl/bootstrapped_r_ansi_gcl/g \ + | ./bootstrapped_ansi_gcl + + ( ${make_ansi_tests_clean} && \ + echo "(load \"gclload.lsp\")" \ + | ./bootstrapped_r_ansi_gcl ) \ + || die "Phase 2, bootstraped compiler failed in tests" + fi +} + +src_install() { + emake DESTDIR="${D}" install + dodoc readme readme.gmp readme.xgcl ChangeLog doc/* + + pushd "${D}"/usr/share/doc > /dev/null + rm dwdoc.tex || die "rm dwdoc.tex.bz2 failed" + if use doc; then + mv *.pdf gcl gcl-si gcl-tk dwdoc ${PF} || die "mv * ${PF} failed" + else + rm -rf *.pdf gcl gcl-si gcl-tk dwdoc + fi + popd > /dev/null + + if use emacs; then + elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el + elisp-install ${PN} elisp/*.el + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-lisp/gcl/metadata.xml b/dev-lisp/gcl/metadata.xml index 28952c76fa9e..c4d029b5b1cc 100644 --- a/dev-lisp/gcl/metadata.xml +++ b/dev-lisp/gcl/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>common-lisp@gentoo.org</email> diff --git a/dev-lisp/hyperspec/hyperspec-7.0-r1.ebuild b/dev-lisp/hyperspec/hyperspec-7.0-r1.ebuild deleted file mode 100644 index 845fb390fddb..000000000000 --- a/dev-lisp/hyperspec/hyperspec-7.0-r1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PV=${PV/./-} -MY_P=HyperSpec-${MY_PV} - -DESCRIPTION="Common Lisp ANSI-standard Hyperspec" -HOMEPAGE="http://www.lispworks.com/reference/HyperSpec/" -SRC_URI="ftp://ftp.lispworks.com/pub/software_tools/reference/${MY_P}.tar.gz" -LICENSE="HyperSpec" -SLOT="0" -KEYWORDS="amd64 ppc sparc x86" -IUSE="" -DEPEND="" - -S=${WORKDIR}/ - -src_install() { - dodir /usr/share/doc/${P} - cp -r HyperSpec* "${D}/usr/share/doc/${P}" - dosym /usr/share/doc/${P} /usr/share/doc/hyperspec -} diff --git a/dev-lisp/hyperspec/hyperspec-7.0-r3.ebuild b/dev-lisp/hyperspec/hyperspec-7.0-r3.ebuild new file mode 100644 index 000000000000..34dd4a786564 --- /dev/null +++ b/dev-lisp/hyperspec/hyperspec-7.0-r3.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit readme.gentoo-r1 + +MY_PV=${PV/./-} +MY_P=HyperSpec-${MY_PV} + +DESCRIPTION="Common Lisp ANSI-standard Hyperspec" +HOMEPAGE="http://www.lispworks.com/reference/HyperSpec/" +SRC_URI="ftp://ftp.lispworks.com/pub/software_tools/reference/${MY_P}.tar.gz" +S="${WORKDIR}" + +LICENSE="HyperSpec" +SLOT="0" +KEYWORDS="amd64 ~mips ppc ppc64 ~riscv sparc x86" + +src_install() { + docinto html + dodoc -r HyperSpec/{Body,Data,Front,Graphics,Issues} + dosym html /usr/share/doc/${PF}/HyperSpec + dosym -r /usr/share/doc/${PF} /usr/share/${PN} + + docinto . + dodoc HyperSpec-{README,Legalese}.text + local DOC_CONTENTS="A permanent link to the HyperSpec documentation + is provided at: ${EPREFIX}/usr/share/${PN}" + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/dev-lisp/hyperspec/metadata.xml b/dev-lisp/hyperspec/metadata.xml index 7ea645c67e72..0e907627e12d 100644 --- a/dev-lisp/hyperspec/metadata.xml +++ b/dev-lisp/hyperspec/metadata.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>common-lisp@gentoo.org</email> <name>Gentoo Common Lisp Project</name> </maintainer> +<stabilize-allarches/> </pkgmetadata> diff --git a/dev-lisp/metadata.xml b/dev-lisp/metadata.xml index 6258c8c7b1b4..fc0d76e9bd05 100644 --- a/dev-lisp/metadata.xml +++ b/dev-lisp/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <catmetadata> <longdescription lang="en"> The dev-lisp category contains libraries and utilities relevant to the @@ -37,4 +37,3 @@ językiem programowania Lisp. </longdescription> </catmetadata> - diff --git a/dev-lisp/roswell/Manifest b/dev-lisp/roswell/Manifest index 7fd282c39d5d..c903d88e30f5 100644 --- a/dev-lisp/roswell/Manifest +++ b/dev-lisp/roswell/Manifest @@ -1,3 +1,3 @@ -DIST roswell-20.01.14.104.tar.gz 164384 BLAKE2B 905bb54081da137c588b911f1aa6ef4957e9d860c9d42b72bcda37b084d4049c4234a757514170e2a857de40c4970d70e53e98d72bbeb037e5c35930fbd9286b SHA512 8eac3ada8afb9f2ee82004e46fcee72e45cfd2ed4e86dea8892ff6fa0bb5339bca7e3d1d4a7e2930d6848ef1bf1ef4b63aa576382bee1e66e98cf50441c81c7e -DIST roswell-20.04.14.105.tar.gz 165121 BLAKE2B f7f0e651768aa2a0d8ccd648b511eaae8d9c18e64941b0ce1a155017e53bd5b6552b129afa35ca1132765d1f03ed91c26d9d83f52799704857f1c3f1475f581d SHA512 3e63b206253c0922877beb0c5091fc42052cb6a711b47333c3d6553cd22eb509f6fb09a0e073465bfb45225b46aa4041d760df17c8e781d3b815c583e9578c3e DIST roswell-20.05.14.106.tar.gz 164302 BLAKE2B bd2387bea78a746d5cfedc27e9d636ef7bc0f5118036ae2270c49a4361268527fafe2683850a2dcaeb1bf3f14db6a24fecd98f395081fdc1b4db620838d2936f SHA512 03a923accc4d6ac9a3a3e0fd1853441bf4be0268571e8b6ffffc122170befad6b1dcda6f062a566b54229bb325efb6a5d39459ce22a89355e927e3fea1e08cee +DIST roswell-21.10.14.111.tar.gz 172464 BLAKE2B 816f2fbbf99be21f7416456fb724faf5e290090ad2130bdd6feb03573cb059bf21bd5419cbf5928c84d2a977c123b31597df6676f65a11ded0121acc37c589aa SHA512 d6979974807385e1e7be993610b5ed6ef5297ded21727162b6bc3240d402168cfe32b6b243f535c69b91620d0af4a3b7e046080be2881610ffbe0d3babfa3b23 +DIST roswell-22.12.14.113.tar.gz 170253 BLAKE2B ddb59d1778b0d0becfc8914edec850203aea979357ac8f33988053afaaa21c8302800af0b44a3e00e694b5deedf1c5d3306f47f8bce5d5f5b4aa5f8c8961e173 SHA512 f102297af67b5d5414f853fc428f39347cb09a604bff95ad50c7f5249582a053e00fa3bb59a52846e3afc8244b8de1a7ee4667847b829f7d176121c496fd038f diff --git a/dev-lisp/roswell/metadata.xml b/dev-lisp/roswell/metadata.xml index 020c3a635287..26aec25c2169 100644 --- a/dev-lisp/roswell/metadata.xml +++ b/dev-lisp/roswell/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>sheepduke@gmail.com</email> <name>YUE Daian</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/dev-lisp/roswell/roswell-20.05.14.106.ebuild b/dev-lisp/roswell/roswell-20.05.14.106.ebuild index 76c9e1152f1d..e7f55bcbac23 100644 --- a/dev-lisp/roswell/roswell-20.05.14.106.ebuild +++ b/dev-lisp/roswell/roswell-20.05.14.106.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools +inherit autotools flag-o-matic DESCRIPTION="A lisp installer and launcher for major environment" HOMEPAGE="https://github.com/roswell/roswell" @@ -20,3 +20,12 @@ src_prepare() { default eautoreconf } + +src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/856106 + # https://github.com/roswell/roswell/issues/584 + filter-lto + + default +} diff --git a/dev-lisp/roswell/roswell-20.01.14.104.ebuild b/dev-lisp/roswell/roswell-21.10.14.111.ebuild index 26c7a2e2605b..de8998f15f2a 100644 --- a/dev-lisp/roswell/roswell-20.01.14.104.ebuild +++ b/dev-lisp/roswell/roswell-21.10.14.111.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools +inherit autotools flag-o-matic DESCRIPTION="A lisp installer and launcher for major environment" HOMEPAGE="https://github.com/roswell/roswell" @@ -15,9 +15,20 @@ LICENSE="MIT" KEYWORDS="~amd64 ~x86" # File collision with librouteros (#691754) -RDEPEND="!net-libs/librouteros" +RDEPEND="!net-libs/librouteros + net-misc/curl" +DEPEND="${RDEPEND}" src_prepare() { default eautoreconf } + +src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/856106 + # https://github.com/roswell/roswell/issues/584 + filter-lto + + default +} diff --git a/dev-lisp/roswell/roswell-20.04.14.105.ebuild b/dev-lisp/roswell/roswell-22.12.14.113.ebuild index 76c9e1152f1d..de8998f15f2a 100644 --- a/dev-lisp/roswell/roswell-20.04.14.105.ebuild +++ b/dev-lisp/roswell/roswell-22.12.14.113.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools +inherit autotools flag-o-matic DESCRIPTION="A lisp installer and launcher for major environment" HOMEPAGE="https://github.com/roswell/roswell" @@ -14,9 +14,21 @@ LICENSE="MIT" KEYWORDS="~amd64 ~x86" -RDEPEND="!net-libs/librouteros" +# File collision with librouteros (#691754) +RDEPEND="!net-libs/librouteros + net-misc/curl" +DEPEND="${RDEPEND}" src_prepare() { default eautoreconf } + +src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/856106 + # https://github.com/roswell/roswell/issues/584 + filter-lto + + default +} diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest index 5c98ca80fc90..a2d10471b0da 100644 --- a/dev-lisp/sbcl/Manifest +++ b/dev-lisp/sbcl/Manifest @@ -1,40 +1,18 @@ -DIST sbcl-1.0.23-sparc-solaris-binary.tar.bz2 7907803 BLAKE2B 4be6831c196cfef505b411fa9ae0b9586f93309ce97fcd2b964abfb4175f00f7437da7859334973f2441592fc1a13cc5557044737659f5ef13998b593d623cda SHA512 d641d7859f0d60ce7dd684a0f21e62282a5a658ed6bb4d67d6b141b3ce22d9e27261efe7e5d0f752c30e467cf90d7c8a03ad2a04b3c60042f0ef0a4808a9c74a +DIST bsd-sockets-test-2.3.1.patch.gz 3451 BLAKE2B 3f1499df0346852d3337d741e4f2e99dddc178f8f31d79911ba3206a83f0d56ad86967ed4deccc7c28a3e24e302814db63a1fafe3b88991cfba7a1c40c8b3851 SHA512 bccf0d4a46b6fcfea40a287863e72267717fa6860d8dc3e3e0bd4f616d9b825eec1195f4e88b0650c12c76360e2fc3c7e32930c0319ecae0ab66834be22fca83 +DIST bsd-sockets-test-2.3.6.patch.gz 3459 BLAKE2B f8ee83904a21944f15890c781aa46f66e0e5c5f59b5c03ba78b54fc8c1d4b1d88cae71bbb6f3f88451435eb7a3ab39a7168df047d9684391b46afc644dc9e96c SHA512 baaf803210c00074042d04e12e47919e8e187c8ae3374651a4205aded9d10bec078e5e17e04fcdcb666ab3f4bb1d7195c453b0f1d8b1fc5038e1ac22bf99ca35 DIST sbcl-1.0.28-alpha-linux-binary.tar.bz2 7573824 BLAKE2B ab8e139adb4fbc0ac7b34457c3361b044d04d8d9dedba2008cb19220915900e2d1bf540b617c738145923d74fa28ab7d979fd0d1bf4b9d17c445dfb080731263 SHA512 85ceb4d3bf971777f5444a63cbabd88ccfaf16ed3b3c86cc5ea6cb3fd3189c4cd5a5ebbf785c97366afb7026604ffc34a1129936291deede5993056e158125ab DIST sbcl-1.0.28-sparc-linux-binary.tar.bz2 8032042 BLAKE2B ca4213ef00447d66406d1c752a1653fd628deba0e112f55a5625dad61da30c0be7c60fe4e84e8dcc9d9946db553ad544dc39b28d62124d8e3d6197943efc944a SHA512 cea1ba06f85169fca9fe3026813c6e7e8e8209b874e048b7bd63cb3a1c5bd7c829e8dbb2c486977e190a0390d28e4845938a9e84378f4f2f16f72bf0b6f45c80 DIST sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 8217590 BLAKE2B 68da614df7d27ecf08a21603d4f172344c86e650176d238fe73d7756a626b694e2165b9157e53732730861d085902e5cc893b967073168fe3845cd2621668b87 SHA512 8118de56e448bce7a72b832e661eb4e2687eed675f88f766f7043c843a432e35121d9e6f9da8d22ac690c54bda0d55ecb07728748ce2cdd57320f49b4b812b86 -DIST sbcl-1.1.6-x86-darwin-binary.tar.bz2 9091955 BLAKE2B b532828cc729ffef17d0bedb827a1482edb190f5740d14dbff347f8cfe61f1960c5011162dc620ebb8d99fbd8f8bbf070923a59b8639ea9985219b58d334cd27 SHA512 5b9d58ba1a7bcf3aa5011ac5ba1c8dba65e44b2c3f8a31b15db54de6b34ea0f7482c45f1cc4e1323e154ce79fbba030112df3795cb323bca46bac50f15d2a138 DIST sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 10038928 BLAKE2B b434f65e9e42341645ac91c8f35ffeb6d2d7f043544ca9af7c519a46df15cee6d2fe4d0a56c10643c6f263e8deb75bcfb00cc399d1f32c10d53c20a9842c45db SHA512 c271796f854fe884e0d8aa6504bbe2e6c078de1555fc9a823463640cfd8c793dbddcb3f32932788d84a41e2b8a085b95c97c13a15c43fc909dcaad18ce25f215 DIST sbcl-1.2.7-powerpc-linux-binary.tar.bz2 9884585 BLAKE2B 1870da882fc5e466eaf5e96ed46aed600660bdfe836eabe145cf9ea4713e537a7d45dd76538d899801d0e3ea944c4ccfff1c9688fc695890bb4cac69135ef046 SHA512 7b9fef12d3d6397adec6a0c26d1431a18b8d91b5bf009034eb2501de9fd60dc04dd2e3cd2d9feb9204d4631360aea88ba07a9ad75dad0767b5dcc5e62e84e790 DIST sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 10438955 BLAKE2B ca9cd3a55873c648940793ae9fb92dde5e4569b7392932771b31dc71da380267556b3ceb8b099f62576b76d77395123735232c43c0ed1f934d1e004a6194d0fa SHA512 9566cebf8fc29ead1f919309e3f98aeb618e97b34c80f53d1f739f1a3f4ef4cbaebd1c67f0b32172a0cdf14dc405eb75d0e916dedf3b8a758cdec2368d25f5c1 -DIST sbcl-1.2.7-x86-linux-binary.tar.bz2 10516485 BLAKE2B 4036684f398c0766d55a6089fb67ae23520fc949b39525b2ac005f2665cdee8c0901a638e5dfc8e78e5f80963331a5fe2ddd4b0108ddaea063fabfd1d5829f72 SHA512 ca09beeafeb40f21eb1a377f04a69d57feb5549fa63aadf2e39aa65f3875418bdab755e22b567b3f2c514fb94534b739a57606288912ffc5cddf370a400e9e5c -DIST sbcl-1.2.7-x86-solaris-binary.tar.bz2 10351529 BLAKE2B 9b7324c8177856c6024220ce71070a1a51b93fa9352fe692c3fd5afa9b6cdcbb361c54e354ab1cc1153e6bf15cb0c5fc267c3da03addd5d35fbec840f72a7c06 SHA512 b30d40f0095bb43719ba2e1a619f53fe5f0bccaa08a35481bc5feeb0dd5b540018a9ec9f61799de89991a85750577922cb4e56db4d7dab8f07e18bbc643bdad1 -DIST sbcl-1.3.11-source.tar.bz2 5790557 BLAKE2B d6b493d880ab2481f18381475165a3eed585fa46e626eb1e762cced29a6a7315be638df6f44ffdc694d8fb55509f912267a7dbe8892b6672eb56e839f55908ff SHA512 07cce0b33f1d41bc208827d228ae356b56165bb55fab72c48973a15a63e2e680aafc16db67d36cc4952f71101faaacafd9660276cd67673314f1699d6a91af82 -DIST sbcl-1.3.11-x86-64-linux-binary.tar.bz2 9248214 BLAKE2B f1f6ebbec168a47d7405c15c63a70f10afad2d271d17dfa461f94bd8b1a1c21506a3a9c1d7ffe2501cc70419406e0d73b53a34ff9ff003e4791170101b7b1293 SHA512 ffb443f9e3ede2f9dbdc1bf28554bd59ef1fd5ad855465ee10f9835221fde20211188e881be854b4760870b122dfc6c5ad5c8cad1bea613ffb3b6a6f67a36056 -DIST sbcl-1.3.12-armhf-linux-binary.tar.bz2 9193847 BLAKE2B 27106c0144ee99f534cd0a59cfb331ef8f39dbefdc76e294a8671523b1c05f42353d31b8e74600dd01f85fb5156d39216a877d77aba57a061427ea1dc28a492e SHA512 5bdb4e2b584933e9ee9aaa2ba68328f219f072af802782ee5dedf83baa5c679cd5a1ccbf3458678810ccb8679ffd392d4fba108e86d537e10554c1860bfd4de5 -DIST sbcl-1.3.9-armhf-linux-binary.tar.bz2 9161130 BLAKE2B 0dbfe39803d6e3955124fa1a619da7b6d4ec9e7d6eb78e868508c61bf478a980cb15ba427ef0b38d0f051ce38b881020534c0d37bfbcd81a8d763654283669ec SHA512 309e2ac7ef9ac95bf751432cf243af0de022c5b21054df2bf4e99da4ff087218af72b0ab3be69214eba3df1b6bbe707cc28840508e960c5d2ed2af0e86de3fdd -DIST sbcl-1.4.11-armhf-linux-binary.tar.bz2 9767589 BLAKE2B 2949338bc19973e0ca38f435caaa4c991a6c86d70dc092a4f1b6ec3eefa47af76f2a0c3fd8a4f8004127f4b8b3666a5cf4260b6ab56802308880067e4eaf8568 SHA512 297edddc36e9b9de080f9e25faa323e23877af234104b4b7e0fe2b74f0dd117d9cf0caa87b79718a8b071bcb5e97c8118f1d11af0e4aba2a961beb40c4dc99cb DIST sbcl-1.4.2-arm64-linux-binary.tar.bz2 10578821 BLAKE2B 1cd25c548be0f1b7ec01edc3bee7fe6c2aaf07b7bd1fc55d408dee7ac95e8f3761a194bf9e8efb734179a7eff04cdae2fe5ba4a9ba5ab06f7322ac1550d142cc SHA512 39bbd735b242aa0bbac05c6f4dbe28cb45e01684db7e5b4f1e51f995a9f9d5b484f63cc4243f472f72b3b1e6c4cd2268a7e812b15426eca5cf9a1fede10f44bb DIST sbcl-1.4.3-x86-linux-binary.tar.bz2 10227185 BLAKE2B 6d77c4f4177cbdb72fb9bab0da5bd91e0aa8deafffd238818a2551332f0ab246715d9489b5c1156f3481aa7fb79d161a988404620fc09fe86ff927543a1ee678 SHA512 41cd63d61dd7c46370341dce39a362287a23b528bfebe8e5571614aeefdea03d318207d25562e995db9ccedb6c1f50ea4d66627721f0fd9486e99440126e6a38 -DIST sbcl-1.4.8-x86-64-linux-binary.tar.bz2 10353701 BLAKE2B 5b56f46fbdb87f015ed1fe103b6caaf43d2d424b45e2574e306b3d3cbc3c7bdfa48847a2e6d7d819e6bf4b59fa02ea01f9ce6b023802ae6f91fc7f56e5a260de SHA512 f3cb3c30dec1b7e6ac0c1b67de26192723871f8a8d543a41d7c4d04b0813fd7da1043433237b648a2c23f73169fe38f2ec3a3c2bd412eb4c9d36ed929c40f27d -DIST sbcl-1.4.9-source.tar.bz2 6051607 BLAKE2B 8abcaf73233ea1a23d47987b16554636dcf94acfbc7ab731f0730fdb4a8176593fb3ab52d9b25b3dd56753cd984f7e0eddb1585a142eb7ad1aa5e3e03d7b0ca9 SHA512 e0248f460f9737d47653dd520732062d2637813b550df356ecc90aa6d21fbdd74f03182d1e890c09c1da742f7d57b4fbd04a4e6dc36999aca51bb6c2952ac236 -DIST sbcl-1.5.6-source.tar.bz2 6370992 BLAKE2B f2b374c9870eda8b7f40e7c66dec8888167fcd17ead6c42cd07acd2f35684f150ab907a95eb2be8e84b741fad8d69bc7f2c10a8de8e568f8705baa0a91c951de SHA512 5adeb4c694d41c08c780d5f0ed2e0f4c830ea74fdb7b345813b1cd616a0b310c2394f4727b6f5a75b04bd0dda92ee774298bef7225253e7d325e8f83bc645320 -DIST sbcl-1.5.6-x86-64-linux-binary.tar.bz2 10131687 BLAKE2B f921b0c0b292f213eb1447b3e533f24ba15bb58c0be00bea3a0cb1dcadc91ed9a648b6452b535fdd189cdb3af7141e554c055748249084c36e7f523ea8f44b8c SHA512 4d270deb04b22cd22caec3086de4b9cb13e9529c33f2e0579baf2c0b00b98d07c16a22997849ea77650ff56a0b844fd5fa750929639481df2820badf12c2a112 -DIST sbcl-1.5.7-source.tar.bz2 6438048 BLAKE2B d7036d6ac6abdd433e112ae9bd59ad00447c45edd064cd863b609d21b99896c7a435b3a0cc82fe0d5ef842c0156d134e690c4363667f4c9b57b49cbfbc24a0e0 SHA512 8dde1b0d400f93fed085f6b6c33b057c3dec4dfa83afb7431384add6628cb2f910cba006b2579cea547685aeb79fade5ad576b0a42e4f7e1f6c0c3f26acf226e -DIST sbcl-1.5.8-source.tar.bz2 6409837 BLAKE2B cb503ee1db82f2e1a9c123b9b6b5052b23167c8a76039f12afee580be058a0b78a51eade541f7e2beab5566204af147c8cd1dab25ef0fff381cf298ba758aee5 SHA512 20966035e878a1f6aa9b0acf20eb88087d5cd604d65ae90f43bbfa3d2d40afa46864daabf45d8c6ecbbd429e876279c891d6e3d9344f2972f611a4f9b2eec8f4 -DIST sbcl-1.5.8-x86-64-linux-binary.tar.bz2 10145219 BLAKE2B aeccd48a5448e334d6cf3ca4e067ac23943256c2a729ff24b6b3c332c6c70c108b68a6903193a403176d4fbf4804c9f22add615e29fa09022f84b0190a429454 SHA512 d733929775be6fe5d46fd5b11c808eae89172a5a8694f1c2a7927cc364419529292d70f6902731f4c7822c85708555382de31b605440493bb281ccef552daf6c -DIST sbcl-2.0.0-source.tar.bz2 6457217 BLAKE2B ae09d4d80ca7100fb412be570126918612eb5a3f27a8c17ced4e0c555d105f3180999f2663ea86910dda9d812d4297cceb8d7c43d5084d20902839e1f23bc739 SHA512 e458e11af6703d8cff973cf5167866b93fe5f6e1b2df3cbf0c1beb014eef2d737d83fc9cde5745d476ef5397a2c9b4b4148d2b77ebbcec13e0f284b2e0900906 -DIST sbcl-2.0.0-x86-64-linux-binary.tar.bz2 10196560 BLAKE2B 161d53df96817a50606ffc6a5ad502a94a1aa622e0a45c17c4ff4148deafb2e1db560aacd33b1198eb6fd3bc462b320e01d4925097bec3954f9d6ce564a2b1f5 SHA512 23d3974656a33ae0cfce340e2fbdd60a4e595353e7cc6e75dbab0242d7baaa30d677d1163d4440e953cd7f859fc737b073055b68fbeb2e57e3542a0133d7648f -DIST sbcl-2.0.1-source.tar.bz2 6466983 BLAKE2B f040fb288f5b7adb8a7f56aae60a37e38034c2fed958b1361f473096769367b0a10a76a0e45380e6dcf3b4bd2c1038957448f70eede38b04c228a14e3afc1fc2 SHA512 1d92589033e123c21377f820dbc22e27f2610a372c5545799bec7c247795ba4b8b65102c7fe739f4a15a84579ec72f63fb9f4b197db5c6da1f8d59bd35966bea -DIST sbcl-2.0.1-x86-64-linux-binary.tar.bz2 10151722 BLAKE2B 445fcaa5a6f1c2a7a7d80dd28d1126c33437af2a59dadd25cbbe9ca4e12488a985e78aa12095fda8e38e21dceca77a0e1bca0949133b0ac2666d4367bf881f68 SHA512 1d24981b42c5d91f6037ad6fed782786bbc75edcb2f125a6d5b793448d00c211af515f56b6dd70a68bd33ea7174fd1d96ef9ab353c96905835b6299dcb170f47 -DIST sbcl-2.0.3-source.tar.bz2 6489521 BLAKE2B f610367e2fbc58e47b3c7a825cd03344e8dd288e2e2a202327c5caa652aa13f1d675c52a65626acf2d577402552ac620973278197c95d7bfaeea31c2e372a2c7 SHA512 c29c115fff0e118e5c05959dd8d73ae876458daeb5ddde67ce485b10e6d1583b1f8a9597b54b45606696ab1b1eea5392dcb09357c83fce31323f2a5a154f2dd1 -DIST sbcl-2.0.3-x86-64-linux-binary.tar.bz2 10180812 BLAKE2B feebf6e957acd8cbe3a5549f6b9e5832d8ee6cc40e7c319a24db0be93cacbc33f5dd5cc3d187be0dfdee6997e3a114267ee0a8cf9fc7defbe63941739a3e2d44 SHA512 7d7fc106aa9c17552d5a7343a2776ebdc24613516c44523c568a4b4045baa9a5356c37480594bc7a6fe8e012c570963915dd80b18c50e4e58f273455d35a8b4d -DIST sbcl-2.0.4-source.tar.bz2 6512479 BLAKE2B 95e42f8d77bb914cf0d45e59bb90c8229cbcf32352cebfc4b7fe44a00205751eddae7910b8453981bfe5ea16574ea3c539a7daecbe71d9c79fb93e65aac8b5df SHA512 855e25d3a25c558cfd4a97c6d6a0130910556ad4b1d4a7df924a34b50f1d9d3cc3d4373510353548c6ddf3000b55c70285ccbd888fab59f73d137c16539df816 -DIST sbcl-2.0.4-x86-64-linux-binary.tar.bz2 10189030 BLAKE2B 93a59750d6c7b89add194ffd7e165599a24d0f23aec8415c1cc5321ad059144c266fd9218f2923d86c4cc19cff1c62dde08ab8a68c7cab8487aa458dfda93f42 SHA512 68533e83a452ec56ee5520daef54c24cfbd4307d8aab231c726eec69562262f40213dd453879c6f82bf9f31d850561a5f3f99c1207a3197ccab8017c2208979d -DIST sbcl-2.0.5-source.tar.bz2 6531110 BLAKE2B c658365c7247abb81fed8ef05a4edf8319df502ca5abed1b2908c9ffac24260bb654a2ad3a17573581a68ea6e6523ce4491e0ca53f36685f251aa168145dcf1a SHA512 0c27e22dd76d157a74ef7e97dcd03030096dde0eb46901ea27acb60faa0ab34881d76a9c6708d963b0e6f62da6331b85b8d3de76fd1fc9163c159e631759f808 -DIST sbcl-2.0.5-x86-64-linux-binary.tar.bz2 10176341 BLAKE2B 602d1c3f09082f62bee04ab9f6d0906567aa9d74f364ea4278b725bf6fbe820f0b470fe2b326adb85c2867a8e96476f4e27cc3e6a18abe6483ab2704d8a1eddf SHA512 0bd278cbdb72f62bd441b061459d074080ff6aeef61137247f56b9c91a05185245539691d6a8a4b8efdcab523e4ab3275b6f924154246aac42cc3b49f48b8198 -DIST sbcl-2.0.7-source.tar.bz2 6622306 BLAKE2B a3395f390f6b58c86f6494eb03544616894f925bc90bc3f6bc8e62395c4b101d01e16666b8e9bf6f562db08408989f9b030d80de9fe2fce5663830cbe3ec2850 SHA512 02f39a2d643e2aebfe0e96611a9bca7cd859ff8a64d0e552cb4e39697a72a69fc51eacf40388bb49d64d851ea4005f9098100e490001d028844d0e2adc3b1490 -DIST sbcl-2.0.7-x86-64-linux-binary.tar.bz2 10199088 BLAKE2B f7ef2743958410b815dc2d235b9faa1d1df9c393bc06a6001de17a07be48d93caee577b29084448d787ce916a18b55dc97c0fa2bdbdb6c9b05ce0fe61357dd65 SHA512 d98d5a080c463a78ea3109a3350d22b816631d50fabed474cc267436b6eb6bf2dfbdd1fd6d29355c1a5714c5fba11ccf95247ffe9573049cb7f18035562a7d12 -DIST sbcl-2.0.8-source.tar.bz2 6628106 BLAKE2B 9b284919d7281a7f1bd169e86aaac8ad970e59a8936fa80821ecc71ad9bf5607ad0bf4dfd67b9d4c6291268e2d8462528132ad4e6293bfdf91127c115a79163b SHA512 d27c97162406298e5ecbbb33f35e6bc5d578942f24c6ae107496cb7dd6d3e5faa72fa810b2330ba59547950c5cd2365ade804cf4909685e674682b90ab841470 -DIST sbcl-2.0.8-x86-64-linux-binary.tar.bz2 10202393 BLAKE2B e0a4b4ff52224d9bd2c59dd6353051fabcbebe2e9413025fbd5a770a0140f097f9c36c631af5e35112b69c680f7d225592cec53c0e22eeac4a5f73bd7225f41f SHA512 2700fe1157b7a82aab8da62f738670e4a45b4bbd028bb4e493481f0c1ce0cf148c26f59b4777361c619d8e7d8c7f124c209c1b2851724fdc7e0772b1ac89da8e -DIST sbcl-2.0.9-source.tar.bz2 6521140 BLAKE2B 3a4924cb908b7c8728d4b34a0014890018cb7f2f80f0a0e26d3aea5c92bb537d99d3ef8fa38e23aff40d3759dc77147036a2cb32dbf6c7d3578630fabb7fc68d SHA512 bc2351d524d6184ee9e60bc33a517f186e55a1dbfbf23288187d9a083fb2ba07985154ff03449eb49a0e2ff7aad9facd5d1ef43472201869561fb694bf04d4dd -DIST sbcl-2.0.9-x86-64-linux-binary.tar.bz2 10202709 BLAKE2B 75e21401f536388b55b62468f104a34cedfd2835fe4c67eae789666eb8f14e0fd95d1ee2411bd84502cce53ee59018f2960c7a168226a3a94da2de7614579c46 SHA512 2f70018af8ad4cd5a978fc6c1ac3a67ef8a44e2be779579a23b89788398551f3d9612f4dae0ffe100f007ca9aa5999b5e5b28bb6d1a11ed4d65a2778fdaeae88 +DIST sbcl-1.5.8-ppc64le-linux-binary.tar.bz2 10025597 BLAKE2B aac079e3585ebe9d5b610cf096e958edfd4410361b0d96b2fa88a285cbdce4133d89e1ddf0cf6729d43d6c3057365d07a3d73362f906fd8798b76c993210a8e5 SHA512 443ab604caa768c756f3322d7c599142a50227914bcd6be12434432daf1e3d5af0740d1ebdb166b856cc77ddf02451e29fcef9e29099f7bc4fb49ad61db17674 +DIST sbcl-2.3.3-armhf-linux-binary.tar.bz2 9932803 BLAKE2B 77e0da4a60fd74caaef3adbf29446a50323c18433cc36418d9e670e410882137cdd482ef4b2da989190c27d1cc737dba0848ad652044832337e39243088813f3 SHA512 b9810c2fe9f34ee974cb90b3b79dbb4c77053300fd029eae216fbb2772da539f2b71ca13c868772adf618f364fc73994a3a467e0a535fe5195b7eb6b0fee3571 +DIST sbcl-2.3.4-x86-64-linux-binary.tar.bz2 11783208 BLAKE2B 40e77c69a3df76749941138720e85cb8b4df4a334b19e4bf998caace63bb016efd321a51b9b3a86cf34a5ad10c7967a2b131d83b63f506f6e196ac5436d874e1 SHA512 2b7ab43f8fb10b4dd2effdd7209b4028a4a48fcc52564406acb9470ab5c6079217369da2a4f170f1ceb56ccc8cc11d129c1cb4daba85e20aa1a3345daa9e19b9 +DIST sbcl-2.3.5-source.tar.bz2 7474392 BLAKE2B 0b4f678dccbb18c18d59709aa2ce9facec3ada9f32cf1d398e1686f63615ab82781da68d6b5914294adab88e18501945d57b6d630507e02a8d89351379f769f3 SHA512 89635b6ebd18a481c56bb40b69ef58f13b2e2ebdb6b1244a1eea3b0d9e85dc1659391754b7c8ba533455575e91989889fe41be05314297f8e49bf11170001004 +DIST sbcl-2.4.3-source.tar.bz2 8126417 BLAKE2B 11c304c4f28e41940e2981e6f9f3401dbc0352e8572cdcd42fddaa1387e19eb35760d8e2b734544953eaa4058f8a867b3a6e492f9d13770b80de376191ce10d1 SHA512 ac61e02af16b81cb25a806b44272956dd72875ae884a04b075c983881be70b618908bad7ebddb763358401f7207c05adde932e4a845e5b8cffccc0c7b76e7557 +DIST sbcl-2.4.3-x86-64-linux-binary.tar.bz2 12003023 BLAKE2B a833630bf3c8ceac1aab64d351d7a19b73cac4906c60c6344ba2222c17831da749bc3b5d0d5fa3246c9c2a847c60e9c78567845efdd9cba50d59f2dfaef1b186 SHA512 c884d04b317b1a7ebd4c5f00b17058819d32c59e3cab437296868bc132a77e34bb6e286e7378c7d27f2b07055f879171533273978bbda84d7de9618638219088 +DIST sbcl-2.4.4-source.tar.bz2 8065883 BLAKE2B b0fd0d462dfa95435c09c44077edbcae0606081adf543e4994310f399491a5a52104114d8b281d459e49c7475fd427e0c20b210b750678e796e12b81882e6267 SHA512 2730b1375b8e871bda96e0fa8536142f5d93e454187a4b6dbe2a2b439c694a5d013648a320aa183f268fae7fda046f8a2a9ce80a315d198db4822d380f845600 +DIST sbcl-2.4.4-x86-64-linux-binary.tar.bz2 11643944 BLAKE2B 4328fda19201f4061955863bde89cabce3e07135bcba0f9bb085531965c019f3323e5c2411a297b08ee8e3b28d5eb81a3fd490d05673be002a5523f3b3466ae1 SHA512 94e06c055fe23da6b1a62a29e93fdc93e629943abf7b24c731b744cd9b32dc2ebd2c8ec1905b80a55944465dd2ee093721f7db196938426becc2c830237d0982 diff --git a/dev-lisp/sbcl/files/bsd-sockets-test-1.2.11.patch b/dev-lisp/sbcl/files/bsd-sockets-test-1.2.11.patch deleted file mode 100644 index 88f6fa588cee..000000000000 --- a/dev-lisp/sbcl/files/bsd-sockets-test-1.2.11.patch +++ /dev/null @@ -1,350 +0,0 @@ -diff -r -U2 sbcl-1.2.11.orig/contrib/sb-bsd-sockets/tests.lisp sbcl-1.2.11/contrib/sb-bsd-sockets/tests.lisp ---- sbcl-1.2.11.orig/contrib/sb-bsd-sockets/tests.lisp 2015-04-27 20:56:47.000000000 +0600 -+++ sbcl-1.2.11/contrib/sb-bsd-sockets/tests.lisp 2015-04-28 22:27:32.588146072 +0600 -@@ -36,13 +36,13 @@ - ;;; Apparently getprotobyname_r on FreeBSD says -1 and EINTR - ;;; for unknown protocols... --#-(and freebsd sb-thread) --#-(and dragonfly sb-thread) --(deftest get-protocol-by-name/error -- (handler-case (get-protocol-by-name "nonexistent-protocol") -- (unknown-protocol () -- t) -- (:no-error () -- nil)) -- t) -+;#-(and freebsd sb-thread) -+;#-(and dragonfly sb-thread) -+;(deftest get-protocol-by-name/error -+; (handler-case (get-protocol-by-name "nonexistent-protocol") -+; (unknown-protocol () -+; t) -+; (:no-error () -+; nil)) -+; t) - - (deftest make-inet-socket.smoke -@@ -92,19 +92,19 @@ - t) - --#-win32 --(deftest make-inet6-socket.smoke -- (handler-case -- (let ((s (make-instance 'inet6-socket :type :stream :protocol (get-protocol-by-name "tcp")))) -- (> (socket-file-descriptor s) 1)) -- (address-family-not-supported () t)) -- t) -- --#-win32 --(deftest make-inet6-socket.keyword -- (handler-case -- (let ((s (make-instance 'inet6-socket :type :stream :protocol :tcp))) -- (> (socket-file-descriptor s) 1)) -- (address-family-not-supported () t)) -- t) -+;#-win32 -+;(deftest make-inet6-socket.smoke -+; (handler-case -+; (let ((s (make-instance 'inet6-socket :type :stream :protocol (get-protocol-by-name "tcp")))) -+; (> (socket-file-descriptor s) 1)) -+; (address-family-not-supported () t)) -+; t) -+ -+;#-win32 -+;(deftest make-inet6-socket.keyword -+; (handler-case -+; (let ((s (make-instance 'inet6-socket :type :stream :protocol :tcp))) -+; (> (socket-file-descriptor s) 1)) -+; (address-family-not-supported () t)) -+; t) - - (deftest* (non-block-socket) -@@ -114,52 +114,52 @@ - t) - --(deftest inet-socket-bind -- (let* ((tcp (get-protocol-by-name "tcp")) -- (address (make-inet-address "127.0.0.1")) -- (s1 (make-instance 'inet-socket :type :stream :protocol tcp)) -- (s2 (make-instance 'inet-socket :type :stream :protocol tcp))) -- (unwind-protect -- ;; Given the functions we've got so far, if you can think of a -- ;; better way to make sure the bind succeeded than trying it -- ;; twice, let me know -- (progn -- (socket-bind s1 address 0) -- (handler-case -- (let ((port (nth-value 1 (socket-name s1)))) -- (socket-bind s2 address port) -- nil) -- (address-in-use-error () t))) -- (socket-close s1) -- (socket-close s2))) -- t) -- --#-win32 --(deftest inet6-socket-bind -- (handler-case -- (let* ((tcp (get-protocol-by-name "tcp")) -- (address (make-inet6-address "::1")) -- (s1 (make-instance 'inet6-socket :type :stream :protocol tcp)) -- (s2 (make-instance 'inet6-socket :type :stream :protocol tcp))) -- (unwind-protect -- ;; Given the functions we've got so far, if you can think of a -- ;; better way to make sure the bind succeeded than trying it -- ;; twice, let me know -- (handler-case -- (socket-bind s1 address 0) -- (socket-error () -- ;; This may mean no IPv6 support, can't fail a test -- ;; because of that (address-family-not-supported doesn't catch that) -- t) -- (:no-error (x) -- (declare (ignore x)) -- (handler-case -- (let ((port (nth-value 1 (socket-name s1)))) -- (socket-bind s2 address port) -- nil) -- (address-in-use-error () t)))) -- (socket-close s1) -- (socket-close s2))) -- (address-family-not-supported () t)) -- t) -+;(deftest inet-socket-bind -+; (let* ((tcp (get-protocol-by-name "tcp")) -+; (address (make-inet-address "127.0.0.1")) -+; (s1 (make-instance 'inet-socket :type :stream :protocol tcp)) -+; (s2 (make-instance 'inet-socket :type :stream :protocol tcp))) -+; (unwind-protect -+; ;; Given the functions we've got so far, if you can think of a -+; ;; better way to make sure the bind succeeded than trying it -+; ;; twice, let me know -+; (progn -+; (socket-bind s1 address 0) -+; (handler-case -+; (let ((port (nth-value 1 (socket-name s1)))) -+; (socket-bind s2 address port) -+; nil) -+; (address-in-use-error () t))) -+; (socket-close s1) -+; (socket-close s2))) -+; t) -+ -+;#-win32 -+;(deftest inet6-socket-bind -+; (handler-case -+; (let* ((tcp (get-protocol-by-name "tcp")) -+; (address (make-inet6-address "::1")) -+; (s1 (make-instance 'inet6-socket :type :stream :protocol tcp)) -+; (s2 (make-instance 'inet6-socket :type :stream :protocol tcp))) -+; (unwind-protect -+; ;; Given the functions we've got so far, if you can think of a -+; ;; better way to make sure the bind succeeded than trying it -+; ;; twice, let me know -+; (handler-case -+; (socket-bind s1 address 0) -+; (socket-error () -+; ;; This may mean no IPv6 support, can't fail a test -+; ;; because of that (address-family-not-supported doesn't catch that) -+; t) -+; (:no-error (x) -+; (declare (ignore x)) -+; (handler-case -+; (let ((port (nth-value 1 (socket-name s1)))) -+; (socket-bind s2 address port) -+; nil) -+; (address-in-use-error () t)))) -+; (socket-close s1) -+; (socket-close s2))) -+; (address-family-not-supported () t)) -+; t) - - (deftest* (simple-sockopt-test) -@@ -228,35 +228,35 @@ - ;;; the message ended up - --#-win32 --(deftest simple-local-client -- (progn -- ;; SunOS (Solaris) and Darwin systems don't have a socket at -- ;; /dev/log. We might also be building in a chroot or -- ;; something, so don't fail this test just because the file is -- ;; unavailable, or if it's a symlink to some weird character -- ;; device. -- (when (block nil -- (handler-bind ((sb-posix:syscall-error -- (lambda (e) -- (declare (ignore e)) -- (return nil)))) -- (sb-posix:s-issock -- (sb-posix::stat-mode (sb-posix:stat "/dev/log"))))) -- (let ((s (make-instance 'local-socket :type :datagram))) -- (format t "Connecting ~A... " s) -- (finish-output) -- (handler-case -- (socket-connect s "/dev/log") -- (sb-bsd-sockets::socket-error () -- (setq s (make-instance 'local-socket :type :stream)) -- (format t "failed~%Retrying with ~A... " s) -- (finish-output) -- (socket-connect s "/dev/log"))) -- (format t "ok.~%") -- (let ((stream (socket-make-stream s :input t :output t :buffering :none))) -- (format stream -- "<7>bsd-sockets: Don't panic. We're testing local-domain client code; this message can safely be ignored")))) -- t) -- t) -+;#-win32 -+;(deftest simple-local-client -+; (progn -+; ;; SunOS (Solaris) and Darwin systems don't have a socket at -+; ;; /dev/log. We might also be building in a chroot or -+; ;; something, so don't fail this test just because the file is -+; ;; unavailable, or if it's a symlink to some weird character -+; ;; device. -+; (when (block nil -+; (handler-bind ((sb-posix:syscall-error -+; (lambda (e) -+; (declare (ignore e)) -+; (return nil)))) -+; (sb-posix:s-issock -+; (sb-posix::stat-mode (sb-posix:stat "/dev/log"))))) -+; (let ((s (make-instance 'local-socket :type :datagram))) -+; (format t "Connecting ~A... " s) -+; (finish-output) -+; (handler-case -+; (socket-connect s "/dev/log") -+; (sb-bsd-sockets::socket-error () -+; (setq s (make-instance 'local-socket :type :stream)) -+; (format t "failed~%Retrying with ~A... " s) -+; (finish-output) -+; (socket-connect s "/dev/log"))) -+; (format t "ok.~%") -+; (let ((stream (socket-make-stream s :input t :output t :buffering :none))) -+; (format stream -+; "<7>bsd-sockets: Don't panic. We're testing local-domain client code; this message can safely be ignored")))) -+; t) -+; t) - - -@@ -373,58 +373,58 @@ - len address port (subseq buf 0 (min 10 len))))))) - --#+sb-thread --(deftest interrupt-io -- (let (result) -- (labels -- ((client (port) -- (setf result -- (let ((s (make-instance 'inet-socket -- :type :stream -- :protocol :tcp))) -- (socket-connect s #(127 0 0 1) port) -- (let ((stream (socket-make-stream s -- :input t -- :output t -- :buffering :none))) -- (handler-case -- (prog1 -- (catch 'stop -- (progn -- (read-char stream) -- (sleep 0.1) -- (sleep 0.1) -- (sleep 0.1))) -- (close stream)) -- (error (c) -- c)))))) -- (server () -- (let ((s (make-instance 'inet-socket -- :type :stream -- :protocol :tcp))) -- (setf (sockopt-reuse-address s) t) -- (socket-bind s (make-inet-address "127.0.0.1") 0) -- (socket-listen s 5) -- (multiple-value-bind (* port) -- (socket-name s) -- (let* ((client (sb-thread:make-thread -- (lambda () (client port)))) -- (r (socket-accept s)) -- (stream (socket-make-stream r -- :input t -- :output t -- :buffering :none)) -- (ok :ok)) -- (socket-close s) -- (sleep 5) -- (sb-thread:interrupt-thread client -- (lambda () (throw 'stop ok))) -- (sleep 5) -- (setf ok :not-ok) -- (write-char #\x stream) -- (close stream) -- (socket-close r)))))) -- (server)) -- result) -- :ok) -+;#+sb-thread -+;(deftest interrupt-io -+; (let (result) -+; (labels -+; ((client (port) -+; (setf result -+; (let ((s (make-instance 'inet-socket -+; :type :stream -+; :protocol :tcp))) -+; (socket-connect s #(127 0 0 1) port) -+; (let ((stream (socket-make-stream s -+; :input t -+; :output t -+; :buffering :none))) -+; (handler-case -+; (prog1 -+; (catch 'stop -+; (progn -+; (read-char stream) -+; (sleep 0.1) -+; (sleep 0.1) -+; (sleep 0.1))) -+; (close stream)) -+; (error (c) -+; c)))))) -+; (server () -+; (let ((s (make-instance 'inet-socket -+; :type :stream -+; :protocol :tcp))) -+; (setf (sockopt-reuse-address s) t) -+; (socket-bind s (make-inet-address "127.0.0.1") 0) -+; (socket-listen s 5) -+; (multiple-value-bind (* port) -+; (socket-name s) -+; (let* ((client (sb-thread:make-thread -+; (lambda () (client port)))) -+; (r (socket-accept s)) -+; (stream (socket-make-stream r -+; :input t -+; :output t -+; :buffering :none)) -+; (ok :ok)) -+; (socket-close s) -+; (sleep 5) -+; (sb-thread:interrupt-thread client -+; (lambda () (throw 'stop ok))) -+; (sleep 5) -+; (setf ok :not-ok) -+; (write-char #\x stream) -+; (close stream) -+; (socket-close r)))))) -+; (server)) -+; result) -+; :ok) - - (defmacro with-client-and-server ((server-socket-var client-socket-var) &body body) -@@ -485,4 +485,5 @@ - client server (unsigned-byte 8) ,direction))))) - -- (define-shutdown-tests :output) -- (define-shutdown-tests :io)) -+; (define-shutdown-tests :output) -+; (define-shutdown-tests :io)) -+) diff --git a/dev-lisp/sbcl/files/bsd-sockets-test-2.0.5.patch b/dev-lisp/sbcl/files/bsd-sockets-test-2.0.5.patch deleted file mode 100644 index 3226e7539dc4..000000000000 --- a/dev-lisp/sbcl/files/bsd-sockets-test-2.0.5.patch +++ /dev/null @@ -1,385 +0,0 @@ -diff -U3 -r sbcl-2.0.5.orig/contrib/sb-bsd-sockets/tests.lisp sbcl-2.0.5/contrib/sb-bsd-sockets/tests.lisp ---- sbcl-2.0.5.orig/contrib/sb-bsd-sockets/tests.lisp 2020-05-31 20:16:48.000000000 +0700 -+++ sbcl-2.0.5/contrib/sb-bsd-sockets/tests.lisp 2020-06-08 18:15:59.750860802 +0700 -@@ -18,16 +18,16 @@ - (equalp (make-inet-address "242.1.211.3") #(242 1 211 3)) - t) - --(deftest make-inet6-address.1 -- (equalp (make-inet6-address "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff") -- #(255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255)) -- t) -- --(deftest unparse-inet6-address -- (string= (sb-bsd-sockets::unparse-inet6-address -- (make-inet6-address "fe80::abcd:1234")) -- "fe80::abcd:1234") -- t) -+;(deftest make-inet6-address.1 -+; (equalp (make-inet6-address "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff") -+; #(255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255)) -+; t) -+ -+;(deftest unparse-inet6-address -+; (string= (sb-bsd-sockets::unparse-inet6-address -+; (make-inet6-address "fe80::abcd:1234")) -+; "fe80::abcd:1234") -+; t) - - (deftest get-protocol-by-name/tcp - (integerp (get-protocol-by-name "tcp")) -@@ -40,15 +40,15 @@ - ;;; See https://bugs.launchpad.net/sbcl/+bug/659857 - ;;; Apparently getprotobyname_r on FreeBSD says -1 and EINTR - ;;; for unknown protocols... --#-(and freebsd sb-thread) --#-(and dragonfly sb-thread) --(deftest get-protocol-by-name/error -- (handler-case (get-protocol-by-name "nonexistent-protocol") -- (unknown-protocol () -- t) -- (:no-error () -- nil)) -- t) -+;#-(and freebsd sb-thread) -+;#-(and dragonfly sb-thread) -+;(deftest get-protocol-by-name/error -+; (handler-case (get-protocol-by-name "nonexistent-protocol") -+; (unknown-protocol () -+; t) -+; (:no-error () -+; nil)) -+; t) - - (eval-when (:compile-toplevel :execute) - (when (handler-case (make-instance 'inet-socket -@@ -108,19 +108,19 @@ - (:no-error nil)) - t) - --(deftest make-inet6-socket.smoke -- (handler-case -- (let ((s (make-instance 'inet6-socket :type :stream :protocol (get-protocol-by-name "tcp")))) -- (> (socket-file-descriptor s) 1)) -- ((or address-family-not-supported protocol-not-supported-error) () t)) -- t) -- --(deftest make-inet6-socket.keyword -- (handler-case -- (let ((s (make-instance 'inet6-socket :type :stream :protocol :tcp))) -- (> (socket-file-descriptor s) 1)) -- ((or address-family-not-supported protocol-not-supported-error) () t)) -- t) -+;(deftest make-inet6-socket.smoke -+; (handler-case -+; (let ((s (make-instance 'inet6-socket :type :stream :protocol (get-protocol-by-name "tcp")))) -+; (> (socket-file-descriptor s) 1)) -+; ((or address-family-not-supported protocol-not-supported-error) () t)) -+; t) -+ -+;(deftest make-inet6-socket.keyword -+; (handler-case -+; (let ((s (make-instance 'inet6-socket :type :stream :protocol :tcp))) -+; (> (socket-file-descriptor s) 1)) -+; ((or address-family-not-supported protocol-not-supported-error) () t)) -+; t) - - #+ipv4-support - (deftest* (non-block-socket) -@@ -129,54 +129,54 @@ - (non-blocking-mode s)) - t) - --#+ipv4-support --(deftest inet-socket-bind -- (let* ((tcp (get-protocol-by-name "tcp")) -- (address (make-inet-address "127.0.0.1")) -- (s1 (make-instance 'inet-socket :type :stream :protocol tcp)) -- (s2 (make-instance 'inet-socket :type :stream :protocol tcp))) -- (unwind-protect -- ;; Given the functions we've got so far, if you can think of a -- ;; better way to make sure the bind succeeded than trying it -- ;; twice, let me know -- (progn -- (socket-bind s1 address 0) -- (handler-case -- (let ((port (nth-value 1 (socket-name s1)))) -- (socket-bind s2 address port) -- nil) -- (address-in-use-error () t))) -- (socket-close s1) -- (socket-close s2))) -- t) -- --(deftest inet6-socket-bind -- (handler-case -- (let* ((tcp (get-protocol-by-name "tcp")) -- (address (make-inet6-address "::1")) -- (s1 (make-instance 'inet6-socket :type :stream :protocol tcp)) -- (s2 (make-instance 'inet6-socket :type :stream :protocol tcp))) -- (unwind-protect -- ;; Given the functions we've got so far, if you can think of a -- ;; better way to make sure the bind succeeded than trying it -- ;; twice, let me know -- (handler-case -- (socket-bind s1 address 0) -- (socket-error () -- ;; This may mean no IPv6 support, can't fail a test -- ;; because of that (address-family-not-supported doesn't catch that) -- t) -- (:no-error (x) -- (declare (ignore x)) -- (handler-case -- (let ((port (nth-value 1 (socket-name s1)))) -- (socket-bind s2 address port) -- nil) -- (address-in-use-error () t)))) -- (socket-close s1) -- (socket-close s2))) -- ((or address-family-not-supported protocol-not-supported-error) () t)) -- t) -+;#+ipv4-support -+;(deftest inet-socket-bind -+; (let* ((tcp (get-protocol-by-name "tcp")) -+; (address (make-inet-address "127.0.0.1")) -+; (s1 (make-instance 'inet-socket :type :stream :protocol tcp)) -+; (s2 (make-instance 'inet-socket :type :stream :protocol tcp))) -+; (unwind-protect -+; ;; Given the functions we've got so far, if you can think of a -+; ;; better way to make sure the bind succeeded than trying it -+; ;; twice, let me know -+; (progn -+; (socket-bind s1 address 0) -+; (handler-case -+; (let ((port (nth-value 1 (socket-name s1)))) -+; (socket-bind s2 address port) -+; nil) -+; (address-in-use-error () t))) -+; (socket-close s1) -+; (socket-close s2))) -+; t) -+ -+;(deftest inet6-socket-bind -+; (handler-case -+; (let* ((tcp (get-protocol-by-name "tcp")) -+; (address (make-inet6-address "::1")) -+; (s1 (make-instance 'inet6-socket :type :stream :protocol tcp)) -+; (s2 (make-instance 'inet6-socket :type :stream :protocol tcp))) -+; (unwind-protect -+; ;; Given the functions we've got so far, if you can think of a -+; ;; better way to make sure the bind succeeded than trying it -+; ;; twice, let me know -+; (handler-case -+; (socket-bind s1 address 0) -+; (socket-error () -+; ;; This may mean no IPv6 support, can't fail a test -+; ;; because of that (address-family-not-supported doesn't catch that) -+; t) -+; (:no-error (x) -+; (declare (ignore x)) -+; (handler-case -+; (let ((port (nth-value 1 (socket-name s1)))) -+; (socket-bind s2 address port) -+; nil) -+; (address-in-use-error () t)))) -+; (socket-close s1) -+; (socket-close s2))) -+; ((or address-family-not-supported protocol-not-supported-error) () t)) -+; t) - - #+ipv4-support - (deftest* (simple-sockopt-test) -@@ -244,37 +244,37 @@ - ;;; to look at /etc/syslog.conf or local equivalent to find out where - ;;; the message ended up - --#-win32 --(deftest simple-local-client -- (progn -- ;; SunOS (Solaris) and Darwin systems don't have a socket at -- ;; /dev/log. We might also be building in a chroot or -- ;; something, so don't fail this test just because the file is -- ;; unavailable, or if it's a symlink to some weird character -- ;; device. -- (when (block nil -- (handler-bind ((sb-posix:syscall-error -- (lambda (e) -- (declare (ignore e)) -- (return nil)))) -- (sb-posix:s-issock -- (sb-posix::stat-mode (sb-posix:stat "/dev/log"))))) -- (let ((s (make-instance 'local-socket :type :datagram))) -- (format t "Connecting ~A... " s) -- (finish-output) -- (handler-case -- (socket-connect s "/dev/log") -- (sb-bsd-sockets::socket-error () -- (setq s (make-instance 'local-socket :type :stream)) -- (format t "failed~%Retrying with ~A... " s) -- (finish-output) -- (socket-connect s "/dev/log"))) -- (format t "ok.~%") -- (let ((stream (socket-make-stream s :input t :output t :buffering :none))) -- (format stream -- "<7>bsd-sockets: Don't panic. We're testing local-domain client code; this message can safely be ignored")))) -- t) -- t) -+;#-win32 -+;(deftest simple-local-client -+; (progn -+; ;; SunOS (Solaris) and Darwin systems don't have a socket at -+; ;; /dev/log. We might also be building in a chroot or -+; ;; something, so don't fail this test just because the file is -+; ;; unavailable, or if it's a symlink to some weird character -+; ;; device. -+; (when (block nil -+; (handler-bind ((sb-posix:syscall-error -+; (lambda (e) -+; (declare (ignore e)) -+; (return nil)))) -+; (sb-posix:s-issock -+; (sb-posix::stat-mode (sb-posix:stat "/dev/log"))))) -+; (let ((s (make-instance 'local-socket :type :datagram))) -+; (format t "Connecting ~A... " s) -+; (finish-output) -+; (handler-case -+; (socket-connect s "/dev/log") -+; (sb-bsd-sockets::socket-error () -+; (setq s (make-instance 'local-socket :type :stream)) -+; (format t "failed~%Retrying with ~A... " s) -+; (finish-output) -+; (socket-connect s "/dev/log"))) -+; (format t "ok.~%") -+; (let ((stream (socket-make-stream s :input t :output t :buffering :none))) -+; (format stream -+; "<7>bsd-sockets: Don't panic. We're testing local-domain client code; this message can safely be ignored")))) -+; t) -+; t) - - ;;; these require that the internet (or bits of it, at least) is available - -@@ -390,59 +390,59 @@ - (format t "Received ~A bytes from ~A:~A - ~A ~%" - len address port (subseq buf 0 (min 10 len))))))) - --#+(and ipv4-support sb-thread) --(deftest interrupt-io -- (let (result -- (sem (sb-thread:make-semaphore))) -- (labels -- ((client (port) -- (setf result -- (let ((s (make-instance 'inet-socket -- :type :stream -- :protocol :tcp))) -- (socket-connect s #(127 0 0 1) port) -- (let ((stream (socket-make-stream s -- :input t -- :output t -- :buffering :none))) -- (handler-case -- (prog1 -- (catch 'stop -- (sb-thread:signal-semaphore sem) -- (read-char stream)) -- (close stream)) -- (error (c) -- c)))))) -- (server () -- (let ((s (make-instance 'inet-socket -- :type :stream -- :protocol :tcp))) -- (setf (sockopt-reuse-address s) t) -- (socket-bind s (make-inet-address "127.0.0.1") 0) -- (socket-listen s 5) -- (multiple-value-bind (* port) -- (socket-name s) -- (let* ((client (sb-thread:make-thread -- (lambda () (client port)))) -- (r (socket-accept s)) -- (stream (socket-make-stream r -- :input t -- :output t -- :buffering :none))) -- (socket-close s) -- (sb-thread:wait-on-semaphore sem) -- (sleep 0.1) -- (sb-thread:interrupt-thread client -- (lambda () (throw 'stop :ok))) -- (unless (sb-ext:wait-for (null (sb-thread::thread-interruptions client)) :timeout 5) -- (setf result :timeout)) -- (write-char #\x stream) -- (close stream) -- (socket-close r) -- (sb-thread:join-thread client :timeout 5)))))) -- (server)) -- result) -- :ok) -+;#+(and ipv4-support sb-thread) -+;(deftest interrupt-io -+; (let (result -+; (sem (sb-thread:make-semaphore))) -+; (labels -+; ((client (port) -+; (setf result -+; (let ((s (make-instance 'inet-socket -+; :type :stream -+; :protocol :tcp))) -+; (socket-connect s #(127 0 0 1) port) -+; (let ((stream (socket-make-stream s -+; :input t -+; :output t -+; :buffering :none))) -+; (handler-case -+; (prog1 -+; (catch 'stop -+; (sb-thread:signal-semaphore sem) -+; (read-char stream)) -+; (close stream)) -+; (error (c) -+; c)))))) -+; (server () -+; (let ((s (make-instance 'inet-socket -+; :type :stream -+; :protocol :tcp))) -+; (setf (sockopt-reuse-address s) t) -+; (socket-bind s (make-inet-address "127.0.0.1") 0) -+; (socket-listen s 5) -+; (multiple-value-bind (* port) -+; (socket-name s) -+; (let* ((client (sb-thread:make-thread -+; (lambda () (client port)))) -+; (r (socket-accept s)) -+; (stream (socket-make-stream r -+; :input t -+; :output t -+; :buffering :none))) -+; (socket-close s) -+; (sb-thread:wait-on-semaphore sem) -+; (sleep 0.1) -+; (sb-thread:interrupt-thread client -+; (lambda () (throw 'stop :ok))) -+; (unless (sb-ext:wait-for (null (sb-thread::thread-interruptions client)) :timeout 5) -+; (setf result :timeout)) -+; (write-char #\x stream) -+; (close stream) -+; (socket-close r) -+; (sb-thread:join-thread client :timeout 5)))))) -+; (server)) -+; result) -+; :ok) - - (defmacro with-client-and-server (((socket-class &rest common-initargs) - (listen-socket-var &rest listen-address) -@@ -505,8 +505,9 @@ - (define-shutdown-test ,(make-name 'shutdown.client.ub8) - client server (unsigned-byte 8) ,direction))))) - -- (define-shutdown-tests :output) -- (define-shutdown-tests :io)) -+; (define-shutdown-tests :output) -+; (define-shutdown-tests :io) -+) - - (defun poor-persons-random-address () - (let ((base (expt 36 8))) diff --git a/dev-lisp/sbcl/files/build-id-2.4.3.patch b/dev-lisp/sbcl/files/build-id-2.4.3.patch new file mode 100644 index 000000000000..ff8e37ce7280 --- /dev/null +++ b/dev-lisp/sbcl/files/build-id-2.4.3.patch @@ -0,0 +1,12 @@ +diff -r -U3 sbcl-2.4.3.orig/make-config.sh sbcl-2.4.3/make-config.sh +--- sbcl-2.4.3.orig/make-config.sh 2024-03-30 00:02:12.000000000 +0700 ++++ sbcl-2.4.3/make-config.sh 2024-04-03 22:07:49.912404814 +0700 +@@ -807,7 +807,7 @@ + fi + + if [ -n "$SOURCE_DATE_EPOCH" ]; then +- echo '"'hostname-id-"$SOURCE_DATE_EPOCH"'"' > output/build-id.inc ++ echo "\"${PV}\"" > output/build-id.inc + else + echo '"'`hostname`-`id -un`-`date +%Y-%m-%d-%H-%M-%S`'"' > output/build-id.inc + fi diff --git a/dev-lisp/sbcl/files/concurrency-test-1.2.6.patch b/dev-lisp/sbcl/files/concurrency-test-1.2.6.patch deleted file mode 100644 index b85fc168ed0e..000000000000 --- a/dev-lisp/sbcl/files/concurrency-test-1.2.6.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nuar a/contrib/sb-concurrency/tests/test-frlock.lisp b/contrib/sb-concurrency/tests/test-frlock.lisp ---- a/contrib/sb-concurrency/tests/test-frlock.lisp 2014-11-29 19:56:58.000000000 +0100 -+++ b/contrib/sb-concurrency/tests/test-frlock.lisp 2014-12-16 23:52:18.569947139 +0100 -@@ -22,9 +22,9 @@ - #+openbsd 0.01 - #-openbsd 0.0001) - --(defun test-frlocks (&key (reader-count 100) (read-count 1000000) -+(defun test-frlocks (&key (reader-count 50) (read-count 500000) - (outer-read-pause 0) (inner-read-pause 0) -- (writer-count 10) (write-count (/ 1 *minimum-sleep*)) -+ (writer-count 10) (write-count 5000) - (outer-write-pause *minimum-sleep*) (inner-write-pause 0)) - (let ((rw (make-frlock)) - (a 0) -@@ -87,7 +87,7 @@ - #+sb-thread - (deftest* (frlock.1 :fails-on :win32) - (handler-case -- (sb-ext:with-timeout 60 (test-frlocks)) -+ (sb-ext:with-timeout 240 (test-frlocks)) - (sb-ext:timeout (c) - (error "~A" c))) - nil diff --git a/dev-lisp/sbcl/files/concurrency-test-1.3.15.patch b/dev-lisp/sbcl/files/concurrency-test-1.3.15.patch deleted file mode 100644 index 53b5bea06bc1..000000000000 --- a/dev-lisp/sbcl/files/concurrency-test-1.3.15.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -r -U2 sbcl-1.3.15.orig/contrib/sb-concurrency/tests/test-frlock.lisp sbcl-1.3.15/contrib/sb-concurrency/tests/test-frlock.lisp ---- sbcl-1.3.15.orig/contrib/sb-concurrency/tests/test-frlock.lisp 2017-02-28 20:51:29.000000000 +0100 -+++ sbcl-1.3.15/contrib/sb-concurrency/tests/test-frlock.lisp 2017-03-02 18:15:41.225284441 +0100 -@@ -25,5 +25,5 @@ - (defun test-frlocks (&key (reader-count 100) (read-count 1000000) - (outer-read-pause 0) (inner-read-pause 0) -- (writer-count 10) (write-count (/ 1 *minimum-sleep*)) -+ (writer-count 10) (write-count 5000) - (outer-write-pause *minimum-sleep*) (inner-write-pause 0)) - (let ((rw (make-frlock)) -@@ -88,5 +88,5 @@ - (deftest* (frlock.1) - (handler-case -- (sb-ext:with-timeout 10 -+ (sb-ext:with-timeout 240 - (test-frlocks #+win32 :outer-write-pause #+win32 t )) - (sb-ext:timeout (c) diff --git a/dev-lisp/sbcl/files/concurrency-test-1.5.3.patch b/dev-lisp/sbcl/files/concurrency-test-1.5.3.patch deleted file mode 100644 index 8c2e89fccfc8..000000000000 --- a/dev-lisp/sbcl/files/concurrency-test-1.5.3.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -r -U2 sbcl-1.5.3.orig/contrib/sb-concurrency/tests/test-frlock.lisp sbcl-1.5.3/contrib/sb-concurrency/tests/test-frlock.lisp ---- sbcl-1.5.3.orig/contrib/sb-concurrency/tests/test-frlock.lisp 2019-05-27 22:03:04.000000000 +0200 -+++ sbcl-1.5.3/contrib/sb-concurrency/tests/test-frlock.lisp 2019-06-01 11:41:21.260384857 +0200 -@@ -26,5 +26,5 @@ - (read-count 1000000) - (outer-read-pause 0) (inner-read-pause 0) -- (writer-count 10) (write-count (/ 1 *minimum-sleep*)) -+ (writer-count 10) (write-count 5000) - (outer-write-pause *minimum-sleep*) (inner-write-pause 0)) - (let ((rw (make-frlock)) -@@ -89,5 +89,5 @@ - (deftest* (frlock.1) - (handler-case -- (sb-ext:with-timeout 20 -+ (sb-ext:with-timeout 240 - (test-frlocks #+win32 :outer-write-pause #+win32 t )) - (sb-ext:timeout (c) diff --git a/dev-lisp/sbcl/files/etags-2.1.0.patch b/dev-lisp/sbcl/files/etags-2.1.0.patch new file mode 100644 index 000000000000..8f14e5038614 --- /dev/null +++ b/dev-lisp/sbcl/files/etags-2.1.0.patch @@ -0,0 +1,10 @@ +diff -r -U2 sbcl-2.1.0.orig/src/runtime/GNUmakefile sbcl-2.1.0/src/runtime/GNUmakefile +--- sbcl-2.1.0.orig/src/runtime/GNUmakefile 2020-12-29 17:05:25.000000000 +0700 ++++ sbcl-2.1.0/src/runtime/GNUmakefile 2021-01-28 18:02:57.682523052 +0700 +@@ -12,5 +12,5 @@ + .PHONY: all clean TAGS tags targets + +-all: targets tags ++all: targets + TARGET=sbcl + diff --git a/dev-lisp/sbcl/files/gentoo-fix_install_man.patch b/dev-lisp/sbcl/files/gentoo-fix_install_man.patch deleted file mode 100644 index 87a5f43c0c13..000000000000 --- a/dev-lisp/sbcl/files/gentoo-fix_install_man.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/install.sh b/install.sh -index 1400791..ac149c1 100644 ---- a/install.sh -+++ b/install.sh -@@ -106,6 +106,7 @@ echo "Documentation:" - - # man - cp doc/sbcl.1 "$BUILD_ROOT$MAN_DIR"/man1/ && echo " man $BUILD_ROOT$MAN_DIR/man1/sbcl.1" -+cp doc/sbcl-asdf-install.1 "$BUILD_ROOT$MAN_DIR"/man1/ && echo " man $BUILD_ROOT$MAN_DIR/man1/sbcl-asdf-install.1" - - # info - for info in doc/manual/*.info diff --git a/dev-lisp/sbcl/files/sb-posix-test-1.2.15.patch b/dev-lisp/sbcl/files/sb-posix-test-1.2.15.patch deleted file mode 100644 index 517208a791e2..000000000000 --- a/dev-lisp/sbcl/files/sb-posix-test-1.2.15.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -r -U1 sbcl-1.2.15.orig/contrib/sb-posix/posix-tests.lisp sbcl-1.2.15/contrib/sb-posix/posix-tests.lisp ---- sbcl-1.2.15.orig/contrib/sb-posix/posix-tests.lisp 2015-08-31 00:59:03.000000000 +0600 -+++ sbcl-1.2.15/contrib/sb-posix/posix-tests.lisp 2015-09-22 10:19:20.000000000 +0600 -@@ -169,19 +169,19 @@ - --(deftest rmdir.error.3 -- (handler-case -- (sb-posix:rmdir #-win32 "/" #+win32 (sb-ext:posix-getenv "windir")) -- (sb-posix:syscall-error (c) -- (typep -- (sb-posix:syscall-errno c) -- '(member -- #+(or darwin openbsd) -- #.sb-posix:eisdir -- #+win32 -- #.sb-posix::eacces -- #+win32 -- #.sb-posix::enotempty -- #+sunos -- #.sb-posix::einval -- #-(or darwin openbsd win32 sunos) -- #.sb-posix::ebusy)))) t) -+;(deftest rmdir.error.3 -+; (handler-case -+; (sb-posix:rmdir #-win32 "/" #+win32 (sb-ext:posix-getenv "windir")) -+; (sb-posix:syscall-error (c) -+; (typep -+; (sb-posix:syscall-errno c) -+; '(member -+; #+(or darwin openbsd) -+; #.sb-posix:eisdir -+; #+win32 -+; #.sb-posix::eacces -+; #+win32 -+; #.sb-posix::enotempty -+; #+sunos -+; #.sb-posix::einval -+; #-(or darwin openbsd win32 sunos) -+; #.sb-posix::ebusy)))) t) - diff --git a/dev-lisp/sbcl/files/sb-posix-test-2.2.9.patch b/dev-lisp/sbcl/files/sb-posix-test-2.2.9.patch new file mode 100644 index 000000000000..f88f13301dfd --- /dev/null +++ b/dev-lisp/sbcl/files/sb-posix-test-2.2.9.patch @@ -0,0 +1,30 @@ +diff -r -U2 sbcl-2.2.9.orig/contrib/sb-posix/posix-tests.lisp sbcl-2.2.9/contrib/sb-posix/posix-tests.lisp +--- sbcl-2.2.9.orig/contrib/sb-posix/posix-tests.lisp 2022-09-29 14:43:33.000000000 +0700 ++++ sbcl-2.2.9/contrib/sb-posix/posix-tests.lisp 2022-10-01 16:32:39.919563905 +0700 +@@ -166,15 +166,15 @@ + #.sb-posix::einval) + +-(deftest rmdir.error.3 +- (handler-case +- (sb-posix:rmdir #-win32 "/" #+win32 (sb-ext:posix-getenv "windir")) +- (sb-posix:syscall-error (c) +- (typep +- (sb-posix:syscall-errno c) +- `(member #+(or darwin openbsd freebsd) ,sb-posix:eisdir +- #+win32 ,sb-posix::eacces #+win32 ,sb-posix::enotempty +- #+sunos ,sb-posix::einval +- #-(or darwin openbsd freebsd win32 sunos) ,sb-posix::ebusy)))) +- t) ++; (deftest rmdir.error.3 ++; (handler-case ++; (sb-posix:rmdir #-win32 "/" #+win32 (sb-ext:posix-getenv "windir")) ++; (sb-posix:syscall-error (c) ++; (typep ++; (sb-posix:syscall-errno c) ++; `(member #+(or darwin openbsd freebsd) ,sb-posix:eisdir ++; #+win32 ,sb-posix::eacces #+win32 ,sb-posix::enotempty ++; #+sunos ,sb-posix::einval ++; #-(or darwin openbsd freebsd win32 sunos) ,sb-posix::ebusy)))) ++; t) + + (deftest rmdir.error.4 diff --git a/dev-lisp/sbcl/files/sbcl-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch b/dev-lisp/sbcl/files/sbcl-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch deleted file mode 100644 index bf03ada518fe..000000000000 --- a/dev-lisp/sbcl/files/sbcl-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- sbcl-1.1.17-orig/src/runtime/Config.x86-linux 2014-03-31 03:14:22.000000000 +1100 -+++ sbcl-1.1.17/src/runtime/Config.x86-linux 2014-04-28 15:34:59.822482441 +1000 -@@ -27,7 +27,7 @@ - # (You *are* encouraged to design and implement a coherent stable - # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is - # working on one and it would be a nice thing to have.) --LINKFLAGS += -Wl,--export-dynamic -m32 -+LINKFLAGS += -Wl,--export-dynamic -m32 -nopie - OS_LIBS = -ldl - - ifdef LISP_FEATURE_LARGEFILE ---- sbcl-1.1.17-orig/src/runtime/Config.x86-64-linux 2014-03-31 03:14:22.000000000 +1100 -+++ sbcl-1.1.17/src/runtime/Config.x86-64-linux 2014-04-28 15:35:22.364623003 +1000 -@@ -27,7 +27,7 @@ - # (You *are* encouraged to design and implement a coherent stable - # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is - # working on one and it would be a nice thing to have.) --LINKFLAGS += -Wl,--export-dynamic -+LINKFLAGS += -Wl,--export-dynamic -nopie - OS_LIBS = -ldl - - ifdef LISP_FEATURE_LARGEFILE diff --git a/dev-lisp/sbcl/files/sbcl-1.2.11-solaris.patch b/dev-lisp/sbcl/files/sbcl-1.2.11-solaris.patch deleted file mode 100644 index 850fd5d9dba7..000000000000 --- a/dev-lisp/sbcl/files/sbcl-1.2.11-solaris.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -r -U2 sbcl-1.2.11.orig/src/runtime/Config.x86-sunos sbcl-1.2.11/src/runtime/Config.x86-sunos ---- sbcl-1.2.11.orig/src/runtime/Config.x86-sunos 2015-04-27 20:56:50.000000000 +0600 -+++ sbcl-1.2.11/src/runtime/Config.x86-sunos 2015-04-28 22:38:01.569103626 +0600 -@@ -12,6 +12,6 @@ - CC=gcc - CFLAGS = -g -O2 -Wall -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer --NM = nm -xgp --GREP = ggrep -+NM = nm -t x -p -+GREP = grep - - ASSEM_SRC = x86-assem.S ldso-stubs.S diff --git a/dev-lisp/sbcl/files/sbcl-1.2.13-verbose-build.patch b/dev-lisp/sbcl/files/sbcl-1.2.13-verbose-build.patch deleted file mode 100644 index ade4f0868c67..000000000000 --- a/dev-lisp/sbcl/files/sbcl-1.2.13-verbose-build.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -r -U2 sbcl-1.2.13.orig/make.sh sbcl-1.2.13/make.sh ---- sbcl-1.2.13.orig/make.sh 2015-06-29 01:24:03.000000000 +0600 -+++ sbcl-1.2.13/make.sh 2015-06-29 15:53:04.430927942 +0600 -@@ -25,5 +25,5 @@ - # any --xc-host parameter should be suitable for the host machine - # instead of the target. --sh make-config.sh "$@" || exit $? -+sh -x make-config.sh "$@" || exit $? - - . output/prefix.def -@@ -70,9 +70,9 @@ - # and the make-target-*.sh scripts will take care of transferring the - # necessary files. --time sh make-host-1.sh --time sh make-target-1.sh --time sh make-host-2.sh --time sh make-target-2.sh --time sh make-target-contrib.sh -+time sh -x make-host-1.sh -+time sh -x make-target-1.sh -+time sh -x make-host-2.sh -+time sh -x make-target-2.sh -+time sh -x make-target-contrib.sh - - NCONTRIBS=`find contrib -name Makefile -print | wc -l` diff --git a/dev-lisp/sbcl/files/sbcl-1.3.11-config.patch b/dev-lisp/sbcl/files/sbcl-1.3.11-config.patch deleted file mode 100644 index e23f1e6d9bcb..000000000000 --- a/dev-lisp/sbcl/files/sbcl-1.3.11-config.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -r -U2 sbcl-1.3.11.orig/src/runtime/Config.x86-64-linux sbcl-1.3.11/src/runtime/Config.x86-64-linux ---- sbcl-1.3.11.orig/src/runtime/Config.x86-64-linux 2016-10-30 23:28:43.000000000 +0700 -+++ sbcl-1.3.11/src/runtime/Config.x86-64-linux 2016-11-16 23:27:37.248815622 +0700 -@@ -58,12 +58,4 @@ - endif - --# The following works for Ubuntu 16.10. There must be a better way to --# do this across various flavors of linux. --ifneq ($(shell $(CC) -dumpspecs 2>/dev/null | grep -e no-pie),) --CFLAGS += -fno-pie --LINKFLAGS += -no-pie --LDFLAGS += -no-pie --endif -- - # Nothing to do for after-grovel-headers. - .PHONY: after-grovel-headers diff --git a/dev-lisp/sbcl/files/sbcl-1.4.0-bsd-sockets-test.patch b/dev-lisp/sbcl/files/sbcl-1.4.0-bsd-sockets-test.patch deleted file mode 100644 index d51bdd5c507c..000000000000 --- a/dev-lisp/sbcl/files/sbcl-1.4.0-bsd-sockets-test.patch +++ /dev/null @@ -1,383 +0,0 @@ -diff -Nuar a/contrib/sb-bsd-sockets/tests.lisp b/contrib/sb-bsd-sockets/tests.lisp ---- a/contrib/sb-bsd-sockets/tests.lisp 2017-09-30 18:30:58.000000000 +0200 -+++ b/contrib/sb-bsd-sockets/tests.lisp 2017-10-01 18:45:57.132900158 +0200 -@@ -18,11 +18,11 @@ - (equalp (make-inet-address "242.1.211.3") #(242 1 211 3)) - t) - --#-win32 --(deftest make-inet6-address.1 -- (equalp (make-inet6-address "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff") -- #(255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255)) -- t) -+;#-win32 -+;(deftest make-inet6-address.1 -+; (equalp (make-inet6-address "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff") -+; #(255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255)) -+; t) - - (deftest get-protocol-by-name/tcp - (integerp (get-protocol-by-name "tcp")) -@@ -35,15 +35,15 @@ - ;;; See https://bugs.launchpad.net/sbcl/+bug/659857 - ;;; Apparently getprotobyname_r on FreeBSD says -1 and EINTR - ;;; for unknown protocols... --#-(and freebsd sb-thread) --#-(and dragonfly sb-thread) --(deftest get-protocol-by-name/error -- (handler-case (get-protocol-by-name "nonexistent-protocol") -- (unknown-protocol () -- t) -- (:no-error () -- nil)) -- t) -+;#-(and freebsd sb-thread) -+;#-(and dragonfly sb-thread) -+;(deftest get-protocol-by-name/error -+; (handler-case (get-protocol-by-name "nonexistent-protocol") -+; (unknown-protocol () -+; t) -+; (:no-error () -+; nil)) -+; t) - - (when (handler-case (make-instance 'inet-socket - :type :stream -@@ -102,21 +102,21 @@ - (:no-error nil)) - t) - --#-win32 --(deftest make-inet6-socket.smoke -- (handler-case -- (let ((s (make-instance 'inet6-socket :type :stream :protocol (get-protocol-by-name "tcp")))) -- (> (socket-file-descriptor s) 1)) -- ((or address-family-not-supported protocol-not-supported-error) () t)) -- t) -- --#-win32 --(deftest make-inet6-socket.keyword -- (handler-case -- (let ((s (make-instance 'inet6-socket :type :stream :protocol :tcp))) -- (> (socket-file-descriptor s) 1)) -- ((or address-family-not-supported protocol-not-supported-error) () t)) -- t) -+;#-win32 -+;(deftest make-inet6-socket.smoke -+; (handler-case -+; (let ((s (make-instance 'inet6-socket :type :stream :protocol (get-protocol-by-name "tcp")))) -+; (> (socket-file-descriptor s) 1)) -+; ((or address-family-not-supported protocol-not-supported-error) () t)) -+; t) -+ -+;#-win32 -+;(deftest make-inet6-socket.keyword -+; (handler-case -+; (let ((s (make-instance 'inet6-socket :type :stream :protocol :tcp))) -+; (> (socket-file-descriptor s) 1)) -+; ((or address-family-not-supported protocol-not-supported-error) () t)) -+; t) - - #+ipv4-support - (deftest* (non-block-socket) -@@ -125,55 +125,55 @@ - (non-blocking-mode s)) - t) - --#+ipv4-support --(deftest inet-socket-bind -- (let* ((tcp (get-protocol-by-name "tcp")) -- (address (make-inet-address "127.0.0.1")) -- (s1 (make-instance 'inet-socket :type :stream :protocol tcp)) -- (s2 (make-instance 'inet-socket :type :stream :protocol tcp))) -- (unwind-protect -- ;; Given the functions we've got so far, if you can think of a -- ;; better way to make sure the bind succeeded than trying it -- ;; twice, let me know -- (progn -- (socket-bind s1 address 0) -- (handler-case -- (let ((port (nth-value 1 (socket-name s1)))) -- (socket-bind s2 address port) -- nil) -- (address-in-use-error () t))) -- (socket-close s1) -- (socket-close s2))) -- t) -- --#-win32 --(deftest inet6-socket-bind -- (handler-case -- (let* ((tcp (get-protocol-by-name "tcp")) -- (address (make-inet6-address "::1")) -- (s1 (make-instance 'inet6-socket :type :stream :protocol tcp)) -- (s2 (make-instance 'inet6-socket :type :stream :protocol tcp))) -- (unwind-protect -- ;; Given the functions we've got so far, if you can think of a -- ;; better way to make sure the bind succeeded than trying it -- ;; twice, let me know -- (handler-case -- (socket-bind s1 address 0) -- (socket-error () -- ;; This may mean no IPv6 support, can't fail a test -- ;; because of that (address-family-not-supported doesn't catch that) -- t) -- (:no-error (x) -- (declare (ignore x)) -- (handler-case -- (let ((port (nth-value 1 (socket-name s1)))) -- (socket-bind s2 address port) -- nil) -- (address-in-use-error () t)))) -- (socket-close s1) -- (socket-close s2))) -- ((or address-family-not-supported protocol-not-supported-error) () t)) -- t) -+;#+ipv4-support -+;(deftest inet-socket-bind -+; (let* ((tcp (get-protocol-by-name "tcp")) -+; (address (make-inet-address "127.0.0.1")) -+; (s1 (make-instance 'inet-socket :type :stream :protocol tcp)) -+; (s2 (make-instance 'inet-socket :type :stream :protocol tcp))) -+; (unwind-protect -+; ;; Given the functions we've got so far, if you can think of a -+; ;; better way to make sure the bind succeeded than trying it -+; ;; twice, let me know -+; (progn -+; (socket-bind s1 address 0) -+; (handler-case -+; (let ((port (nth-value 1 (socket-name s1)))) -+; (socket-bind s2 address port) -+; nil) -+; (address-in-use-error () t))) -+; (socket-close s1) -+; (socket-close s2))) -+; t) -+ -+;#-win32 -+;(deftest inet6-socket-bind -+; (handler-case -+; (let* ((tcp (get-protocol-by-name "tcp")) -+; (address (make-inet6-address "::1")) -+; (s1 (make-instance 'inet6-socket :type :stream :protocol tcp)) -+; (s2 (make-instance 'inet6-socket :type :stream :protocol tcp))) -+; (unwind-protect -+; ;; Given the functions we've got so far, if you can think of a -+; ;; better way to make sure the bind succeeded than trying it -+; ;; twice, let me know -+; (handler-case -+; (socket-bind s1 address 0) -+; (socket-error () -+; ;; This may mean no IPv6 support, can't fail a test -+; ;; because of that (address-family-not-supported doesn't catch that) -+; t) -+; (:no-error (x) -+; (declare (ignore x)) -+; (handler-case -+; (let ((port (nth-value 1 (socket-name s1)))) -+; (socket-bind s2 address port) -+; nil) -+; (address-in-use-error () t)))) -+; (socket-close s1) -+; (socket-close s2))) -+; ((or address-family-not-supported protocol-not-supported-error) () t)) -+; t) - - #+ipv4-support - (deftest* (simple-sockopt-test) -@@ -241,37 +241,37 @@ - ;;; to look at /etc/syslog.conf or local equivalent to find out where - ;;; the message ended up - --#-win32 --(deftest simple-local-client -- (progn -- ;; SunOS (Solaris) and Darwin systems don't have a socket at -- ;; /dev/log. We might also be building in a chroot or -- ;; something, so don't fail this test just because the file is -- ;; unavailable, or if it's a symlink to some weird character -- ;; device. -- (when (block nil -- (handler-bind ((sb-posix:syscall-error -- (lambda (e) -- (declare (ignore e)) -- (return nil)))) -- (sb-posix:s-issock -- (sb-posix::stat-mode (sb-posix:stat "/dev/log"))))) -- (let ((s (make-instance 'local-socket :type :datagram))) -- (format t "Connecting ~A... " s) -- (finish-output) -- (handler-case -- (socket-connect s "/dev/log") -- (sb-bsd-sockets::socket-error () -- (setq s (make-instance 'local-socket :type :stream)) -- (format t "failed~%Retrying with ~A... " s) -- (finish-output) -- (socket-connect s "/dev/log"))) -- (format t "ok.~%") -- (let ((stream (socket-make-stream s :input t :output t :buffering :none))) -- (format stream -- "<7>bsd-sockets: Don't panic. We're testing local-domain client code; this message can safely be ignored")))) -- t) -- t) -+;#-win32 -+;(deftest simple-local-client -+; (progn -+; ;; SunOS (Solaris) and Darwin systems don't have a socket at -+; ;; /dev/log. We might also be building in a chroot or -+; ;; something, so don't fail this test just because the file is -+; ;; unavailable, or if it's a symlink to some weird character -+; ;; device. -+; (when (block nil -+; (handler-bind ((sb-posix:syscall-error -+; (lambda (e) -+; (declare (ignore e)) -+; (return nil)))) -+; (sb-posix:s-issock -+; (sb-posix::stat-mode (sb-posix:stat "/dev/log"))))) -+; (let ((s (make-instance 'local-socket :type :datagram))) -+; (format t "Connecting ~A... " s) -+; (finish-output) -+; (handler-case -+; (socket-connect s "/dev/log") -+; (sb-bsd-sockets::socket-error () -+; (setq s (make-instance 'local-socket :type :stream)) -+; (format t "failed~%Retrying with ~A... " s) -+; (finish-output) -+; (socket-connect s "/dev/log"))) -+; (format t "ok.~%") -+; (let ((stream (socket-make-stream s :input t :output t :buffering :none))) -+; (format stream -+; "<7>bsd-sockets: Don't panic. We're testing local-domain client code; this message can safely be ignored")))) -+; t) -+; t) - - ;;; these require that the internet (or bits of it, at least) is available - -@@ -387,60 +387,60 @@ - (format t "Received ~A bytes from ~A:~A - ~A ~%" - len address port (subseq buf 0 (min 10 len))))))) - --#+(and ipv4-support sb-thread) --(deftest interrupt-io -- (let (result) -- (labels -- ((client (port) -- (setf result -- (let ((s (make-instance 'inet-socket -- :type :stream -- :protocol :tcp))) -- (socket-connect s #(127 0 0 1) port) -- (let ((stream (socket-make-stream s -- :input t -- :output t -- :buffering :none))) -- (handler-case -- (prog1 -- (catch 'stop -- (progn -- (read-char stream) -- (sleep 0.1) -- (sleep 0.1) -- (sleep 0.1))) -- (close stream)) -- (error (c) -- c)))))) -- (server () -- (let ((s (make-instance 'inet-socket -- :type :stream -- :protocol :tcp))) -- (setf (sockopt-reuse-address s) t) -- (socket-bind s (make-inet-address "127.0.0.1") 0) -- (socket-listen s 5) -- (multiple-value-bind (* port) -- (socket-name s) -- (let* ((client (sb-thread:make-thread -- (lambda () (client port)))) -- (r (socket-accept s)) -- (stream (socket-make-stream r -- :input t -- :output t -- :buffering :none)) -- (ok :ok)) -- (socket-close s) -- (sleep 5) -- (sb-thread:interrupt-thread client -- (lambda () (throw 'stop ok))) -- (sleep 5) -- (setf ok :not-ok) -- (write-char #\x stream) -- (close stream) -- (socket-close r)))))) -- (server)) -- result) -- :ok) -+;#+(and ipv4-support sb-thread) -+;(deftest interrupt-io -+; (let (result) -+; (labels -+; ((client (port) -+; (setf result -+; (let ((s (make-instance 'inet-socket -+; :type :stream -+; :protocol :tcp))) -+; (socket-connect s #(127 0 0 1) port) -+; (let ((stream (socket-make-stream s -+; :input t -+; :output t -+; :buffering :none))) -+; (handler-case -+; (prog1 -+; (catch 'stop -+; (progn -+; (read-char stream) -+; (sleep 0.1) -+; (sleep 0.1) -+; (sleep 0.1))) -+; (close stream)) -+; (error (c) -+; c)))))) -+; (server () -+; (let ((s (make-instance 'inet-socket -+; :type :stream -+; :protocol :tcp))) -+; (setf (sockopt-reuse-address s) t) -+; (socket-bind s (make-inet-address "127.0.0.1") 0) -+; (socket-listen s 5) -+; (multiple-value-bind (* port) -+; (socket-name s) -+; (let* ((client (sb-thread:make-thread -+; (lambda () (client port)))) -+; (r (socket-accept s)) -+; (stream (socket-make-stream r -+; :input t -+; :output t -+; :buffering :none)) -+; (ok :ok)) -+; (socket-close s) -+; (sleep 5) -+; (sb-thread:interrupt-thread client -+; (lambda () (throw 'stop ok))) -+; (sleep 5) -+; (setf ok :not-ok) -+; (write-char #\x stream) -+; (close stream) -+; (socket-close r)))))) -+; (server)) -+; result) -+; :ok) - - (defmacro with-client-and-server (((socket-class &rest common-initargs) - (listen-socket-var &rest listen-address) -@@ -503,8 +503,9 @@ - (define-shutdown-test ,(make-name 'shutdown.client.ub8) - client server (unsigned-byte 8) ,direction))))) - -- (define-shutdown-tests :output) -- (define-shutdown-tests :io)) -+; (define-shutdown-tests :output) -+; (define-shutdown-tests :io) -+) - - #+linux - (deftest abstract.smoke diff --git a/dev-lisp/sbcl/files/sbcl-1.4.0-verbose-build.patch b/dev-lisp/sbcl/files/sbcl-1.4.0-verbose-build.patch deleted file mode 100644 index 27ad3b0758d4..000000000000 --- a/dev-lisp/sbcl/files/sbcl-1.4.0-verbose-build.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -Nuar a/make.sh b/make.sh ---- a/make.sh 2017-09-30 18:30:58.000000000 +0200 -+++ b/make.sh 2017-10-01 18:08:26.742909789 +0200 -@@ -24,7 +24,7 @@ - # thing" when run on the target machine, with the minor caveat that - # any --xc-host parameter should be suitable for the host machine - # instead of the target. --sh make-config.sh "$@" || exit $? -+sh -x make-config.sh "$@" || exit $? - - . output/prefix.def - . output/build-config -@@ -76,11 +76,11 @@ - $@ - fi - } --maybetime sh make-host-1.sh --maybetime sh make-target-1.sh --maybetime sh make-host-2.sh --maybetime sh make-target-2.sh --maybetime sh make-target-contrib.sh -+maybetime sh -x make-host-1.sh -+maybetime sh -x make-target-1.sh -+maybetime sh -x make-host-2.sh -+maybetime sh -x make-target-2.sh -+maybetime sh -x make-target-contrib.sh - - NCONTRIBS=`find contrib -name Makefile -print | wc -l` - NPASSED=`find obj/asdf-cache -name test-passed.test-report -print | wc -l` diff --git a/dev-lisp/sbcl/metadata.xml b/dev-lisp/sbcl/metadata.xml index 031c80402d9d..9a9f699bd5e4 100644 --- a/dev-lisp/sbcl/metadata.xml +++ b/dev-lisp/sbcl/metadata.xml @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <maintainer type="person"> + <email>grozin@gentoo.org</email> + <name>Andrey Grozin</name> + </maintainer> <maintainer type="project"> <email>common-lisp@gentoo.org</email> <name>Gentoo Common Lisp Project</name> @@ -18,9 +22,10 @@ non-ANSI features. Support for native threading on GNU/Linux is available for the x86 and amd64 platforms using an NPTL enabled GLIBC. SBCL 0.8.17 and later support Unicode. -</longdescription> + </longdescription> <use> - <flag name="pax_kernel">Enable if the user plans to run the package under a pax enabled hardened kernel</flag> + <flag name="system-bootstrap">Bootstrap SBCL using either system SBCL installation or <pkg>dev-lisp/clisp</pkg></flag> + <flag name="unicode">Make the produced lisp support unicode</flag> </use> <upstream> <remote-id type="sourceforge">sbcl</remote-id> diff --git a/dev-lisp/sbcl/sbcl-1.3.11.ebuild b/dev-lisp/sbcl/sbcl-1.3.11.ebuild deleted file mode 100644 index 0859a02a7834..000000000000 --- a/dev-lisp/sbcl/sbcl-1.3.11.ebuild +++ /dev/null @@ -1,242 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit multilib eutils flag-o-matic pax-utils toolchain-funcs - -#same order as http://www.sbcl.org/platform-table.html -BV_X86=1.2.7 -BV_AMD64=1.3.11 -BV_PPC=1.2.7 -BV_SPARC=1.0.28 -BV_ALPHA=1.0.28 -BV_ARM=1.3.9 -BV_ARM64=1.3.11 -BV_PPC_MACOS=1.0.47 -BV_X86_MACOS=1.1.6 -BV_X64_MACOS=1.2.11 -BV_SPARC_SOLARIS=1.0.23 -BV_X86_SOLARIS=1.2.7 -BV_X64_SOLARIS=1.2.7 - -DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp" -HOMEPAGE="http://sbcl.sourceforge.net/" -SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2 - x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 ) - amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 ) - ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 ) - sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 ) - alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 ) - arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 ) - ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 ) - x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 ) - x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 ) - sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 ) - x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 ) - x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris" -IUSE="debug doc source +threads +unicode pax_kernel zlib" - -CDEPEND=">=dev-lisp/asdf-3.1:=" -DEPEND="${CDEPEND} - doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) - pax_kernel? ( sys-apps/elfix )" -RDEPEND="${CDEPEND} - !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )" - -# Disable warnings about executable stacks, as this won't be fixed soon by upstream -QA_EXECSTACK="usr/bin/sbcl" - -CONFIG="${S}/customize-target-features.lisp" -ENVD="${T}/50sbcl" - -# Prevent ASDF from using the system libraries -CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" -ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" - -usep() { - use ${1} && echo "true" || echo "false" -} - -sbcl_feature() { - echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}" -} - -sbcl_apply_features() { - sed 's/^X//' > "${CONFIG}" <<-'EOF' - (lambda (list) - X (flet ((enable (x) (pushnew x list)) - X (disable (x) (setf list (remove x list)))) - EOF - if use x86 || use amd64; then - sbcl_feature "$(usep threads)" ":sb-thread" - fi - sbcl_feature "true" ":sb-ldb" - sbcl_feature "false" ":sb-test" - sbcl_feature "$(usep unicode)" ":sb-unicode" - sbcl_feature "$(usep zlib)" ":sb-core-compression" - sbcl_feature "$(usep debug)" ":sb-xref-for-internals" - sed 's/^X//' >> "${CONFIG}" <<-'EOF' - X ) - X list) - EOF - cat "${CONFIG}" -} - -src_unpack() { - unpack ${A} - mv sbcl-*-* sbcl-binary || die - cd "${S}" -} - -src_prepare() { - eapply "${FILESDIR}"/gentoo-fix_install_man.patch - # bug #468482 - eapply "${FILESDIR}"/concurrency-test-1.2.6.patch - # bugs #486552, #527666, #517004 - eapply "${FILESDIR}"/bsd-sockets-test-1.2.11.patch - # bugs #560276, #561018 - eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch - # bug #599902 - eapply "${FILESDIR}"/${PN}-1.3.11-config.patch - - eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch - eapply "${FILESDIR}"/${PN}-1.2.13-verbose-build.patch - - # To make the hardened compiler NOT compile with -fPIE -pie - if gcc-specs-pie ; then - einfo "Disabling PIE..." - eapply "${FILESDIR}"/${PN}-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch - fi - - eapply_user - - # bug #526194 - sed -e "s@CFLAGS =.*\$@CFLAGS = ${CFLAGS} -g -Wall -Wsign-compare@" \ - -e "s@LINKFLAGS =.*\$@LINKFLAGS = ${LDFLAGS} -g@" \ - -i src/runtime/GNUmakefile || die - - sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \ - -i make-config.sh || die - - cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die - - use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk - - # Some shells(such as dash) don't have "time" as builtin - # and we don't want to DEPEND on sys-process/time - sed "s,^time ,," -i make.sh || die - sed "s,/lib,/$(get_libdir),g" -i install.sh || die - # #define SBCL_HOME ... - sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die - # change location of /etc/sbclrc ... - sed "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die - - find . -type f -name .cvsignore -delete -} - -src_configure() { - # customizing SBCL version as per - # http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup - echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr - - # applying customizations - sbcl_apply_features -} - -src_compile() { - local bindir="${WORKDIR}"/sbcl-binary - - strip-unsupported-flags ; filter-flags -fomit-frame-pointer - - if use pax_kernel ; then - # To disable PaX on hardened systems - pax-mark -mr "${bindir}"/src/runtime/sbcl - - # Hack to disable PaX on second GENESIS stage - sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\ paxmark.sh -mr \.\/src\/runtime\/sbcl' \ - "${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime" - fi - - # clear the environment to get rid of non-ASCII strings, see bug 174702 - # set HOME for paludis - env - HOME="${T}" PATH="${PATH}" \ - CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \ - CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \ - GNUMAKE=make ./make.sh \ - "sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \ - || die "make failed" - - # need to set HOME because libpango(used by graphviz) complains about it - if use doc; then - env - HOME="${T}" PATH="${PATH}" \ - CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ - ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ - make -C doc/manual info html || die "Cannot build manual" - env - HOME="${T}" PATH="${PATH}" \ - CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ - ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ - make -C doc/internals info html || die "Cannot build internal docs" - fi -} - -src_test() { - ewarn "Unfortunately, it is known that some tests fail eg." - ewarn "run-program.impure.lisp. This is an issue of the upstream's" - ewarn "development and not of Gentoo's side. Please, before filing" - ewarn "any bug(s) search for older submissions. Thank you." - time ( cd tests && sh run-tests.sh ) -} - -src_install() { - # install system-wide initfile - dodir /etc/ - sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF - ;;; The following is required if you want source location functions to - ;;; work in SLIME, for example. - X - (setf (logical-pathname-translations "SYS") - X '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*") - X ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*"))) - X - ;;; Setup ASDF2 - (load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp") - EOF - - # Install documentation - unset SBCL_HOME - INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \ - sh install.sh || die "install.sh failed" - - # bug #517008 - pax-mark -mr "${D}"/usr/bin/sbcl - - # rm empty directories lest paludis complain about this - find "${ED}" -empty -type d -exec rmdir -v {} + - - if use doc; then - dodoc -r doc/internals/sbcl-internals - - doinfo doc/manual/*.info* - doinfo doc/internals/sbcl-internals.info - - docinto internals-notes - dodoc doc/internals-notes/* - else - rm -Rv "${ED}/usr/share/doc/${PF}" || die - fi - - # install the SBCL source - if use source; then - ./clean.sh - cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die - fi - - # necessary for running newly-saved images - echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}" - echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}" - doenvd "${ENVD}" -} diff --git a/dev-lisp/sbcl/sbcl-1.4.9.ebuild b/dev-lisp/sbcl/sbcl-1.4.9.ebuild deleted file mode 100644 index c642c0c994d9..000000000000 --- a/dev-lisp/sbcl/sbcl-1.4.9.ebuild +++ /dev/null @@ -1,246 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit multilib eutils flag-o-matic pax-utils toolchain-funcs - -#same order as http://www.sbcl.org/platform-table.html -BV_X86=1.4.3 -BV_AMD64=1.4.8 -BV_PPC=1.2.7 -BV_SPARC=1.0.28 -BV_ALPHA=1.0.28 -BV_ARM=1.3.12 -BV_ARM64=1.4.2 -BV_X86_MACOS=1.1.6 -BV_X64_MACOS=1.2.11 -BV_PPC_MACOS=1.0.47 -BV_X86_SOLARIS=1.2.7 -BV_X64_SOLARIS=1.2.7 -BV_SPARC_SOLARIS=1.0.23 - -DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp" -HOMEPAGE="http://sbcl.sourceforge.net/" -SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2 - x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 ) - amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 ) - ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 ) - sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 ) - alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 ) - arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 ) - arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 ) - x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 ) - x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 ) - ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 ) - x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 ) - x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 ) - sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris" -IUSE="debug doc source +threads +unicode pax_kernel zlib" - -CDEPEND=">=dev-lisp/asdf-3.1:=" -DEPEND="${CDEPEND} - doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) - pax_kernel? ( sys-apps/elfix )" -RDEPEND="${CDEPEND} - !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )" - -# Disable warnings about executable stacks, as this won't be fixed soon by upstream -QA_EXECSTACK="usr/bin/sbcl" - -CONFIG="${S}/customize-target-features.lisp" -ENVD="${T}/50sbcl" - -# Prevent ASDF from using the system libraries -CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" -ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" - -usep() { - use ${1} && echo "true" || echo "false" -} - -sbcl_feature() { - echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}" -} - -sbcl_apply_features() { - sed 's/^X//' > "${CONFIG}" <<-'EOF' - (lambda (list) - X (flet ((enable (x) (pushnew x list)) - X (disable (x) (setf list (remove x list)))) - EOF - if use x86 || use amd64; then - sbcl_feature "$(usep threads)" ":sb-thread" - fi - sbcl_feature "true" ":sb-ldb" - sbcl_feature "false" ":sb-test" - sbcl_feature "$(usep unicode)" ":sb-unicode" - sbcl_feature "$(usep zlib)" ":sb-core-compression" - sbcl_feature "$(usep debug)" ":sb-xref-for-internals" - sed 's/^X//' >> "${CONFIG}" <<-'EOF' - X ) - X list) - EOF - cat "${CONFIG}" -} - -src_unpack() { - unpack ${A} - mv sbcl-*-* sbcl-binary || die - cd "${S}" -} - -src_prepare() { - # bug #468482 - eapply "${FILESDIR}"/concurrency-test-1.3.15.patch - # bugs #486552, #527666, #517004 - eapply "${FILESDIR}"/${PN}-1.4.0-bsd-sockets-test.patch - # bugs #560276, #561018 - eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch - - eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch - eapply "${FILESDIR}"/${PN}-1.4.0-verbose-build.patch - - eapply_user - - # Make sure the *FLAGS variables are sane. - # sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail. - strip-unsupported-flags - filter-flags -fomit-frame-pointer -Wl,-s - filter-ldflags -s - - # original bugs #526194, #620532 - # this broke no-pie default builds, c.f. bug #632670 - # Pass CFLAGS down by appending our value, to let users override - # the default values. - # Keep passing LDFLAGS down via the LINKFLAGS variable. - sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \ - -e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \ - -i src/runtime/GNUmakefile || die - - sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \ - -i make-config.sh || die - - # Use installed ASDF version - cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die - # Avoid installation of ASDF info page. See bug #605752 - sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die - - use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk - - # Some shells(such as dash) don't have "time" as builtin - # and we don't want to DEPEND on sys-process/time - sed "s,^time ,," -i make.sh || die - sed "s,/lib,/$(get_libdir),g" -i install.sh || die - # #define SBCL_HOME ... - sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die - # change location of /etc/sbclrc ... - sed "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die - - find . -type f -name .cvsignore -delete -} - -src_configure() { - # customizing SBCL version as per - # http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup - echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr - - # applying customizations - sbcl_apply_features -} - -src_compile() { - local bindir="${WORKDIR}"/sbcl-binary - - if use pax_kernel ; then - # To disable PaX on hardened systems - pax-mark -mr "${bindir}"/src/runtime/sbcl - - # Hack to disable PaX on second GENESIS stage - sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\ paxmark.sh -mr \.\/src\/runtime\/sbcl' \ - "${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime" - fi - - # clear the environment to get rid of non-ASCII strings, see bug #174702 - # set HOME for paludis - env - HOME="${T}" PATH="${PATH}" \ - CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \ - CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \ - GNUMAKE=make ./make.sh \ - "sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \ - || die "make failed" - - # need to set HOME because libpango(used by graphviz) complains about it - if use doc; then - env - HOME="${T}" PATH="${PATH}" \ - CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ - ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ - make -C doc/manual info html || die "Cannot build manual" - env - HOME="${T}" PATH="${PATH}" \ - CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ - ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ - make -C doc/internals info html || die "Cannot build internal docs" - fi -} - -src_test() { - ewarn "Unfortunately, it is known that some tests fail eg." - ewarn "run-program.impure.lisp. This is an issue of the upstream's" - ewarn "development and not of Gentoo's side. Please, before filing" - ewarn "any bug(s) search for older submissions. Thank you." - time ( cd tests && sh run-tests.sh ) -} - -src_install() { - # install system-wide initfile - dodir /etc/ - sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF - ;;; The following is required if you want source location functions to - ;;; work in SLIME, for example. - X - (setf (logical-pathname-translations "SYS") - X '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*") - X ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*"))) - X - ;;; Setup ASDF2 - (load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp") - EOF - - # Install documentation - unset SBCL_HOME - INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \ - sh install.sh || die "install.sh failed" - - # bug #517008 - pax-mark -mr "${D}"/usr/bin/sbcl - - # rm empty directories lest paludis complain about this - find "${ED}" -empty -type d -exec rmdir -v {} + - - if use doc; then - dodoc -r doc/internals/sbcl-internals - - doinfo doc/manual/*.info* - doinfo doc/internals/sbcl-internals.info - - docinto internals-notes - dodoc doc/internals-notes/* - else - rm -Rv "${ED}/usr/share/doc/${PF}" || die - fi - - # install the SBCL source - if use source; then - ./clean.sh - cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die - fi - - # necessary for running newly-saved images - echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}" - echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}" - doenvd "${ENVD}" -} diff --git a/dev-lisp/sbcl/sbcl-1.5.6.ebuild b/dev-lisp/sbcl/sbcl-1.5.6.ebuild deleted file mode 100644 index a7b12bfec041..000000000000 --- a/dev-lisp/sbcl/sbcl-1.5.6.ebuild +++ /dev/null @@ -1,246 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit multilib eutils flag-o-matic pax-utils toolchain-funcs - -#same order as http://www.sbcl.org/platform-table.html -BV_X86=1.4.3 -BV_AMD64=1.5.6 -BV_PPC=1.2.7 -BV_SPARC=1.0.28 -BV_ALPHA=1.0.28 -BV_ARM=1.4.11 -BV_ARM64=1.4.2 -BV_X86_MACOS=1.1.6 -BV_X64_MACOS=1.2.11 -BV_PPC_MACOS=1.0.47 -BV_X86_SOLARIS=1.2.7 -BV_X64_SOLARIS=1.2.7 -BV_SPARC_SOLARIS=1.0.23 - -DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp" -HOMEPAGE="http://sbcl.sourceforge.net/" -SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2 - x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 ) - amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 ) - ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 ) - sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 ) - alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 ) - arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 ) - arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 ) - x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 ) - x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 ) - ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 ) - x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 ) - x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 ) - sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris" -IUSE="debug doc source +threads +unicode pax_kernel zlib" - -CDEPEND=">=dev-lisp/asdf-3.1:=" -DEPEND="${CDEPEND} - doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) - pax_kernel? ( sys-apps/elfix )" -RDEPEND="${CDEPEND} - !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )" - -# Disable warnings about executable stacks, as this won't be fixed soon by upstream -QA_EXECSTACK="usr/bin/sbcl" - -CONFIG="${S}/customize-target-features.lisp" -ENVD="${T}/50sbcl" - -# Prevent ASDF from using the system libraries -CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" -ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" - -usep() { - use ${1} && echo "true" || echo "false" -} - -sbcl_feature() { - echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}" -} - -sbcl_apply_features() { - sed 's/^X//' > "${CONFIG}" <<-'EOF' - (lambda (list) - X (flet ((enable (x) (pushnew x list)) - X (disable (x) (setf list (remove x list)))) - EOF - if use x86 || use amd64; then - sbcl_feature "$(usep threads)" ":sb-thread" - fi - sbcl_feature "true" ":sb-ldb" - sbcl_feature "false" ":sb-test" - sbcl_feature "$(usep unicode)" ":sb-unicode" - sbcl_feature "$(usep zlib)" ":sb-core-compression" - sbcl_feature "$(usep debug)" ":sb-xref-for-internals" - sed 's/^X//' >> "${CONFIG}" <<-'EOF' - X ) - X list) - EOF - cat "${CONFIG}" -} - -src_unpack() { - unpack ${A} - mv sbcl-*-* sbcl-binary || die - cd "${S}" -} - -src_prepare() { - # bug #468482 - eapply "${FILESDIR}"/concurrency-test-1.5.3.patch - # bugs #486552, #527666, #517004 - eapply "${FILESDIR}"/${PN}-1.4.0-bsd-sockets-test.patch - # bugs #560276, #561018 - eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch - - eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch - eapply "${FILESDIR}"/${PN}-1.4.0-verbose-build.patch - - eapply_user - - # Make sure the *FLAGS variables are sane. - # sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail. - strip-unsupported-flags - filter-flags -fomit-frame-pointer -Wl,-s - filter-ldflags -s - - # original bugs #526194, #620532 - # this broke no-pie default builds, c.f. bug #632670 - # Pass CFLAGS down by appending our value, to let users override - # the default values. - # Keep passing LDFLAGS down via the LINKFLAGS variable. - sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \ - -e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \ - -i src/runtime/GNUmakefile || die - - sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \ - -i make-config.sh || die - - # Use installed ASDF version - cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die - # Avoid installation of ASDF info page. See bug #605752 - sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die - - use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk - - # Some shells(such as dash) don't have "time" as builtin - # and we don't want to DEPEND on sys-process/time - sed "s,^time ,," -i make.sh || die - sed "s,/lib,/$(get_libdir),g" -i install.sh || die - # #define SBCL_HOME ... - sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die - # change location of /etc/sbclrc ... - sed "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die - - find . -type f -name .cvsignore -delete -} - -src_configure() { - # customizing SBCL version as per - # http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup - echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr - - # applying customizations - sbcl_apply_features -} - -src_compile() { - local bindir="${WORKDIR}"/sbcl-binary - - if use pax_kernel ; then - # To disable PaX on hardened systems - pax-mark -mr "${bindir}"/src/runtime/sbcl - - # Hack to disable PaX on second GENESIS stage - sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\ paxmark.sh -mr \.\/src\/runtime\/sbcl' \ - "${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime" - fi - - # clear the environment to get rid of non-ASCII strings, see bug #174702 - # set HOME for paludis - env - HOME="${T}" PATH="${PATH}" \ - CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \ - CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \ - GNUMAKE=make ./make.sh \ - "sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \ - || die "make failed" - - # need to set HOME because libpango(used by graphviz) complains about it - if use doc; then - env - HOME="${T}" PATH="${PATH}" \ - CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ - ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ - make -C doc/manual info html || die "Cannot build manual" - env - HOME="${T}" PATH="${PATH}" \ - CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ - ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ - make -C doc/internals info html || die "Cannot build internal docs" - fi -} - -src_test() { - ewarn "Unfortunately, it is known that some tests fail eg." - ewarn "run-program.impure.lisp. This is an issue of the upstream's" - ewarn "development and not of Gentoo's side. Please, before filing" - ewarn "any bug(s) search for older submissions. Thank you." - time ( cd tests && sh run-tests.sh ) -} - -src_install() { - # install system-wide initfile - dodir /etc/ - sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF - ;;; The following is required if you want source location functions to - ;;; work in SLIME, for example. - X - (setf (logical-pathname-translations "SYS") - X '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*") - X ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*"))) - X - ;;; Setup ASDF2 - (load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp") - EOF - - # Install documentation - unset SBCL_HOME - INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \ - sh install.sh || die "install.sh failed" - - # bug #517008 - pax-mark -mr "${D}"/usr/bin/sbcl - - # rm empty directories lest paludis complain about this - find "${ED}" -empty -type d -exec rmdir -v {} + - - if use doc; then - dodoc -r doc/internals/sbcl-internals - - doinfo doc/manual/*.info* - doinfo doc/internals/sbcl-internals.info - - docinto internals-notes - dodoc doc/internals-notes/* - else - rm -Rv "${ED}/usr/share/doc/${PF}" || die - fi - - # install the SBCL source - if use source; then - ./clean.sh - cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die - fi - - # necessary for running newly-saved images - echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}" - echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}" - doenvd "${ENVD}" -} diff --git a/dev-lisp/sbcl/sbcl-1.5.7.ebuild b/dev-lisp/sbcl/sbcl-1.5.7.ebuild deleted file mode 100644 index a7b12bfec041..000000000000 --- a/dev-lisp/sbcl/sbcl-1.5.7.ebuild +++ /dev/null @@ -1,246 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit multilib eutils flag-o-matic pax-utils toolchain-funcs - -#same order as http://www.sbcl.org/platform-table.html -BV_X86=1.4.3 -BV_AMD64=1.5.6 -BV_PPC=1.2.7 -BV_SPARC=1.0.28 -BV_ALPHA=1.0.28 -BV_ARM=1.4.11 -BV_ARM64=1.4.2 -BV_X86_MACOS=1.1.6 -BV_X64_MACOS=1.2.11 -BV_PPC_MACOS=1.0.47 -BV_X86_SOLARIS=1.2.7 -BV_X64_SOLARIS=1.2.7 -BV_SPARC_SOLARIS=1.0.23 - -DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp" -HOMEPAGE="http://sbcl.sourceforge.net/" -SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2 - x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 ) - amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 ) - ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 ) - sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 ) - alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 ) - arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 ) - arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 ) - x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 ) - x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 ) - ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 ) - x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 ) - x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 ) - sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris" -IUSE="debug doc source +threads +unicode pax_kernel zlib" - -CDEPEND=">=dev-lisp/asdf-3.1:=" -DEPEND="${CDEPEND} - doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) - pax_kernel? ( sys-apps/elfix )" -RDEPEND="${CDEPEND} - !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )" - -# Disable warnings about executable stacks, as this won't be fixed soon by upstream -QA_EXECSTACK="usr/bin/sbcl" - -CONFIG="${S}/customize-target-features.lisp" -ENVD="${T}/50sbcl" - -# Prevent ASDF from using the system libraries -CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" -ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" - -usep() { - use ${1} && echo "true" || echo "false" -} - -sbcl_feature() { - echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}" -} - -sbcl_apply_features() { - sed 's/^X//' > "${CONFIG}" <<-'EOF' - (lambda (list) - X (flet ((enable (x) (pushnew x list)) - X (disable (x) (setf list (remove x list)))) - EOF - if use x86 || use amd64; then - sbcl_feature "$(usep threads)" ":sb-thread" - fi - sbcl_feature "true" ":sb-ldb" - sbcl_feature "false" ":sb-test" - sbcl_feature "$(usep unicode)" ":sb-unicode" - sbcl_feature "$(usep zlib)" ":sb-core-compression" - sbcl_feature "$(usep debug)" ":sb-xref-for-internals" - sed 's/^X//' >> "${CONFIG}" <<-'EOF' - X ) - X list) - EOF - cat "${CONFIG}" -} - -src_unpack() { - unpack ${A} - mv sbcl-*-* sbcl-binary || die - cd "${S}" -} - -src_prepare() { - # bug #468482 - eapply "${FILESDIR}"/concurrency-test-1.5.3.patch - # bugs #486552, #527666, #517004 - eapply "${FILESDIR}"/${PN}-1.4.0-bsd-sockets-test.patch - # bugs #560276, #561018 - eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch - - eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch - eapply "${FILESDIR}"/${PN}-1.4.0-verbose-build.patch - - eapply_user - - # Make sure the *FLAGS variables are sane. - # sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail. - strip-unsupported-flags - filter-flags -fomit-frame-pointer -Wl,-s - filter-ldflags -s - - # original bugs #526194, #620532 - # this broke no-pie default builds, c.f. bug #632670 - # Pass CFLAGS down by appending our value, to let users override - # the default values. - # Keep passing LDFLAGS down via the LINKFLAGS variable. - sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \ - -e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \ - -i src/runtime/GNUmakefile || die - - sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \ - -i make-config.sh || die - - # Use installed ASDF version - cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die - # Avoid installation of ASDF info page. See bug #605752 - sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die - - use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk - - # Some shells(such as dash) don't have "time" as builtin - # and we don't want to DEPEND on sys-process/time - sed "s,^time ,," -i make.sh || die - sed "s,/lib,/$(get_libdir),g" -i install.sh || die - # #define SBCL_HOME ... - sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die - # change location of /etc/sbclrc ... - sed "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die - - find . -type f -name .cvsignore -delete -} - -src_configure() { - # customizing SBCL version as per - # http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup - echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr - - # applying customizations - sbcl_apply_features -} - -src_compile() { - local bindir="${WORKDIR}"/sbcl-binary - - if use pax_kernel ; then - # To disable PaX on hardened systems - pax-mark -mr "${bindir}"/src/runtime/sbcl - - # Hack to disable PaX on second GENESIS stage - sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\ paxmark.sh -mr \.\/src\/runtime\/sbcl' \ - "${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime" - fi - - # clear the environment to get rid of non-ASCII strings, see bug #174702 - # set HOME for paludis - env - HOME="${T}" PATH="${PATH}" \ - CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \ - CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \ - GNUMAKE=make ./make.sh \ - "sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \ - || die "make failed" - - # need to set HOME because libpango(used by graphviz) complains about it - if use doc; then - env - HOME="${T}" PATH="${PATH}" \ - CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ - ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ - make -C doc/manual info html || die "Cannot build manual" - env - HOME="${T}" PATH="${PATH}" \ - CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ - ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ - make -C doc/internals info html || die "Cannot build internal docs" - fi -} - -src_test() { - ewarn "Unfortunately, it is known that some tests fail eg." - ewarn "run-program.impure.lisp. This is an issue of the upstream's" - ewarn "development and not of Gentoo's side. Please, before filing" - ewarn "any bug(s) search for older submissions. Thank you." - time ( cd tests && sh run-tests.sh ) -} - -src_install() { - # install system-wide initfile - dodir /etc/ - sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF - ;;; The following is required if you want source location functions to - ;;; work in SLIME, for example. - X - (setf (logical-pathname-translations "SYS") - X '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*") - X ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*"))) - X - ;;; Setup ASDF2 - (load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp") - EOF - - # Install documentation - unset SBCL_HOME - INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \ - sh install.sh || die "install.sh failed" - - # bug #517008 - pax-mark -mr "${D}"/usr/bin/sbcl - - # rm empty directories lest paludis complain about this - find "${ED}" -empty -type d -exec rmdir -v {} + - - if use doc; then - dodoc -r doc/internals/sbcl-internals - - doinfo doc/manual/*.info* - doinfo doc/internals/sbcl-internals.info - - docinto internals-notes - dodoc doc/internals-notes/* - else - rm -Rv "${ED}/usr/share/doc/${PF}" || die - fi - - # install the SBCL source - if use source; then - ./clean.sh - cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die - fi - - # necessary for running newly-saved images - echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}" - echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}" - doenvd "${ENVD}" -} diff --git a/dev-lisp/sbcl/sbcl-1.5.8.ebuild b/dev-lisp/sbcl/sbcl-1.5.8.ebuild deleted file mode 100644 index 38e70dcf9c50..000000000000 --- a/dev-lisp/sbcl/sbcl-1.5.8.ebuild +++ /dev/null @@ -1,246 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit multilib eutils flag-o-matic pax-utils toolchain-funcs - -#same order as http://www.sbcl.org/platform-table.html -BV_X86=1.4.3 -BV_AMD64=1.5.8 -BV_PPC=1.2.7 -BV_SPARC=1.0.28 -BV_ALPHA=1.0.28 -BV_ARM=1.4.11 -BV_ARM64=1.4.2 -BV_X86_MACOS=1.1.6 -BV_X64_MACOS=1.2.11 -BV_PPC_MACOS=1.0.47 -BV_X86_SOLARIS=1.2.7 -BV_X64_SOLARIS=1.2.7 -BV_SPARC_SOLARIS=1.0.23 - -DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp" -HOMEPAGE="http://sbcl.sourceforge.net/" -SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2 - x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 ) - amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 ) - ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 ) - sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 ) - alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 ) - arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 ) - arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 ) - x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 ) - x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 ) - ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 ) - x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 ) - x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 ) - sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris" -IUSE="debug doc source +threads +unicode pax_kernel zlib" - -CDEPEND=">=dev-lisp/asdf-3.1:=" -DEPEND="${CDEPEND} - doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) - pax_kernel? ( sys-apps/elfix )" -RDEPEND="${CDEPEND} - !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )" - -# Disable warnings about executable stacks, as this won't be fixed soon by upstream -QA_EXECSTACK="usr/bin/sbcl" - -CONFIG="${S}/customize-target-features.lisp" -ENVD="${T}/50sbcl" - -# Prevent ASDF from using the system libraries -CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" -ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" - -usep() { - use ${1} && echo "true" || echo "false" -} - -sbcl_feature() { - echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}" -} - -sbcl_apply_features() { - sed 's/^X//' > "${CONFIG}" <<-'EOF' - (lambda (list) - X (flet ((enable (x) (pushnew x list)) - X (disable (x) (setf list (remove x list)))) - EOF - if use x86 || use amd64; then - sbcl_feature "$(usep threads)" ":sb-thread" - fi - sbcl_feature "true" ":sb-ldb" - sbcl_feature "false" ":sb-test" - sbcl_feature "$(usep unicode)" ":sb-unicode" - sbcl_feature "$(usep zlib)" ":sb-core-compression" - sbcl_feature "$(usep debug)" ":sb-xref-for-internals" - sed 's/^X//' >> "${CONFIG}" <<-'EOF' - X ) - X list) - EOF - cat "${CONFIG}" -} - -src_unpack() { - unpack ${A} - mv sbcl-*-* sbcl-binary || die - cd "${S}" -} - -src_prepare() { - # bug #468482 - eapply "${FILESDIR}"/concurrency-test-1.5.3.patch - # bugs #486552, #527666, #517004 - eapply "${FILESDIR}"/${PN}-1.4.0-bsd-sockets-test.patch - # bugs #560276, #561018 - eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch - - eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch - eapply "${FILESDIR}"/${PN}-1.4.0-verbose-build.patch - - eapply_user - - # Make sure the *FLAGS variables are sane. - # sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail. - strip-unsupported-flags - filter-flags -fomit-frame-pointer -Wl,-s - filter-ldflags -s - - # original bugs #526194, #620532 - # this broke no-pie default builds, c.f. bug #632670 - # Pass CFLAGS down by appending our value, to let users override - # the default values. - # Keep passing LDFLAGS down via the LINKFLAGS variable. - sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \ - -e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \ - -i src/runtime/GNUmakefile || die - - sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \ - -i make-config.sh || die - - # Use installed ASDF version - cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die - # Avoid installation of ASDF info page. See bug #605752 - sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die - - use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk - - # Some shells(such as dash) don't have "time" as builtin - # and we don't want to DEPEND on sys-process/time - sed "s,^time ,," -i make.sh || die - sed "s,/lib,/$(get_libdir),g" -i install.sh || die - # #define SBCL_HOME ... - sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die - # change location of /etc/sbclrc ... - sed "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die - - find . -type f -name .cvsignore -delete -} - -src_configure() { - # customizing SBCL version as per - # http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup - echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr - - # applying customizations - sbcl_apply_features -} - -src_compile() { - local bindir="${WORKDIR}"/sbcl-binary - - if use pax_kernel ; then - # To disable PaX on hardened systems - pax-mark -mr "${bindir}"/src/runtime/sbcl - - # Hack to disable PaX on second GENESIS stage - sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\ paxmark.sh -mr \.\/src\/runtime\/sbcl' \ - "${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime" - fi - - # clear the environment to get rid of non-ASCII strings, see bug #174702 - # set HOME for paludis - env - HOME="${T}" PATH="${PATH}" \ - CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \ - CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \ - GNUMAKE=make ./make.sh \ - "sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \ - || die "make failed" - - # need to set HOME because libpango(used by graphviz) complains about it - if use doc; then - env - HOME="${T}" PATH="${PATH}" \ - CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ - ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ - make -C doc/manual info html || die "Cannot build manual" - env - HOME="${T}" PATH="${PATH}" \ - CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ - ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ - make -C doc/internals info html || die "Cannot build internal docs" - fi -} - -src_test() { - ewarn "Unfortunately, it is known that some tests fail eg." - ewarn "run-program.impure.lisp. This is an issue of the upstream's" - ewarn "development and not of Gentoo's side. Please, before filing" - ewarn "any bug(s) search for older submissions. Thank you." - time ( cd tests && sh run-tests.sh ) -} - -src_install() { - # install system-wide initfile - dodir /etc/ - sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF - ;;; The following is required if you want source location functions to - ;;; work in SLIME, for example. - X - (setf (logical-pathname-translations "SYS") - X '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*") - X ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*"))) - X - ;;; Setup ASDF2 - (load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp") - EOF - - # Install documentation - unset SBCL_HOME - INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \ - sh install.sh || die "install.sh failed" - - # bug #517008 - pax-mark -mr "${D}"/usr/bin/sbcl - - # rm empty directories lest paludis complain about this - find "${ED}" -empty -type d -exec rmdir -v {} + - - if use doc; then - dodoc -r doc/internals/sbcl-internals - - doinfo doc/manual/*.info* - doinfo doc/internals/sbcl-internals.info - - docinto internals-notes - dodoc doc/internals-notes/* - else - rm -Rv "${ED}/usr/share/doc/${PF}" || die - fi - - # install the SBCL source - if use source; then - ./clean.sh - cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die - fi - - # necessary for running newly-saved images - echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}" - echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}" - doenvd "${ENVD}" -} diff --git a/dev-lisp/sbcl/sbcl-2.0.0.ebuild b/dev-lisp/sbcl/sbcl-2.0.0.ebuild deleted file mode 100644 index 0bde7a4ffe20..000000000000 --- a/dev-lisp/sbcl/sbcl-2.0.0.ebuild +++ /dev/null @@ -1,246 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit multilib eutils flag-o-matic pax-utils toolchain-funcs - -#same order as http://www.sbcl.org/platform-table.html -BV_X86=1.4.3 -BV_AMD64=2.0.0 -BV_PPC=1.2.7 -BV_SPARC=1.0.28 -BV_ALPHA=1.0.28 -BV_ARM=1.4.11 -BV_ARM64=1.4.2 -BV_X86_MACOS=1.1.6 -BV_X64_MACOS=1.2.11 -BV_PPC_MACOS=1.0.47 -BV_X86_SOLARIS=1.2.7 -BV_X64_SOLARIS=1.2.7 -BV_SPARC_SOLARIS=1.0.23 - -DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp" -HOMEPAGE="http://sbcl.sourceforge.net/" -SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2 - x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 ) - amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 ) - ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 ) - sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 ) - alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 ) - arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 ) - arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 ) - x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 ) - x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 ) - ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 ) - x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 ) - x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 ) - sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris" -IUSE="debug doc source +threads +unicode pax_kernel zlib" - -CDEPEND=">=dev-lisp/asdf-3.1:=" -DEPEND="${CDEPEND} - doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) - pax_kernel? ( sys-apps/elfix )" -RDEPEND="${CDEPEND} - !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )" - -# Disable warnings about executable stacks, as this won't be fixed soon by upstream -QA_EXECSTACK="usr/bin/sbcl" - -CONFIG="${S}/customize-target-features.lisp" -ENVD="${T}/50sbcl" - -# Prevent ASDF from using the system libraries -CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" -ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" - -usep() { - use ${1} && echo "true" || echo "false" -} - -sbcl_feature() { - echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}" -} - -sbcl_apply_features() { - sed 's/^X//' > "${CONFIG}" <<-'EOF' - (lambda (list) - X (flet ((enable (x) (pushnew x list)) - X (disable (x) (setf list (remove x list)))) - EOF - if use x86 || use amd64; then - sbcl_feature "$(usep threads)" ":sb-thread" - fi - sbcl_feature "true" ":sb-ldb" - sbcl_feature "false" ":sb-test" - sbcl_feature "$(usep unicode)" ":sb-unicode" - sbcl_feature "$(usep zlib)" ":sb-core-compression" - sbcl_feature "$(usep debug)" ":sb-xref-for-internals" - sed 's/^X//' >> "${CONFIG}" <<-'EOF' - X ) - X list) - EOF - cat "${CONFIG}" -} - -src_unpack() { - unpack ${A} - mv sbcl-*-* sbcl-binary || die - cd "${S}" -} - -src_prepare() { - # bug #468482 - eapply "${FILESDIR}"/concurrency-test-1.5.3.patch - # bugs #486552, #527666, #517004 - eapply "${FILESDIR}"/${PN}-1.4.0-bsd-sockets-test.patch - # bugs #560276, #561018 - eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch - - eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch - eapply "${FILESDIR}"/${PN}-1.4.0-verbose-build.patch - - eapply_user - - # Make sure the *FLAGS variables are sane. - # sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail. - strip-unsupported-flags - filter-flags -fomit-frame-pointer -Wl,-s - filter-ldflags -s - - # original bugs #526194, #620532 - # this broke no-pie default builds, c.f. bug #632670 - # Pass CFLAGS down by appending our value, to let users override - # the default values. - # Keep passing LDFLAGS down via the LINKFLAGS variable. - sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \ - -e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \ - -i src/runtime/GNUmakefile || die - - sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \ - -i make-config.sh || die - - # Use installed ASDF version - cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die - # Avoid installation of ASDF info page. See bug #605752 - sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die - - use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk - - # Some shells(such as dash) don't have "time" as builtin - # and we don't want to DEPEND on sys-process/time - sed "s,^time ,," -i make.sh || die - sed "s,/lib,/$(get_libdir),g" -i install.sh || die - # #define SBCL_HOME ... - sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die - # change location of /etc/sbclrc ... - sed "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die - - find . -type f -name .cvsignore -delete -} - -src_configure() { - # customizing SBCL version as per - # http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup - echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr - - # applying customizations - sbcl_apply_features -} - -src_compile() { - local bindir="${WORKDIR}"/sbcl-binary - - if use pax_kernel ; then - # To disable PaX on hardened systems - pax-mark -mr "${bindir}"/src/runtime/sbcl - - # Hack to disable PaX on second GENESIS stage - sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\ paxmark.sh -mr \.\/src\/runtime\/sbcl' \ - "${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime" - fi - - # clear the environment to get rid of non-ASCII strings, see bug #174702 - # set HOME for paludis - env - HOME="${T}" PATH="${PATH}" \ - CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \ - CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \ - GNUMAKE=make ./make.sh \ - "sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \ - || die "make failed" - - # need to set HOME because libpango(used by graphviz) complains about it - if use doc; then - env - HOME="${T}" PATH="${PATH}" \ - CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ - ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ - make -C doc/manual info html || die "Cannot build manual" - env - HOME="${T}" PATH="${PATH}" \ - CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ - ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ - make -C doc/internals info html || die "Cannot build internal docs" - fi -} - -src_test() { - ewarn "Unfortunately, it is known that some tests fail eg." - ewarn "run-program.impure.lisp. This is an issue of the upstream's" - ewarn "development and not of Gentoo's side. Please, before filing" - ewarn "any bug(s) search for older submissions. Thank you." - time ( cd tests && sh run-tests.sh ) -} - -src_install() { - # install system-wide initfile - dodir /etc/ - sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF - ;;; The following is required if you want source location functions to - ;;; work in SLIME, for example. - X - (setf (logical-pathname-translations "SYS") - X '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*") - X ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*"))) - X - ;;; Setup ASDF2 - (load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp") - EOF - - # Install documentation - unset SBCL_HOME - INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \ - sh install.sh || die "install.sh failed" - - # bug #517008 - pax-mark -mr "${D}"/usr/bin/sbcl - - # rm empty directories lest paludis complain about this - find "${ED}" -empty -type d -exec rmdir -v {} + - - if use doc; then - dodoc -r doc/internals/sbcl-internals - - doinfo doc/manual/*.info* - doinfo doc/internals/sbcl-internals.info - - docinto internals-notes - dodoc doc/internals-notes/* - else - rm -Rv "${ED}/usr/share/doc/${PF}" || die - fi - - # install the SBCL source - if use source; then - ./clean.sh - cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die - fi - - # necessary for running newly-saved images - echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}" - echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}" - doenvd "${ENVD}" -} diff --git a/dev-lisp/sbcl/sbcl-2.0.1.ebuild b/dev-lisp/sbcl/sbcl-2.0.1.ebuild deleted file mode 100644 index 63010e5b32f4..000000000000 --- a/dev-lisp/sbcl/sbcl-2.0.1.ebuild +++ /dev/null @@ -1,246 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit multilib eutils flag-o-matic pax-utils toolchain-funcs - -#same order as http://www.sbcl.org/platform-table.html -BV_X86=1.4.3 -BV_AMD64=2.0.1 -BV_PPC=1.2.7 -BV_SPARC=1.0.28 -BV_ALPHA=1.0.28 -BV_ARM=1.4.11 -BV_ARM64=1.4.2 -BV_X86_MACOS=1.1.6 -BV_X64_MACOS=1.2.11 -BV_PPC_MACOS=1.0.47 -BV_X86_SOLARIS=1.2.7 -BV_X64_SOLARIS=1.2.7 -BV_SPARC_SOLARIS=1.0.23 - -DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp" -HOMEPAGE="http://sbcl.sourceforge.net/" -SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2 - x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 ) - amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 ) - ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 ) - sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 ) - alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 ) - arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 ) - arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 ) - x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 ) - x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 ) - ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 ) - x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 ) - x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 ) - sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris" -IUSE="debug doc source +threads +unicode pax_kernel zlib" - -CDEPEND=">=dev-lisp/asdf-3.1:=" -DEPEND="${CDEPEND} - doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) - pax_kernel? ( sys-apps/elfix )" -RDEPEND="${CDEPEND} - !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )" - -# Disable warnings about executable stacks, as this won't be fixed soon by upstream -QA_EXECSTACK="usr/bin/sbcl" - -CONFIG="${S}/customize-target-features.lisp" -ENVD="${T}/50sbcl" - -# Prevent ASDF from using the system libraries -CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" -ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" - -usep() { - use ${1} && echo "true" || echo "false" -} - -sbcl_feature() { - echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}" -} - -sbcl_apply_features() { - sed 's/^X//' > "${CONFIG}" <<-'EOF' - (lambda (list) - X (flet ((enable (x) (pushnew x list)) - X (disable (x) (setf list (remove x list)))) - EOF - if use x86 || use amd64; then - sbcl_feature "$(usep threads)" ":sb-thread" - fi - sbcl_feature "true" ":sb-ldb" - sbcl_feature "false" ":sb-test" - sbcl_feature "$(usep unicode)" ":sb-unicode" - sbcl_feature "$(usep zlib)" ":sb-core-compression" - sbcl_feature "$(usep debug)" ":sb-xref-for-internals" - sed 's/^X//' >> "${CONFIG}" <<-'EOF' - X ) - X list) - EOF - cat "${CONFIG}" -} - -src_unpack() { - unpack ${A} - mv sbcl-*-* sbcl-binary || die - cd "${S}" -} - -src_prepare() { - # bug #468482 - eapply "${FILESDIR}"/concurrency-test-2.0.1.patch - # bugs #486552, #527666, #517004 - eapply "${FILESDIR}"/${PN}-1.4.0-bsd-sockets-test.patch - # bugs #560276, #561018 - eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch - - eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch - eapply "${FILESDIR}"/${PN}-1.4.0-verbose-build.patch - - eapply_user - - # Make sure the *FLAGS variables are sane. - # sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail. - strip-unsupported-flags - filter-flags -fomit-frame-pointer -Wl,-s - filter-ldflags -s - - # original bugs #526194, #620532 - # this broke no-pie default builds, c.f. bug #632670 - # Pass CFLAGS down by appending our value, to let users override - # the default values. - # Keep passing LDFLAGS down via the LINKFLAGS variable. - sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \ - -e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \ - -i src/runtime/GNUmakefile || die - - sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \ - -i make-config.sh || die - - # Use installed ASDF version - cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die - # Avoid installation of ASDF info page. See bug #605752 - sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die - - use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk - - # Some shells(such as dash) don't have "time" as builtin - # and we don't want to DEPEND on sys-process/time - sed "s,^time ,," -i make.sh || die - sed "s,/lib,/$(get_libdir),g" -i install.sh || die - # #define SBCL_HOME ... - sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die - # change location of /etc/sbclrc ... - sed "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die - - find . -type f -name .cvsignore -delete -} - -src_configure() { - # customizing SBCL version as per - # http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup - echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr - - # applying customizations - sbcl_apply_features -} - -src_compile() { - local bindir="${WORKDIR}"/sbcl-binary - - if use pax_kernel ; then - # To disable PaX on hardened systems - pax-mark -mr "${bindir}"/src/runtime/sbcl - - # Hack to disable PaX on second GENESIS stage - sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\ paxmark.sh -mr \.\/src\/runtime\/sbcl' \ - "${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime" - fi - - # clear the environment to get rid of non-ASCII strings, see bug #174702 - # set HOME for paludis - env - HOME="${T}" PATH="${PATH}" \ - CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \ - CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \ - GNUMAKE=make ./make.sh \ - "sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \ - || die "make failed" - - # need to set HOME because libpango(used by graphviz) complains about it - if use doc; then - env - HOME="${T}" PATH="${PATH}" \ - CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ - ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ - make -C doc/manual info html || die "Cannot build manual" - env - HOME="${T}" PATH="${PATH}" \ - CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ - ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ - make -C doc/internals info html || die "Cannot build internal docs" - fi -} - -src_test() { - ewarn "Unfortunately, it is known that some tests fail eg." - ewarn "run-program.impure.lisp. This is an issue of the upstream's" - ewarn "development and not of Gentoo's side. Please, before filing" - ewarn "any bug(s) search for older submissions. Thank you." - time ( cd tests && sh run-tests.sh ) -} - -src_install() { - # install system-wide initfile - dodir /etc/ - sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF - ;;; The following is required if you want source location functions to - ;;; work in SLIME, for example. - X - (setf (logical-pathname-translations "SYS") - X '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*") - X ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*"))) - X - ;;; Setup ASDF2 - (load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp") - EOF - - # Install documentation - unset SBCL_HOME - INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \ - sh install.sh || die "install.sh failed" - - # bug #517008 - pax-mark -mr "${D}"/usr/bin/sbcl - - # rm empty directories lest paludis complain about this - find "${ED}" -empty -type d -exec rmdir -v {} + - - if use doc; then - dodoc -r doc/internals/sbcl-internals - - doinfo doc/manual/*.info* - doinfo doc/internals/sbcl-internals.info - - docinto internals-notes - dodoc doc/internals-notes/* - else - rm -Rv "${ED}/usr/share/doc/${PF}" || die - fi - - # install the SBCL source - if use source; then - ./clean.sh - cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die - fi - - # necessary for running newly-saved images - echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}" - echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}" - doenvd "${ENVD}" -} diff --git a/dev-lisp/sbcl/sbcl-2.0.5.ebuild b/dev-lisp/sbcl/sbcl-2.0.5.ebuild deleted file mode 100644 index 8db97f2a1f77..000000000000 --- a/dev-lisp/sbcl/sbcl-2.0.5.ebuild +++ /dev/null @@ -1,246 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit multilib eutils flag-o-matic pax-utils toolchain-funcs - -#same order as http://www.sbcl.org/platform-table.html -BV_X86=1.4.3 -BV_AMD64=2.0.5 -BV_PPC=1.2.7 -BV_SPARC=1.0.28 -BV_ALPHA=1.0.28 -BV_ARM=1.4.11 -BV_ARM64=1.4.2 -BV_X86_MACOS=1.1.6 -BV_X64_MACOS=1.2.11 -BV_PPC_MACOS=1.0.47 -BV_X86_SOLARIS=1.2.7 -BV_X64_SOLARIS=1.2.7 -BV_SPARC_SOLARIS=1.0.23 - -DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp" -HOMEPAGE="http://sbcl.sourceforge.net/" -SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2 - x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 ) - amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 ) - ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 ) - sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 ) - alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 ) - arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 ) - arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 ) - x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 ) - x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 ) - ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 ) - x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 ) - x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 ) - sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris" -IUSE="debug doc source +threads +unicode pax_kernel zlib" - -CDEPEND=">=dev-lisp/asdf-3.1:=" -DEPEND="${CDEPEND} - doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) - pax_kernel? ( sys-apps/elfix )" -RDEPEND="${CDEPEND} - !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )" - -# Disable warnings about executable stacks, as this won't be fixed soon by upstream -QA_EXECSTACK="usr/bin/sbcl" - -CONFIG="${S}/customize-target-features.lisp" -ENVD="${T}/50sbcl" - -# Prevent ASDF from using the system libraries -CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" -ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" - -usep() { - use ${1} && echo "true" || echo "false" -} - -sbcl_feature() { - echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}" -} - -sbcl_apply_features() { - sed 's/^X//' > "${CONFIG}" <<-'EOF' - (lambda (list) - X (flet ((enable (x) (pushnew x list)) - X (disable (x) (setf list (remove x list)))) - EOF - if use x86 || use amd64; then - sbcl_feature "$(usep threads)" ":sb-thread" - fi - sbcl_feature "true" ":sb-ldb" - sbcl_feature "false" ":sb-test" - sbcl_feature "$(usep unicode)" ":sb-unicode" - sbcl_feature "$(usep zlib)" ":sb-core-compression" - sbcl_feature "$(usep debug)" ":sb-xref-for-internals" - sed 's/^X//' >> "${CONFIG}" <<-'EOF' - X ) - X list) - EOF - cat "${CONFIG}" -} - -src_unpack() { - unpack ${A} - mv sbcl-*-* sbcl-binary || die - cd "${S}" -} - -src_prepare() { - # bug #468482 - eapply "${FILESDIR}"/concurrency-test-2.0.1.patch - # bugs #486552, #527666, #517004 - eapply "${FILESDIR}"/bsd-sockets-test-2.0.5.patch - # bugs #560276, #561018 - eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch - - eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch - eapply "${FILESDIR}"/verbose-build-2.0.3.patch - - eapply_user - - # Make sure the *FLAGS variables are sane. - # sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail. - strip-unsupported-flags - filter-flags -fomit-frame-pointer -Wl,-s - filter-ldflags -s - - # original bugs #526194, #620532 - # this broke no-pie default builds, c.f. bug #632670 - # Pass CFLAGS down by appending our value, to let users override - # the default values. - # Keep passing LDFLAGS down via the LINKFLAGS variable. - sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \ - -e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \ - -i src/runtime/GNUmakefile || die - - sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \ - -i make-config.sh || die - - # Use installed ASDF version - cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die - # Avoid installation of ASDF info page. See bug #605752 - sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die - - use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk - - # Some shells(such as dash) don't have "time" as builtin - # and we don't want to DEPEND on sys-process/time - sed "s,^time ,," -i make.sh || die - sed "s,/lib,/$(get_libdir),g" -i install.sh || die - # #define SBCL_HOME ... - sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die - # change location of /etc/sbclrc ... - sed "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die - - find . -type f -name .cvsignore -delete -} - -src_configure() { - # customizing SBCL version as per - # http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup - echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr - - # applying customizations - sbcl_apply_features -} - -src_compile() { - local bindir="${WORKDIR}"/sbcl-binary - - if use pax_kernel ; then - # To disable PaX on hardened systems - pax-mark -mr "${bindir}"/src/runtime/sbcl - - # Hack to disable PaX on second GENESIS stage - sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\ paxmark.sh -mr \.\/src\/runtime\/sbcl' \ - "${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime" - fi - - # clear the environment to get rid of non-ASCII strings, see bug #174702 - # set HOME for paludis - env - HOME="${T}" PATH="${PATH}" \ - CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \ - CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \ - GNUMAKE=make ./make.sh \ - "sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \ - || die "make failed" - - # need to set HOME because libpango(used by graphviz) complains about it - if use doc; then - env - HOME="${T}" PATH="${PATH}" \ - CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ - ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ - make -C doc/manual info html || die "Cannot build manual" - env - HOME="${T}" PATH="${PATH}" \ - CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ - ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ - make -C doc/internals info html || die "Cannot build internal docs" - fi -} - -src_test() { - ewarn "Unfortunately, it is known that some tests fail eg." - ewarn "run-program.impure.lisp. This is an issue of the upstream's" - ewarn "development and not of Gentoo's side. Please, before filing" - ewarn "any bug(s) search for older submissions. Thank you." - time ( cd tests && sh run-tests.sh ) -} - -src_install() { - # install system-wide initfile - dodir /etc/ - sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF - ;;; The following is required if you want source location functions to - ;;; work in SLIME, for example. - X - (setf (logical-pathname-translations "SYS") - X '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*") - X ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*"))) - X - ;;; Setup ASDF2 - (load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp") - EOF - - # Install documentation - unset SBCL_HOME - INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \ - sh install.sh || die "install.sh failed" - - # bug #517008 - pax-mark -mr "${D}"/usr/bin/sbcl - - # rm empty directories lest paludis complain about this - find "${ED}" -empty -type d -exec rmdir -v {} + - - if use doc; then - dodoc -r doc/internals/sbcl-internals - - doinfo doc/manual/*.info* - doinfo doc/internals/sbcl-internals.info - - docinto internals-notes - dodoc doc/internals-notes/* - else - rm -Rv "${ED}/usr/share/doc/${PF}" || die - fi - - # install the SBCL source - if use source; then - ./clean.sh - cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die - fi - - # necessary for running newly-saved images - echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}" - echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}" - doenvd "${ENVD}" -} diff --git a/dev-lisp/sbcl/sbcl-2.0.8.ebuild b/dev-lisp/sbcl/sbcl-2.0.8.ebuild deleted file mode 100644 index 4e5c1f7808ce..000000000000 --- a/dev-lisp/sbcl/sbcl-2.0.8.ebuild +++ /dev/null @@ -1,246 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit multilib eutils flag-o-matic pax-utils toolchain-funcs - -#same order as http://www.sbcl.org/platform-table.html -BV_X86=1.4.3 -BV_AMD64=2.0.8 -BV_PPC=1.2.7 -BV_SPARC=1.0.28 -BV_ALPHA=1.0.28 -BV_ARM=1.4.11 -BV_ARM64=1.4.2 -BV_X86_MACOS=1.1.6 -BV_X64_MACOS=1.2.11 -BV_PPC_MACOS=1.0.47 -BV_X86_SOLARIS=1.2.7 -BV_X64_SOLARIS=1.2.7 -BV_SPARC_SOLARIS=1.0.23 - -DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp" -HOMEPAGE="http://sbcl.sourceforge.net/" -SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2 - x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 ) - amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 ) - ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 ) - sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 ) - alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 ) - arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 ) - arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 ) - x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 ) - x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 ) - ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 ) - x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 ) - x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 ) - sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris" -IUSE="debug doc source +threads +unicode pax_kernel zlib" - -CDEPEND=">=dev-lisp/asdf-3.1:=" -DEPEND="${CDEPEND} - doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) - pax_kernel? ( sys-apps/elfix )" -RDEPEND="${CDEPEND} - !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )" - -# Disable warnings about executable stacks, as this won't be fixed soon by upstream -QA_EXECSTACK="usr/bin/sbcl" - -CONFIG="${S}/customize-target-features.lisp" -ENVD="${T}/50sbcl" - -# Prevent ASDF from using the system libraries -CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" -ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" - -usep() { - use ${1} && echo "true" || echo "false" -} - -sbcl_feature() { - echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}" -} - -sbcl_apply_features() { - sed 's/^X//' > "${CONFIG}" <<-'EOF' - (lambda (list) - X (flet ((enable (x) (pushnew x list)) - X (disable (x) (setf list (remove x list)))) - EOF - if use x86 || use amd64; then - sbcl_feature "$(usep threads)" ":sb-thread" - fi - sbcl_feature "true" ":sb-ldb" - sbcl_feature "false" ":sb-test" - sbcl_feature "$(usep unicode)" ":sb-unicode" - sbcl_feature "$(usep zlib)" ":sb-core-compression" - sbcl_feature "$(usep debug)" ":sb-xref-for-internals" - sed 's/^X//' >> "${CONFIG}" <<-'EOF' - X ) - X list) - EOF - cat "${CONFIG}" -} - -src_unpack() { - unpack ${A} - mv sbcl-*-* sbcl-binary || die - cd "${S}" -} - -src_prepare() { - # bug #468482 - eapply "${FILESDIR}"/concurrency-test-2.0.1.patch - # bugs #486552, #527666, #517004 - eapply "${FILESDIR}"/bsd-sockets-test-2.0.5.patch - # bugs #560276, #561018 - eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch - - eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch - eapply "${FILESDIR}"/verbose-build-2.0.3.patch - - eapply_user - - # Make sure the *FLAGS variables are sane. - # sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail. - strip-unsupported-flags - filter-flags -fomit-frame-pointer -Wl,-s - filter-ldflags -s - - # original bugs #526194, #620532 - # this broke no-pie default builds, c.f. bug #632670 - # Pass CFLAGS down by appending our value, to let users override - # the default values. - # Keep passing LDFLAGS down via the LINKFLAGS variable. - sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \ - -e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \ - -i src/runtime/GNUmakefile || die - - sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \ - -i make-config.sh || die - - # Use installed ASDF version - cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die - # Avoid installation of ASDF info page. See bug #605752 - sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die - - use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk - - # Some shells(such as dash) don't have "time" as builtin - # and we don't want to DEPEND on sys-process/time - sed "s,^time ,," -i make.sh || die - sed "s,/lib,/$(get_libdir),g" -i install.sh || die - # #define SBCL_HOME ... - sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die - # change location of /etc/sbclrc ... - sed "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die - - find . -type f -name .cvsignore -delete -} - -src_configure() { - # customizing SBCL version as per - # http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup - echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr - - # applying customizations - sbcl_apply_features -} - -src_compile() { - local bindir="${WORKDIR}"/sbcl-binary - - if use pax_kernel ; then - # To disable PaX on hardened systems - pax-mark -mr "${bindir}"/src/runtime/sbcl - - # Hack to disable PaX on second GENESIS stage - sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\ paxmark.sh -mr \.\/src\/runtime\/sbcl' \ - "${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime" - fi - - # clear the environment to get rid of non-ASCII strings, see bug #174702 - # set HOME for paludis - env - HOME="${T}" PATH="${PATH}" \ - CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \ - CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \ - GNUMAKE=make ./make.sh \ - "sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \ - || die "make failed" - - # need to set HOME because libpango(used by graphviz) complains about it - if use doc; then - env - HOME="${T}" PATH="${PATH}" \ - CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ - ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ - make -C doc/manual info html || die "Cannot build manual" - env - HOME="${T}" PATH="${PATH}" \ - CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ - ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ - make -C doc/internals info html || die "Cannot build internal docs" - fi -} - -src_test() { - ewarn "Unfortunately, it is known that some tests fail eg." - ewarn "run-program.impure.lisp. This is an issue of the upstream's" - ewarn "development and not of Gentoo's side. Please, before filing" - ewarn "any bug(s) search for older submissions. Thank you." - time ( cd tests && sh run-tests.sh ) -} - -src_install() { - # install system-wide initfile - dodir /etc/ - sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF - ;;; The following is required if you want source location functions to - ;;; work in SLIME, for example. - X - (setf (logical-pathname-translations "SYS") - X '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*") - X ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*"))) - X - ;;; Setup ASDF2 - (load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp") - EOF - - # Install documentation - unset SBCL_HOME - INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \ - sh install.sh || die "install.sh failed" - - # bug #517008 - pax-mark -mr "${D}"/usr/bin/sbcl - - # rm empty directories lest paludis complain about this - find "${ED}" -empty -type d -exec rmdir -v {} + - - if use doc; then - dodoc -r doc/internals/sbcl-internals - - doinfo doc/manual/*.info* - doinfo doc/internals/sbcl-internals.info - - docinto internals-notes - dodoc doc/internals-notes/* - else - rm -Rv "${ED}/usr/share/doc/${PF}" || die - fi - - # install the SBCL source - if use source; then - ./clean.sh - cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die - fi - - # necessary for running newly-saved images - echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}" - echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}" - doenvd "${ENVD}" -} diff --git a/dev-lisp/sbcl/sbcl-2.0.9.ebuild b/dev-lisp/sbcl/sbcl-2.0.9.ebuild deleted file mode 100644 index b3f599221e8b..000000000000 --- a/dev-lisp/sbcl/sbcl-2.0.9.ebuild +++ /dev/null @@ -1,246 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit multilib eutils flag-o-matic pax-utils toolchain-funcs - -#same order as http://www.sbcl.org/platform-table.html -BV_X86=1.4.3 -BV_AMD64=2.0.9 -BV_PPC=1.2.7 -BV_SPARC=1.0.28 -BV_ALPHA=1.0.28 -BV_ARM=1.4.11 -BV_ARM64=1.4.2 -BV_X86_MACOS=1.1.6 -BV_X64_MACOS=1.2.11 -BV_PPC_MACOS=1.0.47 -BV_X86_SOLARIS=1.2.7 -BV_X64_SOLARIS=1.2.7 -BV_SPARC_SOLARIS=1.0.23 - -DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp" -HOMEPAGE="http://sbcl.sourceforge.net/" -SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2 - x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 ) - amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 ) - ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 ) - sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 ) - alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 ) - arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 ) - arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 ) - x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 ) - x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 ) - ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 ) - x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 ) - x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 ) - sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris" -IUSE="debug doc source +threads +unicode pax_kernel zlib" - -CDEPEND=">=dev-lisp/asdf-3.1:=" -DEPEND="${CDEPEND} - doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) - pax_kernel? ( sys-apps/elfix )" -RDEPEND="${CDEPEND} - !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )" - -# Disable warnings about executable stacks, as this won't be fixed soon by upstream -QA_EXECSTACK="usr/bin/sbcl" - -CONFIG="${S}/customize-target-features.lisp" -ENVD="${T}/50sbcl" - -# Prevent ASDF from using the system libraries -CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" -ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" - -usep() { - use ${1} && echo "true" || echo "false" -} - -sbcl_feature() { - echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}" -} - -sbcl_apply_features() { - sed 's/^X//' > "${CONFIG}" <<-'EOF' - (lambda (list) - X (flet ((enable (x) (pushnew x list)) - X (disable (x) (setf list (remove x list)))) - EOF - if use x86 || use amd64; then - sbcl_feature "$(usep threads)" ":sb-thread" - fi - sbcl_feature "true" ":sb-ldb" - sbcl_feature "false" ":sb-test" - sbcl_feature "$(usep unicode)" ":sb-unicode" - sbcl_feature "$(usep zlib)" ":sb-core-compression" - sbcl_feature "$(usep debug)" ":sb-xref-for-internals" - sed 's/^X//' >> "${CONFIG}" <<-'EOF' - X ) - X list) - EOF - cat "${CONFIG}" -} - -src_unpack() { - unpack ${A} - mv sbcl-*-* sbcl-binary || die - cd "${S}" -} - -src_prepare() { - # bug #468482 - eapply "${FILESDIR}"/concurrency-test-2.0.1.patch - # bugs #486552, #527666, #517004 - eapply "${FILESDIR}"/bsd-sockets-test-2.0.5.patch - # bugs #560276, #561018 - eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch - - eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch - eapply "${FILESDIR}"/verbose-build-2.0.3.patch - - eapply_user - - # Make sure the *FLAGS variables are sane. - # sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail. - strip-unsupported-flags - filter-flags -fomit-frame-pointer -Wl,-s - filter-ldflags -s - - # original bugs #526194, #620532 - # this broke no-pie default builds, c.f. bug #632670 - # Pass CFLAGS down by appending our value, to let users override - # the default values. - # Keep passing LDFLAGS down via the LINKFLAGS variable. - sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \ - -e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \ - -i src/runtime/GNUmakefile || die - - sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \ - -i make-config.sh || die - - # Use installed ASDF version - cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die - # Avoid installation of ASDF info page. See bug #605752 - sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die - - use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk - - # Some shells(such as dash) don't have "time" as builtin - # and we don't want to DEPEND on sys-process/time - sed "s,^time ,," -i make.sh || die - sed "s,/lib,/$(get_libdir),g" -i install.sh || die - # #define SBCL_HOME ... - sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die - # change location of /etc/sbclrc ... - sed "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die - - find . -type f -name .cvsignore -delete -} - -src_configure() { - # customizing SBCL version as per - # http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup - echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr - - # applying customizations - sbcl_apply_features -} - -src_compile() { - local bindir="${WORKDIR}"/sbcl-binary - - if use pax_kernel ; then - # To disable PaX on hardened systems - pax-mark -mr "${bindir}"/src/runtime/sbcl - - # Hack to disable PaX on second GENESIS stage - sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\ paxmark.sh -mr \.\/src\/runtime\/sbcl' \ - "${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime" - fi - - # clear the environment to get rid of non-ASCII strings, see bug #174702 - # set HOME for paludis - env - HOME="${T}" PATH="${PATH}" \ - CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \ - CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \ - GNUMAKE=make ./make.sh \ - "sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \ - || die "make failed" - - # need to set HOME because libpango(used by graphviz) complains about it - if use doc; then - env - HOME="${T}" PATH="${PATH}" \ - CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ - ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ - make -C doc/manual info html || die "Cannot build manual" - env - HOME="${T}" PATH="${PATH}" \ - CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ - ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ - make -C doc/internals info html || die "Cannot build internal docs" - fi -} - -src_test() { - ewarn "Unfortunately, it is known that some tests fail eg." - ewarn "run-program.impure.lisp. This is an issue of the upstream's" - ewarn "development and not of Gentoo's side. Please, before filing" - ewarn "any bug(s) search for older submissions. Thank you." - time ( cd tests && sh run-tests.sh ) -} - -src_install() { - # install system-wide initfile - dodir /etc/ - sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF - ;;; The following is required if you want source location functions to - ;;; work in SLIME, for example. - X - (setf (logical-pathname-translations "SYS") - X '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*") - X ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*"))) - X - ;;; Setup ASDF2 - (load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp") - EOF - - # Install documentation - unset SBCL_HOME - INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \ - sh install.sh || die "install.sh failed" - - # bug #517008 - pax-mark -mr "${D}"/usr/bin/sbcl - - # rm empty directories lest paludis complain about this - find "${ED}" -empty -type d -exec rmdir -v {} + - - if use doc; then - dodoc -r doc/internals/sbcl-internals - - doinfo doc/manual/*.info* - doinfo doc/internals/sbcl-internals.info - - docinto internals-notes - dodoc doc/internals-notes/* - else - rm -Rv "${ED}/usr/share/doc/${PF}" || die - fi - - # install the SBCL source - if use source; then - ./clean.sh - cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die - fi - - # necessary for running newly-saved images - echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}" - echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}" - doenvd "${ENVD}" -} diff --git a/dev-lisp/sbcl/sbcl-2.0.7.ebuild b/dev-lisp/sbcl/sbcl-2.3.5.ebuild index 97c94b401320..cc8bbe9c6765 100644 --- a/dev-lisp/sbcl/sbcl-2.0.7.ebuild +++ b/dev-lisp/sbcl/sbcl-2.3.5.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit multilib eutils flag-o-matic pax-utils toolchain-funcs +inherit flag-o-matic pax-utils toolchain-funcs #same order as http://www.sbcl.org/platform-table.html BV_X86=1.4.3 -BV_AMD64=2.0.7 +BV_AMD64=2.3.4 BV_PPC=1.2.7 +BV_PPC64LE=1.5.8 BV_SPARC=1.0.28 BV_ALPHA=1.0.28 -BV_ARM=1.4.11 +BV_ARM=2.3.3 BV_ARM64=1.4.2 -BV_X86_MACOS=1.1.6 BV_X64_MACOS=1.2.11 BV_PPC_MACOS=1.0.47 BV_X86_SOLARIS=1.2.7 @@ -21,32 +21,38 @@ BV_X64_SOLARIS=1.2.7 BV_SPARC_SOLARIS=1.0.23 DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp" -HOMEPAGE="http://sbcl.sourceforge.net/" -SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2 - x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 ) - amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 ) - ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 ) - sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 ) - alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 ) - arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 ) - arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 ) - x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 ) - x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 ) - ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 ) - x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 ) - x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 ) - sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )" +HOMEPAGE="https://www.sbcl.org/ http://sbcl.sourceforge.net/" +BSD_SOCKETS_TEST_PATCH=bsd-sockets-test-2.3.1.patch +SRC_URI="https://downloads.sourceforge.net/sbcl/${P}-source.tar.bz2 + https://dev.gentoo.org/~grozin/${BSD_SOCKETS_TEST_PATCH}.gz + !system-bootstrap? ( + x86? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 ) + amd64? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 ) + ppc? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 ) + ppc64? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_PPC64LE}-ppc64le-linux-binary.tar.bz2 ) + sparc? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 ) + alpha? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 ) + arm? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 ) + arm64? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 ) + x64-macos? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 ) + ppc-macos? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 ) + x64-solaris? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 ) + )" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris" -IUSE="debug doc source +threads +unicode pax_kernel zlib" - -CDEPEND=">=dev-lisp/asdf-3.1:=" -DEPEND="${CDEPEND} +KEYWORDS="-* amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="system-bootstrap debug doc source +threads +unicode +zstd" + +CDEPEND=">=dev-lisp/asdf-3.3:= \ + prefix? ( dev-util/patchelf )" +# bug #843851 +BDEPEND="${CDEPEND} + dev-debug/strace doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) - pax_kernel? ( sys-apps/elfix )" + system-bootstrap? ( || ( dev-lisp/clisp dev-lisp/sbcl ) )" RDEPEND="${CDEPEND} + zstd? ( app-arch/zstd ) !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )" # Disable warnings about executable stacks, as this won't be fixed soon by upstream @@ -79,7 +85,7 @@ sbcl_apply_features() { sbcl_feature "true" ":sb-ldb" sbcl_feature "false" ":sb-test" sbcl_feature "$(usep unicode)" ":sb-unicode" - sbcl_feature "$(usep zlib)" ":sb-core-compression" + sbcl_feature "$(usep zstd)" ":sb-core-compression" sbcl_feature "$(usep debug)" ":sb-xref-for-internals" sed 's/^X//' >> "${CONFIG}" <<-'EOF' X ) @@ -90,7 +96,9 @@ sbcl_apply_features() { src_unpack() { unpack ${A} - mv sbcl-*-* sbcl-binary || die + if ! use system-bootstrap ; then + mv sbcl-*-* sbcl-binary || die + fi cd "${S}" } @@ -98,11 +106,12 @@ src_prepare() { # bug #468482 eapply "${FILESDIR}"/concurrency-test-2.0.1.patch # bugs #486552, #527666, #517004 - eapply "${FILESDIR}"/bsd-sockets-test-2.0.5.patch + eapply "${WORKDIR}"/${BSD_SOCKETS_TEST_PATCH} # bugs #560276, #561018 - eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch + eapply "${FILESDIR}"/sb-posix-test-2.2.9.patch + # bug #767742 + eapply "${FILESDIR}"/etags-2.1.0.patch - eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch eapply "${FILESDIR}"/verbose-build-2.0.3.patch eapply_user @@ -149,29 +158,40 @@ src_configure() { # http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr + # set interpreter for Prefix + if use prefix ; then + patchelf --set-interpreter \ + "${EPREFIX}/$(get_libdir)"/ld-linux-x86-64.so.2 \ + "${WORKDIR}"/sbcl-binary/src/runtime/sbcl + fi + # applying customizations sbcl_apply_features } src_compile() { local bindir="${WORKDIR}"/sbcl-binary - - if use pax_kernel ; then - # To disable PaX on hardened systems - pax-mark -mr "${bindir}"/src/runtime/sbcl - - # Hack to disable PaX on second GENESIS stage - sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\ paxmark.sh -mr \.\/src\/runtime\/sbcl' \ - "${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime" + local bootstrap_lisp="sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" + + if use system-bootstrap ; then + if has_version "dev-lisp/sbcl" ; then + bootstrap_lisp="sbcl --no-sysinit --no-userinit --disable-debugger" + else + bootstrap_lisp="clisp" + fi fi + # Bug #869434 + append-cppflags -D_GNU_SOURCE + # clear the environment to get rid of non-ASCII strings, see bug #174702 # set HOME for paludis env - HOME="${T}" PATH="${PATH}" \ CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \ CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \ + SBCL_HOME="/usr/$(get_libdir)/sbcl" SBCL_SOURCE_ROOT="/usr/$(get_libdir)/sbcl/src" \ GNUMAKE=make ./make.sh \ - "sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \ + "${bootstrap_lisp}" \ || die "make failed" # need to set HOME because libpango(used by graphviz) complains about it @@ -237,6 +257,9 @@ src_install() { if use source; then ./clean.sh cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die + for d in contrib/*/; do + cp -av "$d" "${ED}/usr/$(get_libdir)/sbcl/" || die + done fi # necessary for running newly-saved images diff --git a/dev-lisp/sbcl/sbcl-2.0.3.ebuild b/dev-lisp/sbcl/sbcl-2.4.3.ebuild index 819f9f5c7b1e..1a1ab54904e3 100644 --- a/dev-lisp/sbcl/sbcl-2.0.3.ebuild +++ b/dev-lisp/sbcl/sbcl-2.4.3.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit multilib eutils flag-o-matic pax-utils toolchain-funcs +inherit flag-o-matic pax-utils toolchain-funcs #same order as http://www.sbcl.org/platform-table.html BV_X86=1.4.3 -BV_AMD64=2.0.3 +BV_AMD64=2.4.3 BV_PPC=1.2.7 +BV_PPC64LE=1.5.8 BV_SPARC=1.0.28 BV_ALPHA=1.0.28 -BV_ARM=1.4.11 +BV_ARM=2.3.3 BV_ARM64=1.4.2 -BV_X86_MACOS=1.1.6 BV_X64_MACOS=1.2.11 BV_PPC_MACOS=1.0.47 BV_X86_SOLARIS=1.2.7 @@ -21,32 +21,38 @@ BV_X64_SOLARIS=1.2.7 BV_SPARC_SOLARIS=1.0.23 DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp" -HOMEPAGE="http://sbcl.sourceforge.net/" -SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2 - x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 ) - amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 ) - ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 ) - sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 ) - alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 ) - arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 ) - arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 ) - x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 ) - x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 ) - ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 ) - x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 ) - x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 ) - sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )" +HOMEPAGE="https://www.sbcl.org/ http://sbcl.sourceforge.net/" +BSD_SOCKETS_TEST_PATCH=bsd-sockets-test-2.3.6.patch +SRC_URI="https://downloads.sourceforge.net/sbcl/${P}-source.tar.bz2 + https://dev.gentoo.org/~grozin/${BSD_SOCKETS_TEST_PATCH}.gz + !system-bootstrap? ( + x86? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 ) + amd64? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 ) + ppc? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 ) + ppc64? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_PPC64LE}-ppc64le-linux-binary.tar.bz2 ) + sparc? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 ) + alpha? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 ) + arm? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 ) + arm64? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 ) + x64-macos? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 ) + ppc-macos? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 ) + x64-solaris? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 ) + )" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris" -IUSE="debug doc source +threads +unicode pax_kernel zlib" - -CDEPEND=">=dev-lisp/asdf-3.1:=" -DEPEND="${CDEPEND} +KEYWORDS="-* amd64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="system-bootstrap debug doc source +threads +unicode +zstd" + +CDEPEND=">=dev-lisp/asdf-3.3:= \ + prefix? ( dev-util/patchelf )" +# bug #843851 +BDEPEND="${CDEPEND} + dev-debug/strace doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) - pax_kernel? ( sys-apps/elfix )" + system-bootstrap? ( || ( dev-lisp/clisp dev-lisp/sbcl ) )" RDEPEND="${CDEPEND} + zstd? ( app-arch/zstd ) !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )" # Disable warnings about executable stacks, as this won't be fixed soon by upstream @@ -79,7 +85,7 @@ sbcl_apply_features() { sbcl_feature "true" ":sb-ldb" sbcl_feature "false" ":sb-test" sbcl_feature "$(usep unicode)" ":sb-unicode" - sbcl_feature "$(usep zlib)" ":sb-core-compression" + sbcl_feature "$(usep zstd)" ":sb-core-compression" sbcl_feature "$(usep debug)" ":sb-xref-for-internals" sed 's/^X//' >> "${CONFIG}" <<-'EOF' X ) @@ -90,7 +96,9 @@ sbcl_apply_features() { src_unpack() { unpack ${A} - mv sbcl-*-* sbcl-binary || die + if ! use system-bootstrap ; then + mv sbcl-*-* sbcl-binary || die + fi cd "${S}" } @@ -98,11 +106,14 @@ src_prepare() { # bug #468482 eapply "${FILESDIR}"/concurrency-test-2.0.1.patch # bugs #486552, #527666, #517004 - eapply "${FILESDIR}"/${PN}-1.4.0-bsd-sockets-test.patch + eapply "${WORKDIR}"/${BSD_SOCKETS_TEST_PATCH} # bugs #560276, #561018 - eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch + eapply "${FILESDIR}"/sb-posix-test-2.2.9.patch + # bug #767742 + eapply "${FILESDIR}"/etags-2.1.0.patch + # Use ${PV} as build-id, bug #797574 + eapply "${FILESDIR}"/build-id-2.4.3.patch - eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch eapply "${FILESDIR}"/verbose-build-2.0.3.patch eapply_user @@ -149,29 +160,40 @@ src_configure() { # http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr + # set interpreter for Prefix + if use prefix ; then + patchelf --set-interpreter \ + "${EPREFIX}/$(get_libdir)"/ld-linux-x86-64.so.2 \ + "${WORKDIR}"/sbcl-binary/src/runtime/sbcl + fi + # applying customizations sbcl_apply_features } src_compile() { local bindir="${WORKDIR}"/sbcl-binary - - if use pax_kernel ; then - # To disable PaX on hardened systems - pax-mark -mr "${bindir}"/src/runtime/sbcl - - # Hack to disable PaX on second GENESIS stage - sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\ paxmark.sh -mr \.\/src\/runtime\/sbcl' \ - "${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime" + local bootstrap_lisp="sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" + + if use system-bootstrap ; then + if has_version "dev-lisp/sbcl" ; then + bootstrap_lisp="sbcl --no-sysinit --no-userinit --disable-debugger" + else + bootstrap_lisp="clisp" + fi fi + # Bug #869434 + append-cppflags -D_GNU_SOURCE + # clear the environment to get rid of non-ASCII strings, see bug #174702 # set HOME for paludis env - HOME="${T}" PATH="${PATH}" \ CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \ CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \ - GNUMAKE=make ./make.sh \ - "sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \ + SBCL_HOME="/usr/$(get_libdir)/sbcl" SBCL_SOURCE_ROOT="/usr/$(get_libdir)/sbcl/src" \ + GNUMAKE=make PV=${PV} ./make.sh \ + "${bootstrap_lisp}" \ || die "make failed" # need to set HOME because libpango(used by graphviz) complains about it @@ -237,6 +259,9 @@ src_install() { if use source; then ./clean.sh cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die + for d in contrib/*/; do + cp -av "$d" "${ED}/usr/$(get_libdir)/sbcl/" || die + done fi # necessary for running newly-saved images diff --git a/dev-lisp/sbcl/sbcl-2.0.4.ebuild b/dev-lisp/sbcl/sbcl-2.4.4.ebuild index 6c4368d0f07a..0f9267e35bc4 100644 --- a/dev-lisp/sbcl/sbcl-2.0.4.ebuild +++ b/dev-lisp/sbcl/sbcl-2.4.4.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit multilib eutils flag-o-matic pax-utils toolchain-funcs +inherit flag-o-matic pax-utils toolchain-funcs #same order as http://www.sbcl.org/platform-table.html BV_X86=1.4.3 -BV_AMD64=2.0.4 +BV_AMD64=2.4.4 BV_PPC=1.2.7 +BV_PPC64LE=1.5.8 BV_SPARC=1.0.28 BV_ALPHA=1.0.28 -BV_ARM=1.4.11 +BV_ARM=2.3.3 BV_ARM64=1.4.2 -BV_X86_MACOS=1.1.6 BV_X64_MACOS=1.2.11 BV_PPC_MACOS=1.0.47 BV_X86_SOLARIS=1.2.7 @@ -21,32 +21,38 @@ BV_X64_SOLARIS=1.2.7 BV_SPARC_SOLARIS=1.0.23 DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp" -HOMEPAGE="http://sbcl.sourceforge.net/" -SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2 - x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 ) - amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 ) - ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 ) - sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 ) - alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 ) - arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 ) - arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 ) - x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 ) - x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 ) - ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 ) - x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 ) - x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 ) - sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )" +HOMEPAGE="https://www.sbcl.org/ http://sbcl.sourceforge.net/" +BSD_SOCKETS_TEST_PATCH=bsd-sockets-test-2.3.6.patch +SRC_URI="https://downloads.sourceforge.net/sbcl/${P}-source.tar.bz2 + https://dev.gentoo.org/~grozin/${BSD_SOCKETS_TEST_PATCH}.gz + !system-bootstrap? ( + x86? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 ) + amd64? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 ) + ppc? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 ) + ppc64? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_PPC64LE}-ppc64le-linux-binary.tar.bz2 ) + sparc? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 ) + alpha? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 ) + arm? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 ) + arm64? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 ) + x64-macos? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 ) + ppc-macos? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 ) + x64-solaris? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 ) + )" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris" -IUSE="debug doc source +threads +unicode pax_kernel zlib" - -CDEPEND=">=dev-lisp/asdf-3.1:=" -DEPEND="${CDEPEND} +KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="system-bootstrap debug doc source +threads +unicode +zstd" + +CDEPEND=">=dev-lisp/asdf-3.3:= \ + prefix? ( dev-util/patchelf )" +# bug #843851 +BDEPEND="${CDEPEND} + dev-debug/strace doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) - pax_kernel? ( sys-apps/elfix )" + system-bootstrap? ( || ( dev-lisp/clisp dev-lisp/sbcl ) )" RDEPEND="${CDEPEND} + zstd? ( app-arch/zstd ) !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )" # Disable warnings about executable stacks, as this won't be fixed soon by upstream @@ -79,7 +85,7 @@ sbcl_apply_features() { sbcl_feature "true" ":sb-ldb" sbcl_feature "false" ":sb-test" sbcl_feature "$(usep unicode)" ":sb-unicode" - sbcl_feature "$(usep zlib)" ":sb-core-compression" + sbcl_feature "$(usep zstd)" ":sb-core-compression" sbcl_feature "$(usep debug)" ":sb-xref-for-internals" sed 's/^X//' >> "${CONFIG}" <<-'EOF' X ) @@ -90,7 +96,9 @@ sbcl_apply_features() { src_unpack() { unpack ${A} - mv sbcl-*-* sbcl-binary || die + if ! use system-bootstrap ; then + mv sbcl-*-* sbcl-binary || die + fi cd "${S}" } @@ -98,11 +106,14 @@ src_prepare() { # bug #468482 eapply "${FILESDIR}"/concurrency-test-2.0.1.patch # bugs #486552, #527666, #517004 - eapply "${FILESDIR}"/${PN}-1.4.0-bsd-sockets-test.patch + eapply "${WORKDIR}"/${BSD_SOCKETS_TEST_PATCH} # bugs #560276, #561018 - eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch + eapply "${FILESDIR}"/sb-posix-test-2.2.9.patch + # bug #767742 + eapply "${FILESDIR}"/etags-2.1.0.patch + # Use ${PV} as build-id, bug #797574 + eapply "${FILESDIR}"/build-id-2.4.3.patch - eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch eapply "${FILESDIR}"/verbose-build-2.0.3.patch eapply_user @@ -149,29 +160,40 @@ src_configure() { # http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr + # set interpreter for Prefix + if use prefix ; then + patchelf --set-interpreter \ + "${EPREFIX}/$(get_libdir)"/ld-linux-x86-64.so.2 \ + "${WORKDIR}"/sbcl-binary/src/runtime/sbcl + fi + # applying customizations sbcl_apply_features } src_compile() { local bindir="${WORKDIR}"/sbcl-binary - - if use pax_kernel ; then - # To disable PaX on hardened systems - pax-mark -mr "${bindir}"/src/runtime/sbcl - - # Hack to disable PaX on second GENESIS stage - sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\ paxmark.sh -mr \.\/src\/runtime\/sbcl' \ - "${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime" + local bootstrap_lisp="sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" + + if use system-bootstrap ; then + if has_version "dev-lisp/sbcl" ; then + bootstrap_lisp="sbcl --no-sysinit --no-userinit --disable-debugger" + else + bootstrap_lisp="clisp" + fi fi + # Bug #869434 + append-cppflags -D_GNU_SOURCE + # clear the environment to get rid of non-ASCII strings, see bug #174702 # set HOME for paludis env - HOME="${T}" PATH="${PATH}" \ CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \ CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \ - GNUMAKE=make ./make.sh \ - "sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \ + SBCL_HOME="/usr/$(get_libdir)/sbcl" SBCL_SOURCE_ROOT="/usr/$(get_libdir)/sbcl/src" \ + GNUMAKE=make PV=${PV} ./make.sh \ + "${bootstrap_lisp}" \ || die "make failed" # need to set HOME because libpango(used by graphviz) complains about it @@ -237,6 +259,9 @@ src_install() { if use source; then ./clean.sh cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die + for d in contrib/*/; do + cp -av "$d" "${ED}/usr/$(get_libdir)/sbcl/" || die + done fi # necessary for running newly-saved images diff --git a/dev-lisp/trivial-gray-streams/metadata.xml b/dev-lisp/trivial-gray-streams/metadata.xml index f3b41b1e33eb..ab49f9d34032 100644 --- a/dev-lisp/trivial-gray-streams/metadata.xml +++ b/dev-lisp/trivial-gray-streams/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>common-lisp@gentoo.org</email> diff --git a/dev-lisp/uiop/Manifest b/dev-lisp/uiop/Manifest index 112e97ce168f..d6eaea01c5a1 100644 --- a/dev-lisp/uiop/Manifest +++ b/dev-lisp/uiop/Manifest @@ -1,3 +1 @@ -DIST asdf-3.1.5.tar.gz 400359 BLAKE2B 586a66799a37259694baa673f2849e183fac5fedfe5ff5c92529d47fc0954d40b48bbc095db926b9ea2214b551729c269d0925e4396a52310b72fd5f21842f49 SHA512 937d45eabea0853cd1b2e78e84cf33e7b55065857ffcf49fd87ccd60e21ae09c6dc7ab3649d48b37aeb1beaeeaf6c816e5ce035f0283707105296fb976044516 -DIST asdf-3.3.1.tar.gz 479255 BLAKE2B 5161b79741a52721eaa4da80a61bbe51e924967ecb744a087fdcbd99407abcc42faf39eafe6d30af7dd8af751a80caaf23e93ce42aa5f584123a1e8b528cc613 SHA512 bf5efec4518eb5312ce743c0fbe60c587bebfe26c36c833c163d67bf8631e18eeb293f2185e547f6be10da061a17f024d9f4a3a0808727d7b9b3a7d7a0faf133 -DIST uiop-3.3.2.tar.gz 98207 BLAKE2B a003fabde2ee66244e48caa5ae319fb7ce872dc72cdb8f66c39cfa97a5fc5307de667b48a403432cc3c5cf3d8bfa2e3d330ee91b6251add532ec462d0c4c1d29 SHA512 3af6bfc7d0aa6ee102d3d9cbef3277026d9d7ac4811f6c966b4a9f84ab1e0f128822bddcf8b221288a3c895fc5be377f0ae907e2a08f38e6b09f36e5b4635ecc +DIST uiop-3.3.5.tar.gz 103922 BLAKE2B af730c5241245f7d6f41fff32c734a2e3f8c4a86590e5b2cacea0af1f71fdc8f89849c35cb906623d76046ee1928ad1b913364eea3819b546aa37a4494f1fa2b SHA512 33faf9c1d7e48d1573dd17201cbce312ef42edf64ad98576c25fdc51dcd0421322678e9e31f0558450768c6f742882fea80980d2c393b2d64359198091a939f6 diff --git a/dev-lisp/uiop/metadata.xml b/dev-lisp/uiop/metadata.xml index 7ea645c67e72..4de45c7d62d6 100644 --- a/dev-lisp/uiop/metadata.xml +++ b/dev-lisp/uiop/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>common-lisp@gentoo.org</email> diff --git a/dev-lisp/uiop/uiop-3.1.5.ebuild b/dev-lisp/uiop/uiop-3.1.5.ebuild deleted file mode 100644 index b78cf1fb0b7a..000000000000 --- a/dev-lisp/uiop/uiop-3.1.5.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils - -DESCRIPTION="UIOP is a portability layer spun off ASDF3" -HOMEPAGE="http://common-lisp.net/project/asdf/" -SRC_URI="http://common-lisp.net/project/asdf/archives/asdf-${PV}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris" -IUSE="" - -RDEPEND="~dev-lisp/asdf-${PV}" - -S="${WORKDIR}/asdf-${PV}/${PN}" - -src_install() { - insinto /usr/share/common-lisp/source/${PN} - doins -r contrib *.lisp ../version.lisp-expr uiop.asd asdf-driver.asd - dodir /usr/share/common-lisp/systems - dosym /usr/share/common-lisp/source/${PN}/uiop.asd /usr/share/common-lisp/systems/uiop.asd - dosym /usr/share/common-lisp/source/${PN}/asdf-driver.asd /usr/share/common-lisp/systems/asdf-driver.asd -} diff --git a/dev-lisp/uiop/uiop-3.3.1.ebuild b/dev-lisp/uiop/uiop-3.3.1.ebuild deleted file mode 100644 index 354fca8768ef..000000000000 --- a/dev-lisp/uiop/uiop-3.3.1.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit common-lisp-3 - -DESCRIPTION="UIOP is a portability layer spun off ASDF3" -HOMEPAGE="http://common-lisp.net/project/asdf/" -SRC_URI="http://common-lisp.net/project/asdf/archives/asdf-${PV}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris" -IUSE="" - -RDEPEND="~dev-lisp/asdf-${PV}" - -S="${WORKDIR}/asdf-${PV}/${PN}" - -src_install() { - insinto "${CLSOURCEROOT}/${PN}" - doins -r contrib *.lisp ../version.lisp-expr "${PN}.asd" asdf-driver.asd - dodir "${CLSYSTEMROOT}" - dosym "${CLSOURCEROOT}/${PN}/${PN}.asd" "${CLSYSTEMROOT}/${PN}.asd" - dosym "${CLSOURCEROOT}/${PN}/asdf-driver.asd" "${CLSYSTEMROOT}/asdf-driver.asd" -} diff --git a/dev-lisp/uiop/uiop-3.3.2.ebuild b/dev-lisp/uiop/uiop-3.3.5.ebuild index 7b084004812d..5d1f3d2a79e6 100644 --- a/dev-lisp/uiop/uiop-3.3.2.ebuild +++ b/dev-lisp/uiop/uiop-3.3.5.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit common-lisp-3 @@ -11,7 +11,6 @@ SRC_URI="http://common-lisp.net/project/asdf/archives/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris" -IUSE="" +KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos" RDEPEND="~dev-lisp/asdf-${PV}" |