1 |
commit: bd948f4f28a84acaf0eef34466a156ed35c57217 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 1 13:42:23 2020 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 1 13:43:34 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd948f4f |
7 |
|
8 |
net-misc/efax: Fix CFLAGS=-fno-common |
9 |
|
10 |
Package-Manager: Portage-2.3.86, Repoman-2.3.20 |
11 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
12 |
|
13 |
net-misc/efax/Manifest | 2 + |
14 |
net-misc/efax/efax-0.9a_p19_p1.ebuild | 49 +++++++++++++++++++++++++ |
15 |
net-misc/efax/files/efax-0.9a-fax-command.patch | 4 +- |
16 |
net-misc/efax/files/efax-0.9a-fno-common.patch | 32 ++++++++++++++++ |
17 |
net-misc/efax/files/efax-0.9a-strip.patch | 14 +++++++ |
18 |
5 files changed, 99 insertions(+), 2 deletions(-) |
19 |
|
20 |
diff --git a/net-misc/efax/Manifest b/net-misc/efax/Manifest |
21 |
index 38757aa575c..5fc7032b66a 100644 |
22 |
--- a/net-misc/efax/Manifest |
23 |
+++ b/net-misc/efax/Manifest |
24 |
@@ -1,2 +1,4 @@ |
25 |
DIST efax-0.9a-001114.tar.gz 97402 BLAKE2B 4c8365814dda4cc8c53da9cf6f71ae95c9a5b64a4677f0f717d03ea53710df1944db07514d01c18f9bf0d2c64642a2b7ca0416a7571a6f4b880ad8098a919c5e SHA512 b6361f84a8239e515cf29dbcbfde3d38648b73e7acfc72a0e2ced4ff2dd801c73bbccf5d34fb8aa065ec8b8bfc694a58f6d8dc00bb9e9a63e580be618a45228b |
26 |
+DIST efax_0.9a-19.1.diff.gz 18698 BLAKE2B 4b0a97e39f65009ff0f295cd4f573a919580ef442a3f0d3d838f79a7a7e31d70beb7b849a2a8bae839a244b1a43ecddedf90fe1bc59f8794906cb3d354557456 SHA512 dd656dd9f737aea598fc0ba241048e695018bce7eb439e009bc751fba1690dc28a99bee53db0c87d0638c9e4ac02b37e6de543355f06e1d8c87ed3d20e354cfc |
27 |
DIST efax_0.9a-19.diff.gz 18178 BLAKE2B d3dca49db55a52839c88c52c8934976fd56e32fb9501c27fe211b4bd4ed4b85014915f2e0785f7668cfc9743262ee6232af92c477386cc32f2b57e336aa4354e SHA512 8b1a2d007ebba73b772400eb1e0ccc61d832775590ac4fd6e171008c9741409118db099b444dc8da04dd87f1cb7025a9af62f60b2c3ccba21cc89863a2909735 |
28 |
+DIST efax_0.9a.orig.tar.gz 97402 BLAKE2B 4c8365814dda4cc8c53da9cf6f71ae95c9a5b64a4677f0f717d03ea53710df1944db07514d01c18f9bf0d2c64642a2b7ca0416a7571a6f4b880ad8098a919c5e SHA512 b6361f84a8239e515cf29dbcbfde3d38648b73e7acfc72a0e2ced4ff2dd801c73bbccf5d34fb8aa065ec8b8bfc694a58f6d8dc00bb9e9a63e580be618a45228b |
29 |
|
30 |
diff --git a/net-misc/efax/efax-0.9a_p19_p1.ebuild b/net-misc/efax/efax-0.9a_p19_p1.ebuild |
31 |
new file mode 100644 |
32 |
index 00000000000..8b89d9a4456 |
33 |
--- /dev/null |
34 |
+++ b/net-misc/efax/efax-0.9a_p19_p1.ebuild |
35 |
@@ -0,0 +1,49 @@ |
36 |
+# Copyright 1999-2020 Gentoo Authors |
37 |
+# Distributed under the terms of the GNU General Public License v2 |
38 |
+ |
39 |
+EAPI=7 |
40 |
+inherit toolchain-funcs |
41 |
+ |
42 |
+DESCRIPTION="A simple fax program for single-user systems" |
43 |
+HOMEPAGE="http://www.cce.com/efax" |
44 |
+SRC_URI=" |
45 |
+ mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}.orig.tar.gz |
46 |
+ mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-$(ver_cut 5).$(ver_cut 7).diff.gz |
47 |
+" |
48 |
+ |
49 |
+KEYWORDS="~amd64 ~ppc ~x86" |
50 |
+SLOT="0" |
51 |
+LICENSE="GPL-2" |
52 |
+PATCHES=( |
53 |
+ "${FILESDIR}"/${PN}-0.9a-fax-command.patch |
54 |
+ "${FILESDIR}"/${PN}-0.9a-fno-common.patch |
55 |
+ "${FILESDIR}"/${PN}-0.9a-strip.patch |
56 |
+) |
57 |
+S="${WORKDIR}/${P/_p*}-001114" |
58 |
+ |
59 |
+src_prepare () { |
60 |
+ eapply "${WORKDIR}"/${PN}_${PV/_p*}-$(ver_cut 5).$(ver_cut 7).diff |
61 |
+ local patch |
62 |
+ for patch in $(< debian/patches/00list); do |
63 |
+ if [[ -f debian/patches/${patch} ]]; then |
64 |
+ eapply debian/patches/${patch} |
65 |
+ elif [[ -f debian/patches/${patch}.dpatch ]]; then |
66 |
+ eapply debian/patches/${patch}.dpatch |
67 |
+ else |
68 |
+ die "Cannot find patch ${patch}" |
69 |
+ fi |
70 |
+ done |
71 |
+ |
72 |
+ default |
73 |
+} |
74 |
+ |
75 |
+src_compile() { |
76 |
+ emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" |
77 |
+} |
78 |
+ |
79 |
+src_install () { |
80 |
+ dobin efax efix fax |
81 |
+ doman efax.1 efix.1 |
82 |
+ newman fax.1 efax-fax.1 # Don't collide with net-dialup/mgetty, bug #429808 |
83 |
+ dodoc README |
84 |
+} |
85 |
|
86 |
diff --git a/net-misc/efax/files/efax-0.9a-fax-command.patch b/net-misc/efax/files/efax-0.9a-fax-command.patch |
87 |
index 92bec22aa87..b6543432d2e 100644 |
88 |
--- a/net-misc/efax/files/efax-0.9a-fax-command.patch |
89 |
+++ b/net-misc/efax/files/efax-0.9a-fax-command.patch |
90 |
@@ -1,5 +1,5 @@ |
91 |
---- fax 2010/07/11 02:05:19 1.1 |
92 |
-+++ fax 2010/07/11 02:05:37 |
93 |
+--- a/fax |
94 |
++++ b/fax |
95 |
@@ -773,6 +773,7 @@ |
96 |
$GS -q -sDEVICE=tiffg3 -r$RES -dNOPAUSE -dSAFER \ |
97 |
-sOutputFile=$BASENAME.%03d \ |
98 |
|
99 |
diff --git a/net-misc/efax/files/efax-0.9a-fno-common.patch b/net-misc/efax/files/efax-0.9a-fno-common.patch |
100 |
new file mode 100644 |
101 |
index 00000000000..e27fa082e4b |
102 |
--- /dev/null |
103 |
+++ b/net-misc/efax/files/efax-0.9a-fno-common.patch |
104 |
@@ -0,0 +1,32 @@ |
105 |
+--- a/efaxos.h |
106 |
++++ b/efaxos.h |
107 |
+@@ -13,7 +13,6 @@ |
108 |
+ |
109 |
+ /* Bit order reversal table. */ |
110 |
+ |
111 |
+-extern unsigned char normalbits [ ] ; |
112 |
+ |
113 |
+ typedef enum ttymodes /* serial port modes: */ |
114 |
+ { |
115 |
+--- a/efaxlib.h |
116 |
++++ b/efaxlib.h |
117 |
+@@ -208,7 +208,7 @@ |
118 |
+ /* Bit reversal lookup tables (note that the `normalbits' array |
119 |
+ is the one actually used for the bit reversal. */ |
120 |
+ |
121 |
+-uchar reversebits [ 256 ], normalbits [ 256 ] ; |
122 |
++extern uchar reversebits [ 256 ], normalbits [ 256 ] ; |
123 |
+ |
124 |
+ void initbittab(void) ; |
125 |
+ |
126 |
+--- a/efaxlib.c |
127 |
++++ b/efaxlib.c |
128 |
+@@ -25,6 +25,8 @@ |
129 |
+ |
130 |
+ short short256 = 256 ; /* for endian-ness detection */ |
131 |
+ |
132 |
++uchar reversebits [ 256 ], normalbits [ 256 ] ; |
133 |
++ |
134 |
+ /* Make sure printf strings have only %d escapes and n or fewer |
135 |
+ of them. Returns 0 if OK, 1 on error. */ |
136 |
+ |
137 |
|
138 |
diff --git a/net-misc/efax/files/efax-0.9a-strip.patch b/net-misc/efax/files/efax-0.9a-strip.patch |
139 |
new file mode 100644 |
140 |
index 00000000000..a707b7e85ae |
141 |
--- /dev/null |
142 |
+++ b/net-misc/efax/files/efax-0.9a-strip.patch |
143 |
@@ -0,0 +1,14 @@ |
144 |
+--- a/Makefile |
145 |
++++ b/Makefile |
146 |
+@@ -25,11 +25,9 @@ |
147 |
+ |
148 |
+ efax: efax.o efaxlib.o efaxio.o efaxos.o efaxmsg.o |
149 |
+ $(CC) -o efax $(LDFLAGS) efax.o efaxlib.o efaxio.o efaxos.o efaxmsg.o |
150 |
+- strip efax |
151 |
+ |
152 |
+ efix: efix.o efaxlib.o efaxmsg.o |
153 |
+ $(CC) -o efix $(LDFLAGS) efix.o efaxlib.o efaxmsg.o |
154 |
+- strip efix |
155 |
+ |
156 |
+ install: |
157 |
+ cp fax efax efix $(BINDIR) |