gentoo resync : 15.06.2021

5 files changed, 253 insertions, 2 deletions

diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index 6c812e52bb20..d496a82b4819 100644
--- a/dev-lisp/Manifest.gz
+++ b/dev-lisp/Manifest.gz
diff --git a/dev-lisp/clisp/Manifest b/dev-lisp/clisp/Manifest
index 4e2a3571ec5b..c51e2ceb4e9f 100644
--- a/dev-lisp/clisp/Manifest
+++ b/dev-lisp/clisp/Manifest
@@ -1,4 +1,4 @@
 AUX clisp-2.49.92-after_glibc_cfree_bdb.patch 8499 BLAKE2B d093b76cdf25b0822aaca87bd6055c6b58edc68e387d78d7fd979171d881fe585b674246b3a2a6f37a8412b5aef1b997210b4019a1595a07b64471cb9324656f SHA512 1b8cb29bf9caa30ca05474a67202f72f013e57d6b0d2dff1fb5ab0472df9f5c5a5b5de46922c931fa9a4d4a0a25890a05e1f7d38ddfb56c967026eef80001919
 DIST clisp-2.49.92.tar.bz2 9055207 BLAKE2B 6cf331eb9f99f62579e35469e2d01cae066083592ccc71cf483b70b4d1be349cdee9d403e0a7ed1ad1c8c5d805c1dab51c1a5031d77469ff8c4dc52eb58913df SHA512 cc9412a7b3f21c85b040bf5e660380fafb3c2374765a1c00272feb3f7838f2161e27a5d6295cef9976f0c4522f10796cf5ee5447716090d1cc69ecfe598ef306
-EBUILD clisp-2.49.92.ebuild 4023 BLAKE2B 39bb21bdb959b1b41592406e24d45a837b64de62edc125efa0c74cfb98f2db9cff71b01b273105f11a9bb6ab01e7fb8ebf745765f59a05f13b94fc60e4a75bc3 SHA512 5d15a04e0f042afde061058bb023e61fcf5d7b14e8601bde143ae6ac563708918e843ff43688d816f911da4f90d858b1158a470d079887e121ba26f586e5789b
+EBUILD clisp-2.49.92.ebuild 4022 BLAKE2B a6bf1ef77d344ae1f6a184902bc1ef17f41b44280b5fddaa754b2c3f49dd12a6f92883c5d7001244cd44fef88d447010e8728bda882074ccf23d7c81c37cd29b SHA512 b52bf7212c631b06869bd6e028ba99e79f3b61c7e0082aaeb11724e19de95972089ee8ab3b94913584f4012df58be14eaf91fb6eaf2fc4b3a715d3e154b7cb10
 MISC metadata.xml 1240 BLAKE2B f64eb9d2b7885fb771d0bd455c3551191ef85c17ef036686ae213058fa9ae3f87f8dab5dab7d6c89c66dbb883c89f0624009ced645a05f40463f22560802c581 SHA512 8b40fdaba20939478eb982350eed9480df6ac8a48885ceb4e04da9d4bfd77e3c8451f96d2745ce4baff5d4e16db5363d81a66c50a364046f921a47478d563b49
diff --git a/dev-lisp/clisp/clisp-2.49.92.ebuild b/dev-lisp/clisp/clisp-2.49.92.ebuild
index 6a4e241457ee..1403a5e81c59 100644
--- a/dev-lisp/clisp/clisp-2.49.92.ebuild
+++ b/dev-lisp/clisp/clisp-2.49.92.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 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"
+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
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index 4bb0a6307f46..66f3612487fe 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -46,6 +46,8 @@ DIST sbcl-2.1.3-source.tar.bz2 6546338 BLAKE2B 7253a97fe57c9f3bfd3fd094d75dd1d02
 DIST sbcl-2.1.3-x86-64-linux-binary.tar.bz2 10141041 BLAKE2B 724786d03e53b86da38cff705d3d3c3b13cbd92375a3841bbf5f1e410d765b7ca4c451e73c4f6f46dd813d4e121f4b641ac70e8cf88599c157bb66c4d3e40b9d SHA512 9209ecaedab3fc16b877970dc72f6cbf611906cb25e6980fedd7234990f5d2b4b49572942e6a11f638688802dc804b27e114877fd1d17478db9441593629e70e
 DIST sbcl-2.1.4-source.tar.bz2 6550812 BLAKE2B 2d0d05a5b3bd26b2902b9178c426d76556395bf84c7ea476b3815883ddc16e7f5381dacb70370868af21f802646b4611ba05c245b53d00fb6501f64cba427264 SHA512 ed24fdfb1ab5bfbad5c22f938e2450e16ee558defc458ac4dfe24fbc7d57b9eade052ea119544e6e123979eb5048b6c776dada8c5aa6dba459c582a60fc7d943
 DIST sbcl-2.1.4-x86-64-linux-binary.tar.bz2 10144909 BLAKE2B ef83027d043de576211dbc3c188272a082993d12bf448304ab2f0434463de74ea232a0abaf98c71a4cf5a689d33da78bba5c749503b559942deae79aa76fcd5d SHA512 79dcc2ce153464f7d2510424591367af60b3168c6fbda864f2f49121fd88b5b688c5eeecab73f859fafb8c4a7f941bef039a065cf6c0f2e25463737323f87e47
