gentoo auto-resync : 13:11:2022 - 18:49:18

2 files changed, 58 insertions, 31 deletions

diff --git a/dev-scheme/racket/Manifest b/dev-scheme/racket/Manifest
index 4982f7ac44ff..1afd79344b36 100644
--- a/dev-scheme/racket/Manifest
+++ b/dev-scheme/racket/Manifest
@@ -1,14 +1,14 @@
 AUX racket-8.4-ncurses.patch 4768 BLAKE2B 5d2a76efe004446624aac6ac23460a4daf9997a6fe1bd87bc890194939e38ca89ab08769668744afa45f3f5720ab0965a4ed50bf9569a6b3bfff71d302deca65 SHA512 028e0e3b57cfbe7baaea0c7c9c4c27561b663c9eaf4ea0716fda2ffa1d8cebc213ab1f7340671ed1d6a88329a079ee37f8d24a99427e89b7e8cd24ee70546c8d
-DIST racket-8.3-src-builtpkgs.tgz 150608486 BLAKE2B f002934c07afab4152ad8395c4ab5c6c87ef810f5cf79cf5ae0b41f4caa4508e0044f4246812513def14130d507af57aa61efaff8106eaeac0b86918bd775902 SHA512 7c340f65d221343beb2b4205cdc58648bd65dceabdb16f40cda425474faa905f4dd441193dc6cd4856f7863fb83834721394d6888027db356f830eceb127dbae
 DIST racket-8.4-src-builtpkgs.tgz 151809822 BLAKE2B c42f7943975a6f91a03ef0f668d218571dfc4159eac5a5722b9513b978413a9617b4e1bf3ccabef051014311ecf51fdc80d7563942e9e645c442ddfc4995a308 SHA512 afd9f357673a28ac5e4529ea0879a4edc3dbffc5b8627aa3553f1caf867be3296b94620dc2d86b8bb3f0c7ec7743d0057ce897c5caa705e02f2cc469ce4c7116
 DIST racket-8.5-src-builtpkgs.tgz 152548446 BLAKE2B ef914d742b3b949ecd7a1f817900add3ede874d7bd4dbe195c2ab69826d938c3ac81b883bc57d938908bc1f9e96faeaa25cb4dedf85288c580b7a89d62ec970a SHA512 4714599cbe10247cad119cc4073d80329d77c845d92b3741d35a9c88cc6395dc3d6f08ace8f606c3e39840f7071789ea953e3b6548da04fd7dfaa72a4368a7ae
 DIST racket-8.6-src-builtpkgs.tgz 154505661 BLAKE2B ab788ae3e5175024ec75fa0c34297616ab4dcc1bb6f62d4ff4623dc2dd699d63eb9b24238407a854b03210f21fefd02680dc29931ed9d146920ae32472196e32 SHA512 c2948164463fb59a2d6f1b5188cee7634da190ea40bd19f5a88ef466ccdf07da03503b6a1f00e327a66c31b862048bcd5b047f7c586ea0d26e23397ee5ee7682
