gentoo auto-resync : 07:08:2022 - 20:12:29

3 files changed, 66 insertions, 70 deletions

diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 15247e89ceba..e15431a56d73 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/racket/Manifest b/dev-scheme/racket/Manifest
index cc5c406ce1b4..1d4a1db568b9 100644
--- a/dev-scheme/racket/Manifest
+++ b/dev-scheme/racket/Manifest
@@ -1,16 +1,16 @@
 AUX Makefile-nostrip.patch 635 BLAKE2B 6b8c6e573d64e284a4a6842fe8346b382f4f656a98bae59fff5c0b84c71557e74a9c91065f15d82910c3ecaeed720d38d42ba9366beaaeb9b5d1ffaa6baff954 SHA512 08221300c19fd115fe713a6e3f20e83f791d20807af33c27882f7f05e1dc20436dd1459f6b9e011118720c55d26c91f6d4650afa5977e6d2341898fbc7b54971
 AUX Makefile-starter.patch 1346 BLAKE2B 4f33f059ce0c9a02a27250d4893d00423854281ae6343443b7ffc7ddb7eed75951a31cbf11a9f89cf23d3c86513b54f6c42d9e66a006072f032c14957bbb9151 SHA512 a3dd1c1ed1cbb6ca596d32739ac56b1a4db188035572ff9015035061f69f0ef173c0b2dfae4a820b540c30e06d763c65e9d3192d16aaa6c6c25f6f74369f91f8
 AUX racket-8.4-ncurses.patch 4768 BLAKE2B 5d2a76efe004446624aac6ac23460a4daf9997a6fe1bd87bc890194939e38ca89ab08769668744afa45f3f5720ab0965a4ed50bf9569a6b3bfff71d302deca65 SHA512 028e0e3b57cfbe7baaea0c7c9c4c27561b663c9eaf4ea0716fda2ffa1d8cebc213ab1f7340671ed1d6a88329a079ee37f8d24a99427e89b7e8cd24ee70546c8d
-DIST racket-8.2-src-builtpkgs.tgz 150467561 BLAKE2B 5005aa852b089becd9d6da136a55a035ac5fd86bd1ad186ec30cdcf411927d444e1814797d63dbde3eb7b52bba7756e0464edf1d854d2ee7f5851caaae18ba55 SHA512 9e4c0cabfcbdb8c8742e8170548bee58021697e8b0842f575f94193db31adc04a7b9023ed8fd70dae197e5ec6f1aee7985d849be3ce5b4279f216e900ee143c7
 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-minimal-8.2-src-builtpkgs.tgz 21187959 BLAKE2B 0f62a900e71ee101fa3acf0985b0a72215ac657285c5ce9e4f5f49189180b82dcca94ded9778b7ba92a42919f17b1dc24eec07e13c64c77e47fc958614d7dc0a SHA512 04950703fa73cdbbb10c234d57c89e70db6076b42d4a74ddb8cace9e0438b9a1431f7317baf31d667368ad75ae19e4eecec39667ba0c5b08a3580f8cc81f4f5e
+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-minimal-8.4-src-builtpkgs.tgz 21279666 BLAKE2B 25d5eb405cedaa9cadfa776c4dd66b87f1641c86b638110f1a3a788465aaf573f5f8054e1e6913e6c0123840a1a2f64d5855db5f52acace3475b91d095272a76 SHA512 92433c08508cfb1bdb9093e5c7c726630826e9046de02fcb3d402f3dd76aa98fc2d9a5d09515d44e7a50eab0e38d963d2202f48a44741c3cf7fe8e47d9404e63
 DIST racket-minimal-8.5-src-builtpkgs.tgz 21390850 BLAKE2B 7bcd8c409203f71b3a49cd7e4a34159ef62fcc61b8fb66e976bfc0938ac54b7bc475e6aff59796b9c01ee324eb0d88bd68340c787f728a3739a57e879e731bfb SHA512 e0dec1038f33dbe3dfbbeba05cb24829e4b0c4223c5326cd26f920c736171e3b47b457236a06c9c57b6ebc82d17b022fba6558e3c94315b75469a2130b6fd375
-EBUILD racket-8.2-r3.ebuild 5205 BLAKE2B 05b2762605383f5c48ef70cb87c5b791c04a5b721076ce9d52c51293573952898a16a535cc2b40be0c15c13e248cf52713c0617fd1471d4dd41a6f782e9c9250 SHA512 57cff4bd79dfb8ba5b800e6d1782d06968dd9e1ce59bd77c3691bba3b7d9c056e3bdc1bfeaa8377dc6cb0ba5d01f19cb18a67020c7a8b2b0375ea20b40ffbaf7
+DIST racket-minimal-8.6-src-builtpkgs.tgz 22396113 BLAKE2B e8c09da9aef52566746def36823e736e07990ba703d8440a3d067cbeeb43c8d026469c1d4b7d9ad2a423766692b81d6efa400c55512450621acd624d23b1b193 SHA512 695f9be11cab2cf84d1c16b322feb6c4552bf05edbfd901e91fa9532ef52339a6463d8327f4ae4c704cd2e8d67e69c2333bc13b1c862bbe565af00b407debee8
 EBUILD racket-8.3-r3.ebuild 4592 BLAKE2B df72e1388608938c636f9cf45827056b2e4c9d4102b7feeb99c8d33040c22a8efa62006aebfc2544f30b9f6dbca6c2bd22d17029d9c0c145759963c28cd17d25 SHA512 dafd2aec23a547333368908fa5fbc5a2c731581fc74025104c9dd2adaebe4de3a8aa622a7008bec8814cd91887657f52a1cc722760a53d6f3ab0203c2f2cbc99
 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
 MISC metadata.xml 1885 BLAKE2B 0a77f8dc3d86ee5c4f12919b05893ad43c03f1eb21ace376552de1f0aaf071ddd15f27c59ef008f85cdb362e3ed316fbcb3a17ac2a3d4f18a38ad954df7bb338 SHA512 9510e5f9797419fb3da8799487c7dfc808eb9fc1fccfbbd8c225d04f617e00acd0e5b7a14ab6e05dc59b8cbc035a2d35a37dfe9459a42e5347d7ee499894fb5b
