| 1 |
commit: 5abd0f709179225ce20e4dc0f79351b219ad358e |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 30 03:39:21 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 30 03:48:00 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5abd0f70 |
| 7 |
|
| 8 |
net-fs/samba: EAPI 8 |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
net-fs/samba/samba-4.16.5-r1.ebuild | 31 ++++++++++++++++--------------- |
| 13 |
1 file changed, 16 insertions(+), 15 deletions(-) |
| 14 |
|
| 15 |
diff --git a/net-fs/samba/samba-4.16.5-r1.ebuild b/net-fs/samba/samba-4.16.5-r1.ebuild |
| 16 |
index c0a4ddf823c6..b14d8de3be2c 100644 |
| 17 |
--- a/net-fs/samba/samba-4.16.5-r1.ebuild |
| 18 |
+++ b/net-fs/samba/samba-4.16.5-r1.ebuild |
| 19 |
@@ -1,18 +1,18 @@ |
| 20 |
# Copyright 1999-2022 Gentoo Authors |
| 21 |
# Distributed under the terms of the GNU General Public License v2 |
| 22 |
|
| 23 |
-EAPI=7 |
| 24 |
+EAPI=8 |
| 25 |
|
| 26 |
PYTHON_COMPAT=( python3_{8..10} ) |
| 27 |
PYTHON_REQ_USE="threads(+),xml(+)" |
| 28 |
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles |
| 29 |
+inherit python-single-r1 flag-o-matic waf-utils multilib-minimal linux-info systemd pam tmpfiles |
| 30 |
|
| 31 |
DESCRIPTION="Samba Suite Version 4" |
| 32 |
HOMEPAGE="https://samba.org/" |
| 33 |
|
| 34 |
MY_PV="${PV/_rc/rc}" |
| 35 |
MY_P="${PN}-${MY_PV}" |
| 36 |
-if [[ ${PV} = *_rc* ]]; then |
| 37 |
+if [[ ${PV} == *_rc* ]]; then |
| 38 |
SRC_URI="mirror://samba/rc/${MY_P}.tar.gz" |
| 39 |
else |
| 40 |
SRC_URI="mirror://samba/stable/${MY_P}.tar.gz" |
| 41 |
@@ -22,10 +22,10 @@ S="${WORKDIR}/${MY_P}" |
| 42 |
|
| 43 |
LICENSE="GPL-3" |
| 44 |
SLOT="0" |
| 45 |
-IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam |
| 46 |
-glusterfs gpg iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux |
| 47 |
-snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind |
| 48 |
-zeroconf" |
| 49 |
+IUSE="acl addc ads ceph client cluster cpu_flags_x86_aes cups debug fam glusterfs gpg" |
| 50 |
+IUSE+=" iprint json ldap llvm-libunwind pam profiling-data python quota +regedit selinux" |
| 51 |
+IUSE+=" snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test unwind winbind" |
| 52 |
+IUSE+=" zeroconf" |
| 53 |
|
| 54 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 55 |
addc? ( python json winbind ) |
| 56 |
@@ -158,7 +158,7 @@ pkg_setup() { |
| 57 |
|
| 58 |
python-single-r1_pkg_setup |
| 59 |
|
| 60 |
- SHAREDMODS="$(usex snapper '' '!')vfs_snapper" |
| 61 |
+ SHAREDMODS="$(usev !snapper '!')vfs_snapper" |
| 62 |
if use cluster ; then |
| 63 |
SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad" |
| 64 |
elif use ads ; then |
| 65 |
@@ -243,7 +243,7 @@ multilib_src_configure() { |
| 66 |
$(multilib_native_usex python '' '--disable-python') |
| 67 |
$(multilib_native_use_enable zeroconf avahi) |
| 68 |
$(multilib_native_usex test '--enable-selftest' '') |
| 69 |
- $(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '') |
| 70 |
+ $(usev system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')") |
| 71 |
$(use_with debug lttng) |
| 72 |
$(use_with ldap) |
| 73 |
$(use_with profiling-data) |
| 74 |
@@ -257,7 +257,8 @@ multilib_src_configure() { |
| 75 |
myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper ) |
| 76 |
fi |
| 77 |
|
| 78 |
- CPPFLAGS="-I${ESYSROOT}/usr/include/et ${CPPFLAGS}" \ |
| 79 |
+ append-cppflags "-I${ESYSROOT}/usr/include/et" |
| 80 |
+ |
| 81 |
waf-utils_src_configure ${myconf[@]} |
| 82 |
} |
| 83 |
|
| 84 |
@@ -267,7 +268,7 @@ multilib_src_compile() { |
| 85 |
|
| 86 |
multilib_src_test() { |
| 87 |
if multilib_is_native_abi ; then |
| 88 |
- "${WAF_BINARY}" test || die "test failed" |
| 89 |
+ "${WAF_BINARY}" test || die "Test failed" |
| 90 |
fi |
| 91 |
} |
| 92 |
|
| 93 |
@@ -278,23 +279,23 @@ multilib_src_install() { |
| 94 |
find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die |
| 95 |
|
| 96 |
if multilib_is_native_abi ; then |
| 97 |
- # install ldap schema for server (bug #491002) |
| 98 |
+ # Install ldap schema for server (bug #491002) |
| 99 |
if use ldap ; then |
| 100 |
insinto /etc/openldap/schema |
| 101 |
doins examples/LDAP/samba.schema |
| 102 |
fi |
| 103 |
|
| 104 |
- # create symlink for cups (bug #552310) |
| 105 |
+ # Create symlink for cups (bug #552310) |
| 106 |
if use cups ; then |
| 107 |
dosym ../../../bin/smbspool \ |
| 108 |
/usr/libexec/cups/backend/smb |
| 109 |
fi |
| 110 |
|
| 111 |
- # install example config file |
| 112 |
+ # Install example config file |
| 113 |
insinto /etc/samba |
| 114 |
doins examples/smb.conf.default |
| 115 |
|
| 116 |
- # Fix paths in example file (#603964) |
| 117 |
+ # Fix paths in example file (bug #603964) |
| 118 |
sed \ |
| 119 |
-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \ |
| 120 |
-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \ |
Archives