1 |
scarabeus 11/05/03 15:26:30 |
2 |
|
3 |
Modified: samba-3.5.8-r1.ebuild ChangeLog |
4 |
Log: |
5 |
Migrate to eapi4 |
6 |
|
7 |
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 net-fs/samba/samba-3.5.8-r1.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/samba-3.5.8-r1.ebuild?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/samba-3.5.8-r1.ebuild?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/samba-3.5.8-r1.ebuild?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: samba-3.5.8-r1.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.8-r1.ebuild,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- samba-3.5.8-r1.ebuild 23 Mar 2011 11:04:30 -0000 1.1 |
23 |
+++ samba-3.5.8-r1.ebuild 3 May 2011 15:26:29 -0000 1.2 |
24 |
@@ -1,10 +1,10 @@ |
25 |
# Copyright 1999-2011 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.8-r1.ebuild,v 1.1 2011/03/23 11:04:30 dagger Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.8-r1.ebuild,v 1.2 2011/05/03 15:26:29 scarabeus Exp $ |
29 |
|
30 |
-EAPI="2" |
31 |
+EAPI=4 |
32 |
|
33 |
-inherit pam confutils versionator multilib eutils |
34 |
+inherit pam versionator multilib eutils |
35 |
|
36 |
MY_PV=${PV/_/} |
37 |
MY_P="${PN}-${MY_PV}" |
38 |
@@ -65,6 +65,11 @@ |
39 |
|
40 |
CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" |
41 |
|
42 |
+REQUIRED_USE=" |
43 |
+ ads? ( ldap ) |
44 |
+ swat? ( server ) |
45 |
+" |
46 |
+ |
47 |
pkg_setup() { |
48 |
if use server ; then |
49 |
SBINPROGS="${SBINPROGS} bin/smbd bin/nmbd" |
50 |
@@ -104,9 +109,6 @@ |
51 |
eerror "Please use at least the latest stable gcc version." |
52 |
die "Using sys-devel/gcc < 4.3 with winbind use flag." |
53 |
fi |
54 |
- |
55 |
- confutils_use_depend_all ads ldap |
56 |
- confutils_use_depend_all swat server |
57 |
} |
58 |
|
59 |
src_prepare() { |
60 |
@@ -125,16 +127,16 @@ |
61 |
local myconf |
62 |
|
63 |
# Filter out -fPIE |
64 |
- [[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie" |
65 |
+ [[ ${CHOST} == *-*bsd* ]] && myconf+=" --disable-pie" |
66 |
|
67 |
# Upstream refuses to make this configurable |
68 |
use caps && export ac_cv_header_sys_capability_h=yes || export ac_cv_header_sys_capability_h=no |
69 |
|
70 |
# use_with doesn't accept 2 USE-flags |
71 |
if use client && use ads ; then |
72 |
- myconf="${myconf} --with-cifsupcall" |
73 |
+ myconf+=" --with-cifsupcall" |
74 |
else |
75 |
- myconf="${myconf} --without-cifsupcall" |
76 |
+ myconf+=" --without-cifsupcall" |
77 |
fi |
78 |
|
79 |
# Notes: |
80 |
@@ -201,54 +203,54 @@ |
81 |
# compile libs |
82 |
if use addns ; then |
83 |
einfo "make addns library" |
84 |
- emake libaddns || die "emake libaddns failed" |
85 |
+ emake libaddns |
86 |
fi |
87 |
if use netapi ; then |
88 |
einfo "make netapi library" |
89 |
- emake libnetapi || die "emake libnetapi failed" |
90 |
+ emake libnetapi |
91 |
fi |
92 |
if use smbclient ; then |
93 |
einfo "make smbclient library" |
94 |
- emake libsmbclient || die "emake libsmbclient failed" |
95 |
+ emake libsmbclient |
96 |
fi |
97 |
if use smbsharemodes ; then |
98 |
einfo "make smbsharemodes library" |
99 |
- emake libsmbsharemodes || die "emake libsmbsharemodes failed" |
100 |
+ emake libsmbsharemodes |
101 |
fi |
102 |
|
103 |
# compile modules |
104 |
- emake modules || die "building modules failed" |
105 |
+ emake modules |
106 |
|
107 |
# compile pam moudles |
108 |
if use pam ; then |
109 |
einfo "make pam modules" |
110 |
- emake pam_modules || die "emake pam_modules failed"; |
111 |
+ emake pam_modules |
112 |
fi |
113 |
|
114 |
# compile winbind nss modules |
115 |
if use winbind ; then |
116 |
einfo "make nss modules" |
117 |
- emake nss_modules || die "emake nss_modules failed"; |
118 |
+ emake nss_modules |
119 |
fi |
120 |
|
121 |
# compile utilities |
122 |
if [ -n "${BINPROGS}" ] ; then |
123 |
einfo "make binprogs" |
124 |
- emake ${BINPROGS} || die "emake binprogs failed"; |
125 |
+ emake ${BINPROGS} |
126 |
fi |
127 |
if [ -n "${SBINPROGS}" ] ; then |
128 |
einfo "make sbinprogs" |
129 |
- emake ${SBINPROGS} || die "emake sbinprogs failed"; |
130 |
+ emake ${SBINPROGS} |
131 |
fi |
132 |
|
133 |
if [ -n "${KRBPLUGIN}" ] ; then |
134 |
einfo "make krbplugin" |
135 |
- emake ${KRBPLUGIN}${PLUGINEXT} || die "emake krbplugin failed"; |
136 |
+ emake ${KRBPLUGIN}${PLUGINEXT} |
137 |
fi |
138 |
|
139 |
if use client ; then |
140 |
einfo "make {,u}mount.cifs" |
141 |
- emake bin/{,u}mount.cifs || die "emake {,u}mount.cifs failed" |
142 |
+ emake bin/{,u}mount.cifs |
143 |
fi |
144 |
} |
145 |
|
146 |
@@ -256,27 +258,27 @@ |
147 |
# install libs |
148 |
if use addns ; then |
149 |
einfo "install addns library" |
150 |
- emake installlibaddns DESTDIR="${D}" || die "emake install libaddns failed" |
151 |
+ emake installlibaddns DESTDIR="${D}" |
152 |
fi |
153 |
if use netapi ; then |
154 |
einfo "install netapi library" |
155 |
- emake installlibnetapi DESTDIR="${D}" || die "emake install libnetapi failed" |
156 |
+ emake installlibnetapi DESTDIR="${D}" |
157 |
fi |
158 |
if use smbclient ; then |
159 |
einfo "install smbclient library" |
160 |
- emake installlibsmbclient DESTDIR="${D}" || die "emake install libsmbclient failed" |
161 |
+ emake installlibsmbclient DESTDIR="${D}" |
162 |
fi |
163 |
if use smbsharemodes ; then |
164 |
einfo "install smbsharemodes library" |
165 |
- emake installlibsmbsharemodes DESTDIR="${D}" || die "emake install libsmbsharemodes failed" |
166 |
+ emake installlibsmbsharemodes DESTDIR="${D}" |
167 |
fi |
168 |
|
169 |
# install modules |
170 |
- emake installmodules DESTDIR="${D}" || die "installing modules failed" |
171 |
+ emake installmodules DESTDIR="${D}" |
172 |
|
173 |
if use pam ; then |
174 |
einfo "install pam modules" |
175 |
- emake installpammodules DESTDIR="${D}" || die "emake installpammodules failed" |
176 |
+ emake installpammodules DESTDIR="${D}" |
177 |
|
178 |
if use winbind ; then |
179 |
newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind |
180 |
@@ -290,7 +292,7 @@ |
181 |
# Nsswitch extensions. Make link for wins and winbind resolvers |
182 |
if use winbind ; then |
183 |
einfo "install libwbclient" |
184 |
- emake installlibwbclient DESTDIR="${D}" || die "emake installlibwbclient failed" |
185 |
+ emake installlibwbclient DESTDIR="${D}" |
186 |
dolib.so ../nsswitch/libnss_wins.so |
187 |
dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2 |
188 |
dolib.so ../nsswitch/libnss_winbind.so |
189 |
@@ -310,29 +312,27 @@ |
190 |
# install binaries |
191 |
insinto /usr |
192 |
for prog in ${SBINPROGS} ; do |
193 |
- dosbin ${prog} || die "installing ${prog} failed" |
194 |
- doman ../docs/manpages/${prog/bin\/}* || die "doman failed" |
195 |
+ dosbin ${prog} |
196 |
+ doman ../docs/manpages/${prog/bin\/}* |
197 |
done |
198 |
|
199 |
for prog in ${BINPROGS} ; do |
200 |
- dobin ${prog} || die "installing ${prog} failed" |
201 |
- doman ../docs/manpages/${prog/bin\/}* || die "doman failed" |
202 |
+ dobin ${prog} |
203 |
+ doman ../docs/manpages/${prog/bin\/}* |
204 |
done |
205 |
|
206 |
# install krbplugin |
207 |
if [ -n "${KRBPLUGIN}" ] ; then |
208 |
if has_version app-crypt/mit-krb5 ; then |
209 |
insinto /usr/$(get_libdir)/krb5/plugins/libkrb5 |
210 |
- doins ${KRBPLUGIN}${PLUGINEXT} || die "installing |
211 |
- ${KRBPLUGIN}${PLUGINEXT} failed" |
212 |
+ doins ${KRBPLUGIN}${PLUGINEXT} |
213 |
elif has_version app-crypt/heimdal ; then |
214 |
insinto /usr/$(get_libdir)/plugin/krb5 |
215 |
- doins ${KRBPLUGIN}${PLUGINEXT} || die "installing |
216 |
- ${KRBPLUGIN}${PLUGINEXT} failed" |
217 |
+ doins ${KRBPLUGIN}${PLUGINEXT} |
218 |
fi |
219 |
insinto /usr |
220 |
for prog in ${KRBPLUGIN} ; do |
221 |
- doman ../docs/manpages/${prog/bin\/}* || die "doman failed" |
222 |
+ doman ../docs/manpages/${prog/bin\/}* |
223 |
done |
224 |
fi |
225 |
|
226 |
@@ -366,8 +366,7 @@ |
227 |
if use swat ; then |
228 |
insinto /etc/xinetd.d |
229 |
newins "${CONFDIR}/swat.xinetd" swat |
230 |
- script/installswat.sh "${D}" "${ROOT}/usr/share/doc/${PF}/swat" "${S}" \ |
231 |
- || die "installing swat failed" |
232 |
+ script/installswat.sh "${D}" "${ROOT}/usr/share/doc/${PF}/swat" "${S}" |
233 |
fi |
234 |
|
235 |
dodoc ../MAINTAINERS ../README* ../Roadmap ../WHATSNEW.txt ../docs/THANKS |
236 |
@@ -376,8 +375,8 @@ |
237 |
# install client files ({u,}mount.cifs into /) |
238 |
if use client ; then |
239 |
into / |
240 |
- dosbin bin/{u,}mount.cifs || die "u/mount.cifs not around" |
241 |
- doman ../docs/manpages/{u,}mount.cifs.8 || die "can't create man pages" |
242 |
+ dosbin bin/{u,}mount.cifs |
243 |
+ doman ../docs/manpages/{u,}mount.cifs.8 |
244 |
fi |
245 |
|
246 |
# install the spooler to cups |
247 |
|
248 |
|
249 |
|
250 |
1.468 net-fs/samba/ChangeLog |
251 |
|
252 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/ChangeLog?rev=1.468&view=markup |
253 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/ChangeLog?rev=1.468&content-type=text/plain |
254 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/ChangeLog?r1=1.467&r2=1.468 |
255 |
|
256 |
Index: ChangeLog |
257 |
=================================================================== |
258 |
RCS file: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v |
259 |
retrieving revision 1.467 |
260 |
retrieving revision 1.468 |
261 |
diff -u -r1.467 -r1.468 |
262 |
--- ChangeLog 23 Mar 2011 11:04:30 -0000 1.467 |
263 |
+++ ChangeLog 3 May 2011 15:26:29 -0000 1.468 |
264 |
@@ -1,6 +1,9 @@ |
265 |
# ChangeLog for net-fs/samba |
266 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
267 |
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.467 2011/03/23 11:04:30 dagger Exp $ |
268 |
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.468 2011/05/03 15:26:29 scarabeus Exp $ |
269 |
+ |
270 |
+ 03 May 2011; Tomáš Chvátal <scarabeus@g.o> samba-3.5.8-r1.ebuild: |
271 |
+ Migrate to eapi4 |
272 |
|
273 |
*samba-3.5.8-r1 (23 Mar 2011) |