From fd84565e8101e90aef82b8a45dcd202024a40b31 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 19 Jan 2023 14:03:57 +0100 Subject: [PATCH 1/2] gosh: remove package, unused. --- srcpkgs/gosh/template | 12 ------------ srcpkgs/removed-packages/template | 1 + 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 srcpkgs/gosh/template diff --git a/srcpkgs/gosh/template b/srcpkgs/gosh/template deleted file mode 100644 index ab4b86011e3b..000000000000 --- a/srcpkgs/gosh/template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'gosh' -pkgname=gosh -version=0.2.3 -revision=13 -build_style=go -go_import_path="github.com/mkouhei/gosh" -short_desc="Interactive shell for Golang" -maintainer="Orphaned " -license="GPL-3.0-or-later" -homepage="https://github.com/mkouhei/gosh" -distfiles="https://github.com/mkouhei/gosh/archive/v${version}.tar.gz" -checksum=0b601b467a57d809134a13c8e52c4986eb328931a4db3c237630cdcd9891a707 diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 1538b42fd3bd..e86740d57a3c 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -137,6 +137,7 @@ replaces=" goat<=0.0.0.28022016_10 goffice0.8<=0.8.17_6 goproxy<=7.0_1 + gosh<=0.2.3_13 govendor<=1.0.9_3 gradio<=7.2_1 grv<=0.3.1_3 From a514888364a4ff4bccc5f64102169bfd50fb9863 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Thu, 19 Jan 2023 14:06:05 +0100 Subject: [PATCH 2/2] Gauche: install binary as gosh, preserving upstream defaults. --- srcpkgs/Gauche/patches/src-makefile.patch | 19 ------------------- srcpkgs/Gauche/template | 20 +++++++------------- 2 files changed, 7 insertions(+), 32 deletions(-) delete mode 100644 srcpkgs/Gauche/patches/src-makefile.patch diff --git a/srcpkgs/Gauche/patches/src-makefile.patch b/srcpkgs/Gauche/patches/src-makefile.patch deleted file mode 100644 index f74d19149b7e..000000000000 --- a/srcpkgs/Gauche/patches/src-makefile.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/src/Makefile.in 2019-12-13 22:50:49.000000000 +0100 -+++ b/src/Makefile-patched.in 2020-04-30 22:47:55.667135591 +0200 -@@ -59,6 +59,7 @@ - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - BUILD_GOSH_FLAGS = -+GOSH = @GOSH@ - - # These are set by configure - DEFS = @DEFS@ -@@ -526,7 +527,7 @@ - "$(DESTDIR)$(SITE_SCM_DIR)" \ - "$(DESTDIR)$(SITE_ARCH_DIR)" - @CROSS_COMPILING_no@GAUCHE_INSTALL = ./gosh -ftest $(srcdir)/gauche-install.in --@CROSS_COMPILING_yes@GAUCHE_INSTALL = gosh $(srcdir)/gauche-install.in -+@CROSS_COMPILING_yes@GAUCHE_INSTALL = $(GOSH) $(srcdir)/gauche-install.in - - install : install-core - diff --git a/srcpkgs/Gauche/template b/srcpkgs/Gauche/template index 74beafdc6863..2523378d92c5 100644 --- a/srcpkgs/Gauche/template +++ b/srcpkgs/Gauche/template @@ -1,10 +1,11 @@ # Template file for 'Gauche' pkgname=Gauche version=0.9.9 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="texinfo" makedepends="libticonv-devel libatomic_ops-devel" +checkdepends="iana-etc" short_desc="Practical Scheme R7RS implementation" maintainer="rc-05 " license="BSD-3-Clause" @@ -12,26 +13,19 @@ homepage="https://practical-scheme.net/gauche/" distfiles="${SOURCEFORGE_SITE}/gauche/${pkgname}-${version}.tgz" checksum=4ca9325322a7efadb9680d156eb7b53521321c9ca4955c4cbe738bc2e1d7f7fb alternatives=" - scheme:scheme:/usr/bin/gauche - scheme:scheme.1:/usr/share/man/man1/gauche.1 + scheme:scheme:/usr/bin/gosh + scheme:scheme.1:/usr/share/man/man1/gosh.1 " if [ -n "$CROSS_BUILD" ]; then # Gauche needs itself to bootstrap for cross compilation. hostmakedepends+=" Gauche" - # Normally BUILD_GOSH doesn't need to be set but in this case it is mandatory - # as the native Gauche binary (which is needed to cross-compile for another - # architecture) has been renamed for conflict problems with another package with - # the same name. - configure_args="BUILD_GOSH=/usr/bin/gauche" - make_install_args="GOSH=/usr/bin/gauche" fi post_install() { - # Needed as Gauche's binary conflicts with the "gosh" package bin. - mv $DESTDIR/usr/bin/gosh $DESTDIR/usr/bin/gauche - # Modify also the manual page filename to remain consitent. - mv $DESTDIR/usr/share/man/man1/gosh.1 $DESTDIR/usr/share/man/man1/gauche.1 + # Void previously shipped the binary as "gauche", symlink for + # consistancy. + ln -sf gosh $DESTDIR/usr/bin/gauche vlicense COPYING }