1 |
betelgeuse 09/08/28 21:24:01 |
2 |
|
3 |
Modified: ntp-4.2.4_p7.ebuild ChangeLog ntp-4.2.4_p6.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.10 net-misc/ntp/ntp-4.2.4_p7.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/ntp/ntp-4.2.4_p7.ebuild?rev=1.10&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/ntp/ntp-4.2.4_p7.ebuild?rev=1.10&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/ntp/ntp-4.2.4_p7.ebuild?r1=1.9&r2=1.10 |
14 |
|
15 |
Index: ntp-4.2.4_p7.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.4_p7.ebuild,v |
18 |
retrieving revision 1.9 |
19 |
retrieving revision 1.10 |
20 |
diff -u -r1.9 -r1.10 |
21 |
--- ntp-4.2.4_p7.ebuild 3 Jul 2009 19:45:51 -0000 1.9 |
22 |
+++ ntp-4.2.4_p7.ebuild 28 Aug 2009 21:24:01 -0000 1.10 |
23 |
@@ -1,6 +1,8 @@ |
24 |
# Copyright 1999-2009 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.4_p7.ebuild,v 1.9 2009/07/03 19:45:51 vapier Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.4_p7.ebuild,v 1.10 2009/08/28 21:24:01 betelgeuse Exp $ |
28 |
+ |
29 |
+EAPI="2" |
30 |
|
31 |
inherit eutils toolchain-funcs flag-o-matic |
32 |
|
33 |
@@ -18,7 +20,7 @@ |
34 |
DEPEND=">=sys-libs/ncurses-5.2 |
35 |
>=sys-libs/readline-4.1 |
36 |
kernel_linux? ( caps? ( sys-libs/libcap ) ) |
37 |
- zeroconf? ( || ( net-dns/avahi net-misc/mDNSResponder ) ) |
38 |
+ zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) ) |
39 |
!openntpd? ( !net-misc/openntpd ) |
40 |
ssl? ( dev-libs/openssl ) |
41 |
selinux? ( sec-policy/selinux-ntp )" |
42 |
@@ -31,17 +33,9 @@ |
43 |
pkg_setup() { |
44 |
enewgroup ntp 123 |
45 |
enewuser ntp 123 -1 /dev/null ntp |
46 |
- |
47 |
- if use zeroconf && has_version net-dns/avahi && ! built_with_use net-dns/avahi mdnsresponder-compat ; then |
48 |
- eerror "You need to recompile net-dns/avahi with mdnsresponder-compat USE flag" |
49 |
- die "net-dns/avahi is missing required mdnsresponder-compat support" |
50 |
- fi |
51 |
} |
52 |
|
53 |
-src_unpack() { |
54 |
- unpack ${A} |
55 |
- cd "${S}" |
56 |
- |
57 |
+src_prepare() { |
58 |
# Needs to be ported ... |
59 |
#epatch "${FILESDIR}"/4.2.0.20040617-hostname.patch |
60 |
epatch "${FILESDIR}"/${PN}-4.2.4_p5-adjtimex.patch #254030 |
61 |
@@ -49,7 +43,7 @@ |
62 |
append-cppflags -D_GNU_SOURCE #264109 |
63 |
} |
64 |
|
65 |
-src_compile() { |
66 |
+src_configure() { |
67 |
# avoid libmd5/libelf |
68 |
export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no |
69 |
export ac_cv_lib_elf_nlist=no |
70 |
@@ -63,7 +57,6 @@ |
71 |
$(use_enable debug debugging) \ |
72 |
$(use_with ssl crypto) \ |
73 |
|| die |
74 |
- emake || die |
75 |
} |
76 |
|
77 |
src_install() { |
78 |
|
79 |
|
80 |
|
81 |
1.151 net-misc/ntp/ChangeLog |
82 |
|
83 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/ntp/ChangeLog?rev=1.151&view=markup |
84 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/ntp/ChangeLog?rev=1.151&content-type=text/plain |
85 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/ntp/ChangeLog?r1=1.150&r2=1.151 |
86 |
|
87 |
Index: ChangeLog |
88 |
=================================================================== |
89 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v |
90 |
retrieving revision 1.150 |
91 |
retrieving revision 1.151 |
92 |
diff -u -r1.150 -r1.151 |
93 |
--- ChangeLog 3 Jul 2009 19:45:51 -0000 1.150 |
94 |
+++ ChangeLog 28 Aug 2009 21:24:01 -0000 1.151 |
95 |
@@ -1,6 +1,10 @@ |
96 |
# ChangeLog for net-misc/ntp |
97 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
98 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.150 2009/07/03 19:45:51 vapier Exp $ |
99 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.151 2009/08/28 21:24:01 betelgeuse Exp $ |
100 |
+ |
101 |
+ 28 Aug 2009; Petteri Räty <betelgeuse@g.o> ntp-4.2.4_p6.ebuild, |
102 |
+ ntp-4.2.4_p7.ebuild: |
103 |
+ Migrate to EAPI 2 in order to get rid of built_with_use. |
104 |
|
105 |
03 Jul 2009; Mike Frysinger <vapier@g.o> ntp-4.2.4_p7.ebuild: |
106 |
Fix typo in md5.h disabling pointed out by Naohiro Aota #275481. |
107 |
@@ -565,7 +569,7 @@ |
108 |
Closes bug #1882 and allows compilation |
109 |
Update ebuild for lintool compliance |
110 |
|
111 |
-*ntp-4.1.72-r1 (24 March 2002) |
112 |
+*ntp-4.1.72-r1 (24 Mar 2002) |
113 |
|
114 |
24 March 2002; M.Schlemmer <azarah@g.o> : |
115 |
|
116 |
|
117 |
|
118 |
|
119 |
1.10 net-misc/ntp/ntp-4.2.4_p6.ebuild |
120 |
|
121 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/ntp/ntp-4.2.4_p6.ebuild?rev=1.10&view=markup |
122 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/ntp/ntp-4.2.4_p6.ebuild?rev=1.10&content-type=text/plain |
123 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/ntp/ntp-4.2.4_p6.ebuild?r1=1.9&r2=1.10 |
124 |
|
125 |
Index: ntp-4.2.4_p6.ebuild |
126 |
=================================================================== |
127 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.4_p6.ebuild,v |
128 |
retrieving revision 1.9 |
129 |
retrieving revision 1.10 |
130 |
diff -u -r1.9 -r1.10 |
131 |
--- ntp-4.2.4_p6.ebuild 20 Jun 2009 23:12:04 -0000 1.9 |
132 |
+++ ntp-4.2.4_p6.ebuild 28 Aug 2009 21:24:01 -0000 1.10 |
133 |
@@ -1,6 +1,8 @@ |
134 |
# Copyright 1999-2009 Gentoo Foundation |
135 |
# Distributed under the terms of the GNU General Public License v2 |
136 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.4_p6.ebuild,v 1.9 2009/06/20 23:12:04 robbat2 Exp $ |
137 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.4_p6.ebuild,v 1.10 2009/08/28 21:24:01 betelgeuse Exp $ |
138 |
+ |
139 |
+EAPI="2" |
140 |
|
141 |
inherit eutils toolchain-funcs flag-o-matic |
142 |
|
143 |
@@ -18,7 +20,7 @@ |
144 |
DEPEND=">=sys-libs/ncurses-5.2 |
145 |
>=sys-libs/readline-4.1 |
146 |
kernel_linux? ( caps? ( sys-libs/libcap ) ) |
147 |
- zeroconf? ( || ( net-dns/avahi net-misc/mDNSResponder ) ) |
148 |
+ zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) ) |
149 |
!openntpd? ( !net-misc/openntpd ) |
150 |
ssl? ( dev-libs/openssl ) |
151 |
selinux? ( sec-policy/selinux-ntp )" |
152 |
@@ -41,17 +43,9 @@ |
153 |
pkg_setup() { |
154 |
enewgroup ntp 123 |
155 |
enewuser ntp 123 -1 /dev/null ntp |
156 |
- |
157 |
- if use zeroconf && has_version net-dns/avahi && ! built_with_use net-dns/avahi mdnsresponder-compat ; then |
158 |
- eerror "You need to recompile net-dns/avahi with mdnsresponder-compat USE flag" |
159 |
- die "net-dns/avahi is missing required mdnsresponder-compat support" |
160 |
- fi |
161 |
} |
162 |
|
163 |
-src_unpack() { |
164 |
- unpack ${A} |
165 |
- cd "${S}" |
166 |
- |
167 |
+src_prepare() { |
168 |
# Needs to be ported ... |
169 |
#epatch "${FILESDIR}"/4.2.0.20040617-hostname.patch |
170 |
epatch "${FILESDIR}"/${PN}-4.2.4_p5-adjtimex.patch #254030 |
171 |
@@ -65,7 +59,7 @@ |
172 |
configure || die "sed failed" |
173 |
} |
174 |
|
175 |
-src_compile() { |
176 |
+src_configure() { |
177 |
hax_bitkeeper |
178 |
# blah, no real configure options #176333 |
179 |
export ac_cv_header_dns_sd_h=$(use zeroconf && echo yes || echo no) |
180 |
@@ -77,7 +71,6 @@ |
181 |
$(use_enable debug debugging) \ |
182 |
$(use_with ssl crypto) \ |
183 |
|| die |
184 |
- emake || die |
185 |
} |
186 |
|
187 |
src_install() { |