From 6317e7c12e21da53904f0670ce1ffa9b8eecefd4 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Wed, 23 Aug 2017 10:56:09 +0200 Subject: net-fs/samba: Fixed automagic on lttng (bug #622700). In samba-4.5.x lttng is now disabled. In >=samba-4.6 lttng can now be toggled by the "debug" USE flag. Package-Manager: Portage-2.3.8, Repoman-2.3.3 --- net-fs/samba/samba-4.5.10.ebuild | 1 + net-fs/samba/samba-4.5.12.ebuild | 1 + net-fs/samba/samba-4.6.6.ebuild | 5 ++++- net-fs/samba/samba-4.6.7.ebuild | 5 ++++- net-fs/samba/samba-4.7.0_rc3.ebuild | 5 ++++- 5 files changed, 14 insertions(+), 3 deletions(-) (limited to 'net-fs') diff --git a/net-fs/samba/samba-4.5.10.ebuild b/net-fs/samba/samba-4.5.10.ebuild index 067d5941f40..89a1a442591 100644 --- a/net-fs/samba/samba-4.5.10.ebuild +++ b/net-fs/samba/samba-4.5.10.ebuild @@ -150,6 +150,7 @@ multilib_src_configure() { --localstatedir="${EPREFIX}/var" --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba" --with-piddir="${EPREFIX}/run/${PN}" + --without-lttng --bundled-libraries="${bundled_libs}" --builtin-libraries=NONE --disable-rpath diff --git a/net-fs/samba/samba-4.5.12.ebuild b/net-fs/samba/samba-4.5.12.ebuild index 41e0d7a5ba9..c02d56fa244 100644 --- a/net-fs/samba/samba-4.5.12.ebuild +++ b/net-fs/samba/samba-4.5.12.ebuild @@ -151,6 +151,7 @@ multilib_src_configure() { --localstatedir="${EPREFIX}/var" --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba" --with-piddir="${EPREFIX}/run/${PN}" + --without-lttng --bundled-libraries="${bundled_libs}" --builtin-libraries=NONE --disable-rpath diff --git a/net-fs/samba/samba-4.6.6.ebuild b/net-fs/samba/samba-4.6.6.ebuild index 2b3c968c171..b54d5ef777d 100644 --- a/net-fs/samba/samba-4.6.6.ebuild +++ b/net-fs/samba/samba-4.6.6.ebuild @@ -24,7 +24,7 @@ LICENSE="GPL-3" SLOT="0" -IUSE="acl addc addns ads client cluster cups dmapi fam gnutls gpg iprint ldap pam python +IUSE="acl addc addns ads 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=( @@ -66,6 +66,7 @@ CDEPEND=" ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) + debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( @@ -185,6 +186,7 @@ multilib_src_configure() { $(use_with ads) $(use_with cluster cluster-support) $(use_enable cups) + $(use_with debug lttng) $(use_with dmapi) $(use_with fam) $(use_enable gnutls) @@ -218,6 +220,7 @@ multilib_src_configure() { --without-gpgme --disable-iprint $(use_with ldap) + $(use_with debug lttng) --without-pam --without-quotas --without-syslog diff --git a/net-fs/samba/samba-4.6.7.ebuild b/net-fs/samba/samba-4.6.7.ebuild index 7c288fa664f..de3163c7392 100644 --- a/net-fs/samba/samba-4.6.7.ebuild +++ b/net-fs/samba/samba-4.6.7.ebuild @@ -24,7 +24,7 @@ LICENSE="GPL-3" SLOT="0" -IUSE="acl addc addns ads client cluster cups dmapi fam gnutls gpg iprint ldap pam python +IUSE="acl addc addns ads 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=( @@ -66,6 +66,7 @@ CDEPEND=" ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) + debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( @@ -185,6 +186,7 @@ multilib_src_configure() { $(use_with ads) $(use_with cluster cluster-support) $(use_enable cups) + $(use_with debug lttng) $(use_with dmapi) $(use_with fam) $(use_enable gnutls) @@ -218,6 +220,7 @@ multilib_src_configure() { --without-gpgme --disable-iprint $(use_with ldap) + $(use_with debug lttng) --without-pam --without-quotas --without-syslog diff --git a/net-fs/samba/samba-4.7.0_rc3.ebuild b/net-fs/samba/samba-4.7.0_rc3.ebuild index 6a8a94e557e..6debdc7d7e8 100644 --- a/net-fs/samba/samba-4.7.0_rc3.ebuild +++ b/net-fs/samba/samba-4.7.0_rc3.ebuild @@ -23,7 +23,7 @@ LICENSE="GPL-3" SLOT="0" -IUSE="acl addc addns ads client cluster cups dmapi fam gnutls gpg iprint ldap pam python +IUSE="acl addc addns ads 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=" ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) + debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( @@ -182,6 +183,7 @@ multilib_src_configure() { $(use_with ads) $(use_with cluster cluster-support) $(use_enable cups) + $(use_with debug lttng) $(use_with dmapi) $(use_with fam) $(use_enable gnutls) @@ -215,6 +217,7 @@ multilib_src_configure() { --without-gpgme --disable-iprint $(use_with ldap) + $(use_with debug lttng) --without-pam --without-quotas --without-syslog -- cgit v1.2.1