fix for bug 196147 in all versions

Package-Manager: portage-2.1.3.12

5 files changed, 49 insertions, 36 deletions

diff --git a/net-misc/hylafax/ChangeLog b/net-misc/hylafax/ChangeLog
index 218b6c13205d..a67e520dd84a 100644
--- a/net-misc/hylafax/ChangeLog
+++ b/net-misc/hylafax/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/hylafax
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.77 2007/08/24 03:42:26 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.78 2007/10/17 21:19:36 nerdboy Exp $
+
+  17 Oct 2007; Steve Arnold <nerdboy@gentoo.org> hylafax-4.2.5.ebuild,
+  hylafax-4.3.0.ebuild, hylafax-4.3.1.ebuild:
+  fix for bug 196147 in all versions
 
   24 Aug 2007; Steve Arnold <nerdboy@gentoo.org>
   +files/gentoo-gcc-version.patch, +files/hylafax.cron,
diff --git a/net-misc/hylafax/Manifest b/net-misc/hylafax/Manifest
index 478e48dc54d4..d08f0833e074 100644
--- a/net-misc/hylafax/Manifest
+++ b/net-misc/hylafax/Manifest
@@ -29,22 +29,22 @@ SHA256 4910721097093285757ea09cc9bd31cd35ea4ec58ef58a041c50a25f8cfc7a67 files/hy
 DIST hylafax-4.2.5.tar.gz 1450958 RMD160 aef5e7a8ff32bafa43b5efc431b9fd8c334ddb3a SHA1 b3bfd492dcb85e8aa1ddff9e6dcec3c31e00fccc SHA256 0a5f7c52ee377fed60281d97681f50ae23062348e139f7fcc215957df9e69eb7
 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
