gentoo auto-resync : 16:07:2022 - 19:46:10

4 files changed, 27 insertions, 17 deletions

diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index ad23b63aa2e5..aa48cabde505 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/chibi/Manifest b/dev-scheme/chibi/Manifest
index 3e95dccf696c..f513b0ebea6d 100644
--- a/dev-scheme/chibi/Manifest
+++ b/dev-scheme/chibi/Manifest
@@ -1,4 +1,4 @@
-DIST chibi-0.10.tar.gz 1148573 BLAKE2B 1435d5734bfc44b6d6ddafdb339eea659345eea0db0e9b227830d7a6b6b14d3655af10906e43b6f8abd7eb2b90596fcb5dcc024abd2cba123a184f66ffcd0961 SHA512 348c20468e3b3b084ed25d38860f1afdecfb06ad9ff9ceb178c36930c14aa66a78f48b881a8eda28a30498662e7c722938212ea77b1cea89834d1a4377f0f648
-EBUILD chibi-0.10.ebuild 868 BLAKE2B 6101a3349563aaa2a20ac2343ad49ea7e1dbd27280cc22a1acfdf1944d36195d372d201f8b2107d498dacbe0f7df28be2d22b8412edfabe6afd2863255d0fcfc SHA512 9ca2b03ad437ac7dcae1b30640abcbce12e3a2b5012c8b8534c2a8e8ddc1c6ed887f3ae8e9e88a80e24be0d1c0ae576c13302c9ab7b215df9d2efb9dbb32bbd7
-EBUILD chibi-9999.ebuild 868 BLAKE2B 6101a3349563aaa2a20ac2343ad49ea7e1dbd27280cc22a1acfdf1944d36195d372d201f8b2107d498dacbe0f7df28be2d22b8412edfabe6afd2863255d0fcfc SHA512 9ca2b03ad437ac7dcae1b30640abcbce12e3a2b5012c8b8534c2a8e8ddc1c6ed887f3ae8e9e88a80e24be0d1c0ae576c13302c9ab7b215df9d2efb9dbb32bbd7
+DIST chibi-0.10.0.tar.gz 1148573 BLAKE2B 1435d5734bfc44b6d6ddafdb339eea659345eea0db0e9b227830d7a6b6b14d3655af10906e43b6f8abd7eb2b90596fcb5dcc024abd2cba123a184f66ffcd0961 SHA512 348c20468e3b3b084ed25d38860f1afdecfb06ad9ff9ceb178c36930c14aa66a78f48b881a8eda28a30498662e7c722938212ea77b1cea89834d1a4377f0f648
+EBUILD chibi-0.10.0.ebuild 944 BLAKE2B fa45b59f8521af3b896898d066b711f4cd1d7bc66fff86853adeb5fdeb5a436aac2c15467f351b88093964c14a34da517470cfe70a717ba524014b25c0e12ce0 SHA512 daca3c9a2d7d7511d3c04310d1ff017c47ab450551cc7e50a911134b3f1425315176a66c9a28426709eb257d29d25fb0c005c6b4fc27bb097819ace41d9c521e
+EBUILD chibi-9999.ebuild 954 BLAKE2B 4a73664e4b355e94796c61949120f88123e69056aae460c8b40ca1ac764a5c3d06dc1519a5d3433fa29050aed5963e24b76d2d40a492c000d8accc886a56a733 SHA512 90ef12956cb8655edf691ceb1687ea6750c0b1b8794d9d19a2b8b13bc7a72b61e0416377beab5bbad784b0eea8e579edaf1d76bcdf8819ec4f5532e21c0574ee
 MISC metadata.xml 1355 BLAKE2B 0fcce80e3e0fd747b74e5cb5e83904a22de2596bba8c5e664e1d0fd29e9ed43d62357b618994cc586391a66a60ca6fb53a68a9cfd221853ad66171b9b7a47a8e SHA512 f0f8613e22a15e02d34de4c41352a797fba65c2c8fc78b37f9024bfcc57ab99391d2ffa28eb0173d872421744d901655beedadb44e32a04a467917b3a8476fe2
diff --git a/dev-scheme/chibi/chibi-0.10.ebuild b/dev-scheme/chibi/chibi-0.10.0.ebuild
index 189f61eb059f..1a8b1cb4f3fe 100644
--- a/dev-scheme/chibi/chibi-0.10.ebuild
+++ b/dev-scheme/chibi/chibi-0.10.0.ebuild
@@ -1,20 +1,25 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+MY_PN=${PN}-scheme
+MY_PV=0.10  # Release "0.10.0" tagged as "0.10"
+MY_P=${MY_PN}-${MY_PV}
+
 inherit toolchain-funcs
 
 DESCRIPTION="Minimal Scheme implementation for use as an extension language"
 HOMEPAGE="http://synthcode.com/scheme/chibi/"
 
-if [[ "${PV}" == *9999* ]]; then
+if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ashinn/${PN}-scheme.git"
+	EGIT_REPO_URI="https://github.com/ashinn/${MY_PN}.git"
 else
-	SRC_URI="https://github.com/ashinn/${PN}-scheme/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/ashinn/${MY_PN}/archive/${MY_PV}.tar.gz
+				-> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-scheme-${PV}"
+	S="${WORKDIR}"/${MY_P}
 fi
 
 LICENSE="BSD"
@@ -27,12 +32,12 @@ src_configure() {
 	export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
 	export SOLIBDIR="${EPREFIX}/usr/$(get_libdir)"
 
-	# if ldconfig (stored in LDCONFIG variable) exists it is ran
+	# If "ldconfig" exists it is ran, overwrite it with "LDCONFIG" variable.
 	export LDCONFIG="0"
 }
 
 src_install() {
 	default
 
-	dosym chibi-scheme /usr/bin/chibi
+	dosym ${MY_PN} /usr/bin/${PN}
 }
diff --git a/dev-scheme/chibi/chibi-9999.ebuild b/dev-scheme/chibi/chibi-9999.ebuild
index 189f61eb059f..3860b98dfaa5 100644
--- a/dev-scheme/chibi/chibi-9999.ebuild
+++ b/dev-scheme/chibi/chibi-9999.ebuild
@@ -1,20 +1,25 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+MY_PN=${PN}-scheme
+MY_PV=${PV}  # May be tagged incorrectly, see bug #858245
+MY_P=${MY_PN}-${MY_PV}
+
 inherit toolchain-funcs
 
 DESCRIPTION="Minimal Scheme implementation for use as an extension language"
 HOMEPAGE="http://synthcode.com/scheme/chibi/"
 
-if [[ "${PV}" == *9999* ]]; then
+if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ashinn/${PN}-scheme.git"
+	EGIT_REPO_URI="https://github.com/ashinn/${MY_PN}.git"
 else
-	SRC_URI="https://github.com/ashinn/${PN}-scheme/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/ashinn/${MY_PN}/archive/${MY_PV}.tar.gz
+				-> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-scheme-${PV}"
+	S="${WORKDIR}"/${MY_P}
 fi
 
 LICENSE="BSD"
@@ -27,12 +32,12 @@ src_configure() {
 	export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
 	export SOLIBDIR="${EPREFIX}/usr/$(get_libdir)"
 
-	# if ldconfig (stored in LDCONFIG variable) exists it is ran
+	# If "ldconfig" exists it is ran, overwrite it with "LDCONFIG" variable.
 	export LDCONFIG="0"
 }
 
 src_install() {
 	default
 
-	dosym chibi-scheme /usr/bin/chibi
+	dosym ${MY_PN} /usr/bin/${PN}
 }