Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 504694
Collapse All | Expand All

(-)file_not_specified_in_diff (-7 / +8 lines)
Line  Link Here
0
-- samba-4.1.6.ebuild
0
++ samba-4.1.6.ebuild
Lines 20-32 Link Here
20
SLOT="0"
20
SLOT="0"
21
21
22
IUSE="acl addns ads aio avahi client cluster cups dmapi fam gnutls iprint
22
IUSE="acl addns ads aio avahi client cluster cups dmapi fam gnutls iprint
23
ldap quota selinux syslog test winbind"
23
ldap quota selinux syslog system-heimdal test winbind"
24
24
25
# sys-apps/attr is an automagic dependency (see bug #489748)
25
# sys-apps/attr is an automagic dependency (see bug #489748)
26
# dev-libs/libaio is an automagic dependency (see bug #489764)
26
# dev-libs/libaio is an automagic dependency (see bug #489764)
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/libaio
30
	dev-libs/libaio
32
	dev-libs/popt
31
	dev-libs/popt
Lines 50-56 Link Here
50
	gnutls? ( dev-libs/libgcrypt:0
49
	gnutls? ( dev-libs/libgcrypt:0
51
		>=net-libs/gnutls-1.4.0 )
50
		>=net-libs/gnutls-1.4.0 )
52
	ldap? ( net-nds/openldap )
51
	ldap? ( net-nds/openldap )
53
	selinux? ( sec-policy/selinux-samba )"
52
	selinux? ( sec-policy/selinux-samba )
53
	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl] )"
54
DEPEND="${CDEPEND}
54
DEPEND="${CDEPEND}
55
	virtual/pkgconfig"
55
	virtual/pkgconfig"
56
RDEPEND="${CDEPEND}
56
RDEPEND="${CDEPEND}
Lines 104-111 Link Here
104
		--disable-rpath-install \
104
		--disable-rpath-install \
105
		--nopyc \
105
		--nopyc \
106
		--nopyo \
106
		--nopyo \
107
		--bundled-libraries=ntdb \
108
		--builtin-libraries=ntdb \
109
		$(use_with addns dnsupdate) \
107
		$(use_with addns dnsupdate) \
110
		$(use_with acl acl-support) \
108
		$(use_with acl acl-support) \
111
		$(use_with ads) \
109
		$(use_with ads) \
Lines 124-131 Link Here
124
		$(use_with syslog) \
122
		$(use_with syslog) \
125
		$(use_with winbind)
123
		$(use_with winbind)
126
		"
124
		"
125
       
126
        use "system-heimdal" && myconf+="--bundled-libraries=ntdb,NONE"
127
        use "!system-heimdal" && myconf+="--bundled-libraries=ntdb,\!ldb,\!talloc,\!tdb,\!tevent,\!iniparser,\!subunit,\!popt,\!zlib"
127
	use "ads" && myconf+=" --with-shared-modules=idmap_ad"
128
	use "ads" && myconf+=" --with-shared-modules=idmap_ad"
128
129
#        myconf+=" --private-libraries=ntdb"
129
	CPPFLAGS="-I/usr/include/et ${CPPFLAGS}" \
130
	CPPFLAGS="-I/usr/include/et ${CPPFLAGS}" \
130
		waf-utils_src_configure ${myconf}
131
		waf-utils_src_configure ${myconf}
131
}
132
}

Return to bug 504694