dev-scheme/racket: minor cosmetic changes in 8.0

Signed-off-by: Sam James <sam@gentoo.org>

1 files changed, 22 insertions, 14 deletions

diff --git a/dev-scheme/racket/racket-8.0.ebuild b/dev-scheme/racket/racket-8.0.ebuild
index 1a38a64418d3..1057ecbc2027 100644
--- a/dev-scheme/racket/racket-8.0.ebuild
+++ b/dev-scheme/racket/racket-8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,27 +7,30 @@ inherit pax-utils
 
 DESCRIPTION="General purpose, multi-paradigm Lisp-Scheme programming language"
 HOMEPAGE="https://racket-lang.org/"
-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 )"
+SRC_URI="minimal? ( https://download.racket-lang.org/installers/${PV}/${PN}-minimal-${PV}-src-builtpkgs.tgz )"
+SRC_URI+=" !minimal? ( https://download.racket-lang.org/installers/${PV}/${P}-src-builtpkgs.tgz )"
+S="${WORKDIR}/${P}/src"
+
 LICENSE="GPL-3+ LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="doc +futures +jit minimal +places +readline +threads +X +chez"
+
 REQUIRED_USE="futures? ( jit )"
 
-RDEPEND="dev-db/sqlite:3
+RDEPEND="
+	dev-db/sqlite:3
 	media-libs/libpng:0
 	x11-libs/cairo[X?]
 	x11-libs/pango[X?]
 	dev-libs/libffi
 	virtual/jpeg:0
 	readline? ( dev-libs/libedit )
-	X? ( x11-libs/gtk+[X?] )"
-RDEPEND="${RDEPEND} !dev-tex/slatex"
-
+	X? ( x11-libs/gtk+[X?] )
+	!dev-tex/slatex
+"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${P}/src"
-
 src_prepare() {
 	default
 	rm -r bc/foreign/libffi || die 'failed to remove bundled libffi'
@@ -37,15 +40,16 @@ src_configure() {
 	# 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
+	# docdir doesn't get passed automatically
 	econf \
 		--enable-shared \
 		--enable-float \
 		--enable-libffi \
 		--enable-foreign \
+		--docdir="/usr/share/doc/${PF}" \
 		$(usex chez "--enable-cs --enable-csonly" "--enable-bc --enable-bconly") \
 		--disable-libs \
 		--disable-strip \
-		--docdir="/usr/share/doc/${PF}" \
 		$(use_enable X gracket) \
 		$(use_enable doc docs) \
 		$(use_enable jit) \
@@ -63,14 +67,16 @@ src_compile() {
 		# digging through the Makefile in src/racket to find out which
 		# targets would build those binaries but not use them.
 		if ! use chez; then
-			pushd bc
+			pushd bc || die
 			emake cgc-core
 			pax-mark m .libs/racketcgc
-			pushd gc2
+
+			pushd gc2 || die
 			emake all
-			popd
+			popd || die
+
 			pax-mark m .libs/racket3m
-			popd
+			popd || die
 		fi
 	fi
 
@@ -89,12 +95,14 @@ src_install() {
 		done
 
 		use X && pax-mark m "${D}/usr/$(get_libdir)/racket/gracket"
-		
+
 		pax-mark m "${D}/usr/$(get_libdir)/racket/starter"
 	fi
+
 	# raco needs decompressed files for packages doc installation bug 662424
 	if use doc; then
 		docompress -x /usr/share/doc/${PF}
 	fi
+
 	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
 }