-EBUILD hylafax-4.2.5.ebuild 4068 RMD160 7450dc736a394e16abb78cf0be653ec4cd9bcfff SHA1 a128dfc942ba4f100bf74bf3ac0638a20eb4f209 SHA256 37ea5762a0cb3340cbaf57091e55cedf09626b5eafe3bcb1d8c8854f661b1ffb
-MD5 77094759e29b2f42e9e341964ebffcaa hylafax-4.2.5.ebuild 4068
-RMD160 7450dc736a394e16abb78cf0be653ec4cd9bcfff hylafax-4.2.5.ebuild 4068
-SHA256 37ea5762a0cb3340cbaf57091e55cedf09626b5eafe3bcb1d8c8854f661b1ffb hylafax-4.2.5.ebuild 4068
-EBUILD hylafax-4.3.0.ebuild 4507 RMD160 eaad2e063eddf7c026c6dbd2ad3a6657125f635b SHA1 97aa122e00cd0a0abdf28c237f7d310a6b3ebb15 SHA256 16828baea041494185c910fce8ecbd69ee758d666e85f8ec09af046d5a610f4e
-MD5 22dd0c1acf98e61d216e38abbf62a007 hylafax-4.3.0.ebuild 4507
-RMD160 eaad2e063eddf7c026c6dbd2ad3a6657125f635b hylafax-4.3.0.ebuild 4507
-SHA256 16828baea041494185c910fce8ecbd69ee758d666e85f8ec09af046d5a610f4e hylafax-4.3.0.ebuild 4507
-EBUILD hylafax-4.3.1.ebuild 4890 RMD160 37795882725107c7ddb64b3fe33c0799c23c6b38 SHA1 0e695330bb9c85e9a5d02fa8b61079589579497d SHA256 e1d066aace4e559f00c1ce7285a439ef949eb96608f4b4bd767c496e960eefd0
-MD5 4d77c9678421f68a81e1a5dbbe3b470d hylafax-4.3.1.ebuild 4890
-RMD160 37795882725107c7ddb64b3fe33c0799c23c6b38 hylafax-4.3.1.ebuild 4890
-SHA256 e1d066aace4e559f00c1ce7285a439ef949eb96608f4b4bd767c496e960eefd0 hylafax-4.3.1.ebuild 4890
-MISC ChangeLog 16423 RMD160 1ead66278cda5c6bc146f6292521986a75c9440e SHA1 1f5e748957b1efd07440f3b793e314f5f7017095 SHA256 c3cd28c2fd703a400f24fd659ae53f2f94b1cda71d323771b53499b259d43680
-MD5 45005d0571c359766fa56d2d14495a65 ChangeLog 16423
-RMD160 1ead66278cda5c6bc146f6292521986a75c9440e ChangeLog 16423
-SHA256 c3cd28c2fd703a400f24fd659ae53f2f94b1cda71d323771b53499b259d43680 ChangeLog 16423
+EBUILD hylafax-4.2.5.ebuild 4339 RMD160 06384897be4776b452d7d7139bdda097f976a76f SHA1 fcc0e92e493d110cc783603fc60b092d226241f9 SHA256 fec942f14ac11b35cddffd6f53adad2ee49269f4e9567449f820ba51e1444417
+MD5 eb59c77ad94a9eb6c538145a68db1f09 hylafax-4.2.5.ebuild 4339
+RMD160 06384897be4776b452d7d7139bdda097f976a76f hylafax-4.2.5.ebuild 4339
+SHA256 fec942f14ac11b35cddffd6f53adad2ee49269f4e9567449f820ba51e1444417 hylafax-4.2.5.ebuild 4339
+EBUILD hylafax-4.3.0.ebuild 4551 RMD160 a0450e170eae096e28270001586d0dfb7541fca3 SHA1 9cb0032df385a65fe6ee09d9d262f92845574a70 SHA256 7a3c2efb5a2ed011abcfcd9674735f15d525203dd5909997e42eca53a398934c
+MD5 431d28142675cc8ad05391ce2a8f0722 hylafax-4.3.0.ebuild 4551
+RMD160 a0450e170eae096e28270001586d0dfb7541fca3 hylafax-4.3.0.ebuild 4551
+SHA256 7a3c2efb5a2ed011abcfcd9674735f15d525203dd5909997e42eca53a398934c hylafax-4.3.0.ebuild 4551
+EBUILD hylafax-4.3.1.ebuild 4934 RMD160 72d42f85685df824f766e754783d73f33c883e7c SHA1 72aaa0e700c66d506309d6246bab4ffc10875025 SHA256 bbc95d62d5d9d0dcc3895e2da42fa65db6903007c89016a0dc15a60db0efe43a
+MD5 f8d82871459f36e2d9624f574a502f97 hylafax-4.3.1.ebuild 4934
+RMD160 72d42f85685df824f766e754783d73f33c883e7c hylafax-4.3.1.ebuild 4934
+SHA256 bbc95d62d5d9d0dcc3895e2da42fa65db6903007c89016a0dc15a60db0efe43a hylafax-4.3.1.ebuild 4934
+MISC ChangeLog 16578 RMD160 4b0979073f83a5224a6d7c84c7f51d2e11413a7b SHA1 3f25e5c5cb661b6aa9c41a860348cd788107f781 SHA256 3233eb76aa86222f63cd8fb43bb65faff12f2aa71e94490ea1e56f050092a034
+MD5 ddb4c5a24b78807e435c9e57ca668827 ChangeLog 16578
+RMD160 4b0979073f83a5224a6d7c84c7f51d2e11413a7b ChangeLog 16578
+SHA256 3233eb76aa86222f63cd8fb43bb65faff12f2aa71e94490ea1e56f050092a034 ChangeLog 16578
 MISC metadata.xml 680 RMD160 f534f59f38ba9db8b9ec24d72164ef99e90d0e55 SHA1 927f92ce08fdd3c4018e0d231afa81265c4d2525 SHA256 2b5b94cc0d6e9c9cfcc5b8908abb649de267dbc9f4fc2e949a246f79745cf5fd
 MD5 4cb9907739cd9b93d9563d64b0919ee1 metadata.xml 680
 RMD160 f534f59f38ba9db8b9ec24d72164ef99e90d0e55 metadata.xml 680
diff --git a/net-misc/hylafax/hylafax-4.2.5.ebuild b/net-misc/hylafax/hylafax-4.2.5.ebuild
index ec04e3fe1a0d..4863848c114e 100644
--- a/net-misc/hylafax/hylafax-4.2.5.ebuild
+++ b/net-misc/hylafax/hylafax-4.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.9 2007/04/28 22:30:06 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.2.5.ebuild,v 1.10 2007/10/17 21:19:36 nerdboy Exp $
 
 inherit eutils multilib pam flag-o-matic toolchain-funcs
 
