public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Maciej Barć" <xgqt@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-scheme/racket/files/, dev-scheme/racket/
Date: Thu, 23 Nov 2023 15:12:01 +0000 (UTC)	[thread overview]
Message-ID: <1700752317.1ec3517a8530fd57cf7156d5997beeab6faaab23.xgqt@gentoo> (raw)

commit:     1ec3517a8530fd57cf7156d5997beeab6faaab23
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 23 15:09:32 2023 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Thu Nov 23 15:11:57 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ec3517a

dev-scheme/racket: bump to 8.11

Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-scheme/racket/Manifest                         |   2 +
 .../files/racket-8.11-repair-builtpkgs.patch       |  61 +++++++
 dev-scheme/racket/racket-8.11.ebuild               | 184 +++++++++++++++++++++
 3 files changed, 247 insertions(+)

diff --git a/dev-scheme/racket/Manifest b/dev-scheme/racket/Manifest
index c13b0f07a14d..c44bb6cf233c 100644
--- a/dev-scheme/racket/Manifest
+++ b/dev-scheme/racket/Manifest
@@ -1,6 +1,8 @@
 DIST racket-8.10-src-builtpkgs.tgz 156573576 BLAKE2B def6007fec5701a3ca399f3173f863155214521e95b8e655090a61506a8ecd8eae7ddc02785593d256e6a0e23f022997c18460130bdc72e9fcaad8de36030b7d SHA512 4a861b90ca03b252dae0b530ab39cf0fe67dd38e306cc639b6e24516b01d7d25918c0f7e1fb0a105ab51d3be802d349576b4f0ee7ef6ea26bb11fc16abada3dd
+DIST racket-8.11-src-builtpkgs.tgz 156675262 BLAKE2B eff8872ee6bdf84f5fe426970ce9dd84f659eb1c437e820c8e853ee942dcebe2d306707d2e7d4b3fb1be648e5a795d3240f294aba5b8f5989d6eaca72c0e7dd5 SHA512 928b331797b1d9130a765ec2104a569ab984ab5bb101c6cc445f6ef60601d5d42df1db5ebda0ff1aff09592a55118dcdf0bc47467dce13535eabe2f8e4bcf0d1
 DIST racket-8.6-src-builtpkgs.tgz 154505661 BLAKE2B ab788ae3e5175024ec75fa0c34297616ab4dcc1bb6f62d4ff4623dc2dd699d63eb9b24238407a854b03210f21fefd02680dc29931ed9d146920ae32472196e32 SHA512 c2948164463fb59a2d6f1b5188cee7634da190ea40bd19f5a88ef466ccdf07da03503b6a1f00e327a66c31b862048bcd5b047f7c586ea0d26e23397ee5ee7682
 DIST racket-8.9-src-builtpkgs.tgz 157090283 BLAKE2B 515ad19f37a18decb52ea42ceff5b4570d311d39e15996eb0abd228d16ef5fcae971a87145faf7d27584dc0d6b54b1d94a77bb099e6c2dfd3fa5ddca0b3333b0 SHA512 0eb823600233746e9b5e054747fc5ee1c033a102fe6ab912cc2a15d4ad5b217e04c25124f1877ce04eada4f99c2d6b08cc58adf07535c3962f7d05a21dce8471
 DIST racket-minimal-8.10-src-builtpkgs.tgz 23128997 BLAKE2B 614cd3bdaf8852a5de1487c06e2b28968709fade25654684a4ba4f458a983783af23837996bbf163907312fc8e79b2fe22421983bcfe10ae391e0091ec60474d SHA512 aa16ee792b978fbef74b9b3a4af70eb264515bc16ed2109ade15ce54c658b0ccf9bffd9b07b71263298c0eb6eed768ad3d7e2c9e00df284ec1793b7fe0494f82
