commit: bd948f4f28a84acaf0eef34466a156ed35c57217 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Sat Feb 1 13:42:23 2020 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Sat Feb 1 13:43:34 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd948f4f
net-misc/efax: Fix CFLAGS=-fno-common Package-Manager: Portage-2.3.86, Repoman-2.3.20 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> net-misc/efax/Manifest | 2 + net-misc/efax/efax-0.9a_p19_p1.ebuild | 49 +++++++++++++++++++++++++ net-misc/efax/files/efax-0.9a-fax-command.patch | 4 +- net-misc/efax/files/efax-0.9a-fno-common.patch | 32 ++++++++++++++++ net-misc/efax/files/efax-0.9a-strip.patch | 14 +++++++ 5 files changed, 99 insertions(+), 2 deletions(-) diff --git a/net-misc/efax/Manifest b/net-misc/efax/Manifest index 38757aa575c..5fc7032b66a 100644 --- a/net-misc/efax/Manifest +++ b/net-misc/efax/Manifest @@ -1,2 +1,4 @@ DIST efax-0.9a-001114.tar.gz 97402 BLAKE2B 4c8365814dda4cc8c53da9cf6f71ae95c9a5b64a4677f0f717d03ea53710df1944db07514d01c18f9bf0d2c64642a2b7ca0416a7571a6f4b880ad8098a919c5e SHA512 b6361f84a8239e515cf29dbcbfde3d38648b73e7acfc72a0e2ced4ff2dd801c73bbccf5d34fb8aa065ec8b8bfc694a58f6d8dc00bb9e9a63e580be618a45228b +DIST efax_0.9a-19.1.diff.gz 18698 BLAKE2B 4b0a97e39f65009ff0f295cd4f573a919580ef442a3f0d3d838f79a7a7e31d70beb7b849a2a8bae839a244b1a43ecddedf90fe1bc59f8794906cb3d354557456 SHA512 dd656dd9f737aea598fc0ba241048e695018bce7eb439e009bc751fba1690dc28a99bee53db0c87d0638c9e4ac02b37e6de543355f06e1d8c87ed3d20e354cfc DIST efax_0.9a-19.diff.gz 18178 BLAKE2B d3dca49db55a52839c88c52c8934976fd56e32fb9501c27fe211b4bd4ed4b85014915f2e0785f7668cfc9743262ee6232af92c477386cc32f2b57e336aa4354e SHA512 8b1a2d007ebba73b772400eb1e0ccc61d832775590ac4fd6e171008c9741409118db099b444dc8da04dd87f1cb7025a9af62f60b2c3ccba21cc89863a2909735 +DIST efax_0.9a.orig.tar.gz 97402 BLAKE2B 4c8365814dda4cc8c53da9cf6f71ae95c9a5b64a4677f0f717d03ea53710df1944db07514d01c18f9bf0d2c64642a2b7ca0416a7571a6f4b880ad8098a919c5e SHA512 b6361f84a8239e515cf29dbcbfde3d38648b73e7acfc72a0e2ced4ff2dd801c73bbccf5d34fb8aa065ec8b8bfc694a58f6d8dc00bb9e9a63e580be618a45228b diff --git a/net-misc/efax/efax-0.9a_p19_p1.ebuild b/net-misc/efax/efax-0.9a_p19_p1.ebuild new file mode 100644 index 00000000000..8b89d9a4456 --- /dev/null +++ b/net-misc/efax/efax-0.9a_p19_p1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit toolchain-funcs + +DESCRIPTION="A simple fax program for single-user systems" +HOMEPAGE="http://www.cce.com/efax"; +SRC_URI=" + mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}.orig.tar.gz + mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-$(ver_cut 5).$(ver_cut 7).diff.gz +" + +KEYWORDS="~amd64 ~ppc ~x86" +SLOT="0" +LICENSE="GPL-2" +PATCHES=( + "${FILESDIR}"/${PN}-0.9a-fax-command.patch + "${FILESDIR}"/${PN}-0.9a-fno-common.patch + "${FILESDIR}"/${PN}-0.9a-strip.patch +) +S="${WORKDIR}/${P/_p*}-001114" + +src_prepare () { + eapply "${WORKDIR}"/${PN}_${PV/_p*}-$(ver_cut 5).$(ver_cut 7).diff + local patch + for patch in $(< debian/patches/00list); do + if [[ -f debian/patches/${patch} ]]; then + eapply debian/patches/${patch} + elif [[ -f debian/patches/${patch}.dpatch ]]; then + eapply debian/patches/${patch}.dpatch + else + die "Cannot find patch ${patch}" + fi + done + + default +} + +src_compile() { + emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +} + +src_install () { + dobin efax efix fax + doman efax.1 efix.1 + newman fax.1 efax-fax.1 # Don't collide with net-dialup/mgetty, bug #429808 + dodoc README +} diff --git a/net-misc/efax/files/efax-0.9a-fax-command.patch b/net-misc/efax/files/efax-0.9a-fax-command.patch index 92bec22aa87..b6543432d2e 100644 --- a/net-misc/efax/files/efax-0.9a-fax-command.patch +++ b/net-misc/efax/files/efax-0.9a-fax-command.patch @@ -1,5 +1,5 @@ ---- fax 2010/07/11 02:05:19 1.1 -+++ fax 2010/07/11 02:05:37 +--- a/fax ++++ b/fax @@ -773,6 +773,7 @@ $GS -q -sDEVICE=tiffg3 -r$RES -dNOPAUSE -dSAFER \ -sOutputFile=$BASENAME.%03d \ diff --git a/net-misc/efax/files/efax-0.9a-fno-common.patch b/net-misc/efax/files/efax-0.9a-fno-common.patch new file mode 100644 index 00000000000..e27fa082e4b --- /dev/null +++ b/net-misc/efax/files/efax-0.9a-fno-common.patch @@ -0,0 +1,32 @@ +--- a/efaxos.h ++++ b/efaxos.h +@@ -13,7 +13,6 @@ + + /* Bit order reversal table. */ + +-extern unsigned char normalbits [ ] ; + + typedef enum ttymodes /* serial port modes: */ + { +--- a/efaxlib.h ++++ b/efaxlib.h +@@ -208,7 +208,7 @@ + /* Bit reversal lookup tables (note that the `normalbits' array + is the one actually used for the bit reversal. */ + +-uchar reversebits [ 256 ], normalbits [ 256 ] ; ++extern uchar reversebits [ 256 ], normalbits [ 256 ] ; + + void initbittab(void) ; + +--- a/efaxlib.c ++++ b/efaxlib.c +@@ -25,6 +25,8 @@ + + short short256 = 256 ; /* for endian-ness detection */ + ++uchar reversebits [ 256 ], normalbits [ 256 ] ; ++ + /* Make sure printf strings have only %d escapes and n or fewer + of them. Returns 0 if OK, 1 on error. */ + diff --git a/net-misc/efax/files/efax-0.9a-strip.patch b/net-misc/efax/files/efax-0.9a-strip.patch new file mode 100644 index 00000000000..a707b7e85ae --- /dev/null +++ b/net-misc/efax/files/efax-0.9a-strip.patch @@ -0,0 +1,14 @@ +--- a/Makefile ++++ b/Makefile +@@ -25,11 +25,9 @@ + + efax: efax.o efaxlib.o efaxio.o efaxos.o efaxmsg.o + $(CC) -o efax $(LDFLAGS) efax.o efaxlib.o efaxio.o efaxos.o efaxmsg.o +- strip efax + + efix: efix.o efaxlib.o efaxmsg.o + $(CC) -o efix $(LDFLAGS) efix.o efaxlib.o efaxmsg.o +- strip efix + + install: + cp fax efax efix $(BINDIR)
