gentoo resync : 05.12.2021

8 files changed, 49 insertions, 562 deletions

diff --git a/dev-scheme/racket/Manifest b/dev-scheme/racket/Manifest
index 09b8e2126a4b..29665e323ab5 100644
--- a/dev-scheme/racket/Manifest
+++ b/dev-scheme/racket/Manifest
@@ -1,24 +1,9 @@
 AUX Makefile-nostrip.patch 635 BLAKE2B 6b8c6e573d64e284a4a6842fe8346b382f4f656a98bae59fff5c0b84c71557e74a9c91065f15d82910c3ecaeed720d38d42ba9366beaaeb9b5d1ffaa6baff954 SHA512 08221300c19fd115fe713a6e3f20e83f791d20807af33c27882f7f05e1dc20436dd1459f6b9e011118720c55d26c91f6d4650afa5977e6d2341898fbc7b54971
 AUX Makefile-starter.patch 1346 BLAKE2B 4f33f059ce0c9a02a27250d4893d00423854281ae6343443b7ffc7ddb7eed75951a31cbf11a9f89cf23d3c86513b54f6c42d9e66a006072f032c14957bbb9151 SHA512 a3dd1c1ed1cbb6ca596d32739ac56b1a4db188035572ff9015035061f69f0ef173c0b2dfae4a820b540c30e06d763c65e9d3192d16aaa6c6c25f6f74369f91f8
-DIST racket-7.0-src-builtpkgs.tgz 122544008 BLAKE2B fa6eddab17fbdec1db1dac2debb2da72fbab064f10fe0f49eda5b0ccfc635b2f86cef2eb103675988d281459f4fdb19841e27f154b803b38631ee21a2312799f SHA512 e872bb935146027bdc78dd7d22ea07cbbf78a23c761d584770d9ded3ece71b74954a317b799de16b0ba762219a46f0e66f41ceeb4d6741d0b1998bc6abf6b20a
-DIST racket-7.1-src-builtpkgs.tgz 126596138 BLAKE2B 734595105630352977d7f51de233c320de590744810f2f469d4259d84f19a69a84394d4f62ade130897babd21d46180659689a0c2dda7bc9559586f5c3c37be6 SHA512 9d6fb0912c7c612dfb32b4955e192d69f00b67e73c08196ef3caa7b3123909627496a6dfb36f7910ea5f9af526e99b56fe936359cbea261db26a5687ed49c38f
-DIST racket-7.2-src-builtpkgs.tgz 127050541 BLAKE2B f6235c9f5a646a6d2a8ab0ce63ded384ed707dc704927b63281c159e2daa503ffc4bad99cd33511aca05c0fa7aa55adde1e9c79032faa17dcd99f1bbd15324a8 SHA512 748e1ee63b6c32bafc58401e943e7dd31a47cfd2eb8dad6e4a40a8966d4df2fb7e4bb573841c210a567ba0f02b518d41fa69df03736f49ae9761446e71a4ab9b
-DIST racket-7.3-src-builtpkgs.tgz 127136703 BLAKE2B 3449f62d8301cf5cc527cd46e074279d34c6064631a584488407d4c7af3b10aa01bb074d0dbc59034e8e036b1f24f9921ccdc070fb7bb3ff548f18b37cd8d12d SHA512 2cba16d6513984721b82d21e279a0017e3d96f3e2a53ca773deb45e10be2b74a61d4496679eb5aa4aff9276f323a16a1506e9471a873c28ee014f7d4e49bfea8
-DIST racket-8.0-src-builtpkgs.tgz 153847792 BLAKE2B dba1b39e770954e5971689f6d2b413f1aadc6176822e4400b40b41ebf7eab00cc34b5e5158f38d1a1d8caa98fa260ef10864794dc0d4768e2ea5b2ad869d0102 SHA512 df3e14ccdba00eb4de113693a6eee22e640958b074f3ad4946e5900333fbf558c4c2653f65a89f638f6ef173d32c9f97b19349360a9d4afca82365aceb43c911
-DIST racket-8.1-src-builtpkgs.tgz 154340467 BLAKE2B 1a12ca71a3af0c506238e2abad44596c54b5102fbe81d99c713356dc52abcdba8f0a0cf969702cff1f7738a0383d55894a546f682f3d854b504ceab34cef600e SHA512 afc8c737087a98172dbf699d24cee73966da699aebbdefb8b7785a6521dc4de61b8d7f2ed3a3f1d2be7a1dfe6675db7a33d39492da9dfe0aad8d9074cd03cf9f
 DIST racket-8.2-src-builtpkgs.tgz 150467561 BLAKE2B 5005aa852b089becd9d6da136a55a035ac5fd86bd1ad186ec30cdcf411927d444e1814797d63dbde3eb7b52bba7756e0464edf1d854d2ee7f5851caaae18ba55 SHA512 9e4c0cabfcbdb8c8742e8170548bee58021697e8b0842f575f94193db31adc04a7b9023ed8fd70dae197e5ec6f1aee7985d849be3ce5b4279f216e900ee143c7
