Apply debian patches, fix fax command (bug #327737 by John Hardin), drop old.

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

5 files changed, 64 insertions, 41 deletions

diff --git a/net-misc/efax/ChangeLog b/net-misc/efax/ChangeLog
index 15415768f511..d191f433b5cf 100644
--- a/net-misc/efax/ChangeLog
+++ b/net-misc/efax/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/efax
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/efax/ChangeLog,v 1.13 2011/12/21 08:36:34 phajdan.jr Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/efax/ChangeLog,v 1.14 2012/03/03 15:24:42 pacho Exp $
+
+*efax-0.9a-r3 (03 Mar 2012)
+
+  03 Mar 2012; Pacho Ramos <pacho@gentoo.org> +efax-0.9a-r3.ebuild,
+  +files/efax-0.9a-fax-command.patch, -efax-0.9a-r1.ebuild:
+  Apply debian patches, fix fax command (bug #327737 by John Hardin), drop old.
 
   21 Dec 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> efax-0.9a-r2.ebuild:
   x86 stable wrt bug #394029
diff --git a/net-misc/efax/Manifest b/net-misc/efax/Manifest
index 8f4eec53b81f..6fb7b4692632 100644
--- a/net-misc/efax/Manifest
+++ b/net-misc/efax/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
+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
-EBUILD efax-0.9a-r1.ebuild 829 RMD160 e1721bc79388e12be42ba664d2821e7d32cb398e SHA1 9a0e67ed272aef067ee29edd7e5a74363f3f1f4b SHA256 5a69557151114e4a97e4b4f7fe72020d9e3bd346cfd42cad90647fc2bdd93de4
+DIST efax_0.9a-19.diff.gz 18178 RMD160 e3e548e6fab84d8b774c0e9229cdf872c0a3891e SHA1 7a2fb050b57efff6dfde175f9e23390e264d4e1d SHA256 eb039ae8e4be159e262bbb11e1de5596b249ba22f67a9bd3bfdbab0da3964197
 EBUILD efax-0.9a-r2.ebuild 839 RMD160 b5997476b44f0c6abd0facd7bac0ef925c0510eb SHA1 3283bc2aa86e8c443105205def46b83185a4ce34 SHA256 bca1b88ce6582451c8e431cf710ec926f353f70a5bc7d2c64234d492d132df01
+EBUILD efax-0.9a-r3.ebuild 928 RMD160 fb84593659bff81185781cb515eb8baa4e8dbec4 SHA1 4c025e9294dfc61c864386a884c97a32d760abdd SHA256 233e74f7239fb57c2c3938ef7ba12478c08b1741d989e6f812c81cc8a0055c3e
 EBUILD efax-0.9a.ebuild 710 RMD160 9c825d32e4f4284be47905a16124bf36918c7c1b SHA1 1ceae47c7836772945d3eb08c22d90608272c8ef SHA256 9679dcb3faa1d16b03cdf48469afaf7a1a5edc88c18d6682be225b492936566c
-MISC ChangeLog 1583 RMD160 7e1ee14425f7b19bf85f7cd808bdfc20d0712d0f SHA1 4fed85343e00001f83e961b4f557539112363de6 SHA256 41cdf85c4e98376fe7963a94e2c699fbfed38432fbc191d9fb845600a10a1040
+MISC ChangeLog 1816 RMD160 9fea71a94a6c78707164633da0ccc23259f469b7 SHA1 065ee7f18df708ec4b29276a034518f0ebea8d23 SHA256 48b9cd4092e655f4474f0608eb1010b5c98a882c9e451fc834c82b35e4983779
 MISC metadata.xml 210 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 SHA1 efa00493ddec7289a21bc4cbcc6e95ec4de749d5 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk7xmpgACgkQuUQtlDBCeQIAXgCeM9V65FQBdJ0kXWdndUl/suMy
-gkkAnja181+UcNT5lPl4I50crKjlloeQ
-=7OID
+iEYEARECAAYFAk9SN78ACgkQCaWpQKGI+9TkWQCfQv0ND4xHdUoEAtm3aeZlnNgk
+OkYAniIZ6BZnWqLoR8Ssr/9kYb1Xwamv
+=f3eT
 -----END PGP SIGNATURE-----
diff --git a/net-misc/efax/efax-0.9a-r1.ebuild b/net-misc/efax/efax-0.9a-r1.ebuild
deleted file mode 100644
index 12ca6b8f9ba9..000000000000
--- a/net-misc/efax/efax-0.9a-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/efax/efax-0.9a-r1.ebuild,v 1.4 2008/12/30 18:04:51 mpagano Exp $
-
-inherit eutils
-
-S="${WORKDIR}/${P}-001114"
-DESCRIPTION="A simple fax program for single-user systems"
-SRC_URI="http://www.cce.com/efax/download/${P}-001114.tar.gz"
-HOMEPAGE="http://www.cce.com/efax/"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-SLOT="0"
-LICENSE="GPL-2"
-
-src_unpack () {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-segfault.patch"
-
-	# remove strip command as per bug #240932
-	sed -i -e '/strip/d' Makefile
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" || die "compilation failed"
-}
-
-src_install () {
-	dobin efax efix fax || die "dobin failed"
-	doman efax.1 efix.1 fax.1
-	dodoc README
-}
diff --git a/net-misc/efax/efax-0.9a-r3.ebuild b/net-misc/efax/efax-0.9a-r3.ebuild
new file mode 100644
index 000000000000..2fd783979627
--- /dev/null
+++ b/net-misc/efax/efax-0.9a-r3.ebuild
@@ -0,0 +1,38 @@
+# 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-r3.ebuild,v 1.1 2012/03/03 15:24:42 pacho Exp $
+
+EAPI=4
+
+inherit eutils
+
+S="${WORKDIR}/${P}-001114"
+
+DESCRIPTION="A simple fax program for single-user systems"
+HOMEPAGE="http://gentoo.org"
+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"
+	epatch "${FILESDIR}/${P}-segfault.patch"
+	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 fax.1
+	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
new file mode 100644
index 000000000000..92bec22aa879
--- /dev/null
+++ b/net-misc/efax/files/efax-0.9a-fax-command.patch
@@ -0,0 +1,10 @@
+--- fax	2010/07/11 02:05:19	1.1
++++ fax	2010/07/11 02:05:37
+@@ -773,6 +773,7 @@
+ 		$GS -q -sDEVICE=tiffg3 -r$RES -dNOPAUSE -dSAFER \
+ 		-sOutputFile=$BASENAME.%03d \
+ 		-sPAPERSIZE=$PAGE \
++		-dMaxStripSize=0 \
+ 		$BASENAME </dev/null >/dev/null )
+ 		;;
+ 	II*|MM*|P4*)