updated for new tiff and bug 66794

5 files changed, 167 insertions, 9 deletions

diff --git a/net-misc/hylafax/ChangeLog b/net-misc/hylafax/ChangeLog
index 6dbb811e14b7..a7a6c3d86335 100644
--- a/net-misc/hylafax/ChangeLog
+++ b/net-misc/hylafax/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/hylafax
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.39 2004/10/13 16:20:24 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.40 2004/10/24 05:50:07 nerdboy Exp $
+
+*hylafax-4.2.0-r1 (23 Oct 2004)
+
+  23 Oct 2004; Steve Arnold <nerdboy@gentoo.org>
+  +files/hylafax-4.2.0-tiff_version.patch, +hylafax-4.2.0-r1.ebuild:
+  updated for new tiff and other bug fixes; ebuild co-written with new
+  dev-recruit KingTaco <mike@uberslacks.com>. Should fix bug 66794.
 
   13 Oct 2004; Guy Martin <gmsoft@gentoo.org> hylafax-4.1.8-r4.ebuild:
   Stable on hppa.
diff --git a/net-misc/hylafax/Manifest b/net-misc/hylafax/Manifest
index f6e8388c6fa5..d382a276722e 100644
--- a/net-misc/hylafax/Manifest
+++ b/net-misc/hylafax/Manifest
@@ -1,24 +1,27 @@
-MD5 eafb063cb50b0c5bfb5c17db7a603172 ChangeLog 7736
+MD5 193e3e48322068c03e1d41b53f9d6a71 ChangeLog 8028
 MD5 5bc6512c151e6dfd52edef7a54ae2ce5 hylafax-4.1.8-r1.ebuild 2867
 MD5 a9f1947fcf266c9a40835a277a8fff44 hylafax-4.1.8-r2.ebuild 2996
 MD5 d6924a605e66bd7e7694b715aa8afb79 hylafax-4.1.8-r3.ebuild 3020
-MD5 93b89855f1349b94b334cbe94ceafd0f hylafax-4.1.8-r4.ebuild 3187
 MD5 993dbda50bbe5694c4b9e4f4916b6ad8 hylafax-4.1.8.ebuild 2176
-MD5 403a6aa03ec22b618e6d7efb78aa4893 hylafax-4.2.0.ebuild 3564
-MD5 e1c09d4ae9f16afec0050de46d762254 hylafax-4.2.0_rc2.ebuild 3518
 MD5 d82acf1bcf0f7f9e181d6a2821292f2e metadata.xml 435
+MD5 93b89855f1349b94b334cbe94ceafd0f hylafax-4.1.8-r4.ebuild 3187
+MD5 e1c09d4ae9f16afec0050de46d762254 hylafax-4.2.0_rc2.ebuild 3518
+MD5 403a6aa03ec22b618e6d7efb78aa4893 hylafax-4.2.0.ebuild 3564
+MD5 d0badb69f937593c9fb6dbec1bcb4269 hylafax-4.2.0-r1.ebuild 3470
 MD5 46bbae3c77d5651a20e606eb6228c159 files/99hylafax 62
-MD5 fa83948864d83f34f54ce35f26b38ed6 files/99hylafax-4.2 75
 MD5 5243f5e3321151d074643f652133fdfd files/digest-hylafax-4.1.8 66
 MD5 5243f5e3321151d074643f652133fdfd files/digest-hylafax-4.1.8-r1 66
 MD5 5243f5e3321151d074643f652133fdfd files/digest-hylafax-4.1.8-r2 66
 MD5 5243f5e3321151d074643f652133fdfd files/digest-hylafax-4.1.8-r3 66
