From 3517852e3b8a68d1e997770fc0650c5053bafc6c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 4 Jan 2022 01:27:12 +0000 Subject: gentoo resync : 04.01.2022 --- app-shells/scsh/Manifest | 4 +- app-shells/scsh/files/0.6.7-Makefile.in-AR.patch | 26 ++++++++++ ...0.6.7-scheme48vm-prelude.h-SMALL_MULTIPLY.patch | 11 ++++ app-shells/scsh/scsh-0.6.7-r2.ebuild | 47 ------------------ app-shells/scsh/scsh-0.6.7-r3.ebuild | 58 ++++++++++++++++++++++ 5 files changed, 98 insertions(+), 48 deletions(-) create mode 100644 app-shells/scsh/files/0.6.7-Makefile.in-AR.patch create mode 100644 app-shells/scsh/files/0.6.7-scheme48vm-prelude.h-SMALL_MULTIPLY.patch delete mode 100644 app-shells/scsh/scsh-0.6.7-r2.ebuild create mode 100644 app-shells/scsh/scsh-0.6.7-r3.ebuild (limited to 'app-shells/scsh') diff --git a/app-shells/scsh/Manifest b/app-shells/scsh/Manifest index 99efb77b9b14..c19f6b21ea84 100644 --- a/app-shells/scsh/Manifest +++ b/app-shells/scsh/Manifest @@ -1,6 +1,8 @@ +AUX 0.6.7-Makefile.in-AR.patch 933 BLAKE2B ae903e205483625d0c195a0df691a0ed0c48a12bde2eb35548b025f48583028f19436e5b76054298fcb71227570bc652d2c832e18b5062c7294a10a012cab65d SHA512 b8a56ef18a9f3c76a08b49acc5f569bd0588174df7a6833d4ec6cd52fcb839942c71f258b8c0c5bd8b1dc906dc557646ed1fdd1e9c12bfc97d3a779f07d0dacb AUX 0.6.7-Makefile.in-LDFLAGS.patch 373 BLAKE2B 233142e105597caa0bd898bb0d50091f9639303967244087368cde6a3e66664c50e6ea5c00a642df07abff69d8021bd2ea33333c57c15c5847e1be95ce7a9441 SHA512 8fb2601c665494f761f053ceb533d1008863d661ffcd7e8b66901db31dc08329b31274d6556ee353468b7a35b15a28495c92062a11610f059f4c9c71edc985ae AUX 0.6.7-Makefile.in-doc-dir-gentoo.patch 4100 BLAKE2B f1409dfbd0ff5c4cd67fe1e22ebcefffc0bf19a5cee27dfecbdad010bb794affc34ca32dbe0f919b092085f17ae2e21006900fa3360f1a99bcf30b20fff6794c SHA512 e2b647cb89f6972aece5172eea7f186bc9181b80138c7860972deb615959256eed4e99a5ff939a4e50ee6fae1de6e5cd870592f468749fc0df8d2a24e0ad0ee0 AUX 0.6.7-Missing-includes.patch 583 BLAKE2B 59b0a0de190bb633696cb6c48f3cba48fe24b7561aca3af56e25cca68d1d4bdcbebf3bdc94836e46ddb0ec507dc1ddcba273b3c53046157c9e3c01a289aecc55 SHA512 dfe27f640d0b8c1e430be67ee0ca326720063ea3254d2c7ad91a9dc1de17cc32fac4158897250744de219b35665d1e74aa4ab3b64d3b323cf1bef1f560ffbc02 +AUX 0.6.7-scheme48vm-prelude.h-SMALL_MULTIPLY.patch 298 BLAKE2B d1af7be2ab2e0a4322ca2f1b4111268e235fd0b8947bd843ea689c7fac9b15fd8549e9d12bd56c366a535812886ee652b3417f9d70c0db9050915335d84af4ef SHA512 61ccdecbb9f5b1c2a006d68df045a89c2e8299d24fca8e3ae8b96486fcae9af995dbb235d314ee573be2984df6fabcb44130b63abe62b7b30bd724b090d480ab DIST scsh-0.6.7.tar.gz 4367439 BLAKE2B 40231f7744bea9efd58c10c042db7f3e8f4248726ebdc23e482590b53639e7f403b3a1ba9510fdda16a1216d26d71a692fc2ad42615d0a90161debbfdff34841 SHA512 d769b3d70afe813a3d25ef1b77d8dbc549b379ca41b0748cd90791408a36b33ed3ce08937bfd925bab411785aa671761d79bbf2edd9caf0c3ea6c44d90f4b6ea -EBUILD scsh-0.6.7-r2.ebuild 998 BLAKE2B 9c8c3ed7bdc51a539f7a736dcf2c40ee9401c1856745dcf85d0d60272612bf947233a3a9ca13d4a7d7d61d3d27c4857d4e80999d059e5f0bd01ab4948374110a SHA512 5e84813c026c85c232e6ceef7c7f4e0eb2df1c6954b1ed80c27c7c01f31026e59cdcf24d07be4e4d731518b1ce593c512a84b4bfce2673c4d882b755751f30f3 +EBUILD scsh-0.6.7-r3.ebuild 1307 BLAKE2B 47267f75e56be2fa181e9d17ee314a05280f8edd0a091956d5dc716fc852f8bf7f6a6aa608c3e71b34a439ac916b3395595e5182c709a00aacf7dd6f35c1b1c4 SHA512 e5caafd5cc80fc4741c49e0fa35831201bbb1e6103356410f2d6c5be362e2daeb0f03679046862c07ec3e87316b7f76c3f7e26db1469afb0f7f226fd42a4f24c MISC metadata.xml 1014 BLAKE2B feb5ca286e21124c68dffd37b49b066b5b88e70a9aa23dd2995bdc19c78534eacf8da4854db415e6db9babeb143f20d2a64297c6e68d6408fb9e5f9d274b1df9 SHA512 db09274d5bd4e28c4fc000a189885143ffeaf988c09b910af679b3f6542b14e744b249755bcc9f40c511993acbd0586c29ca68d33c93eebb937044ec757e3ef2 diff --git a/app-shells/scsh/files/0.6.7-Makefile.in-AR.patch b/app-shells/scsh/files/0.6.7-Makefile.in-AR.patch new file mode 100644 index 000000000000..b5dfea96b998 --- /dev/null +++ b/app-shells/scsh/files/0.6.7-Makefile.in-AR.patch @@ -0,0 +1,26 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -259,12 +259,12 @@ $(VM): c/main.o $(OBJS) $(UNIX_OBJS) $(LIBOBJS) $(EXTERNAL_OBJECTS) + $(LIBCIG): c/main.o $(OBJS) + # $(CC) -r -o $@ main.o $(OBJS) + $(RM) $@ +- $(AR) $@ c/main.o $(OBJS) ++ $(AR) qc $@ c/main.o $(OBJS) + $(RANLIB) $@ + + $(LIBSCSHVM): c/smain.o $(OBJS) + $(RM) $@ +- $(AR) $@ c/smain.o $(OBJS) ++ $(AR) qc $@ c/smain.o $(OBJS) + $(RANLIB) $@ + + $(LIBSCSH): $(OBJS) $(UNIX_OBJS) $(LIBOBJS) $(EXTERNAL_OBJECTS) +@@ -274,7 +274,7 @@ $(LIBSCSH): $(OBJS) $(UNIX_OBJS) $(LIBOBJS) $(EXTERNAL_OBJECTS) + $(EXTERNAL_INITIALIZERS) && \ + $(CC) -c $(CFLAGS) -o /tmp/s48_external_$$$$.o \ + /tmp/s48_external_$$$$.c && \ +- $(AR) $@ $(OBJS) $(UNIX_OBJS) $(LIBOBJS) $(EXTERNAL_OBJECTS) \ ++ $(AR) qc $@ $(OBJS) $(UNIX_OBJS) $(LIBOBJS) $(EXTERNAL_OBJECTS) \ + /tmp/s48_external_$$$$.o && \ + $(RANLIB) $@ && \ + rm -f /tmp/s48_external_$$$$.c /tmp/s48_external_$$$$.o diff --git a/app-shells/scsh/files/0.6.7-scheme48vm-prelude.h-SMALL_MULTIPLY.patch b/app-shells/scsh/files/0.6.7-scheme48vm-prelude.h-SMALL_MULTIPLY.patch new file mode 100644 index 000000000000..98c904a67e9f --- /dev/null +++ b/app-shells/scsh/files/0.6.7-scheme48vm-prelude.h-SMALL_MULTIPLY.patch @@ -0,0 +1,11 @@ +--- a/c/scheme48vm-prelude.h ++++ b/c/scheme48vm-prelude.h +@@ -5,7 +5,7 @@ + #include "c-mods.h" + #include "write-barrier.h" + +-#define SMALL_MULTIPLY(x,y) ((x) * (y)) ++#define SMALL_MULTIPLY(x,y) ((long)((unsigned long)(x) * (unsigned long)(y))) + + #define NO_ERRORS 0 /* extension to errno.h */ + diff --git a/app-shells/scsh/scsh-0.6.7-r2.ebuild b/app-shells/scsh/scsh-0.6.7-r2.ebuild deleted file mode 100644 index 170f8f2f1eac..000000000000 --- a/app-shells/scsh/scsh-0.6.7-r2.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit multilib - -MY_PV="${PV%*.*}" - -DESCRIPTION="Unix shell embedded in Scheme" -HOMEPAGE="http://www.scsh.net/" -SRC_URI="ftp://ftp.scsh.net/pub/scsh/${MY_PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ppc sparc x86" - -DEPEND="!dev-scheme/scheme48" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PV}-Makefile.in-doc-dir-gentoo.patch" - "${FILESDIR}/${PV}-Makefile.in-LDFLAGS.patch" - "${FILESDIR}/${PV}-Missing-includes.patch" -) - -RESTRICT="test" # some tests don't pass. - -src_prepare() { - default -} - -src_configure() { - use amd64 && multilib_toolchain_setup x86 - SCSH_LIB_DIRS="/usr/$(get_libdir)/${PN}" - econf \ - --libdir=/usr/$(get_libdir) \ - --includedir=/usr/include \ - --with-lib-dirs-list=${SCSH_LIB_DIRS} -} - -src_install() { - emake -j1 DESTDIR="${D}" install - local ENVD="${T}/50scsh" - echo "SCSH_LIB_DIRS=\"${SCSH_LIB_DIRS}\"" > "${ENVD}" || die - doenvd "${ENVD}" -} diff --git a/app-shells/scsh/scsh-0.6.7-r3.ebuild b/app-shells/scsh/scsh-0.6.7-r3.ebuild new file mode 100644 index 000000000000..26d0d047d90b --- /dev/null +++ b/app-shells/scsh/scsh-0.6.7-r3.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# NOTICE: SCSH 0.6.7 is 32bit only +# https://bugs.gentoo.org/589122#c6 + +EAPI=8 + +inherit multilib + +MY_PV="${PV%*.*}" + +DESCRIPTION="Unix shell embedded in Scheme" +HOMEPAGE="https://www.scsh.net/" +SRC_URI="ftp://ftp.scsh.net/pub/scsh/${MY_PV}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ppc sparc x86" + +RDEPEND=" + !dev-scheme/scheme48 + virtual/libcrypt:= + amd64? ( virtual/libcrypt:=[abi_x86_32] ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PV}-Makefile.in-AR.patch + "${FILESDIR}"/${PV}-Makefile.in-LDFLAGS.patch + "${FILESDIR}"/${PV}-Makefile.in-doc-dir-gentoo.patch + "${FILESDIR}"/${PV}-Missing-includes.patch + "${FILESDIR}"/${PV}-scheme48vm-prelude.h-SMALL_MULTIPLY.patch +) + +src_configure() { + use amd64 && multilib_toolchain_setup x86 + + export SCSH_LIB_DIRS="/usr/$(get_libdir)/${PN}" + + local myconf=( + --includedir=/usr/include + --libdir=/usr/$(get_libdir) + --with-lib-dirs-list=${SCSH_LIB_DIRS} + ) + econf "${myconf[@]}" +} + +src_install() { + emake -j1 DESTDIR="${D}" install + + # Fix doc install dir + mv "${ED}/usr/share/doc/${PN}-${PV}" "${ED}/usr/share/doc/${PF}" || die + + local ENVD="${T}/50scsh" + echo "SCSH_LIB_DIRS='\"${SCSH_LIB_DIRS}\"'" > "${ENVD}" || die + doenvd "${ENVD}" +} -- cgit v1.2.3