gentoo resync : 22.12.2021

11 files changed, 100 insertions, 52 deletions

diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 92e828c0126b..3b334a804637 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/chez-minikanren/Manifest b/dev-scheme/chez-minikanren/Manifest
new file mode 100644
index 000000000000..07347e5c5ae2
--- /dev/null
+++ b/dev-scheme/chez-minikanren/Manifest
@@ -0,0 +1,3 @@
+DIST chez-minikanren-2018.04.11.tar.gz 14068 BLAKE2B b3d8ca2499b37f085e34e59bfa47c7d2dc7869025b46c0ccee271556b4b3ed89e37a29374e3e78452041e88377ede7d751b81da0959e590d9b7be0adb72efc94 SHA512 39928df2548353917cfaaad37454ceb94db4c87ebbf8a1bd8e7ce3e32ed07a6660e9cc1aeb446e3b7abbc533e8cf24da1f3a2ce3c2efe9cc8c8ed1bd90b88278
+EBUILD chez-minikanren-2018.04.11.ebuild 1101 BLAKE2B 7453b261da0a11163e3a7a5fd5e7ad03b63cb898f35ac5da9230b70eeaaf7d7421e8842f4178b5580b36ccd9f8c5daa6ede73ebde72ee9bc08332bd84d30109a SHA512 3c3436f6d8fc5c6502221487ec8d622f1f51472d8dbc8ba62c998af04c6fbd9c73a1ce5a3f424dac80093291abbf272eae40a2a9f8cb9dd02ded9ae5f8feca1c
+MISC metadata.xml 850 BLAKE2B e2f9501b9b30f76f3f79db5f4cbc3776fc2cd5a274dcf398a462a28533e876ea83078cad593a25af8dd9d4ee195085b374eb8697a38bf342fe38c3dd7f0d6672 SHA512 26c8c73f9185272cf2a253416405d8236a86085634f4210bb451717f45e740e0670650d54464f6f3be6600dde09894f17a6fcc8f8725d91f2979d158089ad678
diff --git a/dev-scheme/chez-minikanren/chez-minikanren-2018.04.11.ebuild b/dev-scheme/chez-minikanren/chez-minikanren-2018.04.11.ebuild
new file mode 100644
index 000000000000..578cae7255d9
--- /dev/null
+++ b/dev-scheme/chez-minikanren/chez-minikanren-2018.04.11.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# NOTICE: miniKanren does not define a library interface :(
+# so we will make a wrapper to load miniKanren...
+
+EAPI=8
+
+COMMIT=2d50ec5002fe052f5c2f2d72530dcbeb8760fde8
+MY_PN=miniKanren
+
+inherit wrapper
+
+DESCRIPTION="Canonical miniKanren implementation (on Chez Scheme)"
+HOMEPAGE="https://github.com/miniKanren/miniKanren"
+SRC_URI="https://github.com/miniKanren/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${COMMIT}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="source"
+RESTRICT="strip"
+
+RDEPEND="dev-scheme/chez:="
+DEPEND="${RDEPEND}"
+
+MINIKANREN_HOME=/usr/lib/chezscheme/${MY_PN}
+
+src_compile() {
+	local s=( $( find . -name "*.scm" -exec printf "\"%s\" " {} + ) )
+	local c="(import (chezscheme)) (for-each compile-library (list ${s[@]}))"
+	echo "${c}" | chezscheme --quiet --optimize-level 3 || die
+}
+
+src_install() {
+	insinto ${MINIKANREN_HOME}
+	doins *.so
+	use source && doins *.scm
+
+	make_wrapper ${MY_PN} "chezscheme mk.so" ${MINIKANREN_HOME}
+
+	einstalldocs
+}
diff --git a/dev-scheme/chez-minikanren/metadata.xml b/dev-scheme/chez-minikanren/metadata.xml
new file mode 100644
index 000000000000..eafae6b7cb51
--- /dev/null
+++ b/dev-scheme/chez-minikanren/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>scheme@gentoo.org</email>
+    <name>Gentoo Scheme Project</name>
+  </maintainer>
+  <longdescription>
+    miniKanren is an embedded Domain Specific Language for logic programming.
+    The core miniKanren language is very simple, with only three logical
+    operators and one interface operator.
+    miniKanren is designed to be easily modified and extended; extensions
+    include Constraint Logic Programming, probabilistic logic programming,
+    nominal logic programming, and tabling.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/miniKanren/miniKanren/issues</bugs-to>
+    <remote-id type="github">miniKanren/miniKanren</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-scheme/chez/Manifest b/dev-scheme/chez/Manifest
index 311fe964a007..df9dbc1c7bf0 100644
--- a/dev-scheme/chez/Manifest
+++ b/dev-scheme/chez/Manifest
@@ -1,3 +1,3 @@
 DIST chez-9.5.6.tar.gz 34565487 BLAKE2B 5d74cd3365b3039e6be1b774213da75da1080beffb1c9b5044466a8feff0171ce75d9999e69774754a5969d68825c571a88cb27d57af2718e98668e4fe936e3c SHA512 4affd73a5b2ea5cdec01fb200a32499387fc3769b7677ffe7d854f6a5567d50ba114f9f12951f99d8e0fd757c799e82e32c83079fae83e5fc138ee6e1a5f56c0
