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