version bump and jbig support for bugs 133477 and 137613

(Portage version: 2.1.1_pre1-r5)

4 files changed, 179 insertions, 1 deletions

diff --git a/net-misc/hylafax/ChangeLog b/net-misc/hylafax/ChangeLog
index e52b81b618c2..38eec7a3db52 100644
--- a/net-misc/hylafax/ChangeLog
+++ b/net-misc/hylafax/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/hylafax
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.66 2006/05/24 20:41:40 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.67 2006/07/02 02:45:25 nerdboy Exp $
+
+*hylafax-4.3.0 (01 Jul 2006)
+
+  01 Jul 2006; Steve Arnold <nerdboy@gentoo.org>
+  +files/hylafax-fix-configure-gcc-3-4.patch, +hylafax-4.3.0.ebuild:
+  Version bump and jbig support for bugs 133477 and 137613; configure
+  patch is just-in-case (worksforme with 3.4.5 and 4.1.1).
 
   24 May 2006; Michael Hanselmann <hansmi@gentoo.org> hylafax-4.2.5.ebuild:
   Stable on ppc.
diff --git a/net-misc/hylafax/files/digest-hylafax-4.3.0 b/net-misc/hylafax/files/digest-hylafax-4.3.0
new file mode 100644
index 000000000000..b26bbc837155
--- /dev/null
+++ b/net-misc/hylafax/files/digest-hylafax-4.3.0
@@ -0,0 +1,3 @@
+MD5 15fbb3eb5fdf6def379799442a68da4e hylafax-4.3.0.tar.gz 1468136
+RMD160 29c62721e4895848b325f4f3a7b7e7782e275aa8 hylafax-4.3.0.tar.gz 1468136
+SHA256 a50512bfe6ae60573084dadfb5a629de78db30d19ac59ad6750bd621e138817c hylafax-4.3.0.tar.gz 1468136
diff --git a/net-misc/hylafax/files/hylafax-fix-configure-gcc-3-4.patch b/net-misc/hylafax/files/hylafax-fix-configure-gcc-3-4.patch
new file mode 100644
index 000000000000..97824e9bf39e
--- /dev/null
+++ b/net-misc/hylafax/files/hylafax-fix-configure-gcc-3-4.patch
@@ -0,0 +1,10 @@
+--- configure.gcc34-no-builtin	2004-06-04 13:10:08.251245000 +0200
++++ configure	2004-06-04 13:19:25.722497240 +0200
+@@ -1505,6 +1505,7 @@ CheckForLibrary()
+     f=$1; shift
+     libs="$@";
+     cat>t.c<<EOF
++extern int $f();
+ int t() { $f(); return 0; }
+ int main(){ t(); return 0; }
+ EOF
diff --git a/net-misc/hylafax/hylafax-4.3.0.ebuild b/net-misc/hylafax/hylafax-4.3.0.ebuild
new file mode 100644
index 000000000000..6c10fe43d8b0
--- /dev/null
+++ b/net-misc/hylafax/hylafax-4.3.0.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.3.0.ebuild,v 1.1 2006/07/02 02:45:25 nerdboy Exp $
+
+inherit eutils multilib pam flag-o-matic toolchain-funcs
+
+IUSE="faxonly jbig pam mgetty html"
+
+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.8.2
+	media-libs/jpeg
+	jbig? ( media-libs/jbigkit )
+	sys-apps/gawk
+	pam? ( virtual/pam )
+	mgetty? ( net-dialup/mgetty )"
+
+RDEPEND="${DEPEND}
+	net-mail/metamail"
+
+export CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc /usr/lib/fax"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	#epatch ${FILESDIR}/hylafax-fix-configure-gcc-3-4.patch
+}
+
+src_compile() {
+	if use faxonly; then
+		if use mgetty; then
+			eerror "You cannot set both faxonly and mgetty, please remove one." && die "invalid use flags"
+		fi
+	fi
+	if use jbig; then
+		einfo       "Checking for tiff compiled with jbig support..."
+		if built_with_use media-libs/tiff jbig; then
+			einfo "Found jbig support; continuing..."
+		else
+			ewarn "Tiff (media-libs/tiff) must be compiled with jbig support."
+			einfo "Please re-emerge tiff with the jbig USE flag or disable it."
+			die "Tiff not merged with jbig USE flag"
+		fi
+	fi
+
+	# Hylafax doesn't play nice with gcc-3.4 and SSP (bug #74457)
+	# so drop the flags until a better solution comes along
+	[ $(gcc-major-version) -eq 3 ] && [ $(gcc-minor-version) -ge 4 ] \
+		&& filter-flags -fstack-protector -fstack-protector-all
+
+	local my_conf="
+		--with-DIR_BIN=/usr/bin
+		--with-DIR_SBIN=/usr/sbin
+		--with-DIR_LIB=/usr/$(get_libdir)
+		--with-DIR_LIBEXEC=/usr/sbin
+		--with-DIR_LIBDATA=/usr/$(get_libdir)/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_DPSRIP=/var/spool/fax/bin/ps2fax
+		--with-PATH_IMPRIP=\"\"
+		--with-SYSVINIT=no
+		--with-REGEX=yes
+		--with-LIBTIFF=\"-ltiff -ljpeg -lz\"
+		--with-OPTIMIZER=\"${CFLAGS}\"
+		--with-DSO=auto"
+
+	if use html; then
+		my_conf="${my_conf} --with-HTML=yes"
+	else
+		my_conf="${my_conf} --with-HTML=no"
+	fi
+
+	if use mgetty; then
+		my_conf="${my_conf} \
+			--with-PATH_EGETTY=/usr/sbin/mgetty \
+			--with-PATH_VGETTY=/usr/sbin/vgetty"
+	else
+		my_conf="${my_conf} \
+			--with-PATH_EGETTY=/bin/false \
+			--with-PATH_VGETTY=/bin/false"
+	fi
+
+	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/$(get_libdir)/fax /usr/share/man
+	dodir /var/spool /var/spool/recvq
+	fowners uucp:uucp /var/spool/fax
+	fperms 0600 /var/spool/fax
+	dodir /usr/share/doc/${P}/html
+
+	make \
+		BIN=${D}/usr/bin \
+		SBIN=${D}/usr/sbin \
+		LIBDIR=${D}/usr/$(get_libdir) \
+		LIB=${D}/usr/$(get_libdir) \
+		LIBEXEC=${D}/usr/sbin \
+		LIBDATA=${D}/usr/$(get_libdir)/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
+
+	use pam && pamd_mimic_system hylafax auth account session
+
+	dodoc CHANGES CONTRIBUTORS COPYRIGHT README TODO
+}
+
+pkg_postinst() {
+	ewarn "Hylafax tiff support requires at least tiff-3.8.2 now, which"
+	ewarn "is the latest stable version with all required updates."
+	echo
+	einfo "We're also back to depending on metamail for mime handling."
+	einfo "See the docs and man pages for detailed configuration info."
+	echo
+	einfo "Now run faxsetup and (if necessary) faxaddmodem."
+	echo
+}