-EBUILD chez-9.5.6-r1.ebuild 1584 BLAKE2B aa3f84f8a33f1b02df94c22dd2df71ff5f267e08185521ddc4d624c07f1fdf04bb6193fbbf5286b77481f7cd60a55506dfe2a424d6da627afd57b1a4df748bbc SHA512 17166bbcd775f477d5117deec8227f09652363bbe8ccccebabc888478c4f2600d231fee112d2c110862e219cbc954054c99d736b4514bae43b97fb6c058202d8
+EBUILD chez-9.5.6-r2.ebuild 1590 BLAKE2B 81b22038379b87445e11e190d882f0f54bf0b73d0d9dc98100f24a7847ffc4e4c9088dd87e1ceef414dff75bedb469f395f40ca961e7371945f76dbfa6ac3604 SHA512 6fba8c62ae3a547324408f09ed76cfbb24b9c2abcffef7c85c63f59ec128416ca965753f0e09134518daa7abab25960c1da590d002dfe5dad215035dfb0a330b
 MISC metadata.xml 1266 BLAKE2B 85c7701d3c2b5e6cea3975f59c262fda6a6f38f0acd7093544ef62c647bc6fcbde06c5013d84f62ced3ea58efc5882ab1c6eb45fbb4b63f3366e19b1aea78c52 SHA512 27753e59489405becb7e70169447a24eea12ea3c273fd90a1cd7fd416fbab9b8ba6041977a9d57b24a9e9a55bcd2833ee83e31bcc6db2d6ba4b39c5281f535e9
diff --git a/dev-scheme/chez/chez-9.5.6-r1.ebuild b/dev-scheme/chez/chez-9.5.6-r2.ebuild
index 6ec1f6d5145f..95d75036b7b4 100644
--- a/dev-scheme/chez/chez-9.5.6-r1.ebuild
+++ b/dev-scheme/chez/chez-9.5.6-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${CSV}"
 # Chez Scheme itself is Apache 2.0, but it vendors LZ4 (BSD-2),
 # Nanopass (MIT), stex (MIT), and zlib (ZLIB).
 LICENSE="Apache-2.0 BSD-2 MIT ZLIB"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="X examples ncurses threads"
 
