commit: 73e6f2dccad9bf02902232fcc7a47300ec92e9aa
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 19 15:31:02 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 14 00:46:52 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73e6f2dc
net-fs/samba: [QA] inline ESYSROOT
ESYSROOT is SYSROOT/EPREFIX in >= EAPI 7
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-fs/samba/samba-4.14.12-r3.ebuild | 2 +-
net-fs/samba/samba-4.14.13.ebuild | 2 +-
net-fs/samba/samba-4.15.4-r3.ebuild | 2 +-
net-fs/samba/samba-4.15.6-r1.ebuild | 2 +-
net-fs/samba/samba-4.15.7.ebuild | 2 +-
net-fs/samba/samba-4.16.0-r1.ebuild | 2 +-
net-fs/samba/samba-4.16.1.ebuild | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/net-fs/samba/samba-4.14.12-r3.ebuild
b/net-fs/samba/samba-4.14.12-r3.ebuild
index 596a27073a1f..fbb716f96f4d 100644
--- a/net-fs/samba/samba-4.14.12-r3.ebuild
+++ b/net-fs/samba/samba-4.14.12-r3.ebuild
@@ -250,7 +250,7 @@ multilib_src_configure() {
myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
fi
- CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+ CPPFLAGS="-I${ESYSROOT}/usr/include/et ${CPPFLAGS}" \
waf-utils_src_configure ${myconf[@]}
}
diff --git a/net-fs/samba/samba-4.14.13.ebuild
b/net-fs/samba/samba-4.14.13.ebuild
index 0b80891930e8..165914c640d6 100644
--- a/net-fs/samba/samba-4.14.13.ebuild
+++ b/net-fs/samba/samba-4.14.13.ebuild
@@ -250,7 +250,7 @@ multilib_src_configure() {
myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
fi
- CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+ CPPFLAGS="-I${ESYSROOT}/usr/include/et ${CPPFLAGS}" \
waf-utils_src_configure ${myconf[@]}
}
diff --git a/net-fs/samba/samba-4.15.4-r3.ebuild
b/net-fs/samba/samba-4.15.4-r3.ebuild
index bf1ff5956d07..117c8a7ef117 100644
--- a/net-fs/samba/samba-4.15.4-r3.ebuild
+++ b/net-fs/samba/samba-4.15.4-r3.ebuild
@@ -246,7 +246,7 @@ multilib_src_configure() {
myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
fi
- CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+ CPPFLAGS="-I${ESYSROOT}/usr/include/et ${CPPFLAGS}" \
waf-utils_src_configure ${myconf[@]}
}
diff --git a/net-fs/samba/samba-4.15.6-r1.ebuild
b/net-fs/samba/samba-4.15.6-r1.ebuild
index bfffbd68dc99..aa3c460800e1 100644
--- a/net-fs/samba/samba-4.15.6-r1.ebuild
+++ b/net-fs/samba/samba-4.15.6-r1.ebuild
@@ -246,7 +246,7 @@ multilib_src_configure() {
myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
fi
- PYTHONHASHSEED=1 CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et
${CPPFLAGS}" \
+ PYTHONHASHSEED=1 CPPFLAGS="-I${ESYSROOT}/usr/include/et ${CPPFLAGS}" \
waf-utils_src_configure ${myconf[@]}
}
diff --git a/net-fs/samba/samba-4.15.7.ebuild b/net-fs/samba/samba-4.15.7.ebuild
index bfffbd68dc99..aa3c460800e1 100644
--- a/net-fs/samba/samba-4.15.7.ebuild
+++ b/net-fs/samba/samba-4.15.7.ebuild
@@ -246,7 +246,7 @@ multilib_src_configure() {
myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
fi
- PYTHONHASHSEED=1 CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et
${CPPFLAGS}" \
+ PYTHONHASHSEED=1 CPPFLAGS="-I${ESYSROOT}/usr/include/et ${CPPFLAGS}" \
waf-utils_src_configure ${myconf[@]}
}
diff --git a/net-fs/samba/samba-4.16.0-r1.ebuild
b/net-fs/samba/samba-4.16.0-r1.ebuild
index dfb87123595c..a7d3fa8bb5d3 100644
--- a/net-fs/samba/samba-4.16.0-r1.ebuild
+++ b/net-fs/samba/samba-4.16.0-r1.ebuild
@@ -247,7 +247,7 @@ multilib_src_configure() {
myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
fi
- PYTHONHASHSEED=1 CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et
${CPPFLAGS}" \
+ PYTHONHASHSEED=1 CPPFLAGS="-I${ESYSROOT}/usr/include/et ${CPPFLAGS}" \
waf-utils_src_configure ${myconf[@]}
}
diff --git a/net-fs/samba/samba-4.16.1.ebuild b/net-fs/samba/samba-4.16.1.ebuild
index dfb87123595c..a7d3fa8bb5d3 100644
--- a/net-fs/samba/samba-4.16.1.ebuild
+++ b/net-fs/samba/samba-4.16.1.ebuild
@@ -247,7 +247,7 @@ multilib_src_configure() {
myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
fi
- PYTHONHASHSEED=1 CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et
${CPPFLAGS}" \
+ PYTHONHASHSEED=1 CPPFLAGS="-I${ESYSROOT}/usr/include/et ${CPPFLAGS}" \
waf-utils_src_configure ${myconf[@]}
}