net-fs/samba: Fixed automagic linking against sys-cluster/ceph

Closes: https://bugs.gentoo.org/563146
Package-Manager: Portage-2.3.12, Repoman-2.3.4

diff --git a/net-fs/samba/metadata.xml b/net-fs/samba/metadata.xml
index c6b9bbe87e47390b7b69eb4475b0b8050dc21415..2a3bd677e0d2caa739a08305805a7dfac45f69be 100644 (file)
--- a/net-fs/samba/metadata.xml
+++ b/net-fs/samba/metadata.xml
@@ -13,6 +13,7 @@
                <flag name="addns">Enable AD DNS integration</flag>
                <flag name="ads">Enable Active Directory support</flag>
                <flag name="aio">Enable asynchronous IO support</flag>
+               <flag name="ceph">Enable support for Ceph distributed filesystem via <pkg>sys-cluster/ceph</pkg></flag>
                <flag name="client">Enables the client part</flag>
                <flag name="cluster">Enable support for clustering</flag>
                <flag name="dmapi">Enable support for DMAPI. This currently works only in combination with XFS.</flag>

diff --git a/net-fs/samba/samba-4.6.9.ebuild b/net-fs/samba/samba-4.6.9.ebuild
index b4690d4142ed88af6fd0931d67b1aebca971ad04..43d075a4a99484e70806432c120c4d418216c3e4 100644 (file)
--- a/net-fs/samba/samba-4.6.9.ebuild
+++ b/net-fs/samba/samba-4.6.9.ebuild
@@ -24,7 +24,7 @@ LICENSE="GPL-3"
 
 SLOT="0"
 
-IUSE="acl addc addns ads client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
 quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
 
 MULTILIB_WRAPPED_HEADERS=(
@@ -65,6 +65,7 @@ CDEPEND="
                net-dns/bind-tools[gssapi]
                dev-python/dnspython:=[${PYTHON_USEDEP}]
        )
+       ceph? ( sys-cluster/ceph )
        cluster? ( !dev-db/ctdb )
        cups? ( net-print/cups )
        debug? ( dev-util/lttng-ust )
@@ -187,6 +188,7 @@ multilib_src_configure() {
                        $(usex addc '' '--without-ad-dc')
                        $(use_with addns dnsupdate)
                        $(use_with ads)
+                       $(use_enable ceph cephfs)
                        $(use_with cluster cluster-support)
                        $(use_enable cups)
                        $(use_with debug lttng)
@@ -215,6 +217,7 @@ multilib_src_configure() {
                        --without-dnsupdate
                        --without-ads
                        --disable-avahi
+                       --disable-cephfs
                        --without-cluster-support
                        --disable-cups
                        --without-dmapi

diff --git a/net-fs/samba/samba-4.7.0-r1.ebuild b/net-fs/samba/samba-4.7.0-r1.ebuild
index 3828626517624953e6137b59c28c5779950d3220..8e9afc791ab59e511e51df727b1a8fbc31a34728 100644 (file)
--- a/net-fs/samba/samba-4.7.0-r1.ebuild
+++ b/net-fs/samba/samba-4.7.0-r1.ebuild
@@ -23,7 +23,7 @@ LICENSE="GPL-3"
 
 SLOT="0"
 
-IUSE="acl addc addns ads client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
 quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
 
 MULTILIB_WRAPPED_HEADERS=(
@@ -63,6 +63,7 @@ CDEPEND="
                net-dns/bind-tools[gssapi]
                dev-python/dnspython:=[${PYTHON_USEDEP}]
        )
+       ceph? ( sys-cluster/ceph )
        cluster? ( !dev-db/ctdb )
        cups? ( net-print/cups )
        debug? ( dev-util/lttng-ust )
@@ -183,6 +184,7 @@ multilib_src_configure() {
                        $(usex addc '' '--without-ad-dc')
                        $(use_with addns dnsupdate)
                        $(use_with ads)
+                       $(use_enable ceph cephfs)
                        $(use_with cluster cluster-support)
                        $(use_enable cups)
                        $(use_with debug lttng)
@@ -211,6 +213,7 @@ multilib_src_configure() {
                        --without-dnsupdate
                        --without-ads
                        --disable-avahi
+                       --disable-cephfs
                        --without-cluster-support
                        --disable-cups
                        --without-dmapi