updated keywords and cleaned up old versions

(Portage version: 2.1_pre3-r1)

16 files changed, 16 insertions, 733 deletions

diff --git a/net-misc/hylafax/ChangeLog b/net-misc/hylafax/ChangeLog
index d8917ad46ab4..ca609f89483d 100644
--- a/net-misc/hylafax/ChangeLog
+++ b/net-misc/hylafax/ChangeLog
@@ -1,6 +1,19 @@
 # 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.59 2006/01/05 07:51:49 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.60 2006/01/06 03:02:36 nerdboy Exp $
+
+  06 Jan 2006; Steve Arnold <nerdboy@gentoo.org>
+  -files/configure-gcc-3.4.patch, -files/hylafax-4.2.0-fPIC.patch,
+  -files/hylafax-4.2.0-faxcron_uid.patch,
+  -files/hylafax-4.2.0-faxmail-charset.patch,
+  -files/hylafax-4.2.0-tiff_version.patch,
+  -files/hylafax-4.2.1-openpam.patch, -files/hylafax-4.2-tmpdir.patch,
+  -files/hylafax-hostvuln.patch, -hylafax-4.2.0-r3.ebuild,
+  -hylafax-4.2.1-r2.ebuild, -hylafax-4.2.2.ebuild, hylafax-4.2.3-r1.ebuild:
+  Updated keywords and cleaned up old versions; all the old ones were 4.2x,
+  so it seemed like a good opportunity to tidy up all the old patches.  If
+  anyone *really* needs an older version, file a bug and we'll see about
+  back-porting the security patches...
 
 *hylafax-4.2.4 (05 Jan 2006)
 *hylafax-4.2.3-r1 (05 Jan 2006)
