added charset patch for Bug #104022 to 4.2.0 only

(Portage version: 2.0.51.22-r2)

6 files changed, 26 insertions, 128 deletions

diff --git a/net-misc/hylafax/ChangeLog b/net-misc/hylafax/ChangeLog
index 00e2f60c1e3b..d0d40cefea2e 100644
--- a/net-misc/hylafax/ChangeLog
+++ b/net-misc/hylafax/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/hylafax
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.50 2005/08/12 07:39:45 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.51 2005/09/10 08:35:06 nerdboy Exp $
+
+  10 Sep 2005; Steve Arnold <nerdboy@gentoo.org>
+  +files/hylafax-4.2.0-faxmail-charset.patch, -hylafax-4.2.0-r1.ebuild,
+  hylafax-4.2.0-r2.ebuild:
+  Added charset patch for Bug #104022 to 4.2.0 only (needs upstream fix).
+  Thanks to Roman Valls <brainstorm@nopcode.org> for the patch.
 
   12 Aug 2005; Steve Arnold <nerdboy@gentoo.org> ChangeLog:
   Added fix for bug #101383 (incorrect perms on spool dir)
diff --git a/net-misc/hylafax/Manifest b/net-misc/hylafax/Manifest
index 493c626f0e39..6594c58f5242 100644
--- a/net-misc/hylafax/Manifest
+++ b/net-misc/hylafax/Manifest
@@ -1,10 +1,9 @@
-MD5 8a62abc78693ba7bf9b43acca9491877 ChangeLog 10099
-MD5 c63bc34d1cb925c718115a6a74a00b1f hylafax-4.2.0-r2.ebuild 3412
+MD5 da7d7429e4d5b5dabb7f7072b134d698 ChangeLog 10386
+MD5 6cc9e9a694382a34e0011dbac955d47e hylafax-4.2.0-r2.ebuild 3460
 MD5 0cbf4d2990acb2f1d427c20ee46cc64e hylafax-4.2.1.ebuild 3213
 MD5 f965e3c041f4e5ceb970a761df2009a8 hylafax-4.2.1-r1.ebuild 3793
 MD5 d82acf1bcf0f7f9e181d6a2821292f2e metadata.xml 435
 MD5 d83f32c1c30e2a8804a0f5524ed411d2 hylafax-4.1.8-r4.ebuild 3189
-MD5 88de3c2271c4c8005e20f7f6f7c74591 hylafax-4.2.0-r1.ebuild 3416
 MD5 46bbae3c77d5651a20e606eb6228c159 files/99hylafax 62
 MD5 eab749cee07de1984c9756e6eb886df0 files/configure-gcc-3.4.patch 696
 MD5 61b6d16148a84723c2996b519a57d498 files/digest-hylafax-4.2.0-r2 66
@@ -19,6 +18,6 @@ MD5 363ea0f56887928eb876bbe25223de85 files/hylafax-hostvuln.patch 2098
 MD5 e1c4b78af20d5e332db1aef29080caf7 files/digest-hylafax-4.2.1 66
 MD5 cfcafeadd916b8a9103b9b9110887916 files/hylafax-4.2.0-faxcron_uid.patch 527
 MD5 6fd09a3cd0a1657591fc6c5c076cd462 files/hylafax-4.2.0-tiff_version.patch 1011
-MD5 61b6d16148a84723c2996b519a57d498 files/digest-hylafax-4.2.0-r1 66
 MD5 e1c4b78af20d5e332db1aef29080caf7 files/digest-hylafax-4.2.1-r1 66
 MD5 0bf655709c9fc6c62ffc7d2a63340c90 files/hylafax-4.2.1-openpam.patch 1571
+MD5 9cf5cada0895231b3d403f8791431102 files/hylafax-4.2.0-faxmail-charset.patch 473
diff --git a/net-misc/hylafax/files/digest-hylafax-4.2.0-r1 b/net-misc/hylafax/files/digest-hylafax-4.2.0-r1
deleted file mode 100644
index 9de57e0107eb..000000000000
--- a/net-misc/hylafax/files/digest-hylafax-4.2.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 463726ed21cfdac730c5d6915e0840cf hylafax-4.2.0.tar.gz 1351870
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
new file mode 100644
index 000000000000..e2a3cad49864
--- /dev/null
+++ b/net-misc/hylafax/files/hylafax-4.2.0-faxmail-charset.patch
@@ -0,0 +1,14 @@
+--- 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/hylafax-4.2.0-r1.ebuild b/net-misc/hylafax/hylafax-4.2.0-r1.ebuild
deleted file mode 100644
index 29dd4062494d..000000000000
--- a/net-misc/hylafax/hylafax-4.2.0-r1.ebuild
+++ /dev/null
@@ -1,121 +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-r1.ebuild,v 1.7 2005/08/12 07:39:45 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}-faxcron_uid.patch
-	epatch ${FILESDIR}/${P}-tiff_version.patch
-	epatch ${FILESDIR}/configure-gcc-3.4.patch
-	epatch ${FILESDIR}/hylafax-4.2.0-fPIC.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.0-r2.ebuild b/net-misc/hylafax/hylafax-4.2.0-r2.ebuild
index 9825490dc070..299ac77f12fc 100644
--- a/net-misc/hylafax/hylafax-4.2.0-r2.ebuild
+++ b/net-misc/hylafax/hylafax-4.2.0-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.2 2005/08/12 07:39:45 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.2.0-r2.ebuild,v 1.3 2005/09/10 08:35:06 nerdboy Exp $
 
 inherit eutils
 
@@ -34,6 +34,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-tiff_version.patch
 	epatch ${FILESDIR}/configure-gcc-3.4.patch
 	epatch ${FILESDIR}/hylafax-hostvuln.patch
+	epatch ${FILESDIR}/${P}-faxmail-charset.patch
 }
 
 src_compile() {