diff --git a/dev-scheme/racket/racket-8.2-r3.ebuild b/dev-scheme/racket/racket-8.6.ebuild
index 41e0c43edd56..40e8ef89c417 100644
--- a/dev-scheme/racket/racket-8.2-r3.ebuild
+++ b/dev-scheme/racket/racket-8.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit desktop optfeature readme.gentoo-r1 xdg-utils
+inherit desktop optfeature toolchain-funcs readme.gentoo-r1
 
 DESCRIPTION="General purpose, multi-paradigm Lisp-Scheme programming language"
 HOMEPAGE="https://racket-lang.org/"
@@ -11,7 +11,7 @@ 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,40 +24,22 @@ 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="X +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="futures? ( jit threads ) chez? ( threads ) places? ( threads )"
+REQUIRED_USE="chez? ( futures places ) futures? ( jit threads ) places? ( threads )"
 
 DEPEND="
 	!dev-tex/slatex
 	dev-db/sqlite:3
 	dev-libs/libffi:=
-	X? (
-		dev-util/desktop-file-utils
-		media-libs/libpng:0
-		virtual/jpeg:0
-		x11-libs/cairo[X]
-		x11-libs/gtk+:3[X]
-		x11-libs/pango[X]
-		x11-misc/shared-mime-info
-	)
+	ncurses? ( sys-libs/ncurses:= )
 "
 RDEPEND="${DEPEND}"
 
 # "mred" and "mzscheme" are binaries generated by Racket, not CC
 QA_FLAGS_IGNORED="usr/bin/mred usr/bin/mzscheme"
 
-# Backports that will be probably available in 8.3 release
-PATCHES=(
-	# Prevent "libracket3m" from being stripped
-	# https://github.com/racket/racket/commit/92d202060201f569fafc348c4f64a2965b55287f
-	"${FILESDIR}/Makefile-nostrip.patch"
-	# Fix "starter" LDFLAGS
-	# https://github.com/racket/racket/commit/4f0e1703979d704c4f91b009945c324450acec7a
-	"${FILESDIR}/Makefile-starter.patch"
-)
-
 DOC_CONTENTS="
 If you wish to use sys-libs/readline instead of dev-libs/libedit
 for readline-like features in the Racket's REPL you can install
@@ -65,32 +47,33 @@ the package 'readline-gpl' using raco, Racket's package manager
 https://pkgs.racket-lang.org/package/readline-gpl
 "
 
-# Package database files
+# Package database files (for pkg_preinst & pkg_config)
 PKGDB=(
 	/usr/share/racket/info-cache.rktd
 	/usr/share/racket/links.rktd
 	/usr/share/racket/pkgs/pkgs.rktd
 )
 
-post_X_update() {
-	if use X && ! use minimal; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-	fi
-}
-
 src_prepare() {
-	# Prepare environment
+	# Prepare the environment.
 	unset PLTADDONDIR PLTCOLLECTS PLTCONFIGDIR PLTUSERHOME
-	xdg_environment_reset
 
 	default
 
-	# Remove bundled libffi
+	# Remove bundled libffi.
 	rm -r ./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.
@@ -104,40 +87,48 @@ src_configure() {
 	local myconf=(
 		--disable-shared
 		--disable-strip
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--enable-float
-		--enable-foreign
-		--enable-libffi
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
 		--enable-libs
 		$(usex chez "--enable-cs --enable-csonly" "--enable-bc --enable-bconly")
-		$(use_enable X gracket)
 		$(use_enable doc docs)
-		$(use_enable futures)
-		$(use_enable jit)
-		$(use_enable places)
-		$(use_enable threads pthread)
+		$(use_enable iconv)
+		$(use_enable ncurses curses)
 	)
+	# Some options are togglable only for the BC version (are forced in CS)
+	! use chez && myconf+=(
+			--enable-float
+			--enable-foreign
+			--enable-gracket
+			--enable-libffi
+			$(use_enable futures)
+			$(use_enable jit)
+			$(use_enable places)
+			$(use_enable threads pthread)
+		)
 	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 X && ! 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
@@ -148,11 +139,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}"
@@ -164,7 +155,16 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	post_X_update
+	# 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
@@ -172,14 +172,10 @@ pkg_postinst() {
 	readme.gentoo_print_elog
 }
 
-pkg_postrm() {
-	post_X_update
-}
-
 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