gentoo resync : 13.11.2021

3 files changed, 39 insertions, 18 deletions

diff --git a/dev-scheme/racket/Manifest b/dev-scheme/racket/Manifest
index c68059d63963..09b8e2126a4b 100644
--- a/dev-scheme/racket/Manifest
+++ b/dev-scheme/racket/Manifest
@@ -19,6 +19,6 @@ EBUILD racket-7.1-r1.ebuild 2466 BLAKE2B 907c211cf8634e226e13bc8ec6d57fdfa5deabf
 EBUILD racket-7.2-r1.ebuild 2529 BLAKE2B fdfd7f60f5c609bd2835b6b07344e0bda04a128328efd49e925bd9bf20832df0cb3259b497465f106693c9b8b48154619efbd128c290b2e8725907f78956870e SHA512 346fc9a11710e2a4bfd83f65f79a27408ed5be0574d1b38f48a998ee944ace97af7af64c1bd8399c33bc5d09b83b12486f32d2df71f41fe5ca2cafaeefab1f48
 EBUILD racket-7.3-r1.ebuild 2529 BLAKE2B fdfd7f60f5c609bd2835b6b07344e0bda04a128328efd49e925bd9bf20832df0cb3259b497465f106693c9b8b48154619efbd128c290b2e8725907f78956870e SHA512 346fc9a11710e2a4bfd83f65f79a27408ed5be0574d1b38f48a998ee944ace97af7af64c1bd8399c33bc5d09b83b12486f32d2df71f41fe5ca2cafaeefab1f48
 EBUILD racket-8.0-r1.ebuild 2947 BLAKE2B 466e3cd12f6a192ab3c980a07556aaae1af4537bd96fba2b646adcda36f63ebeb93df05f191e1546be0186f2bfb4662e63d4a806d12c44ad0ba9f39e9299bf5b SHA512 993fd309782646a33944ff634ba1c25ef03e2c6d0c22230a2a7aa0406b527af4a9ac0b9b04b6d2fba52e01ef5b02dae008da2c9b80027cdb04e7f9614ef3136e
-EBUILD racket-8.1.ebuild 4412 BLAKE2B bd530aba49c44162b5bb94792b74ae858d43843a692f2d5fbed1224ded76d202fe298c7524c35db5c966fe11c15de7e5a049c3ecf2a0da76f4435fdebd5bbb1c SHA512 2ab601d06f1d195b63443d8bd232aeb492ebf51ebb822c4c845c89b653ce1020cde0123bb09f90076f32daee3c90ed7e20b521597444033cf43c9e91b005a1fe
-EBUILD racket-8.2.ebuild 4412 BLAKE2B bd530aba49c44162b5bb94792b74ae858d43843a692f2d5fbed1224ded76d202fe298c7524c35db5c966fe11c15de7e5a049c3ecf2a0da76f4435fdebd5bbb1c SHA512 2ab601d06f1d195b63443d8bd232aeb492ebf51ebb822c4c845c89b653ce1020cde0123bb09f90076f32daee3c90ed7e20b521597444033cf43c9e91b005a1fe
+EBUILD racket-8.1-r1.ebuild 4669 BLAKE2B a4ac2ad98c75fa22499c3c2426b6b804ede9bfcfbef6a74b36b7615edaf11b3d59faa32199975a227e6bb7608193f01d6a2bb85a04d8bb7865fdb3e8a8e4e89d SHA512 a988c01b07176b63eadb50dc62898a2d24613c22178016a581164e227608f9c63e28e146914ce097956685d7c6b9968f4393814d83286afa5a86d52a5377bf2d
+EBUILD racket-8.2-r1.ebuild 4719 BLAKE2B 347edfd00d2f4af9ba4a1f96de37af00e3e8bc13dd9eb8b8422d1217021e64fe7278b0b168c4c4f461e8249219fc78f2067cda5c9a821529119f68fd19aa5534 SHA512 da546f1216f40fd55e319bf582ca4daefea7c50fc17282bcdffb02f300b795fe496578b4d39aff8f306d16edabc868adf63a01585471479fb0ab75cb3195e1e8
 MISC metadata.xml 1650 BLAKE2B af7d1bb5e4a6a4fa170f4f88fa20faca5463330047a7dcdf48e24f0e9967233235ac810f5901397ab909fbbf008c4aa8c4a89a1ea540bed40a3d2da1886613de SHA512 e2b5c5af4e5e6561cf206c1cfd3b1a1e031d722482f85ac09ce808713acc856e691adf43d62d3df46644d1abcd1f01f8cf07f1453556e7d27ae9bc425f61e63b
