app-emulation/free42: 2.5.16 bump

Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Bernard Cafarelli <voyageur@gentoo.org>

3 files changed, 90 insertions, 0 deletions

diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
index 1efbc90b0f9d..608ae9f5dccb 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -1,2 +1,3 @@
 DIST free42-nologo-2.0.20.tgz 7390214 BLAKE2B 306f3378bcbb44fa7982c5d9c29bfbea62e915ca50ca5e5216f46fbf483f110a1288d4800991a74622a042517496ff8dd94c3fa3249e8bb4181957e6b23d5ea3 SHA512 9b540fbc50df2f94b135b5e778354f330df77a54ef2ad99b257b5b91d1e3e8d1241e8a834522fc46fe33571ea2695ad8889b427dbcf653870672e89cd56d60f5
 DIST free42-nologo-2.5.14.tgz 7410951 BLAKE2B 5d8087269da86a2c8c00378a3bc51d2f85e2458283ab84dbee3f6d84a373423581b983faef184e794f3c2effd3bde568a4df627a29720d8cb3970e27ddc9c3ca SHA512 0e2ed3f13448d0ea60255d5e45831fcf14efef831f7c2fef59348bd15e1e4b0c42d1b24693de4e35d350367057bc14995767e8e099eb3ed46320c6f6ba97fe69
+DIST free42-nologo-2.5.16.tgz 7412652 BLAKE2B bdea95adca140eecbb192706a5e611c1ad5d248b47aa609ac2733eb018ea74e7661a1797acf9458aa07b6015df7376b3ef329685cff984d364c2f5e26f7d213b SHA512 5adfe5ce09e3aecae7f05d3880234eb903eb48b36ee10e88be87a8941752323f97067b97cb85699fc03591fc355024eb6cd621f64c31e6e5c6dd4d5027f1ba34
diff --git a/app-emulation/free42/files/free42-2.5.16-fix-makefile.patch b/app-emulation/free42/files/free42-2.5.16-fix-makefile.patch
new file mode 100644
index 000000000000..f59a700628dd
--- /dev/null
+++ b/app-emulation/free42/files/free42-2.5.16-fix-makefile.patch
@@ -0,0 +1,39 @@
+diff -Naur free42-nologo-2.5.16.orig/gtk/Makefile free42-nologo-2.5.16/gtk/Makefile
+--- free42-nologo-2.5.16.orig/gtk/Makefile	2020-01-25 05:16:45.000000000 +0100
++++ free42-nologo-2.5.16/gtk/Makefile	2020-02-02 20:18:50.460458652 +0100
+@@ -15,7 +15,7 @@
+ # along with this program; if not, see http://www.gnu.org/licenses/.
+ ###############################################################################
+ 
+-CFLAGS = -MMD \
++CFLAGS := -MMD \
+ 	 -Wall \
+ 	 -Wno-parentheses \
+ 	 -Wno-write-strings \
+@@ -34,12 +34,14 @@
+ 	 -DDECIMAL_GLOBAL_ROUNDING=1 \
+ 	 -DDECIMAL_GLOBAL_ROUNDING_ACCESS_FUNCTIONS=1 \
+ 	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \
+-	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1
++	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 \
++	 ${CFLAGS}
+ 
+-CXXFLAGS = $(CFLAGS) \
++CXXFLAGS := $(CFLAGS) \
+ 	 -fno-exceptions \
+ 	 -fno-rtti \
+-	 -D_WCHAR_T_DEFINED
++	 -D_WCHAR_T_DEFINED \
++	 ${CXXFLAGS}
+ 
+ LIBS = gcc111libbid.a $(shell pkg-config --libs gtk+-3.0)
+ 
+@@ -114,7 +116,7 @@
+ 	./keymap2cc
+ 
+ gcc111libbid.a:
+-	sh ./build-intel-lib.sh
++	+sh ./build-intel-lib.sh
+ 	ln -s IntelRDFPMathLib20U1/TESTS/readtest.c
+ 
+ symlinks:
diff --git a/app-emulation/free42/free42-2.5.16.ebuild b/app-emulation/free42/free42-2.5.16.ebuild
new file mode 100644
index 000000000000..bd3148a0b387
--- /dev/null
+++ b/app-emulation/free42/free42-2.5.16.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PV="${PN}-nologo-${PV}"
+
+DESCRIPTION="An HP-42S Calculator Simulator"
+HOMEPAGE="https://thomasokken.com/free42/"
+SRC_URI="https://thomasokken.com/free42/upstream/${MY_PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa"
+
+DEPEND="dev-libs/atk
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	alsa? ( media-libs/alsa-lib )"
+
+RDEPEND="${DEPEND}"
+
+DOCS=( CREDITS HISTORY README )
+S="${WORKDIR}/${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.5.16-fix-makefile.patch"
+	"${FILESDIR}/${PN}-2.5.3-fix-build-intel-lib.patch"
+)
+
+src_prepare() {
+	default
+}
+
+src_compile() {
+	local myconf
+	use alsa && myconf="AUDIO_ALSA=yes"
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk
+	emake -C gtk clean
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk
+}
+
+src_install() {
+	default
+	dobin gtk/free42bin gtk/free42dec
+}