Forcing tiff-3 for most recent (stable) versions per bug 319715.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

8 files changed, 14 insertions, 677 deletions

diff --git a/net-misc/hylafax/ChangeLog b/net-misc/hylafax/ChangeLog
index f9a47170bbd5..1a0151017a9b 100644
--- a/net-misc/hylafax/ChangeLog
+++ b/net-misc/hylafax/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/hylafax
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.102 2009/12/29 17:43:20 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.103 2010/05/23 17:47:48 nerdboy Exp $
+
+  23 May 2010; Steve Arnold <nerdboy@gentoo.org> hylafax-4.4.4-r2.ebuild,
+  hylafax-6.0.3.ebuild, -hylafax-4.2.5.ebuild, -hylafax-4.3.0.ebuild,
+  -hylafax-4.3.1.ebuild, -hylafax-4.3.7.ebuild:
+  Forcing tiff-3 for most recent (stable) versions per bug 319715. Also
+  cleaned up stale versions.
 
   29 Dec 2009; Raúl Porcel <armin76@gentoo.org> hylafax-6.0.3.ebuild:
   sparc stable wrt #290525
diff --git a/net-misc/hylafax/hylafax-4.2.5.ebuild b/net-misc/hylafax/hylafax-4.2.5.ebuild
deleted file mode 100644
index fb46357d824f..000000000000
--- a/net-misc/hylafax/hylafax-4.2.5.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.2.5.ebuild,v 1.12 2009/12/26 17:41:57 pva Exp $
-
-inherit eutils multilib pam flag-o-matic toolchain-funcs
-
-IUSE="faxonly jpeg pam mgetty"
-
-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="amd64 hppa ppc sparc x86"
-
-DEPEND="!faxonly? ( net-dialup/mgetty )
-	>=sys-libs/zlib-1.1.4
-	app-text/ghostscript-gpl
-	>=media-libs/tiff-3.7.0
-	jpeg? ( media-libs/jpeg )
-	media-libs/jbigkit
-	sys-apps/gawk
-	pam? ( virtual/pam )
-	mgetty? ( net-dialup/mgetty )"
-
-RDEPEND="${DEPEND}
-	media-libs/netpbm
-	net-mail/metamail
-	!net-dialup/sendpage"
-
-export CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-tiff_version.patch"
-}
-
-src_compile() {
-	if use mgetty; then
-		if use faxonly; then
-			eerror "You cannot set both faxonly and mgetty, \
-			    please remove one." && die "invalid use flags"
-		fi
-#		# proposed hylafax change for bug #195467
-#		if ! built_with_use net-dialup/mgetty nofax; then
-#			eerror "You need to rebuild the mgetty package with \
-#			    USE=nofax." && die "rebuild mgetty first"
-#		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-HTML=yes
-		--with-PATH_DPSRIP=/var/spool/fax/bin/ps2fax
-		--with-PATH_IMPRIP=\"\"
-		--with-SYSVINIT=no
-		--with-LIBTIFF=\"-ltiff -ljpeg -lz\"
-		--with-OPTIMIZER=\"${CFLAGS}\"
-		--with-DSO=auto"
-
-	if use mgetty; then
-		my_conf="${my_conf} \
-			--with-PATH_GETTY=/sbin/mgetty \
-			--with-PATH_EGETTY=/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 /var/spool /var/spool/recvq
-	fowners uucp:uucp /var/spool/fax
-	fperms 0600 /var/spool/fax
-	dodir /usr/share/doc/${P}/html /usr/$(get_libdir)
-
-	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"
-	newenvd "${FILESDIR}/99hylafax-4.2" 99hylafax
-
-	einfo "Adding init.d entry for Hylafax"
-	newinitd "${FILESDIR}/hylafax-4.2" hylafax
-
-	pamd_mimic_system hylafax auth account session
-
-	dodoc COPYRIGHT README TODO VERSION
-}
-
-pkg_postinst() {
-	ewarn "New Hylafax tiff support requires at least tiff-3.7.0 now,"
-	ewarn "but hopefully this libtiff silliness is now fixed."
-	ewarn "If you have trouble building this brittle C++ code,"
-	ewarn "try disabling distcc and setting MAKEOPTS to -j1."
-	echo
-	einfo "Hylafax is back to depending on metamail for mime handling."
-	echo
-	einfo "Now run faxsetup and (if necessary) faxaddmodem."
-	echo
-}
diff --git a/net-misc/hylafax/hylafax-4.3.0.ebuild b/net-misc/hylafax/hylafax-4.3.0.ebuild
deleted file mode 100644
index 5565811728c4..000000000000
--- a/net-misc/hylafax/hylafax-4.3.0.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2009 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.13 2009/12/26 17:41:57 pva 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="amd64 hppa ppc sparc x86"
-
-DEPEND="!faxonly? ( net-dialup/mgetty )
-	>=sys-libs/zlib-1.1.4
-	app-text/ghostscript-gpl
-	>=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
-	!net-dialup/sendpage"
-
-export CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc /usr/lib/fax"
-
-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
-
-	epatch "${FILESDIR}/gentoo-gcc-version.patch" || die "epatch failed"
-
-	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_GETTY=/sbin/mgetty \
-			--with-PATH_EGETTY=/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"
-	newenvd "${FILESDIR}/99hylafax-4.2" 99hylafax
-
-	einfo "Adding init.d entry for Hylafax"
-	newinitd "${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
-}
diff --git a/net-misc/hylafax/hylafax-4.3.1.ebuild b/net-misc/hylafax/hylafax-4.3.1.ebuild
deleted file mode 100644
index be9aad785ac4..000000000000
--- a/net-misc/hylafax/hylafax-4.3.1.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.3.1.ebuild,v 1.11 2009/12/26 17:41:57 pva Exp $
-
-inherit eutils multilib pam flag-o-matic toolchain-funcs
-
-IUSE="jbig pam mgetty html"
-
-DESCRIPTION="Enterprise 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 ~amd64 ~ppc"
-
-DEPEND=">=sys-libs/zlib-1.1.4
-	app-text/ghostscript-gpl
-	>=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
-	!net-dialup/sendpage"
-
-export CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc /usr/lib/fax"
-
-pkg_setup() {
-	if use mgetty; then
-	    if built_with_use net-dialup/mgetty fax; then
-		eerror "net-dialup/mgetty must be installed without USE=fax"
-		die "merge net-dialup/mgetty without USE=fax"
-	    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
-}
-
-src_compile() {
-	# gcc standard C++ header changes
-	if [ $(gcc-major-version) -eq 4 ] && [ $(gcc-minor-version) -ge 3 ] ; then
-	    sed -i -e 's:"new.h":<new>:g' configure util/Types.h || die "sed failed"
-	    sed -i -e 's:"iostream.h":<iostream>\n using namespace std;:g' \
-		configure || die "sed failed"
-	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
-
-	epatch "${FILESDIR}/gentoo-gcc-version.patch" || die "epatch failed"
-
-	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_GETTY=/sbin/mgetty \
-			--with-PATH_EGETTY=/sbin/mgetty \
-			--with-PATH_VGETTY=/usr/sbin/vgetty"
-	else
-		my_conf="${my_conf} \
-			--with-PATH_GETTY=/bin/false \
-			--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
-
-	#--enable-pam isn't valid
-	use pam || my_conf="${my_conf} $(use_enable pam)"
-
-	myconf="CC=$(tc-getCC) CXX=$(tc-getCXX) ${my_conf}"
-
-	# 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}
-
-	dosed "s:hostname:hostname -f:g" \
-		/var/spool/fax/bin/{faxrcvd,pollrcvd} || die "dosed failed"
-
-	einfo "Adding env.d entry for Hylafax"
-	newenvd "${FILESDIR}/99hylafax-4.2" 99hylafax
-
-	einfo "Adding init.d entry for Hylafax"
-	newinitd "${FILESDIR}/hylafax-4.2" hylafax
-
-	use pam && pamd_mimic_system hylafax auth account session
-
-	dodoc CHANGES CONTRIBUTORS COPYRIGHT README TODO
-}
-
-pkg_postinst() {
-	elog
-	elog "The faxonly USE flag has been removed; since Hylafax does not"
-	elog "require mgetty, and certain fax files conflict, you must build"
-	elog "mgetty without fax support if you wish to use them both.  You"
-	elog "may want to add both to package.use so any future updates are"
-	elog "correctly built:"
-	elog
-	elog "	net-dialup/mgetty -fax"
-	elog "	net-misc/hylafax [-mgetty|mgetty]"
-	elog
-	elog "There are additional files included in the hylafax/files dir."
-	elog
-	elog "Note 1: hylafax.cron is provided for vixie-cron users and"
-	elog "should be placed in /etc/cron.d.  Use as-is or adapt it to"
-	elog "your system config."
-	elog
-	elog "Note 2: if you need to use hylafax with iptables, then you"
-	elog "need to specify the port and use ip_conntrack_ftp as shown"
-	elog "in the included example modules file."
-	elog
-	elog "See the docs and man pages for detailed configuration info."
-	elog
-	elog "Now run faxsetup and (if necessary) faxaddmodem."
-	elog
-}
diff --git a/net-misc/hylafax/hylafax-4.3.7.ebuild b/net-misc/hylafax/hylafax-4.3.7.ebuild
deleted file mode 100644
index d8f5c027693a..000000000000
--- a/net-misc/hylafax/hylafax-4.3.7.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.3.7.ebuild,v 1.3 2009/12/26 17:41:57 pva Exp $
-
-inherit eutils multilib pam flag-o-matic toolchain-funcs
-
-DESCRIPTION="Enterprise 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 ~amd64 ~ppc"
-
-IUSE="jbig pam mgetty html"
-
-DEPEND=">=sys-libs/zlib-1.1.4
-	app-text/ghostscript-gpl
-	>=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
-	!net-dialup/sendpage"
-
-export CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc /usr/lib/fax"
-
-pkg_setup() {
-	if use mgetty; then
-	    if built_with_use net-dialup/mgetty fax; then
-		eerror "net-dialup/mgetty must be installed without USE=fax"
-		die "merge net-dialup/mgetty without USE=fax"
-	    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
-}
-
-src_compile() {
-	# gcc standard C++ header changes
-	if [ $(gcc-major-version) -eq 4 ] && [ $(gcc-minor-version) -ge 3 ] ; then
-	    sed -i -e 's:"new.h":<new>:g' configure util/Types.h || die "sed failed"
-	    sed -i -e 's:"iostream.h":<iostream>\n using namespace std;:g' \
-		configure || die "sed failed"
-	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
-
-#	epatch "${FILESDIR}/gentoo-gcc-version.patch" || die "epatch failed"
-
-	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=/var/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_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_GETTY=/sbin/mgetty \
-			--with-PATH_EGETTY=/sbin/mgetty \
-			--with-PATH_VGETTY=/usr/sbin/vgetty"
-	else
-		my_conf="${my_conf} \
-			--with-PATH_GETTY=/bin/false \
-			--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
-
-	#--enable-pam isn't valid
-	use pam || my_conf="${my_conf} $(use_enable pam)"
-
-	myconf="CC=$(tc-getCC) CXX=$(tc-getCXX) ${my_conf}"
-
-	# 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}
-
-	dosed "s:hostname:hostname -f:g" \
-		/var/spool/fax/bin/{faxrcvd,pollrcvd} || die "dosed failed"
-
-	einfo "Adding env.d entry for Hylafax"
-	newenvd "${FILESDIR}/99hylafax-4.2" 99hylafax
-
-	einfo "Adding init.d entry for Hylafax"
-	newinitd "${FILESDIR}/hylafax-4.2" hylafax
-
-	use pam && pamd_mimic_system hylafax auth account session
-
-	dodoc CHANGES CONTRIBUTORS COPYRIGHT README TODO
-}
-
-pkg_postinst() {
-	elog
-	elog "The faxonly USE flag has been removed; since Hylafax does not"
-	elog "require mgetty, and certain fax files conflict, you must build"
-	elog "mgetty without fax support if you wish to use them both.  You"
-	elog "may want to add both to package.use so any future updates are"
-	elog "correctly built:"
-	elog
-	elog "	net-dialup/mgetty -fax"
-	elog "	net-misc/hylafax [-mgetty|mgetty]"
-	elog
-	elog "There are additional files included in the hylafax/files dir."
-	elog
-	elog "Note 1: hylafax.cron is provided for vixie-cron users and"
-	elog "should be placed in /etc/cron.d.  Use as-is or adapt it to"
-	elog "your system config."
-	elog
-	elog "Note 2: if you need to use hylafax with iptables, then you"
-	elog "need to specify the port and use ip_conntrack_ftp as shown"
-	elog "in the included example modules file."
-	elog
-	elog "See the docs and man pages for detailed configuration info."
-	elog
-	elog "Now run faxsetup and (if necessary) faxaddmodem."
-	elog
-}
diff --git a/net-misc/hylafax/hylafax-4.4.4-r2.ebuild b/net-misc/hylafax/hylafax-4.4.4-r2.ebuild
index cbb66d1588ef..cc96d8a97804 100644
--- a/net-misc/hylafax/hylafax-4.4.4-r2.ebuild
+++ b/net-misc/hylafax/hylafax-4.4.4-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.4.4-r2.ebuild,v 1.7 2009/12/26 17:41:57 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.4.4-r2.ebuild,v 1.8 2010/05/23 17:47:48 nerdboy Exp $
 
 EAPI="2"
 