diff --git a/dev-scheme/racket/racket-8.1.ebuild b/dev-scheme/racket/racket-8.1-r1.ebuild
index b9c6c2601961..652449041953 100644
--- a/dev-scheme/racket/racket-8.1.ebuild
+++ b/dev-scheme/racket/racket-8.1-r1.ebuild
@@ -81,18 +81,24 @@ src_prepare() {
 }
 
 src_configure() {
-	# According to vapier, we should use the bundled libtool
+	# Libtool:
+	#   According to vapier, we should use the bundled libtool
 	#   such that we don't preclude cross-compile.
 	#   Thus don't use --enable-lt=/usr/bin/libtool
-	# --enable-bc builds Racket w/o chez backend
+	# Backend:
+	#   --enable-bc builds Racket w/o chez backend
+	# C Libraries:
+	#   --enable-libs & --disable-shared is the way to build
+	#   .a files that are needed to embed Racket into programs
+	#   https://docs.racket-lang.org/inside/cs-embedding.html
 	local myconf=(
-		--disable-libs
+		--disable-shared
 		--disable-strip
 		--docdir="${EPREFIX}/usr/share/doc/${PF}"
 		--enable-float
 		--enable-foreign
 		--enable-libffi
-		--enable-shared
+		--enable-libs
 		$(usex chez "--enable-cs --enable-csonly" "--enable-bc --enable-bconly")
 		$(use_enable X gracket)
 		$(use_enable doc docs)
@@ -107,14 +113,18 @@ src_configure() {
 src_install() {
 	default
 
+	# Install Racket boot files
+	if use chez; then
+		pushd "${S}"/cs/c || die
+		emake DESTDIR="${ED}" unix-install-boot-files
+		popd || die
+	fi
+
 	# raco needs decompressed files for packages doc installation bug 662424
 	if use doc; then
 		docompress -x /usr/share/doc/${PF}
 	fi
 
-	# Remove unneeded "*.a" and "*.la" files
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-
 	# Create missing desktop files and icon
 	if use X && ! use minimal; then
 		newicon "${ED}/usr/share/racket/drracket-exe-icon.png" "racket.png"
diff --git a/dev-scheme/racket/racket-8.2.ebuild b/dev-scheme/racket/racket-8.2-r1.ebuild
index b9c6c2601961..3437a73c8c5f 100644
--- a/dev-scheme/racket/racket-8.2.ebuild
+++ b/dev-scheme/racket/racket-8.2-r1.ebuild
@@ -21,9 +21,10 @@ LICENSE="
 "
 # Bytecode generated by Racket is not compatible between versions
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="X +chez +doc +futures +jit minimal +places +readline +threads"
-REQUIRED_USE="futures? ( jit )"
+# See bug #809785 re chez/threads
+REQUIRED_USE="futures? ( jit ) chez? ( threads )"
 
 DEPEND="
 	!dev-tex/slatex
@@ -81,18 +82,24 @@ src_prepare() {
 }
 
 src_configure() {
-	# According to vapier, we should use the bundled libtool
+	# Libtool:
+	#   According to vapier, we should use the bundled libtool
 	#   such that we don't preclude cross-compile.
 	#   Thus don't use --enable-lt=/usr/bin/libtool
-	# --enable-bc builds Racket w/o chez backend
+	# Backend:
+	#   --enable-bc builds Racket w/o chez backend
+	# C Libraries:
+	#   --enable-libs & --disable-shared is the way to build
+	#   .a files that are needed to embed Racket into programs
+	#   https://docs.racket-lang.org/inside/cs-embedding.html
 	local myconf=(
-		--disable-libs
+		--disable-shared
 		--disable-strip
 		--docdir="${EPREFIX}/usr/share/doc/${PF}"
 		--enable-float
 		--enable-foreign
 		--enable-libffi
-		--enable-shared
+		--enable-libs
 		$(usex chez "--enable-cs --enable-csonly" "--enable-bc --enable-bconly")
 		$(use_enable X gracket)
 		$(use_enable doc docs)
@@ -107,14 +114,18 @@ src_configure() {
 src_install() {
 	default
 
+	# Install Racket boot files
+	if use chez; then
+		pushd "${S}"/cs/c || die
+		emake DESTDIR="${ED}" unix-install-boot-files
+		popd || die
+	fi
+
 	# raco needs decompressed files for packages doc installation bug 662424
 	if use doc; then
 		docompress -x /usr/share/doc/${PF}
 	fi
 
-	# Remove unneeded "*.a" and "*.la" files
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-
 	# Create missing desktop files and icon
 	if use X && ! use minimal; then
 		newicon "${ED}/usr/share/racket/drracket-exe-icon.png" "racket.png"