-DIST racket-minimal-7.0-src-builtpkgs.tgz 12215529 BLAKE2B 4e9d2b137edf6b188c71dd32771753a16589ab49884aba1641fac5a5f82b9016843fec3257de7d59a9b00971a7dd455e99897782794800e14a656bcb22a17080 SHA512 976fd0ab96f4bf99eb7c63f7f213af91f91de4dd2498c4f8f1440743f7571194090abf0c4037e436970235f737d0add116f5689bf495688b3667a91ef95e8270
-DIST racket-minimal-7.1-src-builtpkgs.tgz 15304920 BLAKE2B be851eb58655d5f7eb36235eeb37f3d24c94c4a6b20724a4772acccf109df6e6a9d8e0f9797530c7c3f6540e99325417ef982244017719fced75e1afda71847a SHA512 e1e839867fd4540fe15234f149162c88ad1f73ca26ba22644d58b3d8ab2809851d8b176f9f448dfd7acd3b7733a20d388c71cdd76e8a5dc6c50662e6113df6df
-DIST racket-minimal-7.2-src-builtpkgs.tgz 15481415 BLAKE2B 145823cfe8538e5f569e33303bae585cb2eebf013da27551a606a005ab84e70b0e58710eadbaecbaae4fc5c9b62b22e26ba1ab2f3158500600c0bc9d7a52e17c SHA512 0fb17ef0e7d8c03c847827118dec48486fd499777fbbf98588124f9e4725dd815e0f6df2e95f4d8700b8d8dbe3b7d678d2ffb8966ce0add6742bff554ef9415c
-DIST racket-minimal-7.3-src-builtpkgs.tgz 15549791 BLAKE2B ab03252c48b8a07ae6caeb3af67d823d8eeddd22242d2146812c7b12ade09caa86ad026fb1a7b3dfeb981e304b78c697d1f93fb9d94c6e7dbc8c3ecb09fdfea0 SHA512 e542898dab04e781b0b8a613f250a35db8beed9db33406f20d4f028b7f3629904409aadf653c68998d36948bdd46e51134d3cebe1e014b46e3dba82472c3563b
-DIST racket-minimal-8.0-src-builtpkgs.tgz 24065953 BLAKE2B 2af056758660d30f7d232dabe03d544e5e77478df71389df883b8af956fe224332048eac3a351fdb905051e3ef99b08bd0e0f1704e04919a4a2e68f8005922b8 SHA512 1e43b390f6a4c1405df0872c71c27638ec35a8cdd8508390db13bd59a43f5a4728f0660fe1afb5785f625d31fd25cdc1a6ecb9972daf99bcb538f7204956dabc
-DIST racket-minimal-8.1-src-builtpkgs.tgz 24172851 BLAKE2B ab3e898e257d610874b31ac5ea3034b5c213f1d181f105c206c45129c35efb53250986163ea8c2399c02084d0d7ec55d0c79c8c8499578067f1bbef4c02568c5 SHA512 eb786882383c33fc77a697a66b06d797b0dbb2de8435daa41db4211cfa893dbbc213910ada4ea087f848dae1abb4d5ff9df162af5cf8eae689f1ef69b410d6c5
+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
-EBUILD racket-7.0-r1.ebuild 2464 BLAKE2B 3e1c81765a0ff1c98a2268d6938dc1156cb88dde0efcd3b5c178a48e3ca9ef5b5df0a8b2d96425c7a6df34ba3c2fba9c0c6fa9db98bf4417cfb669c8fa968f10 SHA512 0af128dc40abcca88043016c6ae3e03db7f655515c91c3ff9330c451b7e94dabdc51d309e485d67e6e03e388563b1b4b30e622803670d53b271594ce57a18302
-EBUILD racket-7.1-r1.ebuild 2466 BLAKE2B 907c211cf8634e226e13bc8ec6d57fdfa5deabf3a32ac2b13800b76861445d689912a0379dd51e64994ef87994be5f919dfb09de162623feb89fd79b6a7e8f49 SHA512 4bb2c9dc8f00aba30a8157721c28679581d66127141539df564dfc703d37f1f9ae18fd5343cc152d7ac828cf536c644168b4cde93dc4dae4bd19bbdc3cc10971
-EBUILD racket-7.2-r1.ebuild 2529 BLAKE2B fdfd7f60f5c609bd2835b6b07344e0bda04a128328efd49e925bd9bf20832df0cb3259b497465f106693c9b8b48154619efbd128c290b2e8725907f78956870e SHA512 346fc9a11710e2a4bfd83f65f79a27408ed5be0574d1b38f48a998ee944ace97af7af64c1bd8399c33bc5d09b83b12486f32d2df71f41fe5ca2cafaeefab1f48
-EBUILD racket-7.3-r1.ebuild 2529 BLAKE2B fdfd7f60f5c609bd2835b6b07344e0bda04a128328efd49e925bd9bf20832df0cb3259b497465f106693c9b8b48154619efbd128c290b2e8725907f78956870e SHA512 346fc9a11710e2a4bfd83f65f79a27408ed5be0574d1b38f48a998ee944ace97af7af64c1bd8399c33bc5d09b83b12486f32d2df71f41fe5ca2cafaeefab1f48
-EBUILD racket-8.0-r1.ebuild 2947 BLAKE2B 466e3cd12f6a192ab3c980a07556aaae1af4537bd96fba2b646adcda36f63ebeb93df05f191e1546be0186f2bfb4662e63d4a806d12c44ad0ba9f39e9299bf5b SHA512 993fd309782646a33944ff634ba1c25ef03e2c6d0c22230a2a7aa0406b527af4a9ac0b9b04b6d2fba52e01ef5b02dae008da2c9b80027cdb04e7f9614ef3136e
-EBUILD racket-8.1-r1.ebuild 4669 BLAKE2B a4ac2ad98c75fa22499c3c2426b6b804ede9bfcfbef6a74b36b7615edaf11b3d59faa32199975a227e6bb7608193f01d6a2bb85a04d8bb7865fdb3e8a8e4e89d SHA512 a988c01b07176b63eadb50dc62898a2d24613c22178016a581164e227608f9c63e28e146914ce097956685d7c6b9968f4393814d83286afa5a86d52a5377bf2d
-EBUILD racket-8.2-r1.ebuild 4719 BLAKE2B 347edfd00d2f4af9ba4a1f96de37af00e3e8bc13dd9eb8b8422d1217021e64fe7278b0b168c4c4f461e8249219fc78f2067cda5c9a821529119f68fd19aa5534 SHA512 da546f1216f40fd55e319bf582ca4daefea7c50fc17282bcdffb02f300b795fe496578b4d39aff8f306d16edabc868adf63a01585471479fb0ab75cb3195e1e8
+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
 MISC metadata.xml 1650 BLAKE2B af7d1bb5e4a6a4fa170f4f88fa20faca5463330047a7dcdf48e24f0e9967233235ac810f5901397ab909fbbf008c4aa8c4a89a1ea540bed40a3d2da1886613de SHA512 e2b5c5af4e5e6561cf206c1cfd3b1a1e031d722482f85ac09ce808713acc856e691adf43d62d3df46644d1abcd1f01f8cf07f1453556e7d27ae9bc425f61e63b