+DIST racket-minimal-8.11-src-builtpkgs.tgz 23127690 BLAKE2B d9855977312af6313dad0b020436e8a3838814a814f48a1d3ef88f51b99c95163f6564f47ec01d23020bdc0eaeeeb3219f55f8e0fdd74a57069e7e533b36eaa6 SHA512 0f7ac946d544449b45f1301d8530ab80baf9ddaa2e2b6ac043926f233e1feb1829a6a49ebd35603b4b2b9d27ba6db2382b47e355464a7855aaaa2954bf693dfe
 DIST racket-minimal-8.6-src-builtpkgs.tgz 22396113 BLAKE2B e8c09da9aef52566746def36823e736e07990ba703d8440a3d067cbeeb43c8d026469c1d4b7d9ad2a423766692b81d6efa400c55512450621acd624d23b1b193 SHA512 695f9be11cab2cf84d1c16b322feb6c4552bf05edbfd901e91fa9532ef52339a6463d8327f4ae4c704cd2e8d67e69c2333bc13b1c862bbe565af00b407debee8
 DIST racket-minimal-8.9-src-builtpkgs.tgz 23084628 BLAKE2B 5e1e688dc600b700ed13acdbbafddaa2d6bf5a0e05db4a845b53f33e9448b277f342f5f615086f78db4762eeac11911c9b88cd102f05fbe165fcdff72a9ebcf3 SHA512 404aa01242eb68453e9db3cc14e38b99a02af9eb13b1dccce36e1de9c10d2ddd37bc6411abad7ab58045c71d25336e09d6e06f391cc3ee372097ca68fc497051

