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

Collapse All | Expand All

(-)samba-4.5.0.ebuild (-3 / +8 lines)
Lines 26-32 LICENSE="GPL-3" Link Here
26
SLOT="0"
26
SLOT="0"
27
27
28
IUSE="acl addc addns ads avahi client cluster cups dmapi fam gnutls iprint
28
IUSE="acl addc addns ads avahi client cluster cups dmapi fam gnutls iprint
29
ldap pam quota selinux syslog +system-mitkrb5 systemd test winbind"
29
ldap pam quota selinux syslog +system-mitkrb5 systemd test winbind gpg"
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 68-74 CDEPEND="${PYTHON_DEPS} Link Here
68
		>=net-libs/gnutls-1.4.0 )
68
		>=net-libs/gnutls-1.4.0 )
69
	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
69
	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
70
	system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
70
	system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
71
	!system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
71
	!addc? ( !system-mitkrb5? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] ) )
72
	gpg? ( app-crypt/gpgme )
72
	systemd? ( sys-apps/systemd:0= )"
73
	systemd? ( sys-apps/systemd:0= )"
73
DEPEND="${CDEPEND}
74
DEPEND="${CDEPEND}
74
	virtual/pkgconfig"
75
	virtual/pkgconfig"
Lines 80-85 RDEPEND="${CDEPEND} Link Here
80
81
81
REQUIRED_USE="addc? ( gnutls !system-mitkrb5 )
82
REQUIRED_USE="addc? ( gnutls !system-mitkrb5 )
82
	ads? ( acl gnutls ldap )
83
	ads? ( acl gnutls ldap )
84
	gpg? ( addc )
83
	${PYTHON_REQUIRED_USE}"
85
	${PYTHON_REQUIRED_USE}"
84
86
85
S="${WORKDIR}/${MY_P}"
87
S="${WORKDIR}/${MY_P}"
Lines 107-112 src_prepare() { Link Here
107
109
108
	# install the patches from tarball(s)
110
	# install the patches from tarball(s)
109
	eapply "${WORKDIR}/patches/"
111
	eapply "${WORKDIR}/patches/"
112
	sed -i -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' source4/dsdb/samdb/ldb_modules/password_hash.c
110
113
111
	multilib_copy_sources
114
	multilib_copy_sources
112
}
115
}
Lines 119-125 multilib_src_configure() { Link Here
119
		--localstatedir="${EPREFIX}/var"
122
		--localstatedir="${EPREFIX}/var"
120
		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
123
		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
121
		--with-piddir="${EPREFIX}/run/${PN}"
124
		--with-piddir="${EPREFIX}/run/${PN}"
122
		--bundled-libraries=NONE
125
		--bundled-libraries=$(usex addc heimdal NONE)
123
		--builtin-libraries=NONE
126
		--builtin-libraries=NONE
124
		--disable-rpath
127
		--disable-rpath
125
		--disable-rpath-install
128
		--disable-rpath-install
Lines 149-154 multilib_src_configure() { Link Here
149
			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
152
			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
150
			$(use_with winbind)
153
			$(use_with winbind)
151
			$(usex test '--enable-selftest' '')
154
			$(usex test '--enable-selftest' '')
155
			$(use_with gpg gpgme)
152
			--with-shared-modules=${SHAREDMODS}
156
			--with-shared-modules=${SHAREDMODS}
153
		)
157
		)
154
	else
158
	else
Lines 172-177 multilib_src_configure() { Link Here
172
			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
176
			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
173
			--without-winbind
177
			--without-winbind
174
			--disable-python
178
			--disable-python
179
			--without-gpgme
175
		)
180
		)
176
	fi
181
	fi
177
182

Return to bug 594130