Don't collide with mgetty, bug #429808 by flameeyes.

Package-Manager: portage-2.1.11.17/cvs/Linux x86_64

3 files changed, 58 insertions, 16 deletions

diff --git a/net-misc/efax/ChangeLog b/net-misc/efax/ChangeLog
index e408c708ff24..917e6c008d7f 100644
--- a/net-misc/efax/ChangeLog
+++ b/net-misc/efax/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/efax
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/efax/ChangeLog,v 1.19 2012/06/27 16:54:39 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/efax/ChangeLog,v 1.20 2012/09/16 09:38:12 pacho Exp $
+
+*efax-0.9a-r4 (16 Sep 2012)
+
+  16 Sep 2012; Pacho Ramos <pacho@gentoo.org> +efax-0.9a-r4.ebuild:
+  Don't collide with mgetty, bug #429808 by flameeyes.
 
   27 Jun 2012; Michael Palimaka <kensington@gentoo.org> -efax-0.9a-r2.ebuild,
   -efax-0.9a.ebuild:
diff --git a/net-misc/efax/Manifest b/net-misc/efax/Manifest
index 5f9842b57e50..30976d31fb21 100644
--- a/net-misc/efax/Manifest
+++ b/net-misc/efax/Manifest
@@ -1,21 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX efax-0.9a-fax-command.patch 269 RMD160 576579e0c212229cabfab79d77dd2d9ae3f555fd SHA1 fef53859e138f1b3ff4b81338bb48debc5a75a96 SHA256 87263c0d23b217e5e50a7dd37d97b3c93bcdf9a4b09049795a2c0a6aaf7f5ea6
-AUX efax-0.9a-segfault.patch 784 RMD160 ef1f2a32b957e78c2477f91e6662ece11908df9c SHA1 9f4255986665516860aad3dab24d00d453692b69 SHA256 d067fe228adef71fd279afc2c80cc7a44d773ad7f4c4b67ac37b30dbf75a3503
-DIST efax-0.9a-001114.tar.gz 97402 RMD160 5235799c98243b3d0e597b7b7aecae7d5954fb79 SHA1 ec8090eb38a827c69d37bf97a3acdd581c2a5781 SHA256 46abddf13f7565ea0c9d85b92845cdb32fb265c47cfc84c972e11a0219cda8ea
-DIST efax_0.9a-19.diff.gz 18178 RMD160 e3e548e6fab84d8b774c0e9229cdf872c0a3891e SHA1 7a2fb050b57efff6dfde175f9e23390e264d4e1d SHA256 eb039ae8e4be159e262bbb11e1de5596b249ba22f67a9bd3bfdbab0da3964197
-EBUILD efax-0.9a-r3.ebuild 1020 RMD160 3fee78fae743a11c79be55ab74d4b66f1ca3a95f SHA1 a0dad487c567ed2339ca85d4d20c29aa7c0c0938 SHA256 90aac246b85e424f9f8882fbf2da09b9c0dfd999ccab8d77762333e59a586324
-MISC ChangeLog 2358 RMD160 1765848f8ab39dad6f8a7454e86613adbd7bc3e8 SHA1 a7e1ad37801b5c0ef1dc16f6e3e95378ea6ad25c SHA256 fd6735b78f9efb81610a833da548ea942fa1d670d98301d91e50dc3f07ee183b
-MISC metadata.xml 210 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 SHA1 efa00493ddec7289a21bc4cbcc6e95ec4de749d5 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39
+AUX efax-0.9a-fax-command.patch 269 SHA256 87263c0d23b217e5e50a7dd37d97b3c93bcdf9a4b09049795a2c0a6aaf7f5ea6 SHA512 a0d776e9a668bd48fffd5aeca42acb2b22364626985c01216c8fae3f170bd53067431ac93c0785a8f7b705695a5fee0a9e8c1dc4f8b0931b029291bb6a63cca2 WHIRLPOOL e505c2ccef6b29aea8c15f44e093a8fd4a5a237b53850fef7e18689a2c86c8a516919975a4eea49f58ba6a5576b44b662e7da284e5088b5aca065f23272dc2d8
+AUX efax-0.9a-segfault.patch 784 SHA256 d067fe228adef71fd279afc2c80cc7a44d773ad7f4c4b67ac37b30dbf75a3503 SHA512 a033128833aef6e878d8b906af45ba19ccb8a33401f74907cbad0d6542738f497ea88c74c2d69e02397d91e54262d0b8adb9d5ed1e149e5090a2656a6d69130e WHIRLPOOL bf6afeaf1158de85633959737de3640338126a25b2893dfbd1a51031adc64393ad77f13747334fda7264a00cb63b270a3a8a34e307ce156608e8eb502b21fa5b
+DIST efax-0.9a-001114.tar.gz 97402 SHA256 46abddf13f7565ea0c9d85b92845cdb32fb265c47cfc84c972e11a0219cda8ea SHA512 b6361f84a8239e515cf29dbcbfde3d38648b73e7acfc72a0e2ced4ff2dd801c73bbccf5d34fb8aa065ec8b8bfc694a58f6d8dc00bb9e9a63e580be618a45228b WHIRLPOOL 790aa776668f58aaea3b1be16daec47e223fea08e8104647427bc80d63b52037ac526f2d8696dc3d93b2ff6efd7bb7b0b6c7bbc251d5db911788b805d13b6f01
+DIST efax_0.9a-19.diff.gz 18178 SHA256 eb039ae8e4be159e262bbb11e1de5596b249ba22f67a9bd3bfdbab0da3964197 SHA512 8b1a2d007ebba73b772400eb1e0ccc61d832775590ac4fd6e171008c9741409118db099b444dc8da04dd87f1cb7025a9af62f60b2c3ccba21cc89863a2909735 WHIRLPOOL 521e647c564216d016efa1cf763fb9ca5977effe310be3db05c9d0401eea25c9bc41e58ddadcd711a4e7f96b034efce189ea346866c86cff30cd3212f1e0c4d8
+EBUILD efax-0.9a-r3.ebuild 1020 SHA256 90aac246b85e424f9f8882fbf2da09b9c0dfd999ccab8d77762333e59a586324 SHA512 442627cf382f43aef5c87718eebf4e97cc52abafa453d6ad64fe3d915ad912f49a662d32ba6229c3dd3dd4e58ce7f3e6d8e8ae1dfdbda45e1e9ccc6312288540 WHIRLPOOL ce3e99c32575ef69003441be90102ac24c02ddfb069fc543ac468b2ad740bfa0e6c2a5c0f1a09e85286c471f09cbc6776ce89b0393d1ed231bb5daa537c41b92
+EBUILD efax-0.9a-r4.ebuild 1094 SHA256 bbd6813b9332194d47f389f66e823571999d82f67efe337634cc46f96c2c60e7 SHA512 921ee1ac6e00e3e6cf2e4d6ab51cf98ca9cad23d17334859577d8d031de09a94a54a65e39936a7fb7b0d0dbabae1ccf151d68bcf70b51be0e19310115c27cfd7 WHIRLPOOL 5d57eaa2a9f2db0d4eabfee9a818f339a6727cf4e23b1da7d79bf7d0902fcf5f7b187cfce62750b4d4b6fc2a19238fe4f28a1db8c2da07863fd18292f0ee20db
+MISC ChangeLog 2506 SHA256 299909a3df58127cd51fe5af1d90a4dafa958aaba8bc686b05e506b64c5f7d25 SHA512 3583d4b8494317802db22acf50175fdd788ea5126c785c63328eb14254b572ebfe46ebbd3296e394ac2e7a88bcc3c1ef2baeff3dc1da466bbc009fad6bac9dac WHIRLPOOL 6a05075bd3d67433430601109fd5c9b7294fe9b3fef996b8958ad7abc92e2a8ef7f022b0ad4f103a8600f7da8b29549497b6c10c527c653be6f60f1afa8dfa13
+MISC metadata.xml 210 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 SHA512 4554adeece55ce9adfdadba04443a3ede6ff910b96a11b77bb1f07ddd6bdbc756b8e6e1873660f8f54e67f46db1065980794a6136c6de7883b24d0ee13ff51fe WHIRLPOOL f546bd1233d5a9934ba0480881ceba944cb8ff1869c12ed2421d4ccbb247ee38dc0c7c8b979f10533ad0fc603b5e4829d0ddf174a83d0bda8e8dd62c1c873eeb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP6zrWAAoJEMbwO6tnXQ0sANwH/3i3oRbUM7y50zv6xxve30JA
-niigyQjTPUrJ1CRFEdwE3T4Km+sKIaEk3Nh2TDc2P4fjfsUAv5KrxNGVzS2DTny5
-z3fr2xWzs9L9nVYsIwNK42PAbQHQ0PFRxTjAbXK6CMyBuz7lv6evmIVNTWvsz9it
-19+l6HIqjADFqVcxRrgsj1BfVdqCVn/gCiPFglwgFYXVD08pqVOXmnNAntJVzK32
-XjLV+tbzkm0+O7Rtox/4YsOJZkICUV9v+h/qBlF8IghCFDPMz1l6ehMVr7r0M/5m
-73RgnfAKwGr/68/aTanb68XLu7qH9Iy+ct/Hk5B0Be0Ao0dI1W/LqNnrZOKznFw=
-=fzue
+iEYEAREIAAYFAlBVngoACgkQCaWpQKGI+9R2dQCeK5ZaqIK3JxQIMB9jkhx40zOQ
+SKcAn1ge7fG689XfcZTDRUg8bpng2EWe
+=TdYd
 -----END PGP SIGNATURE-----
