added patch for bug 29464 and many minor fixes (see changelog)

7 files changed, 121 insertions, 12 deletions

diff --git a/net-misc/hylafax/ChangeLog b/net-misc/hylafax/ChangeLog
index 62547696e12b..5491a4c2684f 100644
--- a/net-misc/hylafax/ChangeLog
+++ b/net-misc/hylafax/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/hylafax
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.25 2003/12/09 17:57:59 lanius Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.26 2004/03/13 17:52:26 nerdboy Exp $
+
+*hylafax-4.1.8-r2 (13 Mar 2004)
+
+  13 Mar 2004; <nerdboy@gentoo.org> hylafax-4.1.8-r2.ebuild,
+  files/hylafax-4.1.8-gcc-version.patch:
+  gcc version patch suggested by Torsten Kurbad <torsten@tk-webart.de>
+  since autoreconf doesn't seem to work on all systems (bug 29464)
+  also fixed date errors and removed mips and ppc due to too many
+  bad depends
 
   09 Dec 2003; Heinrich Wendel <lanius@gentoo.org> hylafax-4.1.8-r1.ebuild,
   hylafax-4.1.8.ebuild:
diff --git a/net-misc/hylafax/Manifest b/net-misc/hylafax/Manifest
index ba802957c2b6..befec35913c1 100644
--- a/net-misc/hylafax/Manifest
+++ b/net-misc/hylafax/Manifest
@@ -1,7 +1,10 @@
-MD5 c4f14be837e106084988def418b24e25 ChangeLog 5325
-MD5 e9538e96e5737fe8e80e3fc8c170274a hylafax-4.1.8.ebuild 2205
+MD5 8a42ffe13ffcdaa829801375964fa443 ChangeLog 5679
+MD5 14708d96b7ec17a7f9102d72f82b35fb hylafax-4.1.8-r1.ebuild 2355
 MD5 d82acf1bcf0f7f9e181d6a2821292f2e metadata.xml 435
-MD5 2fe10476f8f15aeb7e65f445baedff59 hylafax-4.1.8-r1.ebuild 2364
-MD5 5243f5e3321151d074643f652133fdfd files/digest-hylafax-4.1.8-r1 66
+MD5 53b17c09cdf1ec1057be5e48c1a4cf53 hylafax-4.1.8-r2.ebuild 2401
+MD5 f17923ccd84a41b67fe9341eb00590e2 hylafax-4.1.8.ebuild 2196
 MD5 44bdb0490811a12b11a1bb69433ea7a4 files/hylafax 3765
+MD5 5243f5e3321151d074643f652133fdfd files/digest-hylafax-4.1.8-r1 66
+MD5 ad3b0e7082e6e71ee6ba940ce1b6b071 files/hylafax-4.1.8-gcc-version.patch 520
+MD5 5243f5e3321151d074643f652133fdfd files/digest-hylafax-4.1.8-r2 66
 MD5 5243f5e3321151d074643f652133fdfd files/digest-hylafax-4.1.8 66
