gentoo resync : 22.12.2021

3 files changed, 28 insertions, 48 deletions

diff --git a/dev-scheme/racket/Manifest b/dev-scheme/racket/Manifest
index 29665e323ab5..48baa710b146 100644
--- a/dev-scheme/racket/Manifest
+++ b/dev-scheme/racket/Manifest
@@ -4,6 +4,6 @@ DIST racket-8.2-src-builtpkgs.tgz 150467561 BLAKE2B 5005aa852b089becd9d6da136a55
 DIST racket-8.3-src-builtpkgs.tgz 150608486 BLAKE2B f002934c07afab4152ad8395c4ab5c6c87ef810f5cf79cf5ae0b41f4caa4508e0044f4246812513def14130d507af57aa61efaff8106eaeac0b86918bd775902 SHA512 7c340f65d221343beb2b4205cdc58648bd65dceabdb16f40cda425474faa905f4dd441193dc6cd4856f7863fb83834721394d6888027db356f830eceb127dbae
 DIST racket-minimal-8.2-src-builtpkgs.tgz 21187959 BLAKE2B 0f62a900e71ee101fa3acf0985b0a72215ac657285c5ce9e4f5f49189180b82dcca94ded9778b7ba92a42919f17b1dc24eec07e13c64c77e47fc958614d7dc0a SHA512 04950703fa73cdbbb10c234d57c89e70db6076b42d4a74ddb8cace9e0438b9a1431f7317baf31d667368ad75ae19e4eecec39667ba0c5b08a3580f8cc81f4f5e
 DIST racket-minimal-8.3-src-builtpkgs.tgz 21212037 BLAKE2B 76a742efe7ba2c44eb935d4852c20be355ccff9b935b39226ef1935184b0a9179ef6ca2ac0a64f3c7a6ae4a0082117a12c668d7804a0b73b9f1a391eaba61994 SHA512 3cab4a24cab5c1ac107c8aead2ada6fa3ec7d7aa122716c78af584f055dadf89497168e95b36d99115ecd1a1905dc1ec51774dd2c8099198ec7d6aa9d380039d
-EBUILD racket-8.2-r1.ebuild 4884 BLAKE2B 202c3b418652e2a3b8a67c7915e2219b4b27c8e6032f31c84af21a8f86af0f69821f1f2faae522409536213601fef9b5d89bf21978386a86cc6b4bfac7873b2d SHA512 d99c3600f68d1e6d527ca41207af5fadc1c32105bbadfb1ed33042a3091f495673bdfc83a9c607c0f2213bd779b4fc5289994a39dc9514f1431b708a11d99027
-EBUILD racket-8.3.ebuild 4500 BLAKE2B 1e7035d5af3885a8d142c683227bd1449e0be6a5f748824a49cf69d928eaacaec9747f063356c4be06005cecfafeeea3db8c311e0896c263878f22c55567ec5a SHA512 d7be5f51979992d879425585e65e1c30dbe253f609c6799ae01c11e01ad0764d2056398c8a3d43460ed4ad420c9dc2f91475147bb015cce279e66c95cfbc204c
+EBUILD racket-8.2-r2.ebuild 4891 BLAKE2B 22b5f5525bc3ad83ab57c9cdc9d6cbfc9984f737312c8e5aaa729af95ce770fc316ed0ed8fe443aa45c921c1ab985965bf30cc5ed5930b19a2b2cca678357d87 SHA512 3c6875c3c51a3caa759bf43252279c5a7e4dbd7db01911dca2783f9133b129aa5e10ee381da5031b0ddc6324fefdd135dc94ee0da7371f64da688df648df9a8e
+EBUILD racket-8.3-r2.ebuild 4280 BLAKE2B 93675f029ce2988ac052365324dbde46c8b445b92598759108ecfebbb65636ba55e84df0b570e3f667f5c4b2c70406e54f936a092367385f27e6b6567ec05d26 SHA512 af94f04850c9ac6bdaf69c272e24dd6242bf0f0e046d4c0bcbc5b5e1a1f59c49a232570eab5bcda5a8525d858bd9e3a20022a373803b904017e29ab1370eb414
 MISC metadata.xml 1650 BLAKE2B af7d1bb5e4a6a4fa170f4f88fa20faca5463330047a7dcdf48e24f0e9967233235ac810f5901397ab909fbbf008c4aa8c4a89a1ea540bed40a3d2da1886613de SHA512 e2b5c5af4e5e6561cf206c1cfd3b1a1e031d722482f85ac09ce808713acc856e691adf43d62d3df46644d1abcd1f01f8cf07f1453556e7d27ae9bc425f61e63b
