From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1425491-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 14EE8158094
for <garchives@archives.gentoo.org>; Fri, 5 Aug 2022 17:48:18 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 07362E0E36;
Fri, 5 Aug 2022 17:48:17 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 83C16E0E36
for <gentoo-commits@lists.gentoo.org>; Fri, 5 Aug 2022 17:48:16 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 74C45340B37
for <gentoo-commits@lists.gentoo.org>; Fri, 5 Aug 2022 17:48:15 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id CAAE9543
for <gentoo-commits@lists.gentoo.org>; Fri, 5 Aug 2022 17:48:13 +0000 (UTC)
From: "Maciej Barć" <xgqt@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Maciej Barć" <xgqt@gentoo.org>
Message-ID: <1659721690.01b63379a93a881b535fe90112d34501d90c3eb4.xgqt@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-scheme/slib/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-scheme/slib/slib-3.2.5-r1.ebuild dev-scheme/slib/slib-3.2.5-r2.ebuild
X-VCS-Directories: dev-scheme/slib/
X-VCS-Committer: xgqt
X-VCS-Committer-Name: Maciej Barć
X-VCS-Revision: 01b63379a93a881b535fe90112d34501d90c3eb4
X-VCS-Branch: master
Date: Fri, 5 Aug 2022 17:48:13 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: d37ade8f-31d6-4f0e-90fa-83899996fae5
X-Archives-Hash: c4b164fcc8484f5962d4f7849c7e5469
commit: 01b63379a93a881b535fe90112d34501d90c3eb4
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 5 17:27:31 2022 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Fri Aug 5 17:48:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01b63379
dev-scheme/slib: EAPI 8; multiple fixes
Closes: https://bugs.gentoo.org/863803
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
.../{slib-3.2.5-r1.ebuild => slib-3.2.5-r2.ebuild} | 68 +++++++++++-----------
1 file changed, 34 insertions(+), 34 deletions(-)
diff --git a/dev-scheme/slib/slib-3.2.5-r1.ebuild b/dev-scheme/slib/slib-3.2.5-r2.ebuild
similarity index 64%
rename from dev-scheme/slib/slib-3.2.5-r1.ebuild
rename to 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
}