diff --git a/net-misc/hylafax/files/configure-gcc-3.4.patch b/net-misc/hylafax/files/configure-gcc-3.4.patch
deleted file mode 100644
index 60cc898b5897..000000000000
--- a/net-misc/hylafax/files/configure-gcc-3.4.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.orig	2004-10-16 12:23:11.798429288 -0500
-+++ configure	2004-10-16 12:27:04.419065576 -0500
-@@ -1590,11 +1590,24 @@
- 	fi
-     done
- }
--CheckForLibrary strftime -lc || {
-+
-+CheckForLibrary_strftime()
-+{
-+    f=$1; shift
-+    libs="$@";
-+    cat>t.c<<EOF
-+int t() { $f(0, 0, 0, 0); return 0; }
-+int main(){ t(); return 0; }
-+EOF
-+    capture cat t.c
-+    runMake t "t:; \${CCF} t.c $libs"
-+}
-+
-+CheckForLibrary_strftime strftime -lc || {
-     #
-     # SCO has strftime in -lintl.
-     #
--    if CheckForLibrary strftime -lintl; then
-+    if CheckForLibrary_strftime strftime -lintl; then
- 	Note "Looks like -lintl is needed for strftime."
- 	MACHDEPLIBS="$MACHDEPLIBS -lintl"
-     else
diff --git a/net-misc/hylafax/files/digest-hylafax-4.2.0-r3 b/net-misc/hylafax/files/digest-hylafax-4.2.0-r3
deleted file mode 100644
index 9de57e0107eb..000000000000
--- a/net-misc/hylafax/files/digest-hylafax-4.2.0-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 463726ed21cfdac730c5d6915e0840cf hylafax-4.2.0.tar.gz 1351870
diff --git a/net-misc/hylafax/files/digest-hylafax-4.2.1-r2 b/net-misc/hylafax/files/digest-hylafax-4.2.1-r2
deleted file mode 100644
index 9a80e8b49781..000000000000
--- a/net-misc/hylafax/files/digest-hylafax-4.2.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 05430e41a279d0fff6d6e4b444440829 hylafax-4.2.1.tar.gz 1412035
diff --git a/net-misc/hylafax/files/digest-hylafax-4.2.2 b/net-misc/hylafax/files/digest-hylafax-4.2.2
deleted file mode 100644
index cbb86d00ca39..000000000000
--- a/net-misc/hylafax/files/digest-hylafax-4.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 356328a6289d0a26775f33d6bfb75368 hylafax-4.2.2.tar.gz 1438894
diff --git a/net-misc/hylafax/files/hylafax-4.2-tmpdir.patch b/net-misc/hylafax/files/hylafax-4.2-tmpdir.patch
deleted file mode 100644
index a7d77e18a759..000000000000
--- a/net-misc/hylafax/files/hylafax-4.2-tmpdir.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-diff -ru hylafax-4.2.1/util/faxcron.sh.in hylafax-4.2.1.new/util/faxcron.sh.in
---- hylafax-4.2.1/util/faxcron.sh.in	2004-12-22 14:44:06.000000000 +0100
-+++ hylafax-4.2.1.new/util/faxcron.sh.in	2005-08-06 12:24:16.000000000 +0200
-@@ -69,12 +69,18 @@
- UPDATE="date +'%D %H:%M' >$LAST"
- 
- # security
--TMPDIR=/tmp/.faxcron.sh$$
--rm -rf $TMPDIR
--mkdir $TMPDIR || exit 1
-+if test -n "`type -p mktemp`" ; then
-+        TMPFDIR=`mktemp -d -t xferfax.XXXXXX`  || { echo "$0: Cannot create temporary dir!" >&2 ; exit 1; }
-+else
-+	TMPFDIR=${TMPDIR-/tmp}/.faxcron.sh$$
-+	rm -rf $TMPFDIR
-+	mkdir $TMPFDIR || { echo "$0: Cannot create temporary dir! Aborting." ; exit 1; }
-+fi
-+
-+JUNK=$TMPFDIR/faxjunk$$         # temp file used multiple times
-+AWKTMP=$TMPFDIR/faxawk$$                # temp file for awk program
- 
--JUNK=$TMPDIR/faxjunk$$         # temp file used multiple times
--AWKTMP=$TMPDIR/faxawk$$                # temp file for awk program
-+trap "$RM \$AWKTMP \$JUNK; [ -d $TMPFDIR ] && $RM -rf $TMPFDIR" 0 1 2 15
- 
- while [ x"$1" != x"" ] ; do
-     case $1 in
-@@ -90,7 +96,6 @@
-     shift
- done
- 
--trap "$RM \$AWKTMP \$JUNK; $RM -rf $TMPDIR; exit 1" 0 1 2 15
- 
- 
- test -z "$LASTRUN" && LASTRUN=`$CAT $LAST 2>/dev/null`
-@@ -285,7 +290,7 @@
- EOF
- $AWK -f $AWKTMP -v LASTRUN="$LASTRUN" TRANSCRIPT="\
-     LOGFILE=log/%s;\
--    TMP=$TMPDIR/faxlog\$\$;\
-+    TMP=$TMPFDIR/faxlog\$\$;\
-     if [ -f \$LOGFILE ]; then\
- 	$SED -n -e '/%s %s %s.*SESSION BEGIN/,/SESSION END/p' \$LOGFILE |\
- 	$SED -e '/start.*timer/d'\
-diff -ru hylafax-4.2.1/util/recvstats.sh.in hylafax-4.2.1.new/util/recvstats.sh.in
---- hylafax-4.2.1/util/recvstats.sh.in	2004-06-18 06:10:29.000000000 +0200
-+++ hylafax-4.2.1.new/util/recvstats.sh.in	2005-08-06 12:25:17.000000000 +0200
-@@ -153,15 +153,16 @@
- 
- #
- # Generate an awk program to process the statistics file.
--#
--tmpAwk=/tmp/xferfax$$
--trap "rm -f $tmpAwk; exit 1" 0 1 2 15
--
--# security
--rm -rf $tmpAwk
--${NOCLOBBER_ON}
--> $tmpAwk || exit 1
--${NOCLOBBER_OFF}
-+if test -n "`type -p mktemp`" ; then
-+        tmpAwk=`mktemp -t xferfax.XXXXXX`  || { echo "$0: Cannot create temporary file!" >&2 ; exit 1; }
-+else
-+        tmpAwk=${TMPDIR-/tmp}/xferfax$$
-+        rm -f $tmpAwk
-+        ${NOCLOBBER_ON}
-+        > $tmpAwk || { echo "$0: Cannot create temporary file! Aborting." ; exit 1; }
-+        ${NOCLOBBER_OFF}
-+fi
-+trap "[ -f $tmpAwk ] && rm -f $tmpAwk" 0 1 2 15
- 
- ($CAT<<'EOF'
- #
-diff -ru hylafax-4.2.1/util/xferfaxstats.sh.in hylafax-4.2.1.new/util/xferfaxstats.sh.in
---- hylafax-4.2.1/util/xferfaxstats.sh.in	2004-06-18 06:10:29.000000000 +0200
-+++ hylafax-4.2.1.new/util/xferfaxstats.sh.in	2005-08-06 12:25:28.000000000 +0200
-@@ -26,6 +26,9 @@
- # LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
- # OF THIS SOFTWARE.
- #
-+# security
-+NOCLOBBER_ON=@NOCLOBBER_ON@
-+NOCLOBBER_OFF=@NOCLOBBER_OFF@
- 
- #
- # Print Statistics about Transmitted Facsimile.
-@@ -169,8 +172,17 @@
- #
- # Generate an awk program to process the statistics file.
- #
--tmpAwk=/tmp/xferfax$$
--trap "rm -f $tmpAwk; exit 1" 0 1 2 15
-+if test -n "`type -p mktemp`" ; then
-+        tmpAwk=`mktemp -t xferfax.XXXXXX`  || { echo "$0: Cannot create temporary file!" >&2 ; exit 1; }
-+else
-+	tmpAwk=${TMPDIR-/tmp}/xferfax$$
-+	rm -f $tmpAwk
-+	${NOCLOBBER_ON}
-+	> $tmpAwk || { echo "$0: Cannot create temporary file! Aborting." ; exit 1; }
-+	${NOCLOBBER_OFF}
-+fi
-+trap "[ -f $tmpAwk ] && rm -f $tmpAwk" 0 1 2 15
-+
- 
- ($CAT<<'EOF'
- #
diff --git a/net-misc/hylafax/files/hylafax-4.2.0-fPIC.patch b/net-misc/hylafax/files/hylafax-4.2.0-fPIC.patch
deleted file mode 100644
index adce2801d6ca..000000000000
--- a/net-misc/hylafax/files/hylafax-4.2.0-fPIC.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -uNr hylafax-4.2.0.orig/configure hylafax-4.2.0/configure
---- hylafax-4.2.0.orig/configure	2005-01-06 19:56:46.978463856 +0000
-+++ hylafax-4.2.0/configure	2005-01-06 19:57:39.141533864 +0000
-@@ -3313,7 +3313,7 @@
- 	LIBUTIL=''
- 	LIBFAXSERVER='-lfaxserver'
- 	FAXD='${DEPTH}/faxd'
--	DSOOPTS='-shared -fpic -Wl,-soname,$@'
-+	DSOOPTS='-shared -fPIC -Wl,-soname,$@'
- 	LLDOPTS='-L${UTIL} -L${FAXD} -lfaxutil'$USE_RPATH
- 	DSO=LINUX
- 	CheckCCDSO()
-diff -uNr hylafax-4.2.0.orig/faxd/Makefile.in hylafax-4.2.0/faxd/Makefile.in
---- hylafax-4.2.0.orig/faxd/Makefile.in	2005-01-06 19:56:47.001460360 +0000
-+++ hylafax-4.2.0/faxd/Makefile.in	2005-01-06 20:01:58.837054144 +0000
-@@ -43,6 +43,8 @@
- SRCDIR	= ${DEPTH}/${TOPSRCDIR}/faxd
- VPATH	= ../@SRCDIR@/faxd
- 
-+OPTIMIZER += -fPIC
-+
- C++FILES=ClassModem.c++ \
- 	FaxModem.c++ \
- 	Class0.c++ \
-diff -uNr hylafax-4.2.0.orig/regex/Makefile.in hylafax-4.2.0/regex/Makefile.in
---- hylafax-4.2.0.orig/regex/Makefile.in	2005-01-06 19:56:47.099445464 +0000
-+++ hylafax-4.2.0/regex/Makefile.in	2005-01-06 20:00:42.968587904 +0000
-@@ -42,6 +42,8 @@
- SRCDIR	= ${DEPTH}/${TOPSRCDIR}/regex
- VPATH	= ../@SRCDIR@/regex
- 
-+OPTIMIZER += -fPIC
-+
- CFILES= regexec.c regcomp.c regfree.c regerror.c
- TARGETS=libregex.a
- 
-diff -uNr hylafax-4.2.0.orig/util/Makefile.in hylafax-4.2.0/util/Makefile.in
---- hylafax-4.2.0.orig/util/Makefile.in	2005-01-06 19:56:47.113443336 +0000
-+++ hylafax-4.2.0/util/Makefile.in	2005-01-06 19:58:49.756798712 +0000
-@@ -43,6 +43,8 @@
- SRCDIR	= ${DEPTH}/${TOPSRCDIR}/util
- VPATH	= ../@SRCDIR@/util
- 
-+OPTIMIZER += -fPIC
-+
- C++FILES=Array.c++ \
- 	BoolArray.c++ \
- 	Dictionary.c++ \
diff --git a/net-misc/hylafax/files/hylafax-4.2.0-faxcron_uid.patch b/net-misc/hylafax/files/hylafax-4.2.0-faxcron_uid.patch
deleted file mode 100644
index b83a5d2329b0..000000000000
--- a/net-misc/hylafax/files/hylafax-4.2.0-faxcron_uid.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- util/faxcron.sh.in.orig	2004-08-28 12:15:58.000000000 +0100
-+++ util/faxcron.sh.in	2004-08-28 12:16:39.000000000 +0100
-@@ -41,7 +41,7 @@
- AGELOG=30			# keep log info for last 30 days
- AGERCV=7			# purge received facsimile after 7 days
- AGETMP=1			# purge orphaned temp files after 1 day
--FAXUSER=fax			# owner of log files
-+FAXUSER=@FAXUID@		# owner of log files
- LOGMODE=0644			# mode for log files
- XFERLOG=etc/xferfaxlog		# HylaFAX xferfaxlog file location
- LAST=etc/lastrun		# file where time+date of last run recorded
diff --git a/net-misc/hylafax/files/hylafax-4.2.0-faxmail-charset.patch b/net-misc/hylafax/files/hylafax-4.2.0-faxmail-charset.patch
deleted file mode 100644
index e2a3cad49864..000000000000
--- a/net-misc/hylafax/files/hylafax-4.2.0-faxmail-charset.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- faxmail/faxmail.c++.orig	2005-08-09 16:40:21.000000000 +0200
-+++ faxmail/faxmail.c++	2005-08-09 16:40:41.000000000 +0200
-@@ -392,8 +392,9 @@
- 	if (verbose)
- 	    mime.trace(stderr);
- 	// XXX anything but us-ascii is treated as ISO-8859-1
--	setISO8859(mime.getCharset() != CS_USASCII);
--
-+	// setISO8859(mime.getCharset() != CS_USASCII);
-+	setISO8859(true);
-+	
- 	/*
- 	 * Check first for any external script/command to
- 	 * use in converting the body part to PostScript.
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
deleted file mode 100644
index f3e6e8d3c09b..000000000000
--- a/net-misc/hylafax/files/hylafax-4.2.0-tiff_version.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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/files/hylafax-4.2.1-openpam.patch b/net-misc/hylafax/files/hylafax-4.2.1-openpam.patch
deleted file mode 100644
index 51f211d0d761..000000000000
--- a/net-misc/hylafax/files/hylafax-4.2.1-openpam.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -ur hylafax-4.2.1/configure hylafax-4.2.1-fbsd/configure
---- hylafax-4.2.1/configure	2004-12-28 04:45:03 +0000
-+++ hylafax-4.2.1-fbsd/configure	2005-06-05 14:45:14 +0000
-@@ -1578,11 +1578,9 @@
- if [ "$DISABLE_PAM" != "yes" ]; then
- 	Note "Checking for PAM (Pluggable Authentication Module) support"
- 	CheckForLibrary pam_authenticate -lpam &&
--		CheckForLibrary misc_conv -lpam_misc -lpam &&
--		CheckForIncludeFile security/pam_appl.h &&
--		CheckForIncludeFile security/pam_misc.h && {
-+		CheckForIncludeFile security/pam_appl.h && {
- 			HAVE_PAM="#define HAVE_PAM 1"
--			PAMLIBS="-lpam -lpam_misc"
-+			PAMLIBS="-lpam"
- 		}
- 	if [ "x$PAMLIBS" = "x" ]; then
- 		Note "... not found. Disabling PAM support"
-diff -ur hylafax-4.2.1/hfaxd/HylaFAXServer.h hylafax-4.2.1-fbsd/hfaxd/HylaFAXServer.h
---- hylafax-4.2.1/hfaxd/HylaFAXServer.h	2004-11-23 18:05:02 +0000
-+++ hylafax-4.2.1-fbsd/hfaxd/HylaFAXServer.h	2005-06-05 14:45:35 +0000
-@@ -43,7 +43,6 @@
- #ifdef HAVE_PAM
- extern "C" {
- #include <security/pam_appl.h>
--#include <security/pam_misc.h>
- #include <grp.h>
- }
- #endif // HAVE_PAM
-diff -ur hylafax-4.2.1/hfaxd/Login.c++ hylafax-4.2.1-fbsd/hfaxd/Login.c++
---- hylafax-4.2.1/hfaxd/Login.c++	2004-04-27 20:16:15 +0000
-+++ hylafax-4.2.1-fbsd/hfaxd/Login.c++	2005-06-05 15:15:01 +0000
-@@ -109,7 +109,7 @@
- 	for (i=0; i<num_msg; i++) {
- 		switch(msg[i]->msg_style) {
- 			case PAM_PROMPT_ECHO_OFF:
--				replies[i].resp = x_strdup(password);
-+				replies[i].resp = password ? strdup(password) : NULL;
- 				replies[i].resp_retcode = 0;
- 				retval = PAM_SUCCESS;
- 				break;
diff --git a/net-misc/hylafax/files/hylafax-hostvuln.patch b/net-misc/hylafax/files/hylafax-hostvuln.patch
deleted file mode 100644
index dd60220e1df1..000000000000
--- a/net-misc/hylafax/files/hylafax-hostvuln.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Nru hylafax-4.2.0.orig/hfaxd/InetFaxServer.c++ hylafax-4.2.0/hfaxd/InetFaxServer.c++
---- hylafax-4.2.0.orig/hfaxd/InetFaxServer.c++	Mon Dec 27 14:10:09 2004
-+++ hylafax-4.2.0/hfaxd/InetFaxServer.c++	Tue Dec 28 10:49:52 2004
-@@ -177,16 +177,14 @@
- /*
-  * Check host identity returned by gethostbyaddr to
-  * weed out clients trying to spoof us (this is mostly
-- * a sanity check; it's still trivial to spoof).
-- * If the name returned by gethostbyaddr is in our domain,
-- * look up the name and check that the peer's address
-+ * a sanity check; if they have full control of DNS
-+ * they can still spoof)
-+ * Look up the name and check that the peer's address
-  * corresponds to the host name.
-  */
- bool
- InetFaxServer::checkHostIdentity(hostent*& hp)
- {
--    if (!isLocalDomain(hp->h_name))		// not local, don't check
--	return (true);
-     fxStr name(hp->h_name);			// must copy static value
-     hp = Socket::gethostbyname(name);
-     if (hp) {
-diff -Nru hylafax-4.2.0.orig/hfaxd/User.c++ hylafax-4.2.0/hfaxd/User.c++
---- hylafax-4.2.0.orig/hfaxd/User.c++	Mon Dec 27 14:10:21 2004
-+++ hylafax-4.2.0/hfaxd/User.c++	Tue Dec 28 11:00:32 2004
-@@ -136,16 +136,26 @@
- 	 * must supply.  The next field is the password that
- 	 * must be presented to gain administrative privileges.
- 	 *
-+	 * If the regex is a single word (no @ sign), we take it
-+	 * as a host only short form for (^[^@]*@<input>
-+	 *
- 	 * If the first character of the <regex> is a ``!''
- 	 * then the line specifies user(s) to disallow; a match
- 	 * causes the user to be rejected w/o a password prompt.
- 	 * This facility is mainly for backwards compatibility.
- 	 */
- 	char* cp;
-+	bool userandhost = false;
- 	for (cp = line; *cp && *cp != ':'; cp++)
--	    ;
-+	    if (*cp == '@') userandhost = true;
-+
- 	const char* base = &line[line[0] == '!'];
--	RE pat(base, cp-base);
-+	fxStr pattern(base, cp-base);
-+	if (! userandhost) {
-+	    pattern.insert("^.*@");
-+	    pattern.append("$");
-+	}
-+	RE pat(pattern);
- 	if (line[0] == '!') {		// disallow access on match
- 	    if (pat.Find(dotform) || pat.Find(hostform))
- 		return (false);
diff --git a/net-misc/hylafax/hylafax-4.2.0-r3.ebuild b/net-misc/hylafax/hylafax-4.2.0-r3.ebuild
deleted file mode 100644
index b94ecce587af..000000000000
--- a/net-misc/hylafax/hylafax-4.2.0-r3.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2005 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-r3.ebuild,v 1.2 2005/11/28 00:50:56 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}
-	media-libs/netpbm
-	app-arch/sharutils"
-
-export CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-faxcron_uid.patch
-	epatch ${FILESDIR}/${P}-tiff_version.patch
-	epatch ${FILESDIR}/configure-gcc-3.4.patch
-	epatch ${FILESDIR}/hylafax-hostvuln.patch
-	epatch ${FILESDIR}/${P}-faxmail-charset.patch
-	epatch ${FILESDIR}/${P}-fPIC.patch
-	epatch ${FILESDIR}/hylafax-4.2-tmpdir.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}\"
-		--with-DSO=auto"
-
-	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
-	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/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 now,"
-	ewarn "but hopefully this libtiff silliness is now fixed."
-	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 (emerge metamail manually)."
-	echo
-	einfo "Now run faxsetup and (if necessary) faxaddmodem."
-	echo
-}
diff --git a/net-misc/hylafax/hylafax-4.2.1-r2.ebuild b/net-misc/hylafax/hylafax-4.2.1-r2.ebuild
deleted file mode 100644
index 57b8b63d2435..000000000000
--- a/net-misc/hylafax/hylafax-4.2.1-r2.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# 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.2.1-r2.ebuild,v 1.6 2006/01/05 07:51:49 nerdboy Exp $
-
-inherit eutils multilib pam
-
-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="alpha ~amd64 hppa ppc sparc x86"
-
-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? ( virtual/pam )
-	mgetty? ( net-dialup/mgetty )"
-
-RDEPEND="${DEPEND}
-	media-libs/netpbm
-	net-mail/metamail"
-
-export CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-openpam.patch
-	epatch ${FILESDIR}/hylafax-4.2-tmpdir.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
-	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_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 /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"
-	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
-
-	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.2.2.ebuild b/net-misc/hylafax/hylafax-4.2.2.ebuild
deleted file mode 100644
index 670248c446de..000000000000
--- a/net-misc/hylafax/hylafax-4.2.2.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.2.2.ebuild,v 1.2 2005/11/28 00:50:56 nerdboy Exp $
-
-inherit eutils multilib pam
-
-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="~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? ( virtual/pam )
-	mgetty? ( net-dialup/mgetty )"
-
-RDEPEND="${DEPEND}
-	media-libs/netpbm
-	net-mail/metamail"
-
-export CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/hylafax-4.2-tmpdir.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
-	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_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 /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"
-	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
-
-	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.2.3-r1.ebuild b/net-misc/hylafax/hylafax-4.2.3-r1.ebuild
index 5be6f199a105..69b489526d68 100644
--- a/net-misc/hylafax/hylafax-4.2.3-r1.ebuild
+++ b/net-misc/hylafax/hylafax-4.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.2.3-r1.ebuild,v 1.1 2006/01/05 07:51:49 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.2.3-r1.ebuild,v 1.2 2006/01/06 03:02:36 nerdboy Exp $
 
 inherit eutils multilib pam
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.hylafax.org/source/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="hylafax"
-KEYWORDS="~x86 ~sparc ~hppa ~alpha ~amd64 ~ppc"
+KEYWORDS="x86 sparc hppa alpha amd64 ppc"
 
 DEPEND="!faxonly? ( net-dialup/mgetty )
 	>=sys-libs/zlib-1.1.4