-DIST racket-minimal-8.3-src-builtpkgs.tgz 21212037 BLAKE2B 76a742efe7ba2c44eb935d4852c20be355ccff9b935b39226ef1935184b0a9179ef6ca2ac0a64f3c7a6ae4a0082117a12c668d7804a0b73b9f1a391eaba61994 SHA512 3cab4a24cab5c1ac107c8aead2ada6fa3ec7d7aa122716c78af584f055dadf89497168e95b36d99115ecd1a1905dc1ec51774dd2c8099198ec7d6aa9d380039d
+DIST racket-8.7-src-builtpkgs.tgz 156337131 BLAKE2B a323683b6fd6d39473ab3eaeea24d175e12f8e36b9103849ec0730757b9c3d32f2e84ab8a9bde7fa834e2c6cf709e2531ab15e36e2694c5843b3b0bb41e909f8 SHA512 4c01001be49271e5536d24257c36bc57b16ff2cbf14eb59208b2939f4d14b5f58028cd1f643d49497eb8bffa84e5847f761171c951e006c278cf5d8ffafdd73e
 DIST racket-minimal-8.4-src-builtpkgs.tgz 21279666 BLAKE2B 25d5eb405cedaa9cadfa776c4dd66b87f1641c86b638110f1a3a788465aaf573f5f8054e1e6913e6c0123840a1a2f64d5855db5f52acace3475b91d095272a76 SHA512 92433c08508cfb1bdb9093e5c7c726630826e9046de02fcb3d402f3dd76aa98fc2d9a5d09515d44e7a50eab0e38d963d2202f48a44741c3cf7fe8e47d9404e63
 DIST racket-minimal-8.5-src-builtpkgs.tgz 21390850 BLAKE2B 7bcd8c409203f71b3a49cd7e4a34159ef62fcc61b8fb66e976bfc0938ac54b7bc475e6aff59796b9c01ee324eb0d88bd68340c787f728a3739a57e879e731bfb SHA512 e0dec1038f33dbe3dfbbeba05cb24829e4b0c4223c5326cd26f920c736171e3b47b457236a06c9c57b6ebc82d17b022fba6558e3c94315b75469a2130b6fd375
 DIST racket-minimal-8.6-src-builtpkgs.tgz 22396113 BLAKE2B e8c09da9aef52566746def36823e736e07990ba703d8440a3d067cbeeb43c8d026469c1d4b7d9ad2a423766692b81d6efa400c55512450621acd624d23b1b193 SHA512 695f9be11cab2cf84d1c16b322feb6c4552bf05edbfd901e91fa9532ef52339a6463d8327f4ae4c704cd2e8d67e69c2333bc13b1c862bbe565af00b407debee8
-EBUILD racket-8.3-r3.ebuild 4592 BLAKE2B df72e1388608938c636f9cf45827056b2e4c9d4102b7feeb99c8d33040c22a8efa62006aebfc2544f30b9f6dbca6c2bd22d17029d9c0c145759963c28cd17d25 SHA512 dafd2aec23a547333368908fa5fbc5a2c731581fc74025104c9dd2adaebe4de3a8aa622a7008bec8814cd91887657f52a1cc722760a53d6f3ab0203c2f2cbc99
+DIST racket-minimal-8.7-src-builtpkgs.tgz 22795747 BLAKE2B 3f0194ffff3f3a9ea383ddd6c447a8d56d8cf4fb029c77bf9e8733570ca59244afd321541e7506ca11bc8b09f4c56dd3e26cd01d22caa7f3f36bd5af29c861a6 SHA512 b60472160b41a070a4aa74265e6319da4e80c6e58ac3152a30dfa3398f457c6579384de62b66dcb7a7ead68f72f787c41eae65325cdc1ae928b54a90d0a25f05
 EBUILD racket-8.4-r1.ebuild 5384 BLAKE2B e0e8ccc64e93041202a599b50fcc08c857d593bea58caade1621c2b7c1929d9f249b0950f20a1b2ead7500d072526d482e3a6793e9caca2354a1bf381ad57289 SHA512 814ee06014870613888669be0dcc997e7919a45eb8c9a2be78438a8a95918e7f3c82e9644bcb5b44b812da1ea3368da0e8f2eb90dee7b3996577cca83d239566
 EBUILD racket-8.5.ebuild 5155 BLAKE2B 81f16216c48a74c9b6bd120d1e33f6dcd9bdb744ef3071fe3873b1fff058f3018cd6e74acfec85d6df42b29773f4e29335b18f0d0037989aaf2b04d6e8f3fc3d SHA512 08024c77c584bf63504b9ea84aebf083a0b16b2542f1eb0f95ad88948762f03ecba6527602f1e1e107307c31f9c3613854a4840e32d6cee5a4d94bc43d8bc25e
 EBUILD racket-8.6.ebuild 5487 BLAKE2B f8fc01738fe13d07a399ca8b612dc91808572069138f20d45e8bad27d11d2f68d8e618885c94b134b7a05478b26c4418f1ee971eaacc0d0a507c9c67a22db2c4 SHA512 7fcedf53f525d1a9a0626d015762651ea91f0b9b02f20f99c7219bf8ceb6cbf9210ee8bb96dae3dd8ba951ef081db42fd2a005c9a63d6daa427d4637d9a4c6b8
