gentoo auto-resync : 05:08:2022 - 20:08:35

3 files changed, 35 insertions, 35 deletions

diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index c35a55b77a49..28da5f637593 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/slib/Manifest b/dev-scheme/slib/Manifest
index 9f2bb6850544..3e36bdfeaf69 100644
--- a/dev-scheme/slib/Manifest
+++ b/dev-scheme/slib/Manifest
@@ -2,5 +2,5 @@ AUX 50slib 39 BLAKE2B a7e221f173cfc2b24c72f047130e6b4c289533a22dc7d59fca49a147ed
 AUX slib-3.2.5-fix-makefile-guile.patch 882 BLAKE2B 6e9c80b476cafa24477aae5b30e8c35f116cfbd0261f06b15672e39cc94e2ef6cb116104a41e5c0f1ebcb887664d9f43ec6c5b21ab3286d5a33c56d081ca9a4b SHA512 74997578edd5472f084a3b899c4e11b67432a4776bce6a19cbd4300316bf413f38374711a9a5cd3c10cd6cac01cb6d337d6f2ad18236bc4747c0bccf88948e3a
 AUX slib-3.2.5-fix-paths.patch 1627 BLAKE2B bea0c823ca1f4e006953128cb5fe2886f5e84efbcf2d1ee32c801524d3bbbaf65899853c476697b501673501b112e7bd9382f7e372d27745cd190d3fa66a0bd4 SHA512 bdd667f20ca0ef57707a4df379186b58ef5ffab38e61a7e8e4ef697d7a90ebbafa8e4ca1f887d87520290656f2445fe1a9f4bd4e22634587908f70059dde0f30
 DIST slib-3b5.zip 1105432 BLAKE2B ae9a6bb34b318875048fad05403a90342b070770013ecd8b022846dc3c43c708511ce6f8ec2be6da2329b01dcc1ed0a641bf68569fd022bb4e2187e20efac0b0 SHA512 f6ebf163fe34498141ab61b6887a9a5db8f2fe0aef1f6c70a7a5783dde6d1268d7e724bc340b73b36189b09013e7079584e0af74f0876e5ebfa46b53d847923e
-EBUILD slib-3.2.5-r1.ebuild 2767 BLAKE2B 390d5cda717a92cfb0dc86cb629505005aa333b026c3ae861e1d2ba458e515eca12403001944b06097352d4319b2beae3ec3ee07337a21c56ad8d36b0d91b599 SHA512 5afa20d2f19a9a6ad5a6084cc3cd74e8b16a7b4a70ab8f4c95af35e8e01c41144155ba18c0051c1a6f5eaa05f8d79d5c85891d4c892e1a2af3101164499f13ea
+EBUILD slib-3.2.5-r2.ebuild 2809 BLAKE2B 31497215c942426b6f91b4be12e25a9fc2ac0a9968b0b0fff627353221f6d0185bb705d0d234c9f3475e553ddd599aae065b2b4f98442f730863958e8a16140e SHA512 e3220f0df573ac02fa596c07a97658730523c444a8915f41d4a29e8a815abdd374bf0f827240808b7c1cf33e3747d18b69eb6b8430bb331c501fb09a3088f814
 MISC metadata.xml 581 BLAKE2B ce1522831adc36b4f5adc45aa3fded28ace2913a530a30df36d4e35fe53a023f969e124a5270bfbe336dc81f13cca1d4a93565655cb61a6c1f0ad52b967363ae SHA512 3b45d61e0477e55831649e4ccc01112e1d61c3fc4792a723b05bef91ed521e08bb3af6ed63b5009eded639824ba37e5ae8232383aa461d5f43841619175f6422
diff --git a/dev-scheme/slib/slib-3.2.5-r1.ebuild b/dev-scheme/slib/slib-3.2.5-r2.ebuild
index a239934da617..6c59160888a4 100644
--- a/dev-scheme/slib/slib-3.2.5-r1.ebuild
+++ b/dev-scheme/slib/slib-3.2.5-r2.ebuild
@@ -1,46 +1,43 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-
-inherit versionator
+EAPI=8
 
 #version magic thanks to masterdriverz and UberLord using bash array instead of tr
 trarr="0abcdefghi"