-MD5 5243f5e3321151d074643f652133fdfd files/digest-hylafax-4.1.8-r4 66
-MD5 61b6d16148a84723c2996b519a57d498 files/digest-hylafax-4.2.0 66
-MD5 56c8a42db89b1c225f1fd074ae02050e files/digest-hylafax-4.2.0_rc2 69
 MD5 bc084d075b601d42fbd417b97a45f1b2 files/hylafax 3757
 MD5 5f2f2e3fe04414f953d4010d32261318 files/hylafax-4.1.8-fPIC.patch 2086
 MD5 ad3b0e7082e6e71ee6ba940ce1b6b071 files/hylafax-4.1.8-gcc-version.patch 520
+MD5 5243f5e3321151d074643f652133fdfd files/digest-hylafax-4.1.8-r4 66
+MD5 fa83948864d83f34f54ce35f26b38ed6 files/99hylafax-4.2 75
 MD5 491e78765b433d7c11146120cf7e40f8 files/hylafax-4.2 3759
+MD5 56c8a42db89b1c225f1fd074ae02050e files/digest-hylafax-4.2.0_rc2 69
 MD5 6b124a5aade1c4eabe5fdde7a21e0689 files/hylafax-4.2.0-dso.patch 884
 MD5 cfcafeadd916b8a9103b9b9110887916 files/hylafax-4.2.0-faxcron_uid.patch 527