+EBUILD racket-8.7.ebuild 5528 BLAKE2B 7fe822db15dc499c62b7ee6a9302b0ec64b6e74f9923f2df5bbf1c2dd738baa0ab7782e0df97c9ec7cbace94313685bdcdd9c3037ced701b9d86fa4a69ef0b72 SHA512 f55a535bf434268569a395b56347f5c7b5ccce5d6aa32575498adef81e60d5d80aa0bbabd11b4872f96c474cc830a2cfb43a0256e0dbcf353ed6887a6b93932f
 MISC metadata.xml 1885 BLAKE2B 0a77f8dc3d86ee5c4f12919b05893ad43c03f1eb21ace376552de1f0aaf071ddd15f27c59ef008f85cdb362e3ed316fbcb3a17ac2a3d4f18a38ad954df7bb338 SHA512 9510e5f9797419fb3da8799487c7dfc808eb9fc1fccfbbd8c225d04f617e00acd0e5b7a14ab6e05dc59b8cbc035a2d35a37dfe9459a42e5347d7ee499894fb5b
diff --git a/dev-scheme/racket/racket-8.3-r3.ebuild b/dev-scheme/racket/racket-8.7.ebuild
index cc99f7caf28b..6cd3f9300d24 100644
--- a/dev-scheme/racket/racket-8.3-r3.ebuild
+++ b/dev-scheme/racket/racket-8.7.ebuild
@@ -3,15 +3,16 @@
 
 EAPI=8
 
-inherit desktop optfeature readme.gentoo-r1
+inherit desktop optfeature toolchain-funcs readme.gentoo-r1
 
 DESCRIPTION="General purpose, multi-paradigm Lisp-Scheme programming language"
