gentoo resync : 05.12.2021

5 files changed, 165 insertions, 82 deletions

diff --git a/dev-scheme/chicken/Manifest b/dev-scheme/chicken/Manifest
index c8550237f395..79e3d083658d 100644
--- a/dev-scheme/chicken/Manifest
+++ b/dev-scheme/chicken/Manifest
@@ -1,3 +1,5 @@
 DIST chicken-4.13.0.tar.gz 4244358 BLAKE2B c40a28346fb6cd144e33605235ed022d48103edd1db1ae35e109e266989caaa0bf8fabf75e8b9cb740ac8bf4e3fba74218763573485127acacd001b8767cd088 SHA512 02c2035b4f81da6f4af2d246361ce8debdc9d9c663c3f43b7afb9abbf1ff591a2bb8fa144511b4d747a373dea4dcd9c10cac48466bf97032db76f3830c08709d
-EBUILD chicken-4.13.0-r1.ebuild 1703 BLAKE2B 38a6881c50185aacf0810d8d006afe11a56c07067d0ec965b537d73a323e374699f531d6a2daaa5a5ce69899e95b43f4ab3197d403c8799a0dd53888198d6919 SHA512 559251a99faa453ae3ce69044209d30d1cb5551663a99e7f485ffc6b63d3e6182b27e4f0d12d21151b0965262975c3d7ea68a3e702e5545b693cddf1c91405b0
-MISC metadata.xml 618 BLAKE2B e3f4914b2b8036d5fe7979dfb4dedabee6b8ea83df3906d55fd774cb89145fa0f0ea405cbca4b0bef3c37a55a098b9ac922d7ec7b03d043375e3e6f310f48ab1 SHA512 3b6cc9f00a7ba2fbdd7c4933e352394872b62cdb993fd85d85db96e68304d1d5c65abfa6bc6a58c00a9963a14342ca45aebd0e8c15de0e876548b24c8e5eddd9
+DIST chicken-5.3.0.tar.gz 4069549 BLAKE2B 7e1fb8c844542927eec53df751014f718b8c96fb6cf390d6464d7d55467c7320346be9ed05202b9c5c96548f274243ae52fead488981d7c207bec2c001db7cd7 SHA512 8fcc08a1ba44cde42c95820695a11858a3b7ff39a4b577bc5afb894c53513661aab2dc5b8e608e1d9d26648e314551052041626c4c8e519fcb9f8af324386e02
+EBUILD chicken-4.13.0-r2.ebuild 1623 BLAKE2B b5a16a9171e08517f4b014ad9a98d9450c16ef5ef61a7ac9dbd14ed07b497a663c0e329e3f49dc76f3a92d9eb3d4e59564882ba6cc55afad73a8ecc34a7f808d SHA512 188733b4f1c747fbf50fc66330d67a9b8553e82d65c697b56177202f62045b0db08bd5470db5172adeb456467b2b83b799b732ac0dfbd5701131afa617d621f4
+EBUILD chicken-5.3.0.ebuild 1785 BLAKE2B ce54b97bc1efa0ca896250d4ed939d08f9acaf6c0ab0e9c934a7eab5f6cabd964c2d4133a3392f479edd4d7f027dc88b2fd5d7dc0dec8f2c0fea06fd8f2f3f68 SHA512 f6c5a181d15227204ca62d5eb179b09ec19d6c97fb82e8c6de6a3356b43665de0d915580d91744c5f4cb2b722397c6f48850b2b7146dfb6cd62187e7b7851d95
+MISC metadata.xml 634 BLAKE2B b12c63caf7f06e32c23cf6ee7a02d245759f1e8d7da7e69457536e6a8a792eba43b86e170e04f67e6a4871ca4342c4db8db1661fe12626182ae3718dd1599f49 SHA512 9e7e23a443b91bd44870cc00206af7ff6dc536435d69ecfb370e423455b62df8aa4835265994f83c53240001727276005a3c30a4afac6c21f1b10c411d1b1ae7
diff --git a/dev-scheme/chicken/chicken-4.13.0-r1.ebuild b/dev-scheme/chicken/chicken-4.13.0-r1.ebuild
deleted file mode 100644
index 9f70d69dc3f6..000000000000
--- a/dev-scheme/chicken/chicken-4.13.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-MY_PV=$(get_version_component_range 1-3)
-DESCRIPTION="Scheme interpreter and native Scheme to C compiler"
-HOMEPAGE="http://www.call-cc.org/"
-SRC_URI="http://code.call-cc.org/releases/${MY_PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 x86"
-IUSE="doc"
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	default
-
-	#Because chicken's Upstream is in the habit of using variables that
-	#portage also uses :( eg. $ARCH and $A
-	sed "s,A\(\s?=\|)\),chicken&," \
-		-i Makefile.cross-linux-mingw defaults.make rules.make || die
-	sed "s,ARCH,zARCH," \
-		-i Makefile.* defaults.make rules.make || die
-	sed -e "s,\$(PREFIX)/lib,\$(PREFIX)/$(get_libdir)," \
-		-e "s,\$(DATADIR)/doc,\$(SHAREDIR)/doc/${PF}," \
-		-i defaults.make || die
-
-	if ! use doc; then
-		rm -rf manual || die
-		# Without this Makefile tries to re-bootstrap the compiler
-		touch build-version.c
-	fi
-}
-
-src_compile() {
-	emake -j1 PLATFORM=linux PREFIX=/usr C_COMPILER_OPTIMIZATION_OPTIONS="${CFLAGS}" \
-		LINKER_OPTIONS="${LDFLAGS}" \
-		HOSTSYSTEM="${CBUILD}"
-}
-
-src_test() {
-	cd tests
-	./runtests.sh || die
-}
-
-src_install() {
-	# still can't run make in parallel for the install target
-	emake -j1 PLATFORM=linux PREFIX=/usr DESTDIR="${D}" HOSTSYSTEM="${CBUILD}" \
-		LINKER_OPTIONS="${LDFLAGS}" install
-
-	rm "${D}"/usr/share/doc/${PF}/LICENSE || die
-
-	# README is installed by Makefile
-	dodoc NEWS
-
-	# Let portage track this file (created later)
-	touch "${D}"/usr/$(get_libdir)/chicken/8/modules.db || die
-}
-
-pkg_postinst() {
-	# Create modules.db file in ${ROOT}
-	chicken-install -update-db || die
-}
diff --git a/dev-scheme/chicken/chicken-4.13.0-r2.ebuild b/dev-scheme/chicken/chicken-4.13.0-r2.ebuild
new file mode 100644
index 000000000000..2c55fdc89af2
--- /dev/null
+++ b/dev-scheme/chicken/chicken-4.13.0-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Scheme interpreter and native Scheme to C compiler"
+HOMEPAGE="https://www.call-cc.org/"
+SRC_URI="https://code.call-cc.org/releases/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc ppc64 x86"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND=""
+
+src_prepare() {
+	default
+
+	# because chicken's upstream is in the habit of using variables that
+	# portage also uses :( eg. $ARCH and $A
+	sed -i \
+		-e "s/A\([[:space:]]*?=\|)\)/z&/" \
+		-e "s/ARCH/z&/" \
+		-e "/LICENSE /d" \
+		Makefile.* {defaults,rules}.make || die
+	sed -i \
+		-e "s|/lib|/$(get_libdir)|" \
+		-e "s|\$(DATADIR)/doc|\$(SHAREDIR)/doc/${PF}|" \
+		defaults.make || die
+
+	use doc || sed -i "/\$(SEP)manual/d" rules.make || die
+}
+
+src_compile() {
+	emake -j1 \
+		PLATFORM="linux" \
+		PREFIX="${EPREFIX}/usr" \
+		C_COMPILER="$(tc-getCC)" \
+		C_COMPILER_OPTIMIZATION_OPTIONS="${CFLAGS}" \
+		CXX_COMPILER="$(tc-getCXX)" \
+		HOSTSYSTEM="${CBUILD}" \
+		LINKER_OPTIONS="${LDFLAGS}"
+}
+
+src_test() {
+	cd tests && ./runtests.sh || die
+}
+
+src_install() {
+	emake -j1 \
+		PLATFORM="linux" \
+		PREFIX="${EPREFIX}/usr" \
+		C_COMPILER="$(tc-getCC)" \
+		CXX_COMPILER="$(tc-getCXX)" \
+		HOSTSYSTEM="${CBUILD}" \
+		LINKER_OPTIONS="${LDFLAGS}" \
+		DESTDIR="${D}" \
+		install
+	einstalldocs
+	find "${ED}" -name '*.a' -delete || die
+
+	# let portage track this file (created later)
+	touch "${ED}"/usr/$(get_libdir)/${PN}/8/modules.db || die
+}
+
+pkg_postinst() {
+	# create modules.db file in ${ROOT}
+	chicken-install -update-db || die
+}
diff --git a/dev-scheme/chicken/chicken-5.3.0.ebuild b/dev-scheme/chicken/chicken-5.3.0.ebuild
new file mode 100644
index 000000000000..869ed7fcf99a
--- /dev/null
+++ b/dev-scheme/chicken/chicken-5.3.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Scheme interpreter and native Scheme to C compiler"
+HOMEPAGE="https://www.call-cc.org/"
+SRC_URI="https://code.call-cc.org/releases/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND=""
+
+src_prepare() {
+	default
+
+	# because chicken's upstream is in the habit of using variables that
+	# portage also uses :( eg. $ARCH and $A
+	sed -i \
+		-e "s/A\([[:space:]]*?=\|)\)/z&/" \
+		-e "s/ARCH/z&/" \
+		-e "/LICENSE /d" \
+		Makefile.* {defaults,rules}.make || die
+	sed -i \
+		-e "s|/lib|/$(get_libdir)|" \
+		-e "s|\$(DATADIR)/doc|\$(SHAREDIR)/doc/${PF}|" \
+		defaults.make || die
+	sed -i \
+		-e "/\$(CHICKEN_DO_PROGRAM)\$(EXE):/,/^$/s/\(\$<\)/\$(LINKER_OPTIONS) \1/" \
+		rules.make || die
+
+	use doc || sed -i "/\$(SEP)manual/d" rules.make || die
+}
+
+src_compile() {
+	emake -j1 \
+		PLATFORM="linux" \
+		PREFIX="${EPREFIX}/usr" \
+		C_COMPILER="$(tc-getCC)" \
+		C_COMPILER_OPTIMIZATION_OPTIONS="${CFLAGS}" \
+		CXX_COMPILER="$(tc-getCXX)" \
+		HOSTSYSTEM="${CBUILD}" \
+		LINKER_OPTIONS="${LDFLAGS}"
+}
+
+src_test() {
+	cd tests && ./runtests.sh || die
+}
+
+src_install() {
+	emake -j1 \
+		PLATFORM="linux" \
+		PREFIX="${EPREFIX}/usr" \
+		C_COMPILER="$(tc-getCC)" \
+		C_COMPILER_OPTIMIZATION_OPTIONS="${CFLAGS}" \
+		CXX_COMPILER="$(tc-getCXX)" \
+		HOSTSYSTEM="${CBUILD}" \
+		LINKER_OPTIONS="${LDFLAGS}" \
+		DESTDIR="${D}" \
+		install
+	einstalldocs
+	find "${ED}" -name '*.a' -delete || die
+
+	# let portage track this file (created later)
+	touch "${ED}"/usr/$(get_libdir)/${PN}/11/modules.db || die
+}
+
+pkg_postinst() {
+	# create modules.db file in ${ROOT}
+	chicken-install -update-db || die
+}
diff --git a/dev-scheme/chicken/metadata.xml b/dev-scheme/chicken/metadata.xml
index 39f7cc709ea6..be95a48c267f 100644
--- a/dev-scheme/chicken/metadata.xml
+++ b/dev-scheme/chicken/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>scheme@gentoo.org</email>
-	<name>Gentoo Scheme Project</name>
-</maintainer>
-<longdescription>
-CHICKEN is a compiler for the Scheme programming language. CHICKEN produces
-portable, efficient C, supports almost all of the current Scheme language
-standard, the Revised5 Report on the Algorithmic Language Scheme (R5RS ), and
-includes many enhancements and extensions. CHICKEN runs on MacOS X, Windows, and
-many Unix flavours.
-</longdescription>
+	<maintainer type="project">
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
+	<longdescription>
+		CHICKEN is a compiler for the Scheme programming language. CHICKEN
+		produces portable, efficient C, supports almost all of the current
+		Scheme language standard, the Revised^5 Report on the Algorithmic
+		Language Scheme (R5RS), and includes many enhancements and extensions.
+		CHICKEN runs on MacOS X, Windows, and many Unix flavours.
+	</longdescription>
 </pkgmetadata>