diff --git a/dev-scheme/racket/racket-7.0-r1.ebuild b/dev-scheme/racket/racket-7.0-r1.ebuild
deleted file mode 100644
index dbd4ca5333f2..000000000000
--- a/dev-scheme/racket/racket-7.0-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 )"
-LICENSE="GPL-3+ LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="doc +futures +jit minimal +places +readline +threads +X"
-REQUIRED_USE="futures? ( jit )"
-
-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"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	default
-	rm -r foreign/libffi || die 'failed to remove bundled libffi'
-}
-
-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
-	econf \
-		--enable-shared \
-		--enable-float \
-		--enable-libffi \
-		--enable-foreign \
-		--disable-libs \
-		--disable-strip \
-		$(use_enable X gracket) \
-		$(use_enable doc docs) \
-		$(use_enable jit) \
-		$(use_enable places) \
-		$(use_enable futures) \
-		$(use_enable threads pthread)
-}
-
-src_compile() {
-	if use jit; then
-		# When the JIT is enabled, a few binaries need to be pax-marked
-		# on hardened systems (bug 613634). The trick is to pax-mark
-		# them before they're used later in the build system. The
-		# following order for racketcgc and racket3m was determined by
-		# digging through the Makefile in src/racket to find out which
-		# targets would build those binaries but not use them.
-		pushd racket
-		emake cgc-core
-		pax-mark m .libs/racketcgc
-		pushd gc2
-		emake all
-		popd
-		pax-mark m .libs/racket3m
-		popd
-	fi
-
-	default
-}
-
-src_install() {
-	default
-
-	if use jit; then
-		# The final binaries need to be pax-marked, too, if you want to
-		# actually use them. The src_compile marking get lost somewhere
-		# in the install process.
-		for f in mred mzscheme racket; do
-			pax-mark m "${D}/usr/bin/${f}"
-		done
-
-		use X && pax-mark m "${D}/usr/$(get_libdir)/racket/gracket"
-	fi
-	# raco needs decompressed files for packages doc installation bug 662424
-	if use doc; then
-		docompress -x /usr/share/doc/${PF}
-	fi
-}
diff --git a/dev-scheme/racket/racket-7.1-r1.ebuild b/dev-scheme/racket/racket-7.1-r1.ebuild
deleted file mode 100644
index 19e1da2a90c7..000000000000
--- a/dev-scheme/racket/racket-7.1-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 )"
-LICENSE="GPL-3+ LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="doc +futures +jit minimal +places +readline +threads +X"
-REQUIRED_USE="futures? ( jit )"
-
-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"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	default
-	rm -r foreign/libffi || die 'failed to remove bundled libffi'
-}
-
-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
-	econf \
-		--enable-shared \
-		--enable-float \
-		--enable-libffi \
-		--enable-foreign \
-		--disable-libs \
-		--disable-strip \
-		$(use_enable X gracket) \
-		$(use_enable doc docs) \
-		$(use_enable jit) \
-		$(use_enable places) \
-		$(use_enable futures) \
-		$(use_enable threads pthread)
-}
-
-src_compile() {
-	if use jit; then
-		# When the JIT is enabled, a few binaries need to be pax-marked
-		# on hardened systems (bug 613634). The trick is to pax-mark
-		# them before they're used later in the build system. The
-		# following order for racketcgc and racket3m was determined by
-		# digging through the Makefile in src/racket to find out which
-		# targets would build those binaries but not use them.
-		pushd racket
-		emake cgc-core
-		pax-mark m .libs/racketcgc
-		pushd gc2
-		emake all
-		popd
-		pax-mark m .libs/racket3m
-		popd
-	fi
-
-	default
-}
-
-src_install() {
-	default
-
-	if use jit; then
-		# The final binaries need to be pax-marked, too, if you want to
-		# actually use them. The src_compile marking get lost somewhere
-		# in the install process.
-		for f in mred mzscheme racket; do
-			pax-mark m "${D}/usr/bin/${f}"
-		done
-
-		use X && pax-mark m "${D}/usr/$(get_libdir)/racket/gracket"
-	fi
-	# raco needs decompressed files for packages doc installation bug 662424
-	if use doc; then
-		docompress -x /usr/share/doc/${PF}
-	fi
-}
diff --git a/dev-scheme/racket/racket-7.2-r1.ebuild b/dev-scheme/racket/racket-7.2-r1.ebuild
deleted file mode 100644
index 367977769dc9..000000000000
--- a/dev-scheme/racket/racket-7.2-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 )"
-LICENSE="GPL-3+ LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="doc +futures +jit minimal +places +readline +threads +X"
-REQUIRED_USE="futures? ( jit )"
-
-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"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	default
-	rm -r foreign/libffi || die 'failed to remove bundled libffi'
-}
-
-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
-	econf \
-		--enable-shared \
-		--enable-float \
-		--enable-libffi \
-		--enable-foreign \
-		--disable-libs \
-		--disable-strip \
-		$(use_enable X gracket) \
-		$(use_enable doc docs) \
-		$(use_enable jit) \
-		$(use_enable places) \
-		$(use_enable futures) \
-		$(use_enable threads pthread)
-}
-
-src_compile() {
-	if use jit; then
-		# When the JIT is enabled, a few binaries need to be pax-marked
-		# on hardened systems (bug 613634). The trick is to pax-mark
-		# them before they're used later in the build system. The
-		# following order for racketcgc and racket3m was determined by
-		# digging through the Makefile in src/racket to find out which
-		# targets would build those binaries but not use them.
-		pushd racket
-		emake cgc-core
-		pax-mark m .libs/racketcgc
-		pushd gc2
-		emake all
-		popd
-		pax-mark m .libs/racket3m
-		popd
-	fi
-
-	default
-}
-
-src_install() {
-	default
-
-	if use jit; then
-		# The final binaries need to be pax-marked, too, if you want to
-		# actually use them. The src_compile marking get lost somewhere
-		# in the install process.
-		for f in mred mzscheme racket; do
-			pax-mark m "${D}/usr/bin/${f}"
-		done
-
-		use X && pax-mark m "${D}/usr/$(get_libdir)/racket/gracket"
-	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
-}
diff --git a/dev-scheme/racket/racket-7.3-r1.ebuild b/dev-scheme/racket/racket-7.3-r1.ebuild
deleted file mode 100644
index 367977769dc9..000000000000
--- a/dev-scheme/racket/racket-7.3-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 )"
-LICENSE="GPL-3+ LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="doc +futures +jit minimal +places +readline +threads +X"
-REQUIRED_USE="futures? ( jit )"
-
-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"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	default
-	rm -r foreign/libffi || die 'failed to remove bundled libffi'
-}
-
-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
-	econf \
-		--enable-shared \
-		--enable-float \
-		--enable-libffi \
-		--enable-foreign \
-		--disable-libs \
-		--disable-strip \
-		$(use_enable X gracket) \
-		$(use_enable doc docs) \
-		$(use_enable jit) \
-		$(use_enable places) \
-		$(use_enable futures) \
-		$(use_enable threads pthread)
-}
-
-src_compile() {
-	if use jit; then
-		# When the JIT is enabled, a few binaries need to be pax-marked
-		# on hardened systems (bug 613634). The trick is to pax-mark
-		# them before they're used later in the build system. The
-		# following order for racketcgc and racket3m was determined by
-		# digging through the Makefile in src/racket to find out which
-		# targets would build those binaries but not use them.
-		pushd racket
-		emake cgc-core
-		pax-mark m .libs/racketcgc
-		pushd gc2
-		emake all
-		popd
-		pax-mark m .libs/racket3m
-		popd
-	fi
-
-	default
-}
-
-src_install() {
-	default
-
-	if use jit; then
-		# The final binaries need to be pax-marked, too, if you want to
-		# actually use them. The src_compile marking get lost somewhere
-		# in the install process.
-		for f in mred mzscheme racket; do
-			pax-mark m "${D}/usr/bin/${f}"
-		done
-
-		use X && pax-mark m "${D}/usr/$(get_libdir)/racket/gracket"
-	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
-}
diff --git a/dev-scheme/racket/racket-8.0-r1.ebuild b/dev-scheme/racket/racket-8.0-r1.ebuild
deleted file mode 100644
index bedf4056abbf..000000000000
--- a/dev-scheme/racket/racket-8.0-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 )"
-SRC_URI+=" !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 )
-"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="doc +chez +futures +jit minimal +places +readline +threads +X"
-
-REQUIRED_USE="futures? ( jit )"
-
-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+:3[X?] )
-	!dev-tex/slatex
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	rm -r bc/foreign/libffi || die 'failed to remove bundled libffi'
-}
-
-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 \
-		$(use_enable X gracket) \
-		$(use_enable doc docs) \
-		$(use_enable jit) \
-		$(use_enable places) \
-		$(use_enable futures) \
-		$(use_enable threads pthread)
-}
-
-src_compile() {
-	if use jit; then
-		# When the JIT is enabled, a few binaries need to be pax-marked
-		# on hardened systems (bug 613634). The trick is to pax-mark
-		# them before they're used later in the build system. The
-		# following order for racketcgc and racket3m was determined by
-		# 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 || die
-			emake cgc-core
-			pax-mark m .libs/racketcgc
-
-			pushd gc2 || die
-			emake all
-			popd || die
-
-			pax-mark m .libs/racket3m
-			popd || die
-		fi
-	fi
-
-	default
-}
-
-src_install() {
-	default
-
-	if use jit; then
-		# The final binaries need to be pax-marked, too, if you want to
-		# actually use them. The src_compile marking get lost somewhere
-		# in the install process.
-		for f in mred mzscheme racket; do
-			pax-mark m "${D}/usr/bin/${f}"
-		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
-}
diff --git a/dev-scheme/racket/racket-8.2-r1.ebuild b/dev-scheme/racket/racket-8.2-r1.ebuild
index 3437a73c8c5f..ebb87fe339c6 100644
--- a/dev-scheme/racket/racket-8.2-r1.ebuild
+++ b/dev-scheme/racket/racket-8.2-r1.ebuild
@@ -19,12 +19,15 @@ LICENSE="
 	chez? ( Apache-2.0 )
 	!chez? ( LGPL-3 )
 "
