1 |
betelgeuse 09/08/29 18:22:55 |
2 |
|
3 |
Modified: ChangeLog hylafax-4.4.4-r2.ebuild |
4 |
Log: |
5 |
Migrate to EAPI 2 in order to get rid of built_with_use. |
6 |
(Portage version: 2.2_rc38/cvs/Linux i686) |
7 |
|
8 |
Revision Changes Path |
9 |
1.96 net-misc/hylafax/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/hylafax/ChangeLog?rev=1.96&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/hylafax/ChangeLog?rev=1.96&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/hylafax/ChangeLog?r1=1.95&r2=1.96 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v |
18 |
retrieving revision 1.95 |
19 |
retrieving revision 1.96 |
20 |
diff -u -r1.95 -r1.96 |
21 |
--- ChangeLog 27 Jan 2009 22:55:17 -0000 1.95 |
22 |
+++ ChangeLog 29 Aug 2009 18:22:54 -0000 1.96 |
23 |
@@ -1,6 +1,10 @@ |
24 |
# ChangeLog for net-misc/hylafax |
25 |
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.95 2009/01/27 22:55:17 fmccor Exp $ |
27 |
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
28 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/ChangeLog,v 1.96 2009/08/29 18:22:54 betelgeuse Exp $ |
29 |
+ |
30 |
+ 29 Aug 2009; Petteri Räty <betelgeuse@g.o> |
31 |
+ hylafax-4.4.4-r2.ebuild: |
32 |
+ Migrate to EAPI 2 in order to get rid of built_with_use. |
33 |
|
34 |
27 Jan 2009; Ferris McCormick <fmccor@g.o> hylafax-4.4.4-r2.ebuild: |
35 |
Sparc stable, Bug #245190. |
36 |
|
37 |
|
38 |
|
39 |
1.6 net-misc/hylafax/hylafax-4.4.4-r2.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/hylafax/hylafax-4.4.4-r2.ebuild?rev=1.6&view=markup |
42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/hylafax/hylafax-4.4.4-r2.ebuild?rev=1.6&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/hylafax/hylafax-4.4.4-r2.ebuild?r1=1.5&r2=1.6 |
44 |
|
45 |
Index: hylafax-4.4.4-r2.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.4.4-r2.ebuild,v |
48 |
retrieving revision 1.5 |
49 |
retrieving revision 1.6 |
50 |
diff -u -r1.5 -r1.6 |
51 |
--- hylafax-4.4.4-r2.ebuild 27 Jan 2009 22:55:17 -0000 1.5 |
52 |
+++ hylafax-4.4.4-r2.ebuild 29 Aug 2009 18:22:54 -0000 1.6 |
53 |
@@ -1,6 +1,8 @@ |
54 |
# Copyright 1999-2009 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.4.4-r2.ebuild,v 1.5 2009/01/27 22:55:17 fmccor Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/hylafax/hylafax-4.4.4-r2.ebuild,v 1.6 2009/08/29 18:22:54 betelgeuse Exp $ |
58 |
+ |
59 |
+EAPI="2" |
60 |
|
61 |
inherit eutils multilib pam toolchain-funcs |
62 |
|
63 |
@@ -16,12 +18,12 @@ |
64 |
|
65 |
DEPEND=">=sys-libs/zlib-1.1.4 |
66 |
virtual/ghostscript |
67 |
- >=media-libs/tiff-3.8.2 |
68 |
+ >=media-libs/tiff-3.8.2[jbig?] |
69 |
media-libs/jpeg |
70 |
jbig? ( media-libs/jbigkit ) |
71 |
sys-apps/gawk |
72 |
pam? ( virtual/pam ) |
73 |
- mgetty? ( net-dialup/mgetty )" |
74 |
+ mgetty? ( net-dialup/mgetty[-fax] )" |
75 |
|
76 |
RDEPEND="${DEPEND} |
77 |
net-mail/metamail |
78 |
@@ -29,29 +31,7 @@ |
79 |
|
80 |
export CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc /usr/lib/fax" |
81 |
|
82 |
-pkg_setup() { |
83 |
- if use mgetty; then |
84 |
- if built_with_use net-dialup/mgetty fax; then |
85 |
- eerror "net-dialup/mgetty must be installed without USE=fax" |
86 |
- die "merge net-dialup/mgetty without USE=fax" |
87 |
- fi |
88 |
- fi |
89 |
- |
90 |
- if use jbig; then |
91 |
- einfo "Checking for tiff compiled with jbig support..." |
92 |
- if built_with_use media-libs/tiff jbig; then |
93 |
- einfo "Found jbig support; continuing..." |
94 |
- else |
95 |
- ewarn "Tiff (media-libs/tiff) must be compiled with jbig support." |
96 |
- einfo "Please re-emerge tiff with the jbig USE flag or disable it." |
97 |
- die "Tiff not merged with jbig USE flag" |
98 |
- fi |
99 |
- fi |
100 |
-} |
101 |
- |
102 |
-src_unpack() { |
103 |
- unpack ${A} |
104 |
- cd "${S}" |
105 |
+src_prepare() { |
106 |
# force it not to strip binaries |
107 |
for dir in etc util faxalter faxcover faxd faxmail faxrm faxstat \ |
108 |
hfaxd sendfax sendpage ; do |
109 |
@@ -60,7 +40,7 @@ |
110 |
done |
111 |
} |
112 |
|
113 |
-src_compile() { |
114 |
+src_configure() { |
115 |
# gcc standard C++ header changes |
116 |
if [ $(gcc-major-version) -eq 4 ] && [ $(gcc-minor-version) -ge 3 ] ; then |
117 |
sed -i -e 's:"new.h":<new>:g' configure util/Types.h || die "sed failed" |
118 |
@@ -119,7 +99,9 @@ |
119 |
|
120 |
# eval required for quoting in ${my_conf} to work properly, better way? |
121 |
eval ./configure --nointeractive ${my_conf} || die "./configure failed" |
122 |
+} |
123 |
|
124 |
+src_compile() { |
125 |
emake -j1 || die "emake failed" |
126 |
} |
127 |
|
128 |
@@ -130,7 +112,7 @@ |
129 |
fperms 0600 /var/spool/fax |
130 |
dodir /usr/share/doc/${P}/html |
131 |
|
132 |
- make \ |
133 |
+ emake \ |
134 |
BIN=${D}/usr/bin \ |
135 |
SBIN=${D}/usr/sbin \ |
136 |
LIBDIR=${D}/usr/$(get_libdir) \ |