diff --git a/net-misc/hylafax/files/digest-hylafax-4.1.8-r2 b/net-misc/hylafax/files/digest-hylafax-4.1.8-r2
new file mode 100644
index 000000000000..6a11a8f26ec5
--- /dev/null
+++ b/net-misc/hylafax/files/digest-hylafax-4.1.8-r2
@@ -0,0 +1 @@
+MD5 beaf55ad7935e3bcaa53a5ac093f61a8 hylafax-4.1.8.tar.gz 1285536
diff --git a/net-misc/hylafax/files/hylafax-4.1.8-gcc-version.patch b/net-misc/hylafax/files/hylafax-4.1.8-gcc-version.patch
new file mode 100644
index 000000000000..480a4c158aae
--- /dev/null
+++ b/net-misc/hylafax/files/hylafax-4.1.8-gcc-version.patch
@@ -0,0 +1,11 @@
+--- configure.orig	2004-03-08 16:07:05.000000000 +0100
++++ configure	2004-03-08 16:10:40.000000000 +0100
+@@ -777,7 +777,7 @@
+ {
+     app=$1; shift
+     eval `$app -v 2>&1 | \
+-	sed -n -e '/version/s/.* [a-z\-]*\([0-9]*\)\.\([0-9]*\).\([0-9]*\).*/GCCdist=\1;GCCmajor=\2;GCCminor=\3/p'`
++	sed -n -e '/ersion/s/.* [a-z\-]*\([0-9]*\)\.\([0-9]*\).\([0-9]*\).*/GCCdist=\1;GCCmajor=\2;GCCminor=\3/p'`
+     GCCversion="${GCCdist}.${GCCmajor}.${GCCminor}"; export GCCversion
+     if [ ${GCCdist} -gt $1 ]; then
+         return 0
diff --git a/net-misc/hylafax/hylafax-4.1.8-r1.ebuild b/net-misc/hylafax/hylafax-4.1.8-r1.ebuild
index 0f469de198f6..dae36ef846f9 100644
--- a/net-misc/hylafax/hylafax-4.1.8-r1.ebuild
+++ b/net-misc/hylafax/hylafax-4.1.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.1.8-r1.ebuild,v 1.3 2004/02/22 23:28:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.1.8-r1.ebuild,v 1.4 2004/03/13 17:52:26 nerdboy Exp $
 
 # This is basically unchanged from the one supplied by Stephane Loeuillet
 # to Gentoo bug: http://bugs.gentoo.org/show_bug.cgi?id=28574
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.hylafax.org/source/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="hylafax"
-KEYWORDS="x86 ppc sparc alpha mips hppa "
+KEYWORDS="x86 sparc alpha hppa "
 
 DEPEND="net-dialup/mgetty
 	>=sys-libs/zlib-1.1.4
diff --git a/net-misc/hylafax/hylafax-4.1.8-r2.ebuild b/net-misc/hylafax/hylafax-4.1.8-r2.ebuild
new file mode 100644
index 000000000000..81a22abe295c
--- /dev/null
+++ b/net-misc/hylafax/hylafax-4.1.8-r2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.1.8-r2.ebuild,v 1.1 2004/03/13 17:52:26 nerdboy Exp $
+
+# This is basically unchanged from the one supplied by Stephane Loeuillet
+# to Gentoo bug: http://bugs.gentoo.org/show_bug.cgi?id=28574
+# Nice job, and thanks :)
+# Now with autoreconf for new gcc, and a new gentoo init script.
+
+IUSE="jpeg"
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Client-server fax package for class 1 and 2 fax modems."
+HOMEPAGE="http://www.hylafax.org"
+SRC_URI="ftp://ftp.hylafax.org/source/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="hylafax"
+KEYWORDS="~x86 ~sparc ~alpha ~hppa"
+
+DEPEND="net-dialup/mgetty
+	>=sys-libs/zlib-1.1.4
+	virtual/ghostscript
+	>=media-libs/tiff-3.5.5
+	jpeg? ( media-libs/jpeg )
+	sys-apps/gawk"
+
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	epatch ${FILESDIR}/${P}-gcc-version.patch
+	# no 'econf' here because does not support standard --prefix option (prehistoric autoconf v1.92 used !!!)
+	autoreconf -f
+	./configure \
+		--with-DIR_BIN=/usr/bin \
+		--with-DIR_SBIN=/usr/sbin \
+		--with-DIR_LIB=/usr/lib \
+		--with-DIR_LIBEXEC=/usr/sbin \
+		--with-DIR_LIBDATA=/usr/lib/fax \
+		--with-DIR_LOCKS=/var/lock \
+		--with-DIR_MAN=/usr/share/man \
+		--with-DIR_SPOOL=/var/spool/fax \
+		--with-AFM=no \
+		--with-AWK=/usr/bin/gawk \
+		--with-PATH_VGETTY=/sbin/vgetty \
+		--with-PATH_GETTY=/sbin/agetty \
+		--with-HTML=no \
+		--with-PATH_DPSRIP=/var/spool/fax/bin/ps2fax \
+		--with-PATH_IMPRIP=/usr/share/fax/psrip \
+		--with-SYSVINIT=/etc/init.d \
+		--with-INTERACTIVE=no \
+		--with-OPTIMIZER="${CFLAGS}" || die
+	# no 'emake' for the same reason (might use an old automake version)
+	make || die
+}
+
+src_install() {
+
+	dodir /usr/{bin,sbin} /usr/lib/fax /usr/share/man \
+		/var/spool/fax/{archive,client,pollq,recvq,tmp}
+	chown -R uucp:uucp ${D}/var/spool/fax
+
+	make \
+		BIN=${D}/usr/bin \
+		SBIN=${D}/usr/sbin \
+		LIBDIR=${D}/usr/lib \
+		LIB=${D}/usr/lib \
+		LIBEXEC=${D}/usr/sbin \
+		LIBDATA=${D}/usr/lib/fax \
+		MAN=${D}/usr/share/man \
+		SPOOL=${D}/var/spool/fax \
+		install || die
+
+	keepdir /var/spool/fax/{archive,client,pollq,recvq,tmp}
+	keepdir /var/spool/fax/{status,sendq,recvq,log,info,doneq,docq,dev}
+
+	insinto /etc/init.d
+	insopts -m 755
+	doins ${FILESDIR}/hylafax
+
+	dodoc COPYRIGHT README TODO VERSION
+
+	dohtml -r html/
+	keepdir /usr/share/doc/${P}
+}
diff --git a/net-misc/hylafax/hylafax-4.1.8.ebuild b/net-misc/hylafax/hylafax-4.1.8.ebuild
index 0da4e1308252..1648111a52c9 100644
--- a/net-misc/hylafax/hylafax-4.1.8.ebuild
+++ b/net-misc/hylafax/hylafax-4.1.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.1.8.ebuild,v 1.4 2004/02/22 23:28:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.1.8.ebuild,v 1.5 2004/03/13 17:52:26 nerdboy Exp $
 
 # This is basically unchanged from the one supplied by Stephane Loeuillet
 # to Gentoo bug: http://bugs.gentoo.org/show_bug.cgi?id=28574
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.hylafax.org/source/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="hylafax"
-KEYWORDS="x86 ppc sparc alpha mips hppa "
+KEYWORDS="x86 sparc alpha hppa "
 
 DEPEND="net-dialup/mgetty
 	>=sys-libs/zlib-1.1.4