Gentoo Archives: gentoo-commits

From: "José María Alonso" <nimiux@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/free42/, app-emulation/free42/files/
Date: Tue, 30 Jan 2018 20:25:48
Message-Id: 1517343940.fca4bf16855ed8c1c72079662e9546f356f3b1f4.nimiux@gentoo
1 commit: fca4bf16855ed8c1c72079662e9546f356f3b1f4
2 Author: Chema Alonso Josa <nimiux <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 30 20:25:40 2018 +0000
4 Commit: José María Alonso <nimiux <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 30 20:25:40 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fca4bf16
7
8 app-emulation/free42: Drops old version 2.0.8
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12 app-emulation/free42/Manifest | 1 -
13 .../files/free42-2.0.8-fix-build-intel-lib.patch | 12 -----
14 .../free42/files/free42-2.0.8-fix-makefile.patch | 58 ----------------------
15 app-emulation/free42/free42-2.0.8.ebuild | 49 ------------------
16 4 files changed, 120 deletions(-)
17
18 diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
19 index ac6866f07ec..5b013b2944a 100644
20 --- a/app-emulation/free42/Manifest
21 +++ b/app-emulation/free42/Manifest
22 @@ -1,3 +1,2 @@
23 DIST free42-nologo-2.0.10.tgz 7389429 BLAKE2B a633a78ed5974e327aafa9d783c04bdcaa895940580c595c9c67ab0181ec7000efaa92021a485199268341f15f4c4bafe3964d4118c068e8abbfa2f358045b5a SHA512 4f03b9b206ef17e71295f0baac96ca26f34a00844cee6cad254f8ab798d3d0c724788200f3f207a3301f62eb0960707a23e6bcbb2ac924a78b0f0e1c78e70e6d
24 DIST free42-nologo-2.0.6.tgz 7348647 BLAKE2B 708c88b4903358c23989d515c61884ffc9feae3d43fc54f1ac8a18779cfe8aa2d0e1a2ec667e24f78da58cd94ad515399191b7dc968adbc59bb97517b34680be SHA512 078a79cc4dfa36ae7342be5b90350f4b7269f4e71777f2620c2043510d6313acbc1fa9415b75f8b01bebb2de747b9af8a26738f877c34a4d82a1fdd52c75a61d
25 -DIST free42-nologo-2.0.8.tgz 7388038 BLAKE2B e2065ae71cf0be55d7de295965d7c884d2db6bd8aad6eefe85d04028dacf114c7d6cfc90f02b78a220f118ee26fd3b8fa830a802015da5c56f695621bf4ec5ff SHA512 3da4045ddf8a9993369a25344f5d4f472283a7affd4d5640a47dbce4debe4e071b83ad7858f79113d8be2255fc11df8b22edb4c66471945d341e8ffb79495fee
26
27 diff --git a/app-emulation/free42/files/free42-2.0.8-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-2.0.8-fix-build-intel-lib.patch
28 deleted file mode 100644
29 index df2736f01e3..00000000000
30 --- a/app-emulation/free42/files/free42-2.0.8-fix-build-intel-lib.patch
31 +++ /dev/null
32 @@ -1,12 +0,0 @@
33 -diff -Nuar a/gtk/build-intel-lib.sh b/gtk/build-intel-lib.sh
34 ---- a/gtk/build-intel-lib.sh 2017-12-26 19:48:08.000000000 +0100
35 -+++ b/gtk/build-intel-lib.sh 2017-12-26 21:09:52.949997834 +0100
36 -@@ -4,7 +4,7 @@
37 - cd IntelRDFPMathLib20U1
38 - patch -p0 <../intel-lib-linux.patch
39 - cd LIBRARY
40 --make CC=gcc CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0
41 -+make A=a CC=gcc CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0
42 - mv libbid.a ../../gcc111libbid.a
43 - cd ../..
44 - ( echo '#ifdef FREE42_FPTEST'; echo 'const char *readtest_lines[] = {'; tr -d '\r' < IntelRDFPMathLib20U1/TESTS/readtest.in | sed 's/^\(.*\)$/"\1",/'; echo '0 };'; echo '#endif' ) > readtest_lines.cc
45
46 diff --git a/app-emulation/free42/files/free42-2.0.8-fix-makefile.patch b/app-emulation/free42/files/free42-2.0.8-fix-makefile.patch
47 deleted file mode 100644
48 index 2cb44245c3b..00000000000
49 --- a/app-emulation/free42/files/free42-2.0.8-fix-makefile.patch
50 +++ /dev/null
51 @@ -1,58 +0,0 @@
52 -diff -Nuar a/gtk/Makefile b/gtk/Makefile
53 ---- a/gtk/Makefile 2017-12-26 19:48:08.000000000 +0100
54 -+++ b/gtk/Makefile 2017-12-26 21:07:20.279998488 +0100
55 -@@ -15,11 +15,11 @@
56 - # along with this program; if not, see http://www.gnu.org/licenses/.
57 - ###############################################################################
58 -
59 --CFLAGS = -MMD \
60 -+CFLAGS := -MMD \
61 - -Wall \
62 - -Wno-parentheses \
63 - -Wno-write-strings \
64 -- -g \
65 -+ -Wno-error=narrowing \
66 - -I/usr/X11R6/include \
67 - $(shell pkg-config --cflags gtk+-2.0) \
68 - -DVERSION="\"$(shell cat ../VERSION)\"" \
69 -@@ -27,21 +27,25 @@
70 - -DDECIMAL_GLOBAL_ROUNDING=1 \
71 - -DDECIMAL_GLOBAL_ROUNDING_ACCESS_FUNCTIONS=1 \
72 - -DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \
73 -- -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1
74 -+ -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 \
75 -+ ${CFLAGS}
76 -
77 --CXXFLAGS = $(CFLAGS) \
78 -+CXXFLAGS := $(CFLAGS) \
79 - -fno-exceptions \
80 - -fno-rtti \
81 -- -D_WCHAR_T_DEFINED
82 -+ -D_WCHAR_T_DEFINED \
83 -+ ${CXXFLAGS}
84 -
85 --LDFLAGS = -L/usr/X11R6/lib
86 --LIBS = gcc111libbid.a -lXmu $(shell pkg-config --libs gtk+-2.0)
87 -+MYLDFLAGS = -L/usr/X11R6/lib
88 -+LIBS = gcc111libbid.a -lX11 -ldl -lXmu $(shell pkg-config --libs gtk+-2.0)
89 -
90 - ifeq "$(shell uname -s)" "Linux"
91 --LDFLAGS += -Wl,--hash-style=both
92 -+MYLDFLAGS += -Wl,--hash-style=both
93 - LIBS += -lpthread
94 - endif
95 -
96 -+MYLDFLAGS += ${LDFLAGS}
97 -+
98 - SRCS = shell_main.cc shell_skin.cc skins.cc keymap.cc shell_loadimage.cc \
99 - shell_spool.cc core_main.cc core_commands1.cc core_commands2.cc \
100 - core_commands3.cc core_commands4.cc core_commands5.cc \
101 -@@ -83,7 +87,7 @@
102 - endif
103 -
104 - $(EXE): $(OBJS)
105 -- $(CXX) -o $(EXE) $(LDFLAGS) $(OBJS) $(LIBS)
106 -+ $(CXX) -o $(EXE) $(MYLDFLAGS) $(OBJS) $(LIBS)
107 -
108 - $(SRCS) skin2cc.cc keymap2cc.cc skin2cc.conf: symlinks
109 -
110
111 diff --git a/app-emulation/free42/free42-2.0.8.ebuild b/app-emulation/free42/free42-2.0.8.ebuild
112 deleted file mode 100644
113 index 6e2ba52edf2..00000000000
114 --- a/app-emulation/free42/free42-2.0.8.ebuild
115 +++ /dev/null
116 @@ -1,49 +0,0 @@
117 -# Copyright 1999-2017 Gentoo Foundation
118 -# Distributed under the terms of the GNU General Public License v2
119 -
120 -EAPI=6
121 -
122 -inherit eutils toolchain-funcs
123 -
124 -MY_PV="${PN}-nologo-${PV}"
125 -
126 -DESCRIPTION="An HP-42S Calculator Simulator"
127 -HOMEPAGE="http://thomasokken.com/free42/"
128 -SRC_URI="http://thomasokken.com/free42/upstream/${MY_PV}.tgz"
129 -
130 -LICENSE="GPL-2"
131 -SLOT="0"
132 -KEYWORDS="~amd64 ~x86"
133 -IUSE="alsa"
134 -
135 -DEPEND="dev-libs/atk
136 - x11-libs/cairo
137 - x11-libs/gdk-pixbuf
138 - x11-libs/gtk+:2
139 - x11-libs/pango
140 - alsa? ( media-libs/alsa-lib )"
141 -
142 -RDEPEND="${DEPEND}
143 - x11-libs/libX11
144 - x11-libs/libXmu"
145 -
146 -S="${WORKDIR}/${MY_PV}"
147 -
148 -src_prepare() {
149 - default
150 - sed -i -e 's/print_gif_name\[FILENAMELEN\]/print_gif_name\[1000\]/' \
151 - "${S}/gtk/shell_main.cc" || die
152 - epatch "${FILESDIR}"/${P}-fix-makefile.patch
153 - epatch "${FILESDIR}"/${P}-fix-build-intel-lib.patch
154 -}
155 -
156 -src_compile() {
157 - local myconf
158 - use alsa && myconf="AUDIO_ALSA=yes"
159 - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C "${S}/gtk"
160 -}
161 -
162 -src_install() {
163 - dodoc CREDITS HISTORY README
164 - dobin gtk/free42dec
165 -}