-MY_PV="$(get_version_component_range 1)${trarr:$(get_version_component_range 2):1}$(get_version_component_range 3)"
+MY_PV="$(ver_cut 1)${trarr:$(ver_cut 2):1}$(ver_cut 3)"
 
 DESCRIPTION="Portable Scheme library for all standard Scheme implementations"
 HOMEPAGE="http://people.csail.mit.edu/jaffer/SLIB"
 SRC_URI="http://groups.csail.mit.edu/mac/ftpdir/scm/${PN}-${MY_PV}.zip"
-
-RESTRICT="mirror"
+S="${WORKDIR}"/${PN}
 
 LICENSE="public-domain BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="gambit scm"
+RESTRICT="mirror"
 
 RDEPEND="
-	>=sys-apps/texinfo-5.0
 	>=dev-scheme/guile-1.8.8:=
 	gambit? ( dev-scheme/gambit )
-	scm? ( dev-scheme/scm )"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
+	scm? ( dev-scheme/scm )
+"
+BDEPEND="
+	${RDEPEND}
+	>=sys-apps/texinfo-5.0
+	app-arch/unzip
+"
 
 DOCS=( ANNOUNCE COPYING FAQ README ChangeLog slib.{txt,html} )
 
 PATCHES=(
-	"${FILESDIR}/${P}-fix-paths.patch"
-	"${FILESDIR}/${P}-fix-makefile-guile.patch"
+	"${FILESDIR}"/${P}-fix-makefile-guile.patch
+	"${FILESDIR}"/${P}-fix-paths.patch
 )
 
-S="${WORKDIR}/${PN}"
-
 src_configure() {
-	./configure \
-		--prefix=/usr \
-		--libdir=/usr/share || die
+	./configure --prefix=/usr --libdir=/usr/share || die
 }
 
 src_compile() {
@@ -52,44 +49,47 @@ src_compile() {
 
 src_install() {
 	# core
-	dodir /usr/share/${PN}
 	insinto /usr/share/${PN}
-	doins *.{dat,init,ps,scm,sh}
-
-	# permissions
-	local i
-	for i in "${ED%/}"/usr/share/${PN}/*.sh ; do
-		fperms +x /usr/share/${PN}/$(basename "$i")
-	done
+	doins *.{dat,init,ps,scm}
+	exeinto /usr/share/${PN}
+	doexe *.sh
 
 	# bin
 	dodir /usr/bin/
-	dosym /usr/share/${PN}/${PN}.sh /usr/bin/${PN}
+	dosym ../../usr/share/${PN}/${PN}.sh /usr/bin/${PN}
 
 	# env
-	doenvd "${FILESDIR}/50slib"
+	doenvd "${FILESDIR}"/50slib
 
 	# docs
 	doinfo slib.info
 	doman slib.1
 
 	# guile
-	if has_version '=dev-scheme/guile-2.0*'; then
+	if has_version '=dev-scheme/guile-3.0*'; then
+		dodir /usr/share/guile/3.0
+		dosym ../../../../usr/share/${PN}/ /usr/share/guile/3.0/${PN}
+	elif has_version '=dev-scheme/guile-2.0*'; then
 		dodir /usr/share/guile/2.0
-		dosym /usr/share/${PN}/ /usr/share/guile/2.0/${PN}
+		dosym ../../../../usr/share/${PN}/ /usr/share/guile/2.0/${PN}
 	else
 		dodir /usr/share/guile/1.8
-		dosym /usr/share/${PN}/ /usr/share/guile/1.8/${PN}
+		dosym ../../../../usr/share/${PN}/ /usr/share/guile/1.8/${PN}
 	fi
 
+	# gambit
+	use gambit && dodir /usr/share/gambc
+
 	# backwards compatibility
 	dodir /usr/lib/
-	dosym /usr/share/${PN}/ /usr/lib/${PN}
+	dosym ../../usr/share/${PN}/ /usr/lib/${PN}
+
+	einstalldocs
 }
 
 _new_catalog() {
-	if [[ ! "$1" =~ ^(guile|scm)$ ]]; then
-		echo -n "(load \"${ROOT}/usr/share/slib/$1.init\")" || die
+	if [[ ! "${1}" =~ ^(guile|scm)$ ]]; then
+		echo -n "(load \"${ROOT}/usr/share/slib/${1}.init\")" || die
 	fi
 	echo " (require 'new-catalog) (slib:report-version)" || die
 }