-# Bytecode generated by Racket is not compatible between versions
+# 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="X +chez +doc +futures +jit minimal +places +readline +threads"
+IUSE="X +chez +doc +futures +jit minimal +places +threads"
 # See bug #809785 re chez/threads
-REQUIRED_USE="futures? ( jit ) chez? ( threads )"
+REQUIRED_USE="futures? ( jit threads ) chez? ( threads ) places? ( threads )"
 
 DEPEND="
 	!dev-tex/slatex
@@ -39,7 +42,6 @@ DEPEND="
 		x11-libs/pango[X]
 		x11-misc/shared-mime-info
 	)
-	readline? ( dev-libs/libedit )
 "
 RDEPEND="${DEPEND}"
 
@@ -135,30 +137,27 @@ src_install() {
 }
 
 pkg_preinst() {
-	# If we are merging the same version (NOT revision!)
-	# check if pkg database files exist and do not overwrite them
-	local pvr rel
-	for pvr in ${REPLACING_VERSIONS}; do
-		rel="${pvr%-r*}"
-		if [[ "${rel}" == "${PV}" ]]; then
-			echo "We are installing the same version: ${rel}"
-			local rktd
-			for rktd in "${PKGDB[@]}"; do
-				if [[ -f "${EROOT}/${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
-	done
+	# 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}" ]]; 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
 }
 
 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
 }
 
diff --git a/dev-scheme/racket/racket-8.1-r1.ebuild b/dev-scheme/racket/racket-8.3.ebuild
index 652449041953..c767ef23e92c 100644
--- a/dev-scheme/racket/racket-8.1-r1.ebuild
+++ b/dev-scheme/racket/racket-8.3.ebuild
@@ -19,11 +19,15 @@ LICENSE="
 	chez? ( Apache-2.0 )
 	!chez? ( LGPL-3 )
 "
-# Bytecode generated by Racket is not compatible between versions
+# 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="X +chez +doc +futures +jit minimal +places +readline +threads"
-REQUIRED_USE="futures? ( jit )"
+IUSE="X +chez +doc +futures +jit minimal +places +threads"
+# See bug #809785 re chez/threads
+REQUIRED_USE="futures? ( jit threads ) chez? ( threads ) places? ( threads )"
 
 DEPEND="
 	!dev-tex/slatex
@@ -38,23 +42,12 @@ DEPEND="
 		x11-libs/pango[X]
 		x11-misc/shared-mime-info
 	)