diff --git a/dev-scheme/kawa/Manifest b/dev-scheme/kawa/Manifest
index 426b0e08d420..1cfed6376ce3 100644
--- a/dev-scheme/kawa/Manifest
+++ b/dev-scheme/kawa/Manifest
@@ -4,5 +4,5 @@ DIST Kawa-3.1.1.tar.gz 3216501 BLAKE2B abaea589c33ec01c49df9b376b43330a124683242
 DIST XQTS_1_0_3.zip 30956043 BLAKE2B 30d8980e8076eec3291487e582139f1e6a47e6c819ba0e06d9d34ca8867c81db266817e25e50d4823234ae73529c97c939d1aa168056ce0a5379f150425cf62d SHA512 e00efd3dbf0b1cf530795073f7548cf4ab4f3c55921f76af7c000e61e1d7293cd11f41d617b3ce5343df5e9c5b6de4ee3819a6db2b15df9441a19489ae46e1dd
 DIST kawa-1.14.tar.gz 2691484 BLAKE2B bd4e2e725cfd51d65ba55d6511f09ab99ea6d9435d95febc16f9486b47b1bf1cdcde601b58266ae20059f6e776d2119bcb017d7061ff571bbaddd5bcbb297b8c SHA512 e0a0eafd4ed0ce7d254f295db8e920b82cfef6f4f71c440db655d73761a2f99ab743def1daa54241998497db8f29269c7d98f7e3bf819a36d7f7151d3ba2913e
 EBUILD kawa-1.14-r2.ebuild 2532 BLAKE2B 3c05839e512ca81a47c3c59cc7b2f7ccd02421a12630b0924bf9679b382cb8f4876b834699d9c782a97ba40f1047404cc322f136c254f48f9771f4a04650f0d7 SHA512 6af4070642ba6e617fe8d8117b2d355a4e53e4283fffeb292be804d03bb82c5ed725dc48cbfe1a6aaade16ee73902e1642768194b4a03fbacc0113393c711e1e
-EBUILD kawa-3.1.1.ebuild 2065 BLAKE2B 41c36f19a8bbbc0187f3b50b66db897d99ad8c1f159b9a92a8615ef14709e56508c70bf96a9bfa918221830b67433d5aa5e687de3262d79cc694b29596cf2680 SHA512 18a11d9fd32ca0921c835d93b6922d42a4c2d3ce1b74f812aacddd75d2939950862156f71f306b8206bc72c294eca804d3a58df2212fee3d4efdd97a58067579
+EBUILD kawa-3.1.1-r1.ebuild 2066 BLAKE2B 370bcdb330111adfa54f4c1764c58c0b79847c4a4da5033ad4a566e080b0351b4d05f9e6531b5a10c81c85b6e014d93eb94ebfaecbace090fd23726c50d314d9 SHA512 40e39e624588bbfe2732fa5d9ec41b03d7bee27f94e0aa17cb57a11520ac5da4035c208a59da11c0d54d9f99b7237e71d93b0a0a6f9f24026fbd7e764d27b64b
 MISC metadata.xml 1178 BLAKE2B 5a7b5ef1369023679f8227368b53f9a5f18307ff19bd2d34c50e42ec5529c53cc74d462ecdcf0ad117ee0d6f7b2d8651e184e154b3cb40ed9eea91ddd4966e57 SHA512 137a0aa387493f4977a4b5ae7855360a858d0c33417f3b6473cc9354745bff5386c7c15598cafa874021c3027588d66e50c1c50aa2d5c1937b0a14e1875faecf
diff --git a/dev-scheme/kawa/kawa-3.1.1.ebuild b/dev-scheme/kawa/kawa-3.1.1-r1.ebuild
index 3efe3ba8f69b..bbe8642c2a1c 100644
--- a/dev-scheme/kawa/kawa-3.1.1.ebuild
+++ b/dev-scheme/kawa/kawa-3.1.1-r1.ebuild
@@ -61,7 +61,7 @@ src_configure() {
 	fi
 	if use servlets; then
 		myconf+=(
-			"--with-servlet=$(java-pkg_getjar servletapi-2.4 servlet-api.jar)"
+			"--with-servlet=$(java-pkg_getjar servlet-api-3.0 servlet-api.jar)"
 		)
 	fi
 
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
 }