+DIST sbcl-2.1.5-source.tar.bz2 6566902 BLAKE2B 3e98a3d996120baf7cbddbe595aacc07615cd8471e9bb87fc73e8cf0621988e5dd549a58425f7c569588833f9a4b1bbe43af40472fa9a287a3780e40e86536bd SHA512 5e208b3a1b3ff1a589c9ae0398e40086d979342c11fa7bb251797d0266618801b525dddb6998cebae3fc2a88547f7a71bdc43c5418f5edc2cf9bf699ed725334
+DIST sbcl-2.1.5-x86-64-linux-binary.tar.bz2 10155269 BLAKE2B 8456fbe477d6afc4becf4ec2fadb296e40532f02ea0ad5de61891cf68384450028e85e52d44164323c1a40b5f67c591114cd1a077de305b3f1b20484310bf5a6 SHA512 cb90c2bc6bed5f5f3af9831cd520580d4e8207ee45ae3572a17cf0da21563ce8e03d1c0e22099d05b750e0f76b2a0701918c80e25e2b7a9846d8cc5169f82f7c
 EBUILD sbcl-1.3.11.ebuild 8268 BLAKE2B d2004b01de317306719ffcb88a72b7b35c30996d3d032708ca16da9f03651a13594c05b4e183260faa627b74df0c6a81abb83a405c43de5a8e7bc7ad076cf11a SHA512 9a5fa125075f16034b9f49a419059b6fa372c1fab8e59a96f3e99de34b11471910f00893cee3e9c8fc032306ea5bbcb8d46be62d1a5db884e8040b581ce051b0
 EBUILD sbcl-1.4.9.ebuild 8615 BLAKE2B 452523ca8f28020a0502b0d67fe275920bacbcb41d4dcdaade9dab30edf6fe2c8208776d55b5b5a52ee7d860449048233cadaebf2d67d4a604215910bffb86a4 SHA512 c74ac70682cc3ac2dd290b014f3767dd99ef15fa0af1f95c0eaa14f618711d3e021b9548c5783cdb034ee8d590ef25bd1f411ab113065cadf6eaaf5498a70f9a
 EBUILD sbcl-2.0.10.ebuild 8494 BLAKE2B 26053dab5a278ef51d1eb41a009725e69e7a09e0f7b034c59557c7fb0b5f1905b8fe90933e0322680cb0842eedd5e84ed6b603574558f7948ca24f9503b2b1cc SHA512 f631c2e364da7eef3a6e47847fe1b187fcb1f6e0058c07c87562bc1651bc5b7b6cf827f09942ed8fb448c5b721ec2da06b2968513bca7b5c0ac469321e6a0655
@@ -55,4 +57,5 @@ EBUILD sbcl-2.1.1.ebuild 8548 BLAKE2B a38c32d2e3ab6c6095b67e626e6fdf944d27d387d0
 EBUILD sbcl-2.1.2.ebuild 8548 BLAKE2B 4b225ee117866437a9dc527fdac94a9763370732e7aa023be516dc8efad94f5b990bbf3af0063eda2c82312fc40186d95e39e32824e8e1f09a1570cb403db59b SHA512 60e78b800e172650b1b684eb79c30ca987791456086ec230adf2a0702717e3894bccb1ca5f24a49a62938fea6f78b0e4b435e67dbee142d5b49aac7e257c2cb0
 EBUILD sbcl-2.1.3.ebuild 8635 BLAKE2B 41415ae66dd3b9737e275166edd7ca73c8c538de29f4184af5dba0d417d44236cb09d98120e2345cb20225e5b4903b7acfa77888df5ebd7481931b2f2ba10f55 SHA512 0029ae924897f481cd4314a426c905ed5c7c10dfd7fbfa07fd62ee87213e7cd20e8991ebdaa6c242e8679a0bc9b66d3c77227e305bc8af53a87aa67716b70701
 EBUILD sbcl-2.1.4.ebuild 8635 BLAKE2B c3f95ff03793e78bda76096ac6d4f4581a6f4c9fff0430513f8be3e25e48efac1261cc5fe1a0ae66ff1d86329b2dddd92584c13bf599673523844a8f29e0b38c SHA512 c37f10bd17be83aeafb879f98b73e52e1bccaca000b74a83c39eeac91bdf13fb298d42b41755aa340921f4b4bd8198f64c3689fb34c5069966ac7dc1cd86b064
+EBUILD sbcl-2.1.5.ebuild 8635 BLAKE2B 5217c7430f26689fe3ea777630b53f25da8061da5952aad88a9ff59def1f50a5863532e7a3132ab96a0f6e0db6a15b6d1c86019f02caf29e7cb1f4f422e2ff00 SHA512 1bdd822cbf09f99d2a560eb8216a5b2caf70920b5de64970fb3955b742c8870c65e54c4ed1db379506c46952adfe728ba9f0ca5cd201a86e7e9303cd97392dfc
 MISC metadata.xml 1312 BLAKE2B a03042bd9d39465fe7ae45d6b749571fc4d22cf9d7f81d3cd498b155729576ec1f2ddec03c2c662ecb23abfd19a627ba2cbe9798960009e998a8823902062118 SHA512 3c4463de4a8871ab56fe74c286977fda3037e953d5fa26162d07976efa00b0d99bc98295435a7c5233c43b27369e31eb5d1c0b4c66600477a307aa1a7a322e1c
diff --git a/dev-lisp/sbcl/sbcl-2.1.5.ebuild b/dev-lisp/sbcl/sbcl-2.1.5.ebuild
new file mode 100644
index 000000000000..5b723d8bd15b
--- /dev/null
+++ b/dev-lisp/sbcl/sbcl-2.1.5.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib 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.1.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_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 )
+	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-solaris"
+IUSE="debug doc source +threads +unicode pax_kernel zlib"
+
+CDEPEND=">=dev-lisp/asdf-3.3:="
+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
+	# bug #767742
+	eapply "${FILESDIR}"/etags-2.1.0.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
+		for d in contrib/*/; do
+			cp -av "$d" "${ED}/usr/$(get_libdir)/sbcl/" || die
+		done
+	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}"
+}