updated to latest 4.4x release (closes bug 231221)

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.10 x86_64

3 files changed, 193 insertions, 2 deletions

diff --git a/net-misc/hylafax/ChangeLog b/net-misc/hylafax/ChangeLog
index 115ca2cfb860..242219c9fecf 100644
--- a/net-misc/hylafax/ChangeLog
+++ b/net-misc/hylafax/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/hylafax
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.80 2008/07/08 02:12:02 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.81 2008/07/13 23:05:21 nerdboy Exp $
+
+*hylafax-4.4.4 (13 Jul 2008)
+
+  13 Jul 2008; Steve Arnold <nerdboy@gentoo.org> +hylafax-4.4.4.ebuild:
+  updated to latest 4.4x release (closes bug 231221)
 
 *hylafax-4.3.7 (08 Jul 2008)
 
diff --git a/net-misc/hylafax/Manifest b/net-misc/hylafax/Manifest
index 0d99064127a8..11f9be42d1d4 100644
--- a/net-misc/hylafax/Manifest
+++ b/net-misc/hylafax/Manifest
@@ -9,9 +9,11 @@ DIST hylafax-4.2.5.tar.gz 1450958 RMD160 aef5e7a8ff32bafa43b5efc431b9fd8c334ddb3
 DIST hylafax-4.3.0.tar.gz 1468136 RMD160 29c62721e4895848b325f4f3a7b7e7782e275aa8 SHA1 cf0634c410996be1bf2fd34d83ad2dba45d69138 SHA256 a50512bfe6ae60573084dadfb5a629de78db30d19ac59ad6750bd621e138817c
 DIST hylafax-4.3.1.tar.gz 1498444 RMD160 1a29d43a05793ec4185c96ca16698268ae3f7c9b SHA1 9b42872912f2b75949423b76ab5f1b5e2caef869 SHA256 b777c0d8f1f858f3c86f91f9ae4fde9246646ac9e753154b969cb7c3a49947ab
 DIST hylafax-4.3.7.tar.gz 1469003 RMD160 ce86b6caf25c2d034bc9568f3350dfa34e737d7b SHA1 9a337b31f0aa12373e4150d601a8d6af7dd3bcc3 SHA256 4dd699aa90de45bdb2ac4e1c0b1666b9dc6bb8c234b1415a0c30e1beb52c82f9
+DIST hylafax-4.4.4.tar.gz 1188551 RMD160 598258ad6cbca5344efb9f3fa0dcc29a43ae7c4b SHA1 6a866765e48c4c851b4fdc45c7145d0bf18b2143 SHA256 6c059a39efea9b5d8d24004dc4775ae114026813ea3b6ca4e377d4f29c8eb569
 EBUILD hylafax-4.2.5.ebuild 4339 RMD160 06384897be4776b452d7d7139bdda097f976a76f SHA1 fcc0e92e493d110cc783603fc60b092d226241f9 SHA256 fec942f14ac11b35cddffd6f53adad2ee49269f4e9567449f820ba51e1444417
 EBUILD hylafax-4.3.0.ebuild 4551 RMD160 a0450e170eae096e28270001586d0dfb7541fca3 SHA1 9cb0032df385a65fe6ee09d9d262f92845574a70 SHA256 7a3c2efb5a2ed011abcfcd9674735f15d525203dd5909997e42eca53a398934c
 EBUILD hylafax-4.3.1.ebuild 5562 RMD160 55cca50f2b59f1d8308e3d1992f046b024206939 SHA1 143bde56282ce4512f3e76327f8dcc8e46ff893f SHA256 edc010502f8c61faea1d6299f49712c6daf7d6caff436f5274707112ab3c819e
 EBUILD hylafax-4.3.7.ebuild 5553 RMD160 9e238ce27540cb8207d78f70dfe3e3149f6ed78b SHA1 48b19567813a4059127630153983ee5e4e5919a3 SHA256 6a270fc72238cd97c11ef37369587255504fe6121277aca048b1193688016208
-MISC ChangeLog 17038 RMD160 d2b5738ead65e9bb3cee4488b4e882ead18dfd7d SHA1 9eb6efc06952f5d8feeb9483fa8481e842dc6fce SHA256 b59f6e8ec099903382df87578e281fad19e514fe69546db2fcbffdd847d4a78d
+EBUILD hylafax-4.4.4.ebuild 5387 RMD160 a6dd5bffda80aa345a1fd4b11ddfa4055bcdb8fe SHA1 d06ac2fddafb2ab5b7207d005ea7774302db5844 SHA256 71e84a5854001dd68dc922157d17042f50e57c56a1f727370a3346203c7f955d
+MISC ChangeLog 17194 RMD160 6cc57839f55ceb1b60ddd18f4fe2af068f33dda9 SHA1 437d68b15a9f15a646201cbe59aa50a0cd750763 SHA256 48f1fa1014129f9159015f44a3ed0a295e1b3eb878e4cc5564060e33a5ca2ab5
 MISC metadata.xml 680 RMD160 f534f59f38ba9db8b9ec24d72164ef99e90d0e55 SHA1 927f92ce08fdd3c4018e0d231afa81265c4d2525 SHA256 2b5b94cc0d6e9c9cfcc5b8908abb649de267dbc9f4fc2e949a246f79745cf5fd
diff --git a/net-misc/hylafax/hylafax-4.4.4.ebuild b/net-misc/hylafax/hylafax-4.4.4.ebuild
new file mode 100644
index 000000000000..79d7fb49b3a3
--- /dev/null
+++ b/net-misc/hylafax/hylafax-4.4.4.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2008 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.ebuild,v 1.1 2008/07/13 23:05:21 nerdboy Exp $
+
+inherit eutils multilib pam 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
+	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"
+
+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
+
+	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"
+
+	generate_files # in this case, it only generates the env.d entry
+
+	einfo "Adding env.d entry for Hylafax"
+	doenvd 99${P}
+
+	einfo "Adding init.d entry for Hylafax"
+	newinitd "${FILESDIR}"/${PN}-4.2 ${PN}
+
+	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
+}
+
+generate_files() {
+	cat <<-EOF > 99${P}
+	PATH="/var/spool/fax/bin"
+	CONFIG_PROTECT="/var/spool/fax/etc /usr/$(get_libdir)/fax"
+	EOF
+}