@@ -33,15 +33,21 @@ export CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc"
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
-	epatch ${FILESDIR}/${P}-tiff_version.patch
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-tiff_version.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"
+	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)
@@ -59,7 +65,7 @@ src_compile() {
 		--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-DIR_CGI="${WORKDIR}"
 		--with-HTML=yes
 		--with-PATH_DPSRIP=/var/spool/fax/bin/ps2fax
 		--with-PATH_IMPRIP=\"\"
@@ -70,6 +76,7 @@ src_compile() {
 
 	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
@@ -118,10 +125,10 @@ src_install() {
 	keepdir /var/spool/fax/{status,sendq,log,info,doneq,docq,dev}
 
 	einfo "Adding env.d entry for Hylafax"
-	newenvd ${FILESDIR}/99hylafax-4.2 99hylafax
+	newenvd "${FILESDIR}/99hylafax-4.2" 99hylafax
 
 	einfo "Adding init.d entry for Hylafax"
-	newinitd ${FILESDIR}/hylafax-4.2 hylafax
+	newinitd "${FILESDIR}/hylafax-4.2" hylafax
 
 	pamd_mimic_system hylafax auth account session
 
diff --git a/net-misc/hylafax/hylafax-4.3.0.ebuild b/net-misc/hylafax/hylafax-4.3.0.ebuild
index 39c02e7091d7..4b883dec764e 100644
--- a/net-misc/hylafax/hylafax-4.3.0.ebuild
+++ b/net-misc/hylafax/hylafax-4.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.10 2007/08/24 03:42:26 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.3.0.ebuild,v 1.11 2007/10/17 21:19:36 nerdboy Exp $
 
 inherit eutils multilib pam flag-o-matic toolchain-funcs
 
@@ -51,7 +51,7 @@ src_compile() {
 	[ $(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"
+	epatch "${FILESDIR}/gentoo-gcc-version.patch" || die "epatch failed"
 
 	local my_conf="
 		--with-DIR_BIN=/usr/bin
@@ -63,7 +63,7 @@ src_compile() {
 		--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-DIR_CGI="${WORKDIR}"
 		--with-PATH_DPSRIP=/var/spool/fax/bin/ps2fax
 		--with-PATH_IMPRIP=\"\"
 		--with-SYSVINIT=no
@@ -80,6 +80,7 @@ src_compile() {
 
 	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
@@ -129,10 +130,10 @@ src_install() {
 	keepdir /var/spool/fax/{status,sendq,log,info,doneq,docq,dev}
 
 	einfo "Adding env.d entry for Hylafax"
-	newenvd ${FILESDIR}/99hylafax-4.2 99hylafax
+	newenvd "${FILESDIR}/99hylafax-4.2" 99hylafax
 
 	einfo "Adding init.d entry for Hylafax"
-	newinitd ${FILESDIR}/hylafax-4.2 hylafax
+	newinitd "${FILESDIR}/hylafax-4.2" hylafax
 
 	use pam && pamd_mimic_system hylafax auth account session
 
diff --git a/net-misc/hylafax/hylafax-4.3.1.ebuild b/net-misc/hylafax/hylafax-4.3.1.ebuild
index fae965976964..d08a1bf1e0ad 100644
--- a/net-misc/hylafax/hylafax-4.3.1.ebuild
+++ b/net-misc/hylafax/hylafax-4.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.6 2007/08/24 03:42:26 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.3.1.ebuild,v 1.7 2007/10/17 21:19:36 nerdboy Exp $
 
 inherit eutils multilib pam flag-o-matic toolchain-funcs
 
@@ -51,7 +51,7 @@ src_compile() {
 	[ $(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"
+	epatch "${FILESDIR}/gentoo-gcc-version.patch" || die "epatch failed"
 
 	local my_conf="
 		--with-DIR_BIN=/usr/bin
@@ -63,7 +63,7 @@ src_compile() {
 		--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-DIR_CGI="${WORKDIR}"
 		--with-PATH_DPSRIP=/var/spool/fax/bin/ps2fax
 		--with-PATH_IMPRIP=\"\"
 		--with-SYSVINIT=no
@@ -80,6 +80,7 @@ src_compile() {
 
 	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
@@ -134,10 +135,10 @@ src_install() {
 	    /var/spool/fax/bin/{faxrcvd,pollrcvd} || die "dosed failed"
 
 	einfo "Adding env.d entry for Hylafax"
-	newenvd ${FILESDIR}/99hylafax-4.2 99hylafax
+	newenvd "${FILESDIR}/99hylafax-4.2" 99hylafax
 
 	einfo "Adding init.d entry for Hylafax"
-	newinitd ${FILESDIR}/hylafax-4.2 hylafax
+	newinitd "${FILESDIR}/hylafax-4.2" hylafax
 
 	use pam && pamd_mimic_system hylafax auth account session