+MD5 61b6d16148a84723c2996b519a57d498 files/digest-hylafax-4.2.0 66
+MD5 6fd09a3cd0a1657591fc6c5c076cd462 files/hylafax-4.2.0-tiff_version.patch 1011
+MD5 61b6d16148a84723c2996b519a57d498 files/digest-hylafax-4.2.0-r1 66
diff --git a/net-misc/hylafax/files/digest-hylafax-4.2.0-r1 b/net-misc/hylafax/files/digest-hylafax-4.2.0-r1
new file mode 100644
index 000000000000..9de57e0107eb
--- /dev/null
+++ b/net-misc/hylafax/files/digest-hylafax-4.2.0-r1
@@ -0,0 +1 @@
+MD5 463726ed21cfdac730c5d6915e0840cf hylafax-4.2.0.tar.gz 1351870
diff --git a/net-misc/hylafax/files/hylafax-4.2.0-tiff_version.patch b/net-misc/hylafax/files/hylafax-4.2.0-tiff_version.patch
new file mode 100644
index 000000000000..f3e6e8d3c09b
--- /dev/null
+++ b/net-misc/hylafax/files/hylafax-4.2.0-tiff_version.patch
@@ -0,0 +1,25 @@
+--- hylafax-4.2.0.orig/configure	Wed Aug 18 08:22:54 2004
++++ hylafax-4.2.0/configure	Wed Aug 25 07:41:00 2004
+@@ -2355,7 +2355,7 @@
+ 	if [ ${header_ver} -ge 19960307 ]; then
+ 	    if [ "${lib_ver}" = "3.4" ]; then
+ 		tiff_runlen_t="uint16"
+-	    elif [ "${lib_ver}" = "3.5" -o "${lib_ver}" = "3.6" ]; then
++	    elif [ "${lib_ver}" = "3.5" -o "${lib_ver}" = "3.6" -o "${lib_ver}" = "3.7" ]; then
+ 		tiff_runlen_t="uint32"
+ 	    fi
+ 	fi
+@@ -2392,9 +2392,9 @@
+ 
+ Incompatible TIFF Library.
+ 
+-HylaFAX ${VERSION} requires TIFF software distribution ver 3.4, 3.5, or
+-3.6.  If you do not have up to date TIFF software on your system then
+-you can retrieve it from the location where you obtained this software.
++HylaFAX ${VERSION} requires TIFF software distribution ver 3.4, 3.5, 
++3.6, or 3.7.  If you do not have up to date TIFF software on your system
++then you can retrieve it from the location where you obtained this software.
+ The Home Page for version 3.5 and later is http://www.libtiff.org
+ EOF
+ 	boom
+
diff --git a/net-misc/hylafax/hylafax-4.2.0-r1.ebuild b/net-misc/hylafax/hylafax-4.2.0-r1.ebuild
new file mode 100644
index 000000000000..bf9a3cdbe34b
--- /dev/null
+++ b/net-misc/hylafax/hylafax-4.2.0-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.2.0-r1.ebuild,v 1.1 2004/10/24 05:50:07 nerdboy Exp $
+
+inherit eutils
+
+IUSE="faxonly jpeg pam"
+
+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 ~hppa ~alpha ~amd64 ~ppc"
+
+DEPEND="!faxonly? ( net-dialup/mgetty )
+	>=sys-libs/zlib-1.1.4
+	virtual/ghostscript
+	>=media-libs/tiff-3.7.0
+	jpeg? ( media-libs/jpeg )
+	sys-apps/gawk
+	pam? ( sys-libs/pam )"
+
+RDEPEND="${DEPEND}
+	app-arch/sharutils"
+
+export CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-dso.patch
+	epatch ${FILESDIR}/${P}-faxcron_uid.patch
+	epatch ${FILESDIR}/${P}-tiff_version.patch
+	epatch ${FILESDIR}/configure-gcc-3.4.patch
+}
+
+src_compile() {
+	local my_conf="
+		--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-DIR_HTML=/usr/share/doc/${P}/html
+		--with-DIR_CGI=${WORKDIR}
+		--with-PATH_EGETTY=/bin/false
+		--with-HTML=yes
+		--with-PATH_DPSRIP=/var/spool/fax/bin/ps2fax
+		--with-PATH_IMPRIP=\"\"
+		--with-SYSVINIT=no
+		--with-LIBTIFF=\"-ltiff -ljpeg -lz\"
+		--with-OPTIMIZER=\"${CFLAGS}\""
+
+	if [ -h /etc/localtime ]; then
+		local continent=$(readlink /etc/localtime | cut -d / -f 5)
+		if [ "${continent}" == "Europe" ]; then
+			my_conf="${my_conf} --with-PAGESIZE=A4"
+		fi
+	fi
+
+	use faxonly && my_conf="${my_conf} --with-PATH_GETTY=/bin/false
+	                                  --with-PATH_VGETTY=/bin/false"
+	#--enable-pam isn't valid
+	use pam || my_conf="${my_conf} $(use_enable pam)"
+
+	# eval required for quoting in ${my_conf} to work properly, better way?
+	eval ./configure --nointeractive ${my_conf} || die "./configure failed"
+
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	dodir /usr/{bin,sbin} /usr/lib/fax /usr/share/man /var/spool /var/spool/recvq
+	dodir /usr/share/doc/${P}/html
+
+	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 \
+		HTMLDIR=${D}/usr/share/doc/${P}/html \
+		install || die "make install failed"
+
+	keepdir /var/spool/fax/{archive,client,etc,pollq,recvq,tmp}
+	keepdir /var/spool/fax/{status,sendq,log,info,doneq,docq,dev}
+
+	einfo "Adding env.d entry for Hylafax"
+	insinto /etc/env.d
+	newins ${FILESDIR}/99hylafax-4.2 99hylafax
+
+	einfo "Adding init.d entry for Hylafax"
+	insinto /etc/init.d
+	insopts -m 755
+	newins ${FILESDIR}/hylafax-4.2 hylafax
+
+	dodoc COPYRIGHT README TODO VERSION
+}
+
+pkg_postinst() {
+	ewarn "New Hylafax tiff support requires tiff-3.7.0 (still ~arch)"
+	ewarn "but hopefully this libtiff silliness is now fixed."
+	echo
+	ewarn "You can add both hylafax and tiff to /etc/portage/package.keywords"
+	ewarn "and emerge hylafax as normal.  As always, report any problems."
+	echo
+	echo
+	einfo "Hylafax now depends on sharutils instead of metamail for mime"
+	einfo "handling, however, you can continue to use the latter if you"
+	einfo "like."
+	echo
+	einfo "Now run faxsetup and (if necessary) faxaddmodem."
+	echo
+}