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

(Portage version: 2.1.10.49/cvs/Linux x86_64)

4 files changed, 56 insertions, 35 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/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*)