diff --git a/dev-scheme/racket/racket-8.2-r1.ebuild b/dev-scheme/racket/racket-8.2-r2.ebuild
index ebb87fe339c6..d442f6c1047d 100644
--- a/dev-scheme/racket/racket-8.2-r1.ebuild
+++ b/dev-scheme/racket/racket-8.2-r2.ebuild
@@ -143,7 +143,7 @@ pkg_preinst() {
 		echo "We are installing the same SLOT: ${SLOT}"
 		local rktd
 		for rktd in "${PKGDB[@]}"; do
-			if [[ -f "${EROOT}/${rktd}" ]]; then
+			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}"
@@ -169,8 +169,8 @@ pkg_config() {
 	einfo "Swapping package database backup files"
 
 	for rktd in "${PKGDB[@]}"; do
-		mv "${EROOT}"/${rktd} "${EROOT}"/${rktd}.pkg_config || die
-		mv "${EROOT}"/${rktd}.bak "${EROOT}"/${rktd} || die
-		mv "${EROOT}"/${rktd}.pkg_config "${EROOT}"/${rktd}.bak || die
+		mv "${EROOT}"/${rktd} "${EROOT}"/${rktd}.pkg_config
+		mv "${EROOT}"/${rktd}.bak "${EROOT}"/${rktd}
+		mv "${EROOT}"/${rktd}.pkg_config "${EROOT}"/${rktd}.bak
 	done
 }
diff --git a/dev-scheme/racket/racket-8.3.ebuild b/dev-scheme/racket/racket-8.3-r2.ebuild
index c767ef23e92c..d6c989e973c9 100644
--- a/dev-scheme/racket/racket-8.3.ebuild
+++ b/dev-scheme/racket/racket-8.3-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit desktop optfeature xdg-utils
+inherit desktop optfeature
 
 DESCRIPTION="General purpose, multi-paradigm Lisp-Scheme programming language"
 HOMEPAGE="https://racket-lang.org/"
@@ -25,47 +25,30 @@ LICENSE="
 # 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"
+IUSE="+chez +doc +futures +jit minimal +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
-	)
 "
 RDEPEND="${DEPEND}"
 
 # "mred" and "mzscheme" are binaries generated by Racket, not CC
 QA_FLAGS_IGNORED="usr/bin/mred usr/bin/mzscheme"
 
-# 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
 
@@ -88,18 +71,21 @@ src_configure() {
 		--disable-shared
 		--disable-strip
 		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--enable-float
-		--enable-foreign
-		--enable-libffi
 		--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)
 	)
+	# 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[@]}"
 }
 
@@ -119,7 +105,7 @@ src_install() {
 	fi
 
 	# Create missing desktop files and icon
-	if use X && ! use minimal; then
+	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;"
@@ -133,7 +119,7 @@ pkg_preinst() {
 		echo "We are installing the same SLOT: ${SLOT}"
 		local rktd
 		for rktd in "${PKGDB[@]}"; do
-			if [[ -f "${EROOT}/${rktd}" ]]; then
+			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}"
@@ -145,22 +131,16 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	post_X_update
-
 	optfeature "readline editing features in REPL" dev-libs/libedit sys-libs/readline
 	optfeature "generating PDF files using Scribble" dev-texlive/texlive-fontsextra
 }
 
-pkg_postrm() {
-	post_X_update
-}
-
 pkg_config() {
 	einfo "Swapping package database backup files"
 
 	for rktd in "${PKGDB[@]}"; do
-		mv "${EROOT}"/${rktd} "${EROOT}"/${rktd}.pkg_config || die
-		mv "${EROOT}"/${rktd}.bak "${EROOT}"/${rktd} || die
-		mv "${EROOT}"/${rktd}.pkg_config "${EROOT}"/${rktd}.bak || die
+		mv "${EROOT}"/${rktd} "${EROOT}"/${rktd}.pkg_config
+		mv "${EROOT}"/${rktd}.bak "${EROOT}"/${rktd}
+		mv "${EROOT}"/${rktd}.pkg_config "${EROOT}"/${rktd}.bak
 	done
 }