diff --git a/dev-scheme/racket/files/racket-8.11-repair-builtpkgs.patch b/dev-scheme/racket/files/racket-8.11-repair-builtpkgs.patch
new file mode 100644
index 000000000000..9629aeb2e539
--- /dev/null
+++ b/dev-scheme/racket/files/racket-8.11-repair-builtpkgs.patch
@@ -0,0 +1,61 @@
+From bed9a444b85951cb83e2b37d07cea2dcadb551b3 Mon Sep 17 00:00:00 2001
+From: Matthew Flatt <mflatt@racket-lang.org>
+Date: Wed, 15 Nov 2023 10:56:31 -0700
+Subject: [PATCH] repair install of a builtpkgs build
+
+---
+ racket/src/bc/build.zuo   | 3 ++-
+ racket/src/cs/c/build.zuo | 3 ++-
+ racket/src/lib.zuo        | 4 ++++
+ 3 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/bc/build.zuo b/bc/build.zuo
+index 5af471ba8cd..98b6ea34f3b 100644
+--- a/bc/build.zuo
++++ b/bc/build.zuo
+@@ -637,7 +637,8 @@
+ 
+   (define (setup-prepare-to-here?)
+     (and (equal? (lookup 'MAKE_COPYTREE) "copytree")
+-         (not cross?)))
++         (not cross?)
++         (not (in-builtpkgs-distro?))))
+ 
+   (define the-targets
+     (append
+diff --git a/cs/c/build.zuo b/cs/c/build.zuo
+index 451e2c8c2a0..c47649f206f 100644
+--- a/cs/c/build.zuo
++++ b/cs/c/build.zuo
+@@ -373,7 +373,8 @@
+ 
+   (define (setup-prepare-to-here?)
+     (and (equal? (lookup 'MAKE_COPYTREE) "copytree")
+-         (not cross?)))
++         (not cross?)
++         (not (in-builtpkgs-distro?))))
+ 
+   (define the-targets
+     (make-targets
+diff --git a/lib.zuo b/lib.zuo
+index 80c5c88c94e..64c41b6c7a4 100644
+--- a/lib.zuo
++++ b/lib.zuo
+@@ -42,6 +42,7 @@
+          strip-lib-debug
+          run-raco-setup
+          raco-setup-prepare-to-here
++         in-builtpkgs-distro?
+ 
+          install-license-files
+          maybe-copytree
+@@ -494,6 +495,9 @@
+                   built-racket
+                   #f '()))
+ 
++(define (in-builtpkgs-distro?)
++  (file-exists? (at-source "../collects/racket/compiled/base_rkt.zo")))
++
+ (define (install-license-files sharepltdir)
+   (mkdir-p sharepltdir)
+   (for-each (lambda (path)

diff --git a/dev-scheme/racket/racket-8.11.ebuild b/dev-scheme/racket/racket-8.11.ebuild
new file mode 100644
index 000000000000..384f6d7d658c
--- /dev/null
+++ b/dev-scheme/racket/racket-8.11.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop optfeature toolchain-funcs readme.gentoo-r1
+
+DESCRIPTION="General purpose, multi-paradigm Lisp-Scheme programming language"
+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"
+
+# See https://blog.racket-lang.org/2019/11/completing-racket-s-relicensing-effort.html
+LICENSE="
+	|| ( MIT Apache-2.0 )
+	chez? ( Apache-2.0 )
+	!chez? ( LGPL-3 )
+"
+# Bytecode generated by Racket is not compatible between versions.
+# The bytecode version should be denoted by SLOT, in most cases
+# 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 iconv +jit minimal ncurses +places +threads"
+# See bug #809785 re chez/threads
+REQUIRED_USE="chez? ( futures places ) futures? ( jit threads ) places? ( threads )"
+
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/libffi:=
+	ncurses? ( sys-libs/ncurses:= )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-8.11-repair-builtpkgs.patch" )
+
+# "mred" and "mzscheme" are binaries generated by Racket, not CC
+QA_FLAGS_IGNORED="usr/bin/mred usr/bin/mzscheme"
+
+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
+the package 'readline-gpl' using raco, Racket's package manager
+https://pkgs.racket-lang.org/package/readline-gpl
+"
+
+# 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
+)
+
+src_prepare() {
+	# Prepare the environment.
+	unset PLTADDONDIR PLTCOLLECTS PLTCONFIGDIR PLTUSERHOME
+
+	default
+
+	# 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
+
+	einfo "Configuring Zuo in ${S}/zuo"
+	pushd "${S}/zuo" >/dev/null || die
+	econf
+	popd >/dev/null || die
+
+	einfo "Configuring Racket in ${S}"
+	# Libtool:
+	#   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
+	# Backend:
+	#   --enable-bc builds Racket w/o chez backend
+	# C Libraries:
+	#   --enable-libs & --disable-shared is the way to build
+	#   .a files that are needed to embed Racket into programs
+	#   https://docs.racket-lang.org/inside/cs-embedding.html
+	local -a myconf=(
+		--disable-shared
+		--disable-strip
+		--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+=(
+			--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 Zuo.
+	emake -C zuo DESTDIR="${ED}" install
+
+	# 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
+
+		make_desktop_entry "gracket" "GRacket" "racket" "Development;Education;"
+		make_desktop_entry "plt-games" "PLT Games" "racket" "Education;Game;"
+	fi
+
+	readme.gentoo_create_doc
+}
+
+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
+		echo "We are installing the same SLOT: ${SLOT}"
+
+		local rktd
+		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}"
+
+				cp "${EROOT}/${rktd}" "${ED}/${rktd}" ||
+					die "failed to create a copy of ${rktd}"
+			fi
+		done
+	fi
+}
+
+get_outsiders() {
+	racket -l raco -- pkg show -i | grep 'link' | sed 's|link.*||g'
+}
+
+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 -a outsiders=( $(get_outsiders) )
+	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
+
+	readme.gentoo_print_elog
+}


             reply	other threads:[~2023-11-23 15:12 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-23 15:12 Maciej Barć [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-12-12 19:07 [gentoo-commits] repo/gentoo:master commit in: dev-scheme/racket/files/, dev-scheme/racket/ Amy Liffey
2022-02-14 15:49 Maciej Barć

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1700752317.1ec3517a8530fd57cf7156d5997beeab6faaab23.xgqt@gentoo \
    --to=xgqt@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox