gentoo resync : 05.02.2020

5 files changed, 103 insertions, 3 deletions

diff --git a/net-misc/efax/Manifest b/net-misc/efax/Manifest
index c5ef8f563923..48b7b9ba727c 100644
--- a/net-misc/efax/Manifest
+++ b/net-misc/efax/Manifest
@@ -1,5 +1,10 @@
-AUX efax-0.9a-fax-command.patch 269 BLAKE2B cebba28052074d9dc4473870492291ffca27a574123d799d2c51d09d82e00b85267f1fe19e89bff3a8e9c40318eaae054cdfc533edd0e50dad51e0ac94cc094a SHA512 a0d776e9a668bd48fffd5aeca42acb2b22364626985c01216c8fae3f170bd53067431ac93c0785a8f7b705695a5fee0a9e8c1dc4f8b0931b029291bb6a63cca2
+AUX efax-0.9a-fax-command.patch 229 BLAKE2B 393efd22712658af3e98fd08808e30c9c5f7f29f3526e12a5003b4c9f771a96e9f3e1640dfa8a42090dfc6ec013d224dbdf7cc2fbffdcf7a93b9729718539d88 SHA512 fabd2208d170369c6773ecf0248dda2b2585284d2fe776c49b1e08d5136a751ea0a11d53bdcd1313d5d673e829469f216e9bc96bdbe4db57152f422ee5f5b137
+AUX efax-0.9a-fno-common.patch 762 BLAKE2B 57c915976dd6437a9f4e420188ae28ed44dda6cabb91a86c0fe02670cf772f8511588a3bab8fa07cd3cec4a23aee660caa639eccf72cf6ca8e35f501878e1b94 SHA512 db1fd713c85e9c151252b8f47943123185981c250d8d018d4b8ba8086bec3497fe89abe9cdad539c61b42be9af7a0df7465dfdf637e98c9b02a86c382caef760
+AUX efax-0.9a-strip.patch 332 BLAKE2B 12f4313f6d0c9c5b88dc39eda399afbb7e5ec0d0e5b95114197757b091a1c635e086e2e1791cfde415e950c08f4e2eb6b020bb607750441c59e1a3ef7896e2d8 SHA512 02945f51850e90e70572402fd75cdedc3a213b4329c5277066f696153b773e9911b4d48c29f295c0f7c54dc3518e08b4b8a83f882f5ed604284cbb784ae42b13
 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
 EBUILD efax-0.9a-r4.ebuild 984 BLAKE2B 3a48dc7e60aa0784ea1761aac3494e506ecfcd74060faa446fb82097ed6472334279a3e0f26cfa2e12a2bf5eadc9feb2d418fe7885b8de316c5d7776d2fc013d SHA512 24ed551aeaf705a960e11be4813045c84fe1fe0653c0dd840faf7c428b6462e1410c7b5de8ed84e4655f3743f0bc75daa5eeace1806bcbda1a04c5588f7165f8
+EBUILD efax-0.9a_p19_p1.ebuild 1245 BLAKE2B aacc00ddab996e2d1384be6cf80b673ea54f6ff305d36fc40a86636fc4d68748f318c8c4680bf8d8180e9c8f9b9782f75e1a4285ecea1783d43c653fb5b9e8df SHA512 e07987dfb00812c5a081677905af709422f2194385d7d21eb3e2de6f7f42e021f55c768c3bee9bed42e4624b32ba813406d33dd765c2ef6f5c093a118ff09970
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
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 000000000000..8b89d9a44565
--- /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 92bec22aa879..b6543432d2e2 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 000000000000..e27fa082e4b8
--- /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 000000000000..a707b7e85aef
--- /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)