-	readline? ( dev-libs/libedit )
 "
 RDEPEND="${DEPEND}"
 
 # "mred" and "mzscheme" are binaries generated by Racket, not CC
 QA_FLAGS_IGNORED="usr/bin/mred usr/bin/mzscheme"
 
-# Backports that will be probably available in 8.3 release
-PATCHES=(
-	# Prevent "libracket3m" from being stripped
-	# https://github.com/racket/racket/commit/92d202060201f569fafc348c4f64a2965b55287f
-	"${FILESDIR}/Makefile-nostrip.patch"
-	# Fix "starter" LDFLAGS
-	# https://github.com/racket/racket/commit/4f0e1703979d704c4f91b009945c324450acec7a
-	"${FILESDIR}/Makefile-starter.patch"
-)
-
 # Package database files
 PKGDB=(
 	/usr/share/racket/info-cache.rktd
@@ -134,30 +127,27 @@ src_install() {
 }
 
 pkg_preinst() {
-	# If we are merging the same version (NOT revision!)
-	# check if pkg database files exist and do not overwrite them
-	local pvr rel
-	for pvr in ${REPLACING_VERSIONS}; do
-		rel="${pvr%-r*}"
-		if [[ "${rel}" == "${PV}" ]]; then
-			echo "We are installing the same version: ${rel}"
-			local rktd
-			for rktd in "${PKGDB[@]}"; do
-				if [[ -f "${EROOT}/${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
-	done
+	# 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}" ]]; 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
 }
 
 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
 }