@@ -18,7 +18,7 @@ IUSE="jbig pam mgetty html"
 
 DEPEND=">=sys-libs/zlib-1.1.4
 	app-text/ghostscript-gpl
-	>=media-libs/tiff-3.8.2[jbig?]
+	=media-libs/tiff-3.9*[jbig?]
 	media-libs/jpeg
 	jbig? ( media-libs/jbigkit )
 	sys-apps/gawk
diff --git a/net-misc/hylafax/hylafax-6.0.3.ebuild b/net-misc/hylafax/hylafax-6.0.3.ebuild
index 1c1fb37ab99b..381845d06f8a 100644
--- a/net-misc/hylafax/hylafax-6.0.3.ebuild
+++ b/net-misc/hylafax/hylafax-6.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-6.0.3.ebuild,v 1.6 2009/12/29 17:43:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-6.0.3.ebuild,v 1.7 2010/05/23 17:47:48 nerdboy Exp $
 
 EAPI="2"
 
@@ -18,7 +18,7 @@ IUSE="jbig pam mgetty html"
 
 DEPEND=">=sys-libs/zlib-1.1.4
 	app-text/ghostscript-gpl
-	>=media-libs/tiff-3.9.1[jbig?]
+	=media-libs/tiff-3.9*[jbig?]
 	media-libs/jpeg
 	jbig? ( media-libs/jbigkit )
 	sys-apps/gawk
diff --git a/net-misc/hylafax/metadata.xml b/net-misc/hylafax/metadata.xml
index 9b8845990a79..77de9fd5e83b 100644
--- a/net-misc/hylafax/metadata.xml
+++ b/net-misc/hylafax/metadata.xml
@@ -13,7 +13,6 @@ HylaFAX(tm) はメールゲートウェイ、ページング、マルチプラ�
 クライアント/サーバ・FAX・システムです。
 </longdescription>
   <use>
-    <flag name="faxonly">Don't depend on mgetty-fax</flag>
     <flag name="html">Adds HTML documentation</flag>
     <flag name="mgetty">Adds support for mgetty and vgetty</flag>
   </use>