[gentoo-commits] repo/gentoo:master commit in: dev-scheme/racket/

["Maciej Barć" <xgqt@gentoo.org>]

commit:     708340176aab8fee6f5e9070968316175285afe3
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  9 20:59:57 2021 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Thu Dec  9 22:06:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70834017

dev-scheme/racket: revisit configure options

Removed X dependencies because its pure FFI and do not depend on X11's
pkgs being installed.
Some options are forced in CS variant, so logically restrict the untooglable
USE flags to be enabled.
Bump to EAPI 8.
This still does not close 828602.

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 .../{racket-8.3.ebuild => racket-8.3-r1.ebuild}    | 56 +++++++---------------
 1 file changed, 18 insertions(+), 38 deletions(-)

diff --git a/dev-scheme/racket/racket-8.3.ebuild b/dev-scheme/racket/racket-8.3-r1.ebuild
similarity index 82%
rename from dev-scheme/racket/racket-8.3.ebuild
rename to dev-scheme/racket/racket-8.3-r1.ebuild
index c767ef23e92c..507893805143 100644
--- a/dev-scheme/racket/racket-8.3.ebuild
+++ b/dev-scheme/racket/racket-8.3-r1.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;"
@@ -145,16 +131,10 @@ 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"