From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CB126158094 for ; Fri, 30 Sep 2022 03:49:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 025D12BC066; Fri, 30 Sep 2022 03:49:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DC89E2BC066 for ; Fri, 30 Sep 2022 03:49:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A8DA4341399 for ; Fri, 30 Sep 2022 03:49:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 369F25F6 for ; Fri, 30 Sep 2022 03:49:11 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1664509680.5abd0f709179225ce20e4dc0f79351b219ad358e.sam@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.16.5-r1.ebuild X-VCS-Directories: net-fs/samba/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5abd0f709179225ce20e4dc0f79351b219ad358e X-VCS-Branch: master Date: Fri, 30 Sep 2022 03:49:11 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 144c3fbe-71b4-4a71-b397-f200fada44da X-Archives-Hash: 149e9358bf9ffa1d7e66247a5da90898 commit: 5abd0f709179225ce20e4dc0f79351b219ad358e Author: Sam James gentoo org> AuthorDate: Fri Sep 30 03:39:21 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Sep 30 03:48:00 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5abd0f70 net-fs/samba: EAPI 8 Signed-off-by: Sam James gentoo.org> net-fs/samba/samba-4.16.5-r1.ebuild | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/net-fs/samba/samba-4.16.5-r1.ebuild b/net-fs/samba/samba-4.16.5-r1.ebuild index c0a4ddf823c6..b14d8de3be2c 100644 --- a/net-fs/samba/samba-4.16.5-r1.ebuild +++ b/net-fs/samba/samba-4.16.5-r1.ebuild @@ -1,18 +1,18 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="threads(+),xml(+)" -inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles +inherit python-single-r1 flag-o-matic waf-utils multilib-minimal linux-info systemd pam tmpfiles DESCRIPTION="Samba Suite Version 4" HOMEPAGE="https://samba.org/" MY_PV="${PV/_rc/rc}" MY_P="${PN}-${MY_PV}" -if [[ ${PV} = *_rc* ]]; then +if [[ ${PV} == *_rc* ]]; then SRC_URI="mirror://samba/rc/${MY_P}.tar.gz" else SRC_URI="mirror://samba/stable/${MY_P}.tar.gz" @@ -22,10 +22,10 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-3" SLOT="0" -IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam -glusterfs gpg iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux -snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind -zeroconf" +IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam glusterfs gpg" +IUSE+=" iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux" +IUSE+=" snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind" +IUSE+=" zeroconf" REQUIRED_USE="${PYTHON_REQUIRED_USE} addc? ( python json winbind ) @@ -158,7 +158,7 @@ pkg_setup() { python-single-r1_pkg_setup - SHAREDMODS="$(usex snapper '' '!')vfs_snapper" + SHAREDMODS="$(usev !snapper '!')vfs_snapper" if use cluster ; then SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad" elif use ads ; then @@ -243,7 +243,7 @@ multilib_src_configure() { $(multilib_native_usex python '' '--disable-python') $(multilib_native_use_enable zeroconf avahi) $(multilib_native_usex test '--enable-selftest' '') - $(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '') + $(usev system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')") $(use_with debug lttng) $(use_with ldap) $(use_with profiling-data) @@ -257,7 +257,8 @@ multilib_src_configure() { myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper ) fi - CPPFLAGS="-I${ESYSROOT}/usr/include/et ${CPPFLAGS}" \ + append-cppflags "-I${ESYSROOT}/usr/include/et" + waf-utils_src_configure ${myconf[@]} } @@ -267,7 +268,7 @@ multilib_src_compile() { multilib_src_test() { if multilib_is_native_abi ; then - "${WAF_BINARY}" test || die "test failed" + "${WAF_BINARY}" test || die "Test failed" fi } @@ -278,23 +279,23 @@ multilib_src_install() { find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die if multilib_is_native_abi ; then - # install ldap schema for server (bug #491002) + # Install ldap schema for server (bug #491002) if use ldap ; then insinto /etc/openldap/schema doins examples/LDAP/samba.schema fi - # create symlink for cups (bug #552310) + # Create symlink for cups (bug #552310) if use cups ; then dosym ../../../bin/smbspool \ /usr/libexec/cups/backend/smb fi - # install example config file + # Install example config file insinto /etc/samba doins examples/smb.conf.default - # Fix paths in example file (#603964) + # Fix paths in example file (bug #603964) sed \ -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \ -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \