| 1 |
opfer 08/02/04 09:49:07 |
| 2 |
|
| 3 |
Modified: ChangeLog hylafax-4.3.1.ebuild |
| 4 |
Log: |
| 5 |
revamp logic to pkg_setup(); add another built_with_use check for USE=fax on net-dialup/mgetty |
| 6 |
(Portage version: 2.1.3.19) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.79 net-misc/hylafax/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/hylafax/ChangeLog?rev=1.79&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/hylafax/ChangeLog?rev=1.79&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/hylafax/ChangeLog?r1=1.78&r2=1.79 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v |
| 18 |
retrieving revision 1.78 |
| 19 |
retrieving revision 1.79 |
| 20 |
diff -u -r1.78 -r1.79 |
| 21 |
--- ChangeLog 17 Oct 2007 21:19:36 -0000 1.78 |
| 22 |
+++ ChangeLog 4 Feb 2008 09:49:06 -0000 1.79 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for net-misc/hylafax |
| 25 |
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.78 2007/10/17 21:19:36 nerdboy Exp $ |
| 27 |
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.79 2008/02/04 09:49:06 opfer Exp $ |
| 29 |
+ |
| 30 |
+ 04 Feb 2008; Christian Faulhammer <opfer@g.o> hylafax-4.3.1.ebuild: |
| 31 |
+ revamp logic to pkg_setup(); add another built_with_use check for USE=fax on |
| 32 |
+ net-dialup/mgetty |
| 33 |
|
| 34 |
17 Oct 2007; Steve Arnold <nerdboy@g.o> hylafax-4.2.5.ebuild, |
| 35 |
hylafax-4.3.0.ebuild, hylafax-4.3.1.ebuild: |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.8 net-misc/hylafax/hylafax-4.3.1.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/hylafax/hylafax-4.3.1.ebuild?rev=1.8&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/hylafax/hylafax-4.3.1.ebuild?rev=1.8&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/hylafax/hylafax-4.3.1.ebuild?r1=1.7&r2=1.8 |
| 44 |
|
| 45 |
Index: hylafax-4.3.1.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.3.1.ebuild,v |
| 48 |
retrieving revision 1.7 |
| 49 |
retrieving revision 1.8 |
| 50 |
diff -u -r1.7 -r1.8 |
| 51 |
--- hylafax-4.3.1.ebuild 17 Oct 2007 21:19:36 -0000 1.7 |
| 52 |
+++ hylafax-4.3.1.ebuild 4 Feb 2008 09:49:06 -0000 1.8 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
-# Copyright 1999-2007 Gentoo Foundation |
| 55 |
+# Copyright 1999-2008 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.3.1.ebuild,v 1.7 2007/10/17 21:19:36 nerdboy Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.3.1.ebuild,v 1.8 2008/02/04 09:49:06 opfer Exp $ |
| 59 |
|
| 60 |
inherit eutils multilib pam flag-o-matic toolchain-funcs |
| 61 |
|
| 62 |
@@ -29,12 +29,19 @@ |
| 63 |
|
| 64 |
export CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc /usr/lib/fax" |
| 65 |
|
| 66 |
-src_compile() { |
| 67 |
+pkg_setup() { |
| 68 |
if use faxonly; then |
| 69 |
if use mgetty; then |
| 70 |
- eerror "You cannot set both faxonly and mgetty, please remove one." && die "invalid use flags" |
| 71 |
+ eerror "You cannot set both faxonly and mgetty, please remove one." |
| 72 |
+ die "invalid USE flags" |
| 73 |
fi |
| 74 |
fi |
| 75 |
+ |
| 76 |
+ if built_with_use --missing true net-dialup/mgetty fax; then |
| 77 |
+ eerror "net-dialup/mgetty must be installed without USE=fax" |
| 78 |
+ die "merge net-dialup/mgetty without USE=fax" |
| 79 |
+ fi |
| 80 |
+ |
| 81 |
if use jbig; then |
| 82 |
einfo "Checking for tiff compiled with jbig support..." |
| 83 |
if built_with_use media-libs/tiff jbig; then |
| 84 |
@@ -45,7 +52,9 @@ |
| 85 |
die "Tiff not merged with jbig USE flag" |
| 86 |
fi |
| 87 |
fi |
| 88 |
+} |
| 89 |
|
| 90 |
+src_compile() { |
| 91 |
# Hylafax doesn't play nice with gcc-3.4 and SSP (bug #74457) |
| 92 |
# so drop the flags until a better solution comes along |
| 93 |
[ $(gcc-major-version) -eq 3 ] && [ $(gcc-minor-version) -ge 4 ] \ |
| 94 |
@@ -97,7 +106,7 @@ |
| 95 |
fi |
| 96 |
|
| 97 |
use faxonly && my_conf="${my_conf} --with-PATH_GETTY=/bin/false |
| 98 |
- --with-PATH_VGETTY=/bin/false" |
| 99 |
+ --with-PATH_VGETTY=/bin/false" |
| 100 |
#--enable-pam isn't valid |
| 101 |
use pam || my_conf="${my_conf} $(use_enable pam)" |
| 102 |
|
| 103 |
@@ -132,7 +141,7 @@ |
| 104 |
keepdir /var/spool/fax/{status,sendq,log,info,doneq,docq,dev} |
| 105 |
|
| 106 |
dosed "s:hostname:hostname -f:g" \ |
| 107 |
- /var/spool/fax/bin/{faxrcvd,pollrcvd} || die "dosed failed" |
| 108 |
+ /var/spool/fax/bin/{faxrcvd,pollrcvd} || die "dosed failed" |
| 109 |
|
| 110 |
einfo "Adding env.d entry for Hylafax" |
| 111 |
newenvd "${FILESDIR}/99hylafax-4.2" 99hylafax |
| 112 |
|
| 113 |
|
| 114 |
|
| 115 |
-- |
| 116 |
gentoo-commits@l.g.o mailing list |
Archives