From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0C06A1388BF for ; Tue, 12 Jan 2016 09:16:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9A30AE086B; Tue, 12 Jan 2016 09:16:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 33F66E086B for ; Tue, 12 Jan 2016 09:16:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B8AE8340A7B for ; Tue, 12 Jan 2016 09:16:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0678D11 for ; Tue, 12 Jan 2016 09:16:40 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1452590196.3e77c54440c06967eeae9283c87a5702b0010f41.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-fs/samba/samba-4.2.7-r1.ebuild net-fs/samba/samba-4.3.3-r1.ebuild X-VCS-Directories: net-fs/samba/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 3e77c54440c06967eeae9283c87a5702b0010f41 X-VCS-Branch: master Date: Tue, 12 Jan 2016 09:16:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b314599c-0859-4315-92bd-7200bd81c2d2 X-Archives-Hash: 7ff3bfa152ba8a762930a1e933504d7b commit: 3e77c54440c06967eeae9283c87a5702b0010f41 Author: Lars Wendler gentoo org> AuthorDate: Tue Jan 12 09:16:20 2016 +0000 Commit: Lars Wendler gentoo org> CommitDate: Tue Jan 12 09:16:36 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e77c544 net-fs/samba: Minor formatting fixes. Package-Manager: portage-2.2.26 Signed-off-by: Lars Wendler gentoo.org> net-fs/samba/samba-4.2.7-r1.ebuild | 116 +++++++++++++++++++------------------ net-fs/samba/samba-4.3.3-r1.ebuild | 116 +++++++++++++++++++------------------ 2 files changed, 120 insertions(+), 112 deletions(-) diff --git a/net-fs/samba/samba-4.2.7-r1.ebuild b/net-fs/samba/samba-4.2.7-r1.ebuild index b7ff879..6686a68 100644 --- a/net-fs/samba/samba-4.2.7-r1.ebuild +++ b/net-fs/samba/samba-4.2.7-r1.ebuild @@ -93,14 +93,14 @@ pkg_setup() { python-single-r1_pkg_setup if use aio ; then if ! linux_config_exists || ! linux_chkconfig_present AIO; then - ewarn "You must enable AIO support in your kernel config, " - ewarn "to be able to support asynchronous I/O. " - ewarn "You can find it at" - ewarn - ewarn "General Support" - ewarn " Enable AIO support " - ewarn - ewarn "and recompile your kernel..." + ewarn "You must enable AIO support in your kernel config, " + ewarn "to be able to support asynchronous I/O. " + ewarn "You can find it at" + ewarn + ewarn "General Support" + ewarn " Enable AIO support " + ewarn + ewarn "and recompile your kernel..." fi fi } @@ -127,54 +127,58 @@ multilib_src_configure() { --nopyc --nopyo ) - if multilib_is_native_abi ; then myconf+=( - $(use_with acl acl-support) - $(usex addc '' '--without-ad-dc') - $(use_with addns dnsupdate) - $(use_with ads) - $(usex ads '--with-shared-modules=idmap_ad' '') - $(use_with aio aio-support) - $(usex cluster '--with-ctdb-dir=/usr' '') - $(use_enable avahi) - $(use_with cluster cluster-support) - $(use_enable cups) - $(use_with dmapi) - $(use_with fam) - $(use_enable gnutls) - $(use_enable iprint) - $(use_with ldap) - $(use_with pam) - $(use_with pam pam_smbpass) - $(usex pam "--with-pammodulesdir=/$(get_libdir)/security" '') - $(use_with quota quotas) - $(use_with syslog) - $(use_with systemd) - $(usex system-mitkrb5 '--with-system-mitkrb5' '') - $(use_with winbind) - $(usex test '--enable-selftest' '') - ); else myconf+=( - --without-acl-support - --without-ad-dc - --without-dnsupdate - --without-ads - --without-aio-support - --disable-avahi - --without-cluster-support - --disable-cups - --without-dmapi - --without-fam - --disable-gnutls - --disable-iprint - --without-ldap - --without-pam - --without-pam_smbpass - --without-quotas - --without-syslog - --without-systemd - $(usex system-mitkrb5 '--with-system-mitkrb5' '') - --without-winbind - --disable-python - ); fi + if multilib_is_native_abi ; then + myconf+=( + $(use_with acl acl-support) + $(usex addc '' '--without-ad-dc') + $(use_with addns dnsupdate) + $(use_with ads) + $(usex ads '--with-shared-modules=idmap_ad' '') + $(use_with aio aio-support) + $(usex cluster '--with-ctdb-dir=/usr' '') + $(use_enable avahi) + $(use_with cluster cluster-support) + $(use_enable cups) + $(use_with dmapi) + $(use_with fam) + $(use_enable gnutls) + $(use_enable iprint) + $(use_with ldap) + $(use_with pam) + $(use_with pam pam_smbpass) + $(usex pam "--with-pammodulesdir=/$(get_libdir)/security" '') + $(use_with quota quotas) + $(use_with syslog) + $(use_with systemd) + $(usex system-mitkrb5 '--with-system-mitkrb5' '') + $(use_with winbind) + $(usex test '--enable-selftest' '') + ) + else + myconf+=( + --without-acl-support + --without-ad-dc + --without-dnsupdate + --without-ads + --without-aio-support + --disable-avahi + --without-cluster-support + --disable-cups + --without-dmapi + --without-fam + --disable-gnutls + --disable-iprint + --without-ldap + --without-pam + --without-pam_smbpass + --without-quotas + --without-syslog + --without-systemd + $(usex system-mitkrb5 '--with-system-mitkrb5' '') + --without-winbind + --disable-python + ) + fi CPPFLAGS="-I${SYSROOT}/usr/include/et ${CPPFLAGS}" \ waf-utils_src_configure ${myconf[@]} diff --git a/net-fs/samba/samba-4.3.3-r1.ebuild b/net-fs/samba/samba-4.3.3-r1.ebuild index 0b93ae7..d7769ae 100644 --- a/net-fs/samba/samba-4.3.3-r1.ebuild +++ b/net-fs/samba/samba-4.3.3-r1.ebuild @@ -92,14 +92,14 @@ pkg_setup() { python-single-r1_pkg_setup if use aio ; then if ! linux_config_exists || ! linux_chkconfig_present AIO; then - ewarn "You must enable AIO support in your kernel config, " - ewarn "to be able to support asynchronous I/O. " - ewarn "You can find it at" - ewarn - ewarn "General Support" - ewarn " Enable AIO support " - ewarn - ewarn "and recompile your kernel..." + ewarn "You must enable AIO support in your kernel config, " + ewarn "to be able to support asynchronous I/O. " + ewarn "You can find it at" + ewarn + ewarn "General Support" + ewarn " Enable AIO support " + ewarn + ewarn "and recompile your kernel..." fi fi } @@ -126,54 +126,58 @@ multilib_src_configure() { --nopyc --nopyo ) - if multilib_is_native_abi ; then myconf+=( - $(use_with acl acl-support) - $(usex addc '' '--without-ad-dc') - $(use_with addns dnsupdate) - $(use_with ads) - $(usex ads '--with-shared-modules=idmap_ad' '') - $(use_with aio aio-support) - $(usex cluster '--with-ctdb-dir=/usr' '') - $(use_enable avahi) - $(use_with cluster cluster-support) - $(use_enable cups) - $(use_with dmapi) - $(use_with fam) - $(use_enable gnutls) - $(use_enable iprint) - $(use_with ldap) - $(use_with pam) - $(use_with pam pam_smbpass) - $(usex pam "--with-pammodulesdir=/$(get_libdir)/security" '') - $(use_with quota quotas) - $(use_with syslog) - $(use_with systemd) - $(usex system-mitkrb5 '--with-system-mitkrb5' '') - $(use_with winbind) - $(usex test '--enable-selftest' '') - ); else myconf+=( - --without-acl-support - --without-ad-dc - --without-dnsupdate - --without-ads - --without-aio-support - --disable-avahi - --without-cluster-support - --disable-cups - --without-dmapi - --without-fam - --disable-gnutls - --disable-iprint - --without-ldap - --without-pam - --without-pam_smbpass - --without-quotas - --without-syslog - --without-systemd - $(usex system-mitkrb5 '--with-system-mitkrb5' '') - --without-winbind - --disable-python - ); fi + if multilib_is_native_abi ; then + myconf+=( + $(use_with acl acl-support) + $(usex addc '' '--without-ad-dc') + $(use_with addns dnsupdate) + $(use_with ads) + $(usex ads '--with-shared-modules=idmap_ad' '') + $(use_with aio aio-support) + $(usex cluster '--with-ctdb-dir=/usr' '') + $(use_enable avahi) + $(use_with cluster cluster-support) + $(use_enable cups) + $(use_with dmapi) + $(use_with fam) + $(use_enable gnutls) + $(use_enable iprint) + $(use_with ldap) + $(use_with pam) + $(use_with pam pam_smbpass) + $(usex pam "--with-pammodulesdir=/$(get_libdir)/security" '') + $(use_with quota quotas) + $(use_with syslog) + $(use_with systemd) + $(usex system-mitkrb5 '--with-system-mitkrb5' '') + $(use_with winbind) + $(usex test '--enable-selftest' '') + ) + else + myconf+=( + --without-acl-support + --without-ad-dc + --without-dnsupdate + --without-ads + --without-aio-support + --disable-avahi + --without-cluster-support + --disable-cups + --without-dmapi + --without-fam + --disable-gnutls + --disable-iprint + --without-ldap + --without-pam + --without-pam_smbpass + --without-quotas + --without-syslog + --without-systemd + $(usex system-mitkrb5 '--with-system-mitkrb5' '') + --without-winbind + --disable-python + ) + fi CPPFLAGS="-I${SYSROOT}/usr/include/et ${CPPFLAGS}" \ waf-utils_src_configure ${myconf[@]}