-HOMEPAGE="https://racket-lang.org/"
+HOMEPAGE="https://racket-lang.org/
+	https://github.com/racket/racket/"
 SRC_URI="
 	minimal? ( https://download.racket-lang.org/installers/${PV}/${PN}-minimal-${PV}-src-builtpkgs.tgz )
 	!minimal? ( https://download.racket-lang.org/installers/${PV}/${P}-src-builtpkgs.tgz )
 "
-S="${WORKDIR}/${P}/src"
+S="${WORKDIR}"/${P}/src
 
 # See https://blog.racket-lang.org/2019/11/completing-racket-s-relicensing-effort.html
 LICENSE="
@@ -24,17 +25,18 @@ LICENSE="
 # PV == SLOT but this has to be checked carefully and in cases
 # where we use _p, _pre, etc it will have to be set manually.
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="+chez +doc +futures +jit minimal +places +threads"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="+chez +doc +futures iconv +jit minimal ncurses +places +threads"
 # See bug #809785 re chez/threads
 REQUIRED_USE="chez? ( futures places ) futures? ( jit threads ) places? ( threads )"
 
-DEPEND="
+RDEPEND="
 	!dev-tex/slatex
 	dev-db/sqlite:3
 	dev-libs/libffi:=
+	ncurses? ( sys-libs/ncurses:= )
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 
 # "mred" and "mzscheme" are binaries generated by Racket, not CC
 QA_FLAGS_IGNORED="usr/bin/mred usr/bin/mzscheme"
@@ -54,16 +56,25 @@ PKGDB=(
 )
 
 src_prepare() {
-	# Prepare the environment
+	# Prepare the environment.
 	unset PLTADDONDIR PLTCOLLECTS PLTCONFIGDIR PLTUSERHOME
 
 	default
 
-	# Remove bundled libffi
-	rm -r ./bc/foreign/libffi || die "failed to remove bundled libffi"
+	# Remove bundled libffi.
+	rm -r "${S}"/bc/foreign/libffi || die "failed to remove bundled libffi"
 }
 
 src_configure() {
+	# Compilation of Zuo does not respect the autoconf configuration.
+	tc-export CC
+
+	# Configure Zuo.
+	pushd "${S}"/zuo >/dev/null || die
+	econf
+	popd >/dev/null || die
+
+	# Configure Racket.
 	# Libtool:
 	#   According to vapier, we should use the bundled libtool
 	#   such that we don't preclude cross-compile.
@@ -77,10 +88,12 @@ src_configure() {
 	local myconf=(
 		--disable-shared
 		--disable-strip
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
 		--enable-libs
 		$(usex chez "--enable-cs --enable-csonly" "--enable-bc --enable-bconly")
 		$(use_enable doc docs)
+		$(use_enable iconv)
+		$(use_enable ncurses curses)
 	)
 	# Some options are togglable only for the BC version (are forced in CS)
 	! use chez && myconf+=(
@@ -96,24 +109,27 @@ src_configure() {
 	econf "${myconf[@]}"
 }
 
+src_compile() {
+	# Compile Racket.
+	CC_FOR_BUILD="$(tc-getCC)" default
+
+	# Recompile Zuo with optimizations.
+	emake -C zuo
+}
+
 src_install() {
+	# Install Racket.
 	default
 
-	# Install Racket boot files
-	if use chez; then
-		pushd "${S}"/cs/c || die
-		emake DESTDIR="${ED}" unix-install-boot-files
-		popd || die
-	fi
+	# Install Zuo.
+	emake -C zuo DESTDIR="${ED}" install
 
-	# raco needs decompressed files for packages doc installation bug 662424
-	if use doc; then
-		docompress -x /usr/share/doc/${PF}
-	fi
+	# raco needs decompressed files for packages doc installation, bug #662424
+	use doc && docompress -x /usr/share/doc/${PF}
 
-	# Create missing desktop files and icon
-	if ! use minimal; then
-		newicon "${ED}/usr/share/racket/drracket-exe-icon.png" "racket.png"
+	# Create missing desktop files and icon.
+	if ! use minimal ; then
+		newicon "${ED}"/usr/share/racket/drracket-exe-icon.png racket.png
 		make_desktop_entry "gracket" "GRacket" "racket" "Development;Education;"
 		make_desktop_entry "plt-games" "PLT Games" "racket" "Education;Game;"
 	fi
@@ -124,11 +140,11 @@ src_install() {
 pkg_preinst() {
 	# If we are merging the same SLOT check if package
 	# database files exist and do not overwrite them
-	if has_version "${CATEGORY}/${PN}:${SLOT}"; then
+	if has_version ${CATEGORY}/${PN}:${SLOT} ; then
 		echo "We are installing the same SLOT: ${SLOT}"
 		local rktd
-		for rktd in "${PKGDB[@]}"; do
-			if [[ -f "${EROOT}"/${rktd} ]] && [[ -f "${ED}"/${rktd} ]]; then
+		for rktd in "${PKGDB[@]}" ; do
+			if [[ -f "${EROOT}"/${rktd} ]] && [[ -f "${ED}"/${rktd} ]] ; then
 				einfo "Keeping old file: ${rktd}"
 				mv "${ED}"/${rktd} "${ED}"/${rktd}.bak ||
 					die "failed to create a backup of ${rktd}"
@@ -140,6 +156,17 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
+	# If we have any pkgs not included in Racket main distribution (outsiders),
+	# then we have to re-setup them or during installation other pkgs will want
+	# to recompile parts of "outsider" pkgs they depend upon (and fail).
+	local outsiders=( $(raco pkg show -i | grep 'link' | sed 's|link.*||g') )
+	if [[ -n "${outsiders[@]}" ]] ; then
+		ebegin "Running \"raco setup\" for outsider packages"
+		echo "Outsiders: ${outsiders[@]}"
+		raco setup --all-users --force --no-docs --no-user --pkgs "${outsiders[@]}"
+		eend 0  # do not fail
+	fi
+
 	optfeature "readline editing features in REPL" dev-libs/libedit
 	optfeature "generating PDF files using Scribble" dev-texlive/texlive-fontsextra
 
@@ -149,7 +176,7 @@ pkg_postinst() {
 pkg_config() {
 	einfo "Swapping package database backup files"
 
-	for rktd in "${PKGDB[@]}"; do
+	for rktd in "${PKGDB[@]}" ; do
 		mv "${EROOT}"/${rktd} "${EROOT}"/${rktd}.pkg_config
 		mv "${EROOT}"/${rktd}.bak "${EROOT}"/${rktd}
 		mv "${EROOT}"/${rktd}.pkg_config "${EROOT}"/${rktd}.bak