diff --git a/net-misc/efax/efax-0.9a-r4.ebuild b/net-misc/efax/efax-0.9a-r4.ebuild
new file mode 100644
index 000000000000..fd35ed4df0f6
--- /dev/null
+++ b/net-misc/efax/efax-0.9a-r4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/efax/efax-0.9a-r4.ebuild,v 1.1 2012/09/16 09:38:12 pacho Exp $
+
+EAPI=4
+inherit eutils
+
+S="${WORKDIR}/${P}-001114"
+
+DESCRIPTION="A simple fax program for single-user systems"
+HOMEPAGE="http://www.cce.com/efax"
+SRC_URI="http://www.cce.com/efax/download/${P}-001114.tar.gz
+	mirror://debian/pool/main/e/efax/efax_0.9a-19.diff.gz"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+SLOT="0"
+LICENSE="GPL-2"
+
+src_prepare () {
+	epatch "${WORKDIR}/${PN}_${PV}-19.diff"
+	rm -f "${S}"/${P}/debian/patches/series "${S}"/${P}/debian/patches/00list
+	EPATCH_FORCE="yes" epatch "${S}"/${P}/debian/patches/*
+
+	epatch "${FILESDIR}/${P}-fax-command.patch" #327737
+
+	# remove strip command as per bug #240932
+	sed -i -e '/strip/d' Makefile
+}
+
+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
+}