[gentoo-commits] repo/gentoo:master commit in: sci-calculators/wcalc/files/, sci-calculators/wcalc/
commit: e4e89132cedbe27e467ae19876c820976266e841
Author: Eli Schwartz gmail com>
AuthorDate: Wed Mar 13 22:19:04 2024 +
Commit: Sam James gentoo org>
CommitDate: Thu Mar 14 00:10:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4e89132
sci-calculators/wcalc: add patch to fix bashism
The software is dead upstream for several years, and it is sourceforge,
so I haven't forwarded it.
Signed-off-by: Eli Schwartz gmail.com>
Signed-off-by: Sam James gentoo.org>
.../0001-fix-bashism-in-configure-script.patch | 28 ++
sci-calculators/wcalc/wcalc-2.5.ebuild | 5 +++-
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git
a/sci-calculators/wcalc/files/0001-fix-bashism-in-configure-script.patch
b/sci-calculators/wcalc/files/0001-fix-bashism-in-configure-script.patch
new file mode 100644
index ..97cd3772309b
--- /dev/null
+++ b/sci-calculators/wcalc/files/0001-fix-bashism-in-configure-script.patch
@@ -0,0 +1,28 @@
+From b533584038a4ab8709fb8c88d7c4441f22b5de78 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz
+Date: Wed, 13 Mar 2024 18:15:00 -0400
+Subject: [PATCH] fix bashism in configure script
+
+double equals is horrid and banned. Do not ever use it, but definitely
+don't use it in POSIX sh, where it doesn't exist *even* as an alias for
+single equals.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1db142d..af541af 100644
+--- a/configure.ac
b/configure.ac
+@@ -48,7 +48,7 @@ AC_PROG_RANLIB
+ AC_PROG_YACC
+ AM_PROG_AR
+ AM_PROG_LEX
+-AS_IF([test "x$LEX" == x],
++AS_IF([test "x$LEX" = x],
+ [AC_MSG_ERROR([A Lex/Flex program is required in order to compile
wcalc.])],
+ [AS_IF([test "x$LEX" != xflex],
+[LEX="$SHELL $missing_dir/missing flex"
+--
+2.43.2
+
diff --git a/sci-calculators/wcalc/wcalc-2.5.ebuild
b/sci-calculators/wcalc/wcalc-2.5.ebuild
index edb093739358..6fd0f9e9cae0 100644
--- a/sci-calculators/wcalc/wcalc-2.5.ebuild
+++ b/sci-calculators/wcalc/wcalc-2.5.ebuild
@@ -20,7 +20,10 @@ RDEPEND="
readline? ( sys-libs/readline:0= )"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}"/${P}-AR.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-AR.patch
+ "${FILESDIR}"/0001-fix-bashism-in-configure-script.patch
+)
src_prepare() {
default
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/wcalc/files/, sci-calculators/wcalc/
commit: e606af941b0e308edd7e4ee3dde23a41fcefea7c
Author: Jakov Smolic sartura hr>
AuthorDate: Mon Nov 16 23:21:00 2020 +
Commit: David Seifert gentoo org>
CommitDate: Mon Nov 16 23:21:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e606af94
sci-calculators/wcalc: port to EAPI 7
Closes: https://bugs.gentoo.org/725378
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: David Seifert gentoo.org>
sci-calculators/wcalc/files/wcalc-2.5-AR.patch | 10 ++
sci-calculators/wcalc/wcalc-2.5.ebuild | 13 ++---
2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/sci-calculators/wcalc/files/wcalc-2.5-AR.patch
b/sci-calculators/wcalc/files/wcalc-2.5-AR.patch
new file mode 100644
index 000..03291019d29
--- /dev/null
+++ b/sci-calculators/wcalc/files/wcalc-2.5-AR.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
b/configure.ac
+@@ -46,6 +46,7 @@ AC_PROG_CC
+ AC_PROG_CC_C99
+ AC_PROG_RANLIB
+ AC_PROG_YACC
++AM_PROG_AR
+ AM_PROG_LEX
+ AS_IF([test "x$LEX" == x],
+ [AC_MSG_ERROR([A Lex/Flex program is required in order to compile
wcalc.])],
diff --git a/sci-calculators/wcalc/wcalc-2.5.ebuild
b/sci-calculators/wcalc/wcalc-2.5.ebuild
index 9b9a8d8b67a..f7a5e03f83e 100644
--- a/sci-calculators/wcalc/wcalc-2.5.ebuild
+++ b/sci-calculators/wcalc/wcalc-2.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit eutils
+inherit autotools desktop
DESCRIPTION="A flexible command-line scientific calculator"
HOMEPAGE="http://w-calc.sourceforge.net/;
@@ -20,6 +20,13 @@ RDEPEND="
readline? ( sys-libs/readline:0= )"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}"/${P}-AR.patch )
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
src_configure() {
econf $(use_with readline)
}
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/wcalc/files/
commit: bec662c3a5f548672f410ea6a02251a5e2159a5b Author: Andrew Savchenko gentoo org> AuthorDate: Tue Jan 3 21:21:54 2017 + Commit: Andrew Savchenko gentoo org> CommitDate: Tue Jan 3 21:22:45 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bec662c3 sci-calculators/wcalc: remove unused patch Package-Manager: Portage-2.3.3, Repoman-2.3.1 Signed-off-by: Andrew Savchenko gentoo.org> sci-calculators/wcalc/files/wcalc-2.3.1-parallel-build.patch | 11 --- 1 file changed, 11 deletions(-) diff --git a/sci-calculators/wcalc/files/wcalc-2.3.1-parallel-build.patch b/sci-calculators/wcalc/files/wcalc-2.3.1-parallel-build.patch deleted file mode 100644 index 15ca95a.. --- a/sci-calculators/wcalc/files/wcalc-2.3.1-parallel-build.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur Wcalc-2.3.1/Makefile.am Wcalc-2.3.1.new/Makefile.am Wcalc-2.3.1/Makefile.am2007-02-25 21:09:18.0 -0500 -+++ Wcalc-2.3.1.new/Makefile.am2008-10-11 06:38:08.0 -0400 -@@ -1,6 +1,7 @@ - bin_PROGRAMS = wcalc - AM_YFLAGS = -dt - #AM_LFLAGS = -w -+BUILT_SOURCES = parser.c - wcalc_SOURCES = calculator.h variables.h string_manip.h help.h parser.y \ - string_manip.h historyManager.h files.h conversion.h \ - scanner.l help.c calculator.c string_manip.c historyManager.c \
