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

Collapse All | Expand All

(-)a/samba-4.5.4.ebuild (-13 / +7 lines)
Lines 26-32 Link Here
26
SLOT="0"
26
SLOT="0"
27
27
28
IUSE="acl addc addns ads client cluster cups dmapi fam gnutls gpg iprint ldap pam
28
IUSE="acl addc addns ads client cluster cups dmapi fam gnutls gpg iprint ldap pam
29
quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
29
quota selinux syslog systemd test winbind zeroconf"
30
30
31
MULTILIB_WRAPPED_HEADERS=(
31
MULTILIB_WRAPPED_HEADERS=(
32
	/usr/include/samba-4.0/policy.h
32
	/usr/include/samba-4.0/policy.h
Lines 71-78 Link Here
71
	)
71
	)
72
	gpg? ( app-crypt/gpgme )
72
	gpg? ( app-crypt/gpgme )
73
	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
73
	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
74
	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
75
	system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
76
	systemd? ( sys-apps/systemd:0= )"
74
	systemd? ( sys-apps/systemd:0= )"
77
DEPEND="${CDEPEND}
75
DEPEND="${CDEPEND}
78
	virtual/pkgconfig"
76
	virtual/pkgconfig"
Lines 82-91 Link Here
82
	!dev-perl/Parse-Yapp
80
	!dev-perl/Parse-Yapp
83
"
81
"
84
82
85
REQUIRED_USE="addc? ( gnutls !system-mitkrb5 )
83
REQUIRED_USE="addc? ( gnutls )
86
	ads? ( acl gnutls ldap )
84
	ads? ( acl gnutls ldap )
87
	gpg? ( addc )
85
	gpg? ( addc )
88
	?? ( system-heimdal system-mitkrb5 )
89
	${PYTHON_REQUIRED_USE}"
86
	${PYTHON_REQUIRED_USE}"
90
87
91
S="${WORKDIR}/${MY_P}"
88
S="${WORKDIR}/${MY_P}"
Lines 131-140 Link Here
131
multilib_src_configure() {
128
multilib_src_configure() {
132
	# when specifying libs for samba build you must append NONE to the end to 
129
	# when specifying libs for samba build you must append NONE to the end to 
133
	# stop it automatically including things
130
	# stop it automatically including things
134
	local bundled_libs="NONE"
131
#	local bundled_libs="NONE"
135
	if ! use system-heimdal && ! use system-mitkrb5 ; then
132
#	if ! use system-heimdal && ! use system-mitkrb5 ; then
136
		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
133
#		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
137
	fi
134
#	fi
138
135
139
	local myconf=()
136
	local myconf=()
140
	myconf=(
137
	myconf=(
Lines 143-150 Link Here
143
		--localstatedir="${EPREFIX}/var"
140
		--localstatedir="${EPREFIX}/var"
144
		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
141
		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
145
		--with-piddir="${EPREFIX}/run/${PN}"
142
		--with-piddir="${EPREFIX}/run/${PN}"
146
		--bundled-libraries="${bundled_libs}"
143
		--bundled-libraries=heimdal
147
		--builtin-libraries=NONE
148
		--disable-rpath
144
		--disable-rpath
149
		--disable-rpath-install
145
		--disable-rpath-install
150
		--nopyc
146
		--nopyc
Lines 169-175 Link Here
169
			$(use_with quota quotas)
165
			$(use_with quota quotas)
170
			$(use_with syslog)
166
			$(use_with syslog)
171
			$(use_with systemd)
167
			$(use_with systemd)
172
			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
173
			$(use_with winbind)
168
			$(use_with winbind)
174
			$(usex test '--enable-selftest' '')
169
			$(usex test '--enable-selftest' '')
175
			$(use_enable zeroconf avahi)
170
			$(use_enable zeroconf avahi)
Lines 194-200 Link Here
194
			--without-quotas
189
			--without-quotas
195
			--without-syslog
190
			--without-syslog
196
			--without-systemd
191
			--without-systemd
197
			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
198
			--without-winbind
192
			--without-winbind
199
			--disable-python
193
			--disable-python
200
		)
194
		)

Return to bug 603570