Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 490872 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-7 / +6 lines)
Line  Link Here
0
-- samba-4.1.17.ebuild 2015-05-26 20:06:38.164636594 -0400
0
++ samba-4.1.17-r1.ebuild      2015-05-26 20:54:13.077598174 -0400
Lines 21-32 Link Here
21
SLOT="0"
21
SLOT="0"
22
22
23
IUSE="acl addns ads aio avahi client cluster cups dmapi fam gnutls iprint
23
IUSE="acl addns ads aio avahi client cluster cups dmapi fam gnutls iprint
24
ldap quota selinux syslog systemd test winbind"
24
ldap quota selinux syslog +system-heimdal systemd test winbind"
25
25
26
# sys-apps/attr is an automagic dependency (see bug #489748)
26
# sys-apps/attr is an automagic dependency (see bug #489748)
27
# sys-libs/pam is an automagic dependency (see bug #489770)
27
# sys-libs/pam is an automagic dependency (see bug #489770)
28
CDEPEND="${PYTHON_DEPS}
28
CDEPEND="${PYTHON_DEPS}
29
       >=app-crypt/heimdal-1.5[-ssl]
30
       dev-libs/iniparser
29
       dev-libs/iniparser
31
       dev-libs/popt
30
       dev-libs/popt
32
       sys-libs/readline:=
31
       sys-libs/readline:=
Lines 51-56 Link Here
51
       gnutls? ( dev-libs/libgcrypt:0
50
       gnutls? ( dev-libs/libgcrypt:0
52
               >=net-libs/gnutls-1.4.0 )
51
               >=net-libs/gnutls-1.4.0 )
53
       ldap? ( net-nds/openldap )
52
       ldap? ( net-nds/openldap )
53
       system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl] )
54
       systemd? ( sys-apps/systemd:0= )"
54
       systemd? ( sys-apps/systemd:0= )"
55
DEPEND="${CDEPEND}
55
DEPEND="${CDEPEND}
56
       virtual/pkgconfig"
56
       virtual/pkgconfig"
Lines 108-118 Link Here
108
               --disable-rpath-install \
108
               --disable-rpath-install \
109
               --nopyc \
109
               --nopyc \
110
               --nopyo \
110
               --nopyo \
111
               --bundled-libraries=NONE \
111
               --bundled-libraries=$(usex system-heimdal "NONE" "heimdal,!tdb,!talloc,!pytalloc-util,!tevent,!popt,!ldb,!pyldb-util,!zlib") \
112
               --builtin-libraries=NONE \
112
               --builtin-libraries=NONE \
113
               $(use_with addns dnsupdate) \
113
               $(use_with addns dnsupdate) \
114
               $(use_with acl acl-support) \
114
               $(use_with acl acl-support) \
115
               $(use_with ads) \
115
               $(use_with ads) \
116
               $(usex ads "--with-shared-modules=idmap_ad" "") \
116
               $(use_with aio aio-support) \
117
               $(use_with aio aio-support) \
117
               $(use_enable avahi) \
118
               $(use_enable avahi) \
118
               $(use_with cluster cluster-support) \
119
               $(use_with cluster cluster-support) \
Lines 127-135 Link Here
127
               $(use_with quota quotas) \
128
               $(use_with quota quotas) \
128
               $(use_with syslog) \
129
               $(use_with syslog) \
129
               $(use_with systemd) \
130
               $(use_with systemd) \
130
               $(use_with winbind)
131
               $(use_with winbind)"
131
               "
132
       use "ads" && myconf+=" --with-shared-modules=idmap_ad"
133
132
134
       CPPFLAGS="-I/usr/include/et ${CPPFLAGS}" \
133
       CPPFLAGS="-I/usr/include/et ${CPPFLAGS}" \
135
               waf-utils_src_configure ${myconf}
134
               waf-utils_src_configure ${myconf}

Return to bug 490872