| 1 |
scarabeus 10/11/05 15:24:44 |
| 2 |
|
| 3 |
Modified: ChangeLog samba-3.5.6.ebuild |
| 4 |
Log: |
| 5 |
Move use dependant calls from global scope to pkg_setup. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha3/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.452 net-fs/samba/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/ChangeLog?rev=1.452&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/ChangeLog?rev=1.452&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/ChangeLog?r1=1.451&r2=1.452 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v |
| 19 |
retrieving revision 1.451 |
| 20 |
retrieving revision 1.452 |
| 21 |
diff -u -r1.451 -r1.452 |
| 22 |
--- ChangeLog 24 Oct 2010 16:42:17 -0000 1.451 |
| 23 |
+++ ChangeLog 5 Nov 2010 15:24:44 -0000 1.452 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for net-fs/samba |
| 26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.451 2010/10/24 16:42:17 halcy0n Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.452 2010/11/05 15:24:44 scarabeus Exp $ |
| 29 |
+ |
| 30 |
+ 05 Nov 2010; Tomáš Chvátal <scarabeus@g.o> samba-3.5.6.ebuild: |
| 31 |
+ Move use dependant calls from global scope to pkg_setup. |
| 32 |
|
| 33 |
24 Oct 2010; Mark Loeser <halcy0n@g.o> samba-3.4.9.ebuild: |
| 34 |
Stable for ppc64; bug #337295 |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.2 net-fs/samba/samba-3.5.6.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/samba-3.5.6.ebuild?rev=1.2&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/samba-3.5.6.ebuild?rev=1.2&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/samba-3.5.6.ebuild?r1=1.1&r2=1.2 |
| 43 |
|
| 44 |
Index: samba-3.5.6.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.6.ebuild,v |
| 47 |
retrieving revision 1.1 |
| 48 |
retrieving revision 1.2 |
| 49 |
diff -u -r1.1 -r1.2 |
| 50 |
--- samba-3.5.6.ebuild 18 Oct 2010 16:48:59 -0000 1.1 |
| 51 |
+++ samba-3.5.6.ebuild 5 Nov 2010 15:24:44 -0000 1.2 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2010 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.6.ebuild,v 1.1 2010/10/18 16:48:59 vostorga Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.6.ebuild,v 1.2 2010/11/05 15:24:44 scarabeus Exp $ |
| 57 |
|
| 58 |
EAPI="2" |
| 59 |
|
| 60 |
@@ -53,34 +53,6 @@ |
| 61 |
PLUGINEXT=".so" |
| 62 |
SHAREDMODS="" |
| 63 |
|
| 64 |
-if use server ; then |
| 65 |
- SBINPROGS="${SBINPROGS} bin/smbd bin/nmbd" |
| 66 |
- BINPROGS="${BINPROGS} bin/testparm bin/smbstatus bin/smbcontrol bin/pdbedit |
| 67 |
- bin/profiles bin/sharesec bin/eventlogadm" |
| 68 |
- |
| 69 |
- use swat && SBINPROGS="${SBINPROGS} bin/swat" |
| 70 |
- use winbind && SBINPROGS="${SBINPROGS} bin/winbindd" |
| 71 |
- use ads && use winbind && KRBPLUGIN="${KRBPLUGIN} bin/winbind_krb5_locator" |
| 72 |
-fi |
| 73 |
- |
| 74 |
-if use client ; then |
| 75 |
- BINPROGS="${BINPROGS} bin/smbclient bin/net bin/smbget bin/smbtree |
| 76 |
- bin/nmblookup bin/smbpasswd bin/rpcclient bin/smbcacls bin/smbcquotas |
| 77 |
- bin/ntlm_auth" |
| 78 |
- |
| 79 |
- use ads && SBINPROGS="${SBINPROGS} bin/cifs.upcall" |
| 80 |
-fi |
| 81 |
- |
| 82 |
-use cups && BINPROGS="${BINPROGS} bin/smbspool" |
| 83 |
-use ldb && BINPROGS="${BINPROGS} bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename"; |
| 84 |
- |
| 85 |
-if use winbind ; then |
| 86 |
- BINPROGS="${BINPROGS} bin/wbinfo" |
| 87 |
- SHAREDMODS="${SHAREDMODS}idmap_rid" |
| 88 |
- use ads && SHAREDMODS="${SHAREDMODS},idmap_ad" |
| 89 |
- use ldap && SHAREDMODS="${SHAREDMODS},idmap_ldap" |
| 90 |
-fi |
| 91 |
- |
| 92 |
S="${WORKDIR}/${MY_P}/source3" |
| 93 |
|
| 94 |
# TODO: |
| 95 |
@@ -91,6 +63,34 @@ |
| 96 |
CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)" |
| 97 |
|
| 98 |
pkg_setup() { |
| 99 |
+ if use server ; then |
| 100 |
+ SBINPROGS="${SBINPROGS} bin/smbd bin/nmbd" |
| 101 |
+ BINPROGS="${BINPROGS} bin/testparm bin/smbstatus bin/smbcontrol bin/pdbedit |
| 102 |
+ bin/profiles bin/sharesec bin/eventlogadm" |
| 103 |
+ |
| 104 |
+ use swat && SBINPROGS="${SBINPROGS} bin/swat" |
| 105 |
+ use winbind && SBINPROGS="${SBINPROGS} bin/winbindd" |
| 106 |
+ use ads && use winbind && KRBPLUGIN="${KRBPLUGIN} bin/winbind_krb5_locator" |
| 107 |
+ fi |
| 108 |
+ |
| 109 |
+ if use client ; then |
| 110 |
+ BINPROGS="${BINPROGS} bin/smbclient bin/net bin/smbget bin/smbtree |
| 111 |
+ bin/nmblookup bin/smbpasswd bin/rpcclient bin/smbcacls bin/smbcquotas |
| 112 |
+ bin/ntlm_auth" |
| 113 |
+ |
| 114 |
+ use ads && SBINPROGS="${SBINPROGS} bin/cifs.upcall" |
| 115 |
+ fi |
| 116 |
+ |
| 117 |
+ use cups && BINPROGS="${BINPROGS} bin/smbspool" |
| 118 |
+ use ldb && BINPROGS="${BINPROGS} bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename"; |
| 119 |
+ |
| 120 |
+ if use winbind ; then |
| 121 |
+ BINPROGS="${BINPROGS} bin/wbinfo" |
| 122 |
+ SHAREDMODS="${SHAREDMODS}idmap_rid" |
| 123 |
+ use ads && SHAREDMODS="${SHAREDMODS},idmap_ad" |
| 124 |
+ use ldap && SHAREDMODS="${SHAREDMODS},idmap_ldap" |
| 125 |
+ fi |
| 126 |
+ |
| 127 |
if use winbind && |
| 128 |
[[ $(tc-getCC)$ == *gcc* ]] && |
| 129 |
[[ $(gcc-major-version)$(gcc-minor-version) -lt 43 ]] |
Archives