commit: ccb2186cfc6b6b04c02658195a870241c72a4cc8 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Thu Feb 24 23:45:55 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Feb 24 23:53:21 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccb2186c
net-fs/samba: drop dmapi sys-fs/dmapi is being last-rited and USE=dmapi has been masked for years. Closes: https://bugs.gentoo.org/811894 Signed-off-by: David Seifert <soap <AT> gentoo.org> Signed-off-by: Sam James <sam <AT> gentoo.org> net-fs/samba/metadata.xml | 1 - net-fs/samba/samba-4.14.10-r3.ebuild | 5 ++--- net-fs/samba/samba-4.14.12-r1.ebuild | 5 ++--- net-fs/samba/samba-4.15.2-r3.ebuild | 5 ++--- net-fs/samba/samba-4.15.3-r2.ebuild | 5 ++--- net-fs/samba/samba-4.15.4-r1.ebuild | 5 ++--- net-fs/samba/samba-4.15.5-r1.ebuild | 5 ++--- net-fs/samba/samba-4.16.0_rc3-r1.ebuild | 5 ++--- profiles/base/package.use.mask | 2 -- 9 files changed, 14 insertions(+), 24 deletions(-) diff --git a/net-fs/samba/metadata.xml b/net-fs/samba/metadata.xml index 05441d23eaed..0430625e206a 100644 --- a/net-fs/samba/metadata.xml +++ b/net-fs/samba/metadata.xml @@ -15,7 +15,6 @@ <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> <flag name="glusterfs">Enable support for Glusterfs filesystem via <pkg>sys-cluster/glusterfs</pkg></flag> <flag name="gpg">Use <pkg>app-crypt/gpgme</pkg> for AD DC</flag> <flag name="json">Enable json audit support through <pkg>dev-libs/jansson</pkg></flag> diff --git a/net-fs/samba/samba-4.14.10-r3.ebuild b/net-fs/samba/samba-4.14.10-r3.ebuild index 8eb00dba2dc8..6232b2584a7d 100644 --- a/net-fs/samba/samba-4.14.10-r3.ebuild +++ b/net-fs/samba/samba-4.14.10-r3.ebuild @@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-3" SLOT="0" -IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs +IUSE="acl addc addns ads ceph client cluster cups debug fam glusterfs gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf" @@ -99,7 +99,6 @@ COMMON_DEPEND=" cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) - dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme:= ) json? ( dev-libs/jansson:= ) @@ -223,7 +222,7 @@ multilib_src_configure() { $(multilib_native_use_enable ceph cephfs) $(multilib_native_use_with cluster cluster-support) $(multilib_native_use_enable cups) - $(multilib_native_use_with dmapi) + --without-dmapi $(multilib_native_use_with fam) $(multilib_native_use_enable glusterfs) $(multilib_native_use_with gpg gpgme) diff --git a/net-fs/samba/samba-4.14.12-r1.ebuild b/net-fs/samba/samba-4.14.12-r1.ebuild index 09b9de9572a4..a4f3a7c48492 100644 --- a/net-fs/samba/samba-4.14.12-r1.ebuild +++ b/net-fs/samba/samba-4.14.12-r1.ebuild @@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-3" SLOT="0" -IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs +IUSE="acl addc addns ads ceph client cluster cups debug fam glusterfs gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf" @@ -99,7 +99,6 @@ COMMON_DEPEND=" cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) - dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme:= ) json? ( dev-libs/jansson:= ) @@ -220,7 +219,7 @@ multilib_src_configure() { $(multilib_native_use_enable ceph cephfs) $(multilib_native_use_with cluster cluster-support) $(multilib_native_use_enable cups) - $(multilib_native_use_with dmapi) + --without-dmapi $(multilib_native_use_with fam) $(multilib_native_use_enable glusterfs) $(multilib_native_use_with gpg gpgme) diff --git a/net-fs/samba/samba-4.15.2-r3.ebuild b/net-fs/samba/samba-4.15.2-r3.ebuild index e3b6465541ed..98f20aeaa316 100644 --- a/net-fs/samba/samba-4.15.2-r3.ebuild +++ b/net-fs/samba/samba-4.15.2-r3.ebuild @@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-3" SLOT="0" -IUSE="acl addc ads ceph client cluster cups debug dmapi fam glusterfs +IUSE="acl addc ads ceph client cluster cups debug fam glusterfs gpg iprint json ldap pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf" @@ -96,7 +96,6 @@ COMMON_DEPEND=" cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) - dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme:= ) json? ( dev-libs/jansson:= ) @@ -219,7 +218,7 @@ multilib_src_configure() { $(multilib_native_use_enable ceph cephfs) $(multilib_native_use_with cluster cluster-support) $(multilib_native_use_enable cups) - $(multilib_native_use_with dmapi) + --without-dmapi $(multilib_native_use_with fam) $(multilib_native_use_enable glusterfs) $(multilib_native_use_with gpg gpgme) diff --git a/net-fs/samba/samba-4.15.3-r2.ebuild b/net-fs/samba/samba-4.15.3-r2.ebuild index 931272c67c51..138a2bc526df 100644 --- a/net-fs/samba/samba-4.15.3-r2.ebuild +++ b/net-fs/samba/samba-4.15.3-r2.ebuild @@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-3" SLOT="0" -IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug dmapi fam +IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam glusterfs gpg iprint json ldap pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf" @@ -96,7 +96,6 @@ COMMON_DEPEND=" cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) - dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme:= ) json? ( dev-libs/jansson:= ) @@ -217,7 +216,7 @@ multilib_src_configure() { $(multilib_native_use_enable ceph cephfs) $(multilib_native_use_with cluster cluster-support) $(multilib_native_use_enable cups) - $(multilib_native_use_with dmapi) + --without-dmapi $(multilib_native_use_with fam) $(multilib_native_use_enable glusterfs) $(multilib_native_use_with gpg gpgme) diff --git a/net-fs/samba/samba-4.15.4-r1.ebuild b/net-fs/samba/samba-4.15.4-r1.ebuild index 931272c67c51..138a2bc526df 100644 --- a/net-fs/samba/samba-4.15.4-r1.ebuild +++ b/net-fs/samba/samba-4.15.4-r1.ebuild @@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-3" SLOT="0" -IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug dmapi fam +IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam glusterfs gpg iprint json ldap pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf" @@ -96,7 +96,6 @@ COMMON_DEPEND=" cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) - dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme:= ) json? ( dev-libs/jansson:= ) @@ -217,7 +216,7 @@ multilib_src_configure() { $(multilib_native_use_enable ceph cephfs) $(multilib_native_use_with cluster cluster-support) $(multilib_native_use_enable cups) - $(multilib_native_use_with dmapi) + --without-dmapi $(multilib_native_use_with fam) $(multilib_native_use_enable glusterfs) $(multilib_native_use_with gpg gpgme) diff --git a/net-fs/samba/samba-4.15.5-r1.ebuild b/net-fs/samba/samba-4.15.5-r1.ebuild index ccd3d27f7e34..63161f7a96ce 100644 --- a/net-fs/samba/samba-4.15.5-r1.ebuild +++ b/net-fs/samba/samba-4.15.5-r1.ebuild @@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-3" SLOT="0" -IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug dmapi fam +IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam glusterfs gpg iprint json ldap pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf" @@ -96,7 +96,6 @@ COMMON_DEPEND=" cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) - dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme:= ) json? ( dev-libs/jansson:= ) @@ -217,7 +216,7 @@ multilib_src_configure() { $(multilib_native_use_enable ceph cephfs) $(multilib_native_use_with cluster cluster-support) $(multilib_native_use_enable cups) - $(multilib_native_use_with dmapi) + --without-dmapi $(multilib_native_use_with fam) $(multilib_native_use_enable glusterfs) $(multilib_native_use_with gpg gpgme) diff --git a/net-fs/samba/samba-4.16.0_rc3-r1.ebuild b/net-fs/samba/samba-4.16.0_rc3-r1.ebuild index bd63c0c7c297..edebd88b5c02 100644 --- a/net-fs/samba/samba-4.16.0_rc3-r1.ebuild +++ b/net-fs/samba/samba-4.16.0_rc3-r1.ebuild @@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-3" SLOT="0" -IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug dmapi fam +IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam glusterfs gpg iprint json ldap pam profiling-data python quota +regedit selinux snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf" @@ -96,7 +96,6 @@ COMMON_DEPEND=" cluster? ( net-libs/rpcsvc-proto ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) - dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme:= ) json? ( dev-libs/jansson:= ) @@ -217,7 +216,7 @@ multilib_src_configure() { $(multilib_native_use_enable ceph cephfs) $(multilib_native_use_with cluster cluster-support) $(multilib_native_use_enable cups) - $(multilib_native_use_with dmapi) + --without-dmapi $(multilib_native_use_with fam) $(multilib_native_use_enable glusterfs) $(multilib_native_use_with gpg gpgme) diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 17be4f3fbd94..e7449be6612a 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -481,8 +481,6 @@ sys-block/fio static sci-libs/ipopt hsl # Lars Wendler <[email protected]> (2018-03-14) -# Broken on all 32bit arches. Globally masked because of sys-apps/dmapi having -# no active upstream anymore. # sys-cluster/ceph is only available on amd64 & x86, unmask per arch net-fs/samba dmapi ceph
