[gentoo-commits] repo/gentoo:master commit in: app-shells/scsh/
commit: 41e61ffd2214f056b3c2b5fd13bdb27730c912f6 Author: Maciej Barć gentoo org> AuthorDate: Tue Jul 26 21:35:37 2022 + Commit: Maciej Barć gentoo org> CommitDate: Tue Jul 26 21:35:37 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41e61ffd app-shells/scsh: filter LTO (type mismatch) Closes: https://bugs.gentoo.org/854873 Signed-off-by: Maciej Barć gentoo.org> app-shells/scsh/scsh-0.6.7-r3.ebuild | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app-shells/scsh/scsh-0.6.7-r3.ebuild b/app-shells/scsh/scsh-0.6.7-r3.ebuild index 26d0d047d90b..e42fc36bb8a3 100644 --- a/app-shells/scsh/scsh-0.6.7-r3.ebuild +++ b/app-shells/scsh/scsh-0.6.7-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # NOTICE: SCSH 0.6.7 is 32bit only @@ -6,7 +6,7 @@ EAPI=8 -inherit multilib +inherit flag-o-matic multilib MY_PV="${PV%*.*}" @@ -36,6 +36,9 @@ PATCHES=( src_configure() { use amd64 && multilib_toolchain_setup x86 + # bug #854873 + filter-lto + export SCSH_LIB_DIRS="/usr/$(get_libdir)/${PN}" local myconf=(
[gentoo-commits] repo/gentoo:master commit in: app-shells/scsh/files/, app-shells/scsh/
commit: ca8c43d3d9c60c241f8d91205901ec3de7d100ca Author: Maciej Barć gentoo org> AuthorDate: Sat Feb 19 19:54:29 2022 + Commit: Maciej Barć gentoo org> CommitDate: Sat Feb 19 20:39:05 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca8c43d3 app-shells/scsh: bump to 0.7_pre20160820 Closes: https://github.com/gentoo/gentoo/pull/22703 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Maciej Barć gentoo.org> app-shells/scsh/Manifest | 2 + .../scsh/files/scsh-0.7-Makefile.in-LDFLAGS.patch | 18 ++ app-shells/scsh/files/scsh-0.7-test-packages.patch | 9 +++ app-shells/scsh/scsh-0.7_pre20160820.ebuild| 69 ++ 4 files changed, 98 insertions(+) diff --git a/app-shells/scsh/Manifest b/app-shells/scsh/Manifest index 5c815ea83efb..ede7ef03f689 100644 --- a/app-shells/scsh/Manifest +++ b/app-shells/scsh/Manifest @@ -1 +1,3 @@ DIST scsh-0.6.7.tar.gz 4367439 BLAKE2B 40231f7744bea9efd58c10c042db7f3e8f4248726ebdc23e482590b53639e7f403b3a1ba9510fdda16a1216d26d71a692fc2ad42615d0a90161debbfdff34841 SHA512 d769b3d70afe813a3d25ef1b77d8dbc549b379ca41b0748cd90791408a36b33ed3ce08937bfd925bab411785aa671761d79bbf2edd9caf0c3ea6c44d90f4b6ea +DIST scsh-0.7_pre20160820.tar.gz 227203 BLAKE2B 888a52a4866bfe4f8245fff4ca449a82cd67485aa8a3e8f67d20805f7120e62ed8dd37b7fe6139712652785d0d9f064bbeab0010722e9ce0b58bc59e44b054b3 SHA512 e2c223f64eb2a19dde19382dacad01aa04f8faabeeb15e1c1b3e28b2f675f4184825372f7aa281141797cd56f5ef999b4977dd7e68ae0a3b23631fd76182fba1 +DIST scsh-0.7_pre20160820_rx.tar.gz 46869 BLAKE2B 4be965c558cc21bde5fc24dee2ddc68a3e1d83d6b9701a7e484eb47c928ecdedfa896b944bbb1d709d014d9848a066a67a0d53f6dd86f435ea665ef99da1d40e SHA512 bc300f596b611ae296327b3046aa01cfb6b2be182c69abfe56e3e504573607d3dee55723b1d48951aa8534f450a0184fc7da0c1370fcffb9adba866ace3665b4 diff --git a/app-shells/scsh/files/scsh-0.7-Makefile.in-LDFLAGS.patch b/app-shells/scsh/files/scsh-0.7-Makefile.in-LDFLAGS.patch new file mode 100644 index ..b2431c908922 --- /dev/null +++ b/app-shells/scsh/files/scsh-0.7-Makefile.in-LDFLAGS.patch @@ -0,0 +1,18 @@ +--- a/Makefile.in b/Makefile.in +@@ -126,13 +126,13 @@ SCHEME = scheme/command-line.scm \ +rx/regress.scm + + go: c/scsh-tramp.c +- $(CC) -o $@ $(CFLAGS) \ ++ $(CC) -o $@ $(CFLAGS) $(CPPLAGS) $(LDFLAGS) \ + -DVM=\"$(SCHEME48VM)\" \ + -DIMAGE=\"scsh.image\" \ + $(srcdir)/c/scsh-tramp.c + + scsh: c/scsh-tramp.c +- $(CC) -o $@ $(CFLAGS) \ ++ $(CC) -o $@ $(CFLAGS) $(CPPLAGS) $(LDFLAGS) \ + -DVM=\"$(SCHEME48VM)\" \ + -DIMAGE=\"$(LIB)/scsh.image\" \ + $(srcdir)/c/scsh-tramp.c diff --git a/app-shells/scsh/files/scsh-0.7-test-packages.patch b/app-shells/scsh/files/scsh-0.7-test-packages.patch new file mode 100644 index ..c16f9da1ab54 --- /dev/null +++ b/app-shells/scsh/files/scsh-0.7-test-packages.patch @@ -0,0 +1,9 @@ +--- a/test/test-packages.scm b/test/test-packages.scm +@@ -112,6 +112,5 @@ + file-name-maniplation-test + read-delimited-strings-test + bitwise-ops-test +-user-and-group-db-access-test + file-system-test)) + diff --git a/app-shells/scsh/scsh-0.7_pre20160820.ebuild b/app-shells/scsh/scsh-0.7_pre20160820.ebuild new file mode 100644 index ..f43099505e28 --- /dev/null +++ b/app-shells/scsh/scsh-0.7_pre20160820.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PV=$(ver_cut 1-2) + +# For snapshots: keep the hashes in sync with dev-scheme/scsh-lib +SCSH_H=114432435e4eadd54334df6b37fcae505079b49f +RX_H=d3231ad13de2b44e3ee173b1c9d09ff165e8b6d5 + +# compatible scheme48 version +SCHEME48V=1.9.2 + +inherit autotools + +DESCRIPTION="Unix shell embedded in Scheme" +HOMEPAGE="https://www.scsh.net/; +SRC_URI=" + https://github.com/scheme/scsh/archive/${SCSH_H}.tar.gz -> ${P}.tar.gz + https://github.com/scheme/rx/archive/${RX_H}.tar.gz -> ${P}_rx.tar.gz +" +S="${WORKDIR}/scsh-${SCSH_H}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +# older versions were in conflict with scheme48's files, on the other hand, +# new 2016 version uses scheme48 +RDEPEND="~dev-scheme/scsh-lib-${PV}" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/scsh-${MY_PV}-Makefile.in-LDFLAGS.patch + "${FILESDIR}"/scsh-${MY_PV}-test-packages.patch +) + +src_unpack() { + unpack ${P}.tar.gz + + tar xf "${DISTDIR}/${P}_rx.tar.gz" --strip-components 1 -C "${S}/rx/" || + die "Failed to unpack ${P}_rx.tar.gz" +} + +src_prepare() { + SCHEME48VM=/usr/$(get_libdir)/scheme48-${SCHEME48V}/scheme48vm + export SCHEME48VM + + default + eautoreconf +} + +src_configure() { + econf --with-scheme48=${SCHEME48VM} +} + +src_compile() { + emake SCHEME48VM=${SCHEME48VM} +} + +src_install() { + emake
[gentoo-commits] repo/gentoo:master commit in: app-shells/scsh/files/, app-shells/scsh/, profiles/arch/amd64/no-multilib/
commit: 93fbed6e982f91eb32076fbf42c017cfcdd6c7ac Author: Maciej Barć gentoo org> AuthorDate: Fri Dec 31 00:11:18 2021 + Commit: Maciej Barć gentoo org> CommitDate: Fri Dec 31 00:31:22 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93fbed6e app-shells/scsh: build only on 32bit arches; tests; format libcrypt/GCC not being 32bit/multilib bugs: - https://bugs.gentoo.org/589122 - https://bugs.gentoo.org/710570 - https://bugs.gentoo.org/830282 Thanks for patches: - SCSH_LIB_DIRS environment variable: adam michalik.es https://bugs.gentoo.org/413791#c0 - scheme48vm-prelude (for tests) https://bugs.gentoo.org/299414#c2 Closes: https://bugs.gentoo.org/299414 Closes: https://bugs.gentoo.org/413791 Closes: https://bugs.gentoo.org/589122 Closes: https://bugs.gentoo.org/710570 Closes: https://bugs.gentoo.org/722442 Closes: https://bugs.gentoo.org/830282 Signed-off-by: Maciej Barć gentoo.org> 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 ++ profiles/arch/amd64/no-multilib/package.mask | 1 + 5 files changed, 96 insertions(+), 47 deletions(-) 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 ..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 ..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.. --- 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
[gentoo-commits] repo/gentoo:master commit in: app-shells/scsh/
commit: a923e060dbad90ddff48e9d75185e059bb73 Author: Patrice Clement gentoo org> AuthorDate: Sat Oct 21 12:15:17 2017 + Commit: Patrice Clement gentoo org> CommitDate: Sat Oct 21 16:51:40 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a923 app-shells/scsh: stable for x86. mark stable for the remaining arches via the ALLARCHES policy. Package-Manager: Portage-2.3.8, Repoman-2.3.3 app-shells/scsh/scsh-0.6.7-r2.ebuild | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app-shells/scsh/scsh-0.6.7-r2.ebuild b/app-shells/scsh/scsh-0.6.7-r2.ebuild index b1910140c90..170f8f2f1ea 100644 --- a/app-shells/scsh/scsh-0.6.7-r2.ebuild +++ b/app-shells/scsh/scsh-0.6.7-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,8 +13,7 @@ SRC_URI="ftp://ftp.scsh.net/pub/scsh/${MY_PV}/${P}.tar.gz; LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~ppc ~sparc ~x86" -IUSE="" +KEYWORDS="amd64 ppc sparc x86" DEPEND="!dev-scheme/scheme48" RDEPEND="${DEPEND}"
[gentoo-commits] repo/gentoo:master commit in: app-shells/scsh/
commit: aae3e2c1bd20cc7ec874bbcceb01c928e28caa47 Author: Patrice Clement gentoo org> AuthorDate: Sat Oct 21 12:16:39 2017 + Commit: Patrice Clement gentoo org> CommitDate: Sat Oct 21 16:51:42 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aae3e2c1 app-shells/scsh: clean up old. Package-Manager: Portage-2.3.8, Repoman-2.3.3 app-shells/scsh/scsh-0.6.7-r1.ebuild | 43 app-shells/scsh/scsh-0.6.7.ebuild| 41 -- 2 files changed, 84 deletions(-) diff --git a/app-shells/scsh/scsh-0.6.7-r1.ebuild b/app-shells/scsh/scsh-0.6.7-r1.ebuild deleted file mode 100644 index eda1276277a..000 --- a/app-shells/scsh/scsh-0.6.7-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="2" - -inherit eutils 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" -IUSE="" - -DEPEND="!dev-scheme/scheme48" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}/${PV}-Makefile.in-doc-dir-gentoo.patch" - epatch "${FILESDIR}/${PV}-Makefile.in-LDFLAGS.patch" - epatch "${FILESDIR}/${PV}-Missing-includes.patch" -} - -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 || die "make install failed." - - local ENVD="${T}/50scsh" - echo "SCSH_LIB_DIRS=\"${SCSH_LIB_DIRS}\"" > "${ENVD}" - doenvd "${ENVD}" -} diff --git a/app-shells/scsh/scsh-0.6.7.ebuild b/app-shells/scsh/scsh-0.6.7.ebuild deleted file mode 100644 index d32f9236bbf..000 --- a/app-shells/scsh/scsh-0.6.7.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="2" - -inherit eutils 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" -IUSE="" - -DEPEND="!dev-scheme/scheme48" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}/${PV}-Makefile.in-doc-dir-gentoo.patch" -} - -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 || die "make install failed." - - local ENVD="${T}/50scsh" - echo "SCSH_LIB_DIRS=\"${SCSH_LIB_DIRS}\"" > "${ENVD}" - doenvd "${ENVD}" -}
[gentoo-commits] repo/gentoo:master commit in: app-shells/scsh/
commit: 2f8fec58c4a3e0636e46fdf5915c6ed519aeb578 Author: Patrice Clement gentoo org> AuthorDate: Sat Oct 21 12:17:32 2017 + Commit: Patrice Clement gentoo org> CommitDate: Sat Oct 21 16:51:44 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f8fec58 app-shells/scsh: fix metadata.xml file. Package-Manager: Portage-2.3.8, Repoman-2.3.3 app-shells/scsh/metadata.xml | 41 ++--- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/app-shells/scsh/metadata.xml b/app-shells/scsh/metadata.xml index 317ccdbc433..0d54e8853cd 100644 --- a/app-shells/scsh/metadata.xml +++ b/app-shells/scsh/metadata.xml @@ -1,29 +1,24 @@ http://www.gentoo.org/dtd/metadata.dtd;> - - sch...@gentoo.org - Gentoo Scheme Project - - -Scsh has two main components: a process notation for running programs -and setting up pipelines and redirections, and a complete syscall -library for low-level access to the operating system, i.e. to POSIX, -the least common denominator of more or less all Unices, plus widely -supported extensions such as symbolic links and BSD sockets. + + sch...@gentoo.org + Gentoo Scheme Project + + + Scsh has two main components: a process notation for running programs + and setting up pipelines and redirections, and a complete syscall + library for low-level access to the operating system, i.e. to POSIX, + the least common denominator of more or less all Unices, plus widely + supported extensions such as symbolic links and BSD sockets. -Moreover, scsh provides an awk facility for pattern-directed -computation over streams of records, a rich facility for matching -regular-expression patterns in strings, event-based interrupt -handling, user-level threads, a futuristic module system, and an -interactive environment. + Moreover, scsh provides an awk facility for pattern-directed + computation over streams of records, a rich facility for matching + regular-expression patterns in strings, event-based interrupt + handling, user-level threads, a futuristic module system, and an + interactive environment. -Scsh comes with extensive documentation describing these and other -features. - - + Scsh comes with extensive documentation describing these and other + features. +
[gentoo-commits] repo/gentoo:master commit in: app-shells/scsh-install-lib/
commit: 773a84ea4903ae3e13693e059cd46d068ea10b8c Author: Patrice Clement gentoo org> AuthorDate: Thu Feb 23 23:41:55 2017 + Commit: Patrice Clement gentoo org> CommitDate: Fri Feb 24 22:17:20 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=773a84ea app-shells/scsh-install-lib: clean up useless variables. Package-Manager: portage-2.3.3 app-shells/scsh-install-lib/scsh-install-lib-1.3.0-r1.ebuild | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/app-shells/scsh-install-lib/scsh-install-lib-1.3.0-r1.ebuild b/app-shells/scsh-install-lib/scsh-install-lib-1.3.0-r1.ebuild index e74cf45266..98a6f33e24 100644 --- a/app-shells/scsh-install-lib/scsh-install-lib-1.3.0-r1.ebuild +++ b/app-shells/scsh-install-lib/scsh-install-lib-1.3.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -13,14 +13,9 @@ SRC_URI="http://lamp.epfl.ch/~schinz/scsh_packages/${P}.tar.gz; LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" DEPEND=">=app-shells/scsh-0.6.6" -src_prepare() { - default -} - src_install() { dodir "${SCSH_MODULES_PATH}" ./install.scm ${SCSH_LAYOUT_CONF} \
[gentoo-commits] repo/gentoo:master commit in: app-shells/scsh/
commit: e915ad00c95b078330f5d650e09ea51b6117c994 Author: Patrice Clement gentoo org> AuthorDate: Mon Dec 26 00:09:13 2016 + Commit: Patrice Clement gentoo org> CommitDate: Mon Dec 26 00:29:33 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e915ad00 app-shells/scsh: EAPI 6 bump. Package-Manager: portage-2.3.0 app-shells/scsh/scsh-0.6.7-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/scsh/scsh-0.6.7-r2.ebuild b/app-shells/scsh/scsh-0.6.7-r2.ebuild index a90d936..5761603 100644 --- a/app-shells/scsh/scsh-0.6.7-r2.ebuild +++ b/app-shells/scsh/scsh-0.6.7-r2.ebuild @@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.scsh.net/pub/scsh/${MY_PV}/${P}.tar.gz; LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="amd64 ~ppc ~sparc ~x86" IUSE="" DEPEND="!dev-scheme/scheme48"
[gentoo-commits] repo/gentoo:master commit in: app-shells/scsh/files/, app-shells/scsh/
commit: 97bcea63fe55df0e0b60994cbb513f2483c6cb12 Author: Patrice Clement gentoo org> AuthorDate: Thu Dec 8 22:43:55 2016 + Commit: Patrice Clement gentoo org> CommitDate: Thu Dec 8 22:47:47 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97bcea63 app-shells/scsh: EAPI 6 bump and clean up. Package-Manager: portage-2.3.0 .../scsh/files/0.6.7-Makefile.in-LDFLAGS.patch | 4 +- .../files/0.6.7-Makefile.in-doc-dir-gentoo.patch | 4 +- app-shells/scsh/scsh-0.6.7-r2.ebuild | 49 ++ 3 files changed, 53 insertions(+), 4 deletions(-) diff --git a/app-shells/scsh/files/0.6.7-Makefile.in-LDFLAGS.patch b/app-shells/scsh/files/0.6.7-Makefile.in-LDFLAGS.patch index b1c6480..34d54a5 100644 --- a/app-shells/scsh/files/0.6.7-Makefile.in-LDFLAGS.patch +++ b/app-shells/scsh/files/0.6.7-Makefile.in-LDFLAGS.patch @@ -1,5 +1,5 @@ Makefile.in.orig 2010-08-11 16:55:09.246939884 +0200 -+++ Makefile.in2010-08-11 16:55:31.309819842 +0200 +--- a/Makefile.in.orig 2010-08-11 16:55:09.246939884 +0200 b/Makefile.in 2010-08-11 16:55:31.309819842 +0200 @@ -853,7 +853,7 @@ cig/libcig.c: cig/libcig.scm diff --git a/app-shells/scsh/files/0.6.7-Makefile.in-doc-dir-gentoo.patch b/app-shells/scsh/files/0.6.7-Makefile.in-doc-dir-gentoo.patch index 6ec949b..d32e24b 100644 --- a/app-shells/scsh/files/0.6.7-Makefile.in-doc-dir-gentoo.patch +++ b/app-shells/scsh/files/0.6.7-Makefile.in-doc-dir-gentoo.patch @@ -1,5 +1,5 @@ Makefile.in.orig 2004-09-24 01:43:55.743685848 +0200 -+++ Makefile.in2004-09-24 01:43:55.745685544 +0200 +--- a/Makefile.in.orig 2004-09-24 01:43:55.743685848 +0200 b/Makefile.in 2004-09-24 01:43:55.745685544 +0200 @@ -33,7 +33,7 @@ host = @host@ ### End of `configure' section### diff --git a/app-shells/scsh/scsh-0.6.7-r2.ebuild b/app-shells/scsh/scsh-0.6.7-r2.ebuild new file mode 100644 index ..a90d936 --- /dev/null +++ b/app-shells/scsh/scsh-0.6.7-r2.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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" +IUSE="" + +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}" +}
[gentoo-commits] repo/gentoo:master commit in: app-shells/scsh-install-lib/
commit: 8895d3bdc452f367b2b02a4d243d10f8226a0661 Author: Patrice Clement gentoo org> AuthorDate: Thu Dec 8 22:46:55 2016 + Commit: Patrice Clement gentoo org> CommitDate: Thu Dec 8 22:47:50 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8895d3bd app-shells/scsh-install-lib: EAPI 6 bump. Package-Manager: portage-2.3.0 .../scsh-install-lib-1.3.0-r1.ebuild | 30 ++ 1 file changed, 30 insertions(+) diff --git a/app-shells/scsh-install-lib/scsh-install-lib-1.3.0-r1.ebuild b/app-shells/scsh-install-lib/scsh-install-lib-1.3.0-r1.ebuild new file mode 100644 index ..e63d9ab --- /dev/null +++ b/app-shells/scsh-install-lib/scsh-install-lib-1.3.0-r1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit scsh + +DESCRIPTION="Installation tool for the Scheme Untergrund Library" +HOMEPAGE="http://lamp.epfl.ch/~schinz/scsh_packages/; +SRC_URI="http://lamp.epfl.ch/~schinz/scsh_packages/${P}.tar.gz; + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~x86" +IUSE="" + +DEPEND=">=app-shells/scsh-0.6.6" + +src_prepare() { + default +} + +src_install() { + dodir "${SCSH_MODULES_PATH}" + ./install.scm ${SCSH_LAYOUT_CONF} \ + --bindir /usr/bin \ + --force \ + || die "./install.scm failed" +}
[gentoo-commits] repo/gentoo:master commit in: app-shells/scsh-install-lib/
commit: 7d544bd78f20b63351e941d0da642ddd2fb760bd Author: Patrice Clement gentoo org> AuthorDate: Thu Dec 8 22:47:34 2016 + Commit: Patrice Clement gentoo org> CommitDate: Thu Dec 8 22:47:52 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d544bd7 app-shells/scsh-install-lib: keyword for amd64. Package-Manager: portage-2.3.0 app-shells/scsh-install-lib/scsh-install-lib-1.3.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/scsh-install-lib/scsh-install-lib-1.3.0-r1.ebuild b/app-shells/scsh-install-lib/scsh-install-lib-1.3.0-r1.ebuild index e63d9ab..e74cf45 100644 --- a/app-shells/scsh-install-lib/scsh-install-lib-1.3.0-r1.ebuild +++ b/app-shells/scsh-install-lib/scsh-install-lib-1.3.0-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://lamp.epfl.ch/~schinz/scsh_packages/${P}.tar.gz; LICENSE="BSD" SLOT="0" -KEYWORDS="~x86" +KEYWORDS="~amd64 ~x86" IUSE="" DEPEND=">=app-shells/scsh-0.6.6"
[gentoo-commits] repo/gentoo:master commit in: app-shells/scsh/files/
commit: 0257e5b704a54705711efb9b1f812c43236497a0 Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Thu Jul 14 17:39:25 2016 + Commit: Patrice Clement gentoo org> CommitDate: Sat Jul 16 09:52:10 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0257e5b7 app-shells/scsh: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/1887 Signed-off-by: Patrice Clement gentoo.org> .../files/0.6.6-Makefile.in-doc-dir-gentoo.patch | 93 -- 1 file changed, 93 deletions(-) diff --git a/app-shells/scsh/files/0.6.6-Makefile.in-doc-dir-gentoo.patch b/app-shells/scsh/files/0.6.6-Makefile.in-doc-dir-gentoo.patch deleted file mode 100644 index 28f0f17..000 --- a/app-shells/scsh/files/0.6.6-Makefile.in-doc-dir-gentoo.patch +++ /dev/null @@ -1,93 +0,0 @@ Makefile.in.orig 2004-09-24 01:43:55.743685848 +0200 -+++ Makefile.in2004-09-24 01:43:55.745685544 +0200 -@@ -33,7 +33,7 @@ - host = @host@ - ### End of `configure' section### - --htmldir = $(libdir)/scsh/doc/scsh-manual/html -+htmldir = /usr/share/doc/scsh-0.6.6/scsh-manual/html - - # HP 9000 series, if you don't have gcc - # CC = cc -@@ -358,38 +358,38 @@ - done - - inst-doc: -- for f in $(srcdir)/doc/*.txt $(srcdir)/doc/*.ps; do \ -- $(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/doc/; \ -+ for f in $(srcdir)/doc/*.txt $(srcdir)/doc/*.ps; do \ -+ $(INSTALL_DATA) $$f $(DESTDIR)/usr/share/doc/scsh-0.6.6/; \ - done && \ - for f in $(srcdir)/doc/src/*.tex \ - $(srcdir)/doc/src/*.dvi \ - $(srcdir)/doc/src/*.ps; \ -- do $(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/doc/s48-manual/; \ -+ do $(INSTALL_DATA) $$f $(DESTDIR)/usr/share/doc/scsh-0.6.6/s48-manual/;\ - done && \ - for f in $(srcdir)/doc/src/manual/*.html; \ -- do $(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/doc/s48-manual/html/; \ -+do $(INSTALL_DATA) $$f $(DESTDIR)/usr/share/doc/scsh-0.6.6/s48-manual/html/;\ - done && \ - for f in $(srcdir)/doc/scsh-manual/*.tex \ - $(srcdir)/doc/scsh-manual/*.sty \ - $(srcdir)/doc/scsh-manual/*.dvi \ - $(srcdir)/doc/scsh-manual/*.ps \ - $(srcdir)/doc/scsh-manual/*.pdf; \ -- do $(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/doc/scsh-manual/; \ -+ do $(INSTALL_DATA) $$f $(DESTDIR)/usr/share/doc/scsh-0.6.6/scsh-manual/;\ - done && \ - for f in $(srcdir)/doc/scsh-manual/html/*.html \ - $(srcdir)/doc/scsh-manual/html/*.gif \ - $(srcdir)/doc/scsh-manual/html/*.css; \ -- do $(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/; \ -+ do $(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/; \ - done && \ - for f in $(srcdir)/doc/scsh-paper/*.tex \ - $(srcdir)/doc/scsh-paper/*.sty \ - $(srcdir)/doc/scsh-paper/*.dvi \ - $(srcdir)/doc/scsh-paper/*.ps; \ -- do $(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/doc/scsh-paper/; \ -+ do $(INSTALL_DATA) $$f $(DESTDIR)/usr/share/doc/scsh-0.6.6/scsh-paper/; \ - done && \ - for f in $(srcdir)/doc/scsh-paper/html/*.html \ - $(srcdir)/doc/scsh-paper/html/*.css; \ -- do $(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/doc/scsh-paper/html; \ -+do $(INSTALL_DATA) $$f $(DESTDIR)/usr/share/doc/scsh-0.6.6/scsh-paper/html/;\ - done - - -@@ -412,19 +412,21 @@ - chmod +x $@ - - dirs: -- for dir in $(libdir) $(bindir) $(incdir) $(LIB) $(mandir) $(htmldir); do\ -- { mkdir -p $(DESTDIR)$$dir && [ -w $(DESTDIR)$$dir ]; } || { \ -- echo "$(DESTDIR)$$dir not a writable directory" >&2; \ -- exit 1; \ -- }