From e68d405c5d712af4387159df07e226217bdda049 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 6 Apr 2022 22:33:41 +0100 Subject: gentoo resync : 06.04.2022 --- dev-scheme/scm/Manifest | 3 +- dev-scheme/scm/scm-5.5.6-r3.ebuild | 167 ------------------------------------- dev-scheme/scm/scm-5.5.6-r4.ebuild | 27 ++++-- 3 files changed, 20 insertions(+), 177 deletions(-) delete mode 100644 dev-scheme/scm/scm-5.5.6-r3.ebuild (limited to 'dev-scheme/scm') diff --git a/dev-scheme/scm/Manifest b/dev-scheme/scm/Manifest index b9e3eb7e3606..b7d982c1d602 100644 --- a/dev-scheme/scm/Manifest +++ b/dev-scheme/scm/Manifest @@ -1,6 +1,5 @@ AUX scm-5.5.6-multiplefixes.patch 3014 BLAKE2B 08891323ec487c703a04f72043b73edb0d8e697366f71910a4a728a8ad937c75db310cefdb96144a1af9334edd2da9fc5c720530c6cb0f741e310ee06277e6c1 SHA512 e746ebca91e26569354f09403cf1610c745281af3477d92587a8b52de704998a61d1aeac75bfadfed8aead84243aa01f626438399cfffe92c73bba9fa9564f22 AUX scm-5.5.6-respect-ldflags.patch 395 BLAKE2B 1fec97642ad348678070df454bbc2c7e64e17907f986a95cf96a3ead621ebe6f22a2f5dbcccc4fe9f7a8b8b951d935bafc5a64ce5cc0b48a514d2cda6ecebfb3 SHA512 03f740acdde590dbdc67046795aa1bed609721cbf83e7c153f5d1d5524c4761e3025c808855bf5b56d44d917c4aefa7198b96d66729e565b277c1acac7c53356 DIST scm-5e6.zip 912968 BLAKE2B c059b49364abd25bb2335ad11f82791b96ac95aa9529b914396d08592e46e5aa5cba178b791fc96e3ea3066670c48bdd728609463bea398300b81d979fb304cb SHA512 897370f043401a7961eb1c2e22c951e2144505a1670e328e2c3eab33d52da83f195b873fb7cf8486f412ae52316cfc437c9f2da1432ade70f82eb0da12c2f852 -EBUILD scm-5.5.6-r3.ebuild 3741 BLAKE2B 71e479b6df69b8a33ce6b4f826fc955d6c7361726fa4c50fe1bb3906b427d3cf97cdbeb5117d412249953bf8b185fe8e11a56a800cbf3d3cf97a9f2b29a61718 SHA512 ed4bd81f329cd9fffc6504dbce66e6017491448c9b9d32a75536231ca4c1a83f772cb5f428033c552ed85802b2fb0e23f6a9d9df035c135193cca63e312d1b0a -EBUILD scm-5.5.6-r4.ebuild 3714 BLAKE2B 5c1aafbfe92f0185ad45cd4a5c8eb73eed2995dd975e45c5d5635b2242153c503f1fedfea7708385edcb6b4e282dac1143e4d5860729082057a48c48c15f8ec0 SHA512 b8400426ec602f874be94488b916fd6ed865d21d4808e3ef617a1b9d01d98dee382dc09fe56f130af9b7606ae7964934eba2a9f4af86d1d44d26d971598c5a9a +EBUILD scm-5.5.6-r4.ebuild 3886 BLAKE2B 54647203a4dbc28d546cb496392976066bace65131e36600bff7e5c29715343c0aa296fda795cdc622f07d7f8a175ce5801d534dbd696962e13919fcd3347aab SHA512 b43a123cb307db0c11275be904fc033488ad10c15ae17beab9ce273fe8b9b91e54aef57803add43b85b5c353b40767b4c7c79c6168cb3c04b31a81ad9ace1e04 MISC metadata.xml 1637 BLAKE2B fb3ba0a5330e95dabfbd0b8aae6b5bcf89a97f5c1f2ba98203a287098bdc5e8cc2795adbef31dc7eebd149ec8644162812770ce82dca060aae66480d3b72e75a SHA512 a96fa63997c9ee51578f9590c9ebf198a05b15be499f873bead38cb80985acccc47fdc9d8f67a683ebe3f97a2ed5b34aad037ce68148a12fa169f92dbe2b8c06 diff --git a/dev-scheme/scm/scm-5.5.6-r3.ebuild b/dev-scheme/scm/scm-5.5.6-r3.ebuild deleted file mode 100644 index 7f9e5ca83411..000000000000 --- a/dev-scheme/scm/scm-5.5.6-r3.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit versionator flag-o-matic - -#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_P=${PN}-${MY_PV} -S=${WORKDIR}/${PN} -DESCRIPTION="SCM is a Scheme implementation from the author of slib" -SRC_URI="http://groups.csail.mit.edu/mac/ftpdir/scm/${MY_P}.zip" -HOMEPAGE="http://swiss.csail.mit.edu/~jaffer/SCM" - -SLOT="0" -LICENSE="LGPL-3" -KEYWORDS="amd64 x86 ~amd64-linux" -IUSE="arrays bignums cautious dynamic-linking engineering-notation gsubr inexact ioext libscm macro ncurses posix readline regex sockets unix" - -#unzip for unpacking -DEPEND="app-arch/unzip - >=dev-scheme/slib-3.1.5 - dev-util/cproto - ncurses? ( sys-libs/ncurses:0= ) - readline? ( sys-libs/libtermcap-compat )" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${P}-multiplefixes.patch" ) - -src_compile() { - # SLIB is required to build SCM. - local slibpath="${EPREFIX}/usr/share/slib/" - if [ -n "$SCHEME_LIBRARY_PATH" ]; then - einfo "using SLIB $SCHEME_LIBRARY_PATH" - elif [ -d ${slibpath} ]; then - export SCHEME_LIBRARY_PATH=${slibpath} - fi - - einfo "Making scmlit" - emake -j1 scmlit clean - - einfo "Building scm" - local features="" - use arrays && features+="arrays" - use bignums && features+=" bignums" - use cautious && features+=" cautious" - use engineering-notation && features+=" engineering-notation" - use inexact && features+=" inexact" - use macro && features+=" macro" - - ( use readline || - use ncurses || - use regex || - use posix || - use ioext || - use gsubr || - use sockets || - use unix || - use dynamic-linking ) && features+=" dynamic-linking" - - ./build \ - --compiler-options="${CFLAGS}" \ - --linker-options="${LDFLAGS} -L${EPREFIX}/$(get_libdir)" \ - -s "${EPREFIX}"/usr/$(get_libdir)/scm \ - -F ${features:="none"} \ - -h system \ - -o scm || die - - einfo "Building DLLs" - if use readline; then - ./build \ - --compiler-options="${CFLAGS}" \ - --linker-options="${LDFLAGS}" \ - -h system \ - -F edit-line \ - -t dll || die - fi - if use ncurses ; then - ./build \ - --compiler-options="${CFLAGS}" \ - --linker-options="${LDFLAGS}" \ - -F curses \ - -h system \ - -t dll || die - fi - if use regex ; then - ./build \ - --compiler-options="${CFLAGS}" \ - --linker-options="${LDFLAGS}" \ - -c rgx.c \ - -h system \ - -t dll || die - fi - if use gsubr ; then - ./build \ - --compiler-options="${CFLAGS}" \ - --linker-options="${LDFLAGS}" \ - -c gsubr.c \ - -h system \ - -t dll || die - fi - if use ioext ; then - ./build \ - --compiler-options="${CFLAGS}" \ - --linker-options="${LDFLAGS}" \ - -c ioext.c \ - -h system \ - -t dll || die - fi - if use posix; then - ./build \ - --compiler-options="${CFLAGS}" \ - --linker-options="${LDFLAGS}" \ - -c posix.c \ - -h system \ - -t dll || die - fi - if use sockets ; then - ./build \ - --compiler-options="${CFLAGS}" \ - --linker-options="${LDFLAGS}" \ - -c socket.c \ - -h system \ - -t dll || die - fi - if use unix ; then - ./build \ - --compiler-options="${CFLAGS}" \ - --linker-options="${LDFLAGS}" \ - -c unix.c \ - -h system \ - -t dll || die - fi - - if use libscm ; then - emake libscm.a - fi -} - -src_test() { - emake check -} - -src_install() { - emake DESTDIR="${D}" man1dir="${EPREFIX}"/usr/share/man/man1/ \ - install - - if use libscm; then - emake DESTDIR="${D}" libdir="${EPREFIX}"/usr/$(get_libdir)/ \ - installlib - fi - - doinfo scm.info - doinfo hobbit.info -} - -pkg_postinst() { - [ "${ROOT}" == "/" ] && pkg_config -} - -pkg_config() { - einfo "Regenerating catalog..." - scm -e "(require 'new-catalog)" -} diff --git a/dev-scheme/scm/scm-5.5.6-r4.ebuild b/dev-scheme/scm/scm-5.5.6-r4.ebuild index 482f32675a52..0a286fe7cd04 100644 --- a/dev-scheme/scm/scm-5.5.6-r4.ebuild +++ b/dev-scheme/scm/scm-5.5.6-r4.ebuild @@ -1,21 +1,23 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -#version magic thanks to masterdriverz and UberLord using bash array instead of tr +# Version magic thanks to masterdriverz and UberLord using bash array instead of tr trarr="0abcdefghi" MY_PV="$(ver_cut 1)${trarr:$(ver_cut 2):1}$(ver_cut 3)" - MY_P=${PN}-${MY_PV} -S=${WORKDIR}/${PN} + +inherit toolchain-funcs + DESCRIPTION="SCM is a Scheme implementation from the author of slib" -SRC_URI="http://groups.csail.mit.edu/mac/ftpdir/scm/${MY_P}.zip" HOMEPAGE="http://swiss.csail.mit.edu/~jaffer/SCM" +SRC_URI="http://groups.csail.mit.edu/mac/ftpdir/scm/${MY_P}.zip" +S=${WORKDIR}/${PN} SLOT="0" LICENSE="LGPL-3" -KEYWORDS="~amd64 ~x86 ~amd64-linux" +KEYWORDS="amd64 x86 ~amd64-linux" IUSE="arrays bignums cautious dynamic-linking engineering-notation gsubr inexact ioext libscm macro ncurses posix readline regex sockets unix" BDEPEND="app-arch/unzip" @@ -28,6 +30,15 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${P}-multiplefixes.patch" "${FILESDIR}/${P}-respect-ldflags.patch" ) +src_prepare() { + default + + sed \ + -e "s|\"gcc\"|\"$(tc-getCC)\"|g" \ + -e "s|\"ld\"|\"$(tc-getLD)\"|g" \ + -i ./build.scm || die +} + src_compile() { # SLIB is required to build SCM. local slibpath="${EPREFIX}/usr/share/slib/" @@ -38,7 +49,7 @@ src_compile() { fi einfo "Making scmlit" - emake -j1 scmlit clean + emake -j1 CC=$(tc-getCC) scmlit clean einfo "Building scm" local features="" -- cgit v1.2.3