commit: b9fd64557974fa02bc719f282a1776623072a864
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 3 21:25:56 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 14 23:21:35 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9fd6455
sys-process/audit: Drop superfluous calls to python_is_python3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sys-process/audit/audit-2.8.4.ebuild | 40 ++++++++-------------------------
sys-process/audit/audit-2.8.5-r1.ebuild | 40 ++++++++-------------------------
sys-process/audit/audit-2.8.5.ebuild | 40 ++++++++-------------------------
3 files changed, 27 insertions(+), 93 deletions(-)
diff --git a/sys-process/audit/audit-2.8.4.ebuild
b/sys-process/audit/audit-2.8.4.ebuild
index 9e94441dc51..fb5ec3ac098 100644
--- a/sys-process/audit/audit-2.8.4.ebuild
+++ b/sys-process/audit/audit-2.8.4.ebuild
@@ -85,11 +85,7 @@ multilib_src_configure() {
mkdir -p "${BUILD_DIR}" || die
cd "${BUILD_DIR}" || die
- if python_is_python3; then
- econf --without-python --with-python3
- else
- econf --with-python --without-python3
- fi
+ econf --without-python --with-python3
}
use python && python_foreach_impl python_configure
@@ -109,25 +105,16 @@ multilib_src_compile() {
default
python_compile() {
- local pysuffix pydef
- if python_is_python3; then
- pysuffix=3
- pydef='USE_PYTHON3=true'
- else
- pysuffix=2
- pydef='HAVE_PYTHON=true'
- fi
-
emake -C "${BUILD_DIR}"/bindings/swig \
VPATH="${native_build}/lib" \
LIBS="${native_build}/lib/libaudit.la" \
_audit_la_LIBADD="${native_build}/lib/libaudit.la" \
_audit_la_DEPENDENCIES="${S}/lib/libaudit.h
${native_build}/lib/libaudit.la" \
- ${pydef}
- emake -C
"${BUILD_DIR}"/bindings/python/python${pysuffix} \
-
VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}"
\
+ USE_PYTHON3=true
+ emake -C "${BUILD_DIR}"/bindings/python/python3 \
+
VPATH="${S}/bindings/python/python3:${native_build}/bindings/python/python3" \
auparse_la_LIBADD="${native_build}/auparse/libauparse.la
${native_build}/lib/libaudit.la" \
- ${pydef}
+ USE_PYTHON3=true
}
local native_build="${BUILD_DIR}"
@@ -143,26 +130,17 @@ multilib_src_install() {
emake DESTDIR="${D}" initdir="$(systemd_get_systemunitdir)"
install
python_install() {
- local pysuffix pydef
- if python_is_python3; then
- pysuffix=3
- pydef='USE_PYTHON3=true'
- else
- pysuffix=2
- pydef='HAVE_PYTHON=true'
- fi
-
emake -C "${BUILD_DIR}"/bindings/swig \
VPATH="${native_build}/lib" \
LIBS="${native_build}/lib/libaudit.la" \
_audit_la_LIBADD="${native_build}/lib/libaudit.la" \
_audit_la_DEPENDENCIES="${S}/lib/libaudit.h
${native_build}/lib/libaudit.la" \
- ${pydef} \
+ USE_PYTHON3=true \
DESTDIR="${D}" install
- emake -C
"${BUILD_DIR}"/bindings/python/python${pysuffix} \
-
VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}"
\
+ emake -C "${BUILD_DIR}"/bindings/python/python3 \
+
VPATH="${S}/bindings/python/python3:${native_build}/bindings/python/python3" \
auparse_la_LIBADD="${native_build}/auparse/libauparse.la
${native_build}/lib/libaudit.la" \
- ${pydef} \
+ USE_PYTHON3=true \
DESTDIR="${D}" install
}
diff --git a/sys-process/audit/audit-2.8.5-r1.ebuild
b/sys-process/audit/audit-2.8.5-r1.ebuild
index 4206c41eaf9..dba672537b5 100644
--- a/sys-process/audit/audit-2.8.5-r1.ebuild
+++ b/sys-process/audit/audit-2.8.5-r1.ebuild
@@ -95,11 +95,7 @@ multilib_src_configure() {
mkdir -p "${BUILD_DIR}" || die
cd "${BUILD_DIR}" || die
- if python_is_python3; then
- econf ${my_conf} --without-python --with-python3
- else
- econf ${my_conf} --with-python --without-python3
- fi
+ econf ${my_conf} --without-python --with-python3
}
use python && python_foreach_impl python_configure
@@ -119,25 +115,16 @@ multilib_src_compile() {
default
python_compile() {
- local pysuffix pydef
- if python_is_python3; then
- pysuffix=3
- pydef='USE_PYTHON3=true'
- else
- pysuffix=2
- pydef='HAVE_PYTHON=true'
- fi
-
emake -C "${BUILD_DIR}"/bindings/swig \
VPATH="${native_build}/lib" \
LIBS="${native_build}/lib/libaudit.la" \
_audit_la_LIBADD="${native_build}/lib/libaudit.la" \
_audit_la_DEPENDENCIES="${S}/lib/libaudit.h
${native_build}/lib/libaudit.la" \
- ${pydef}
- emake -C
"${BUILD_DIR}"/bindings/python/python${pysuffix} \
-
VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}"
\
+ USE_PYTHON3=true
+ emake -C "${BUILD_DIR}"/bindings/python/python3 \
+
VPATH="${S}/bindings/python/python3:${native_build}/bindings/python/python3" \
auparse_la_LIBADD="${native_build}/auparse/libauparse.la
${native_build}/lib/libaudit.la" \
- ${pydef}
+ USE_PYTHON3=true
}
local native_build="${BUILD_DIR}"
@@ -153,26 +140,17 @@ multilib_src_install() {
emake DESTDIR="${D}" initdir="$(systemd_get_systemunitdir)"
install
python_install() {
- local pysuffix pydef
- if python_is_python3; then
- pysuffix=3
- pydef='USE_PYTHON3=true'
- else
- pysuffix=2
- pydef='HAVE_PYTHON=true'
- fi
-
emake -C "${BUILD_DIR}"/bindings/swig \
VPATH="${native_build}/lib" \
LIBS="${native_build}/lib/libaudit.la" \
_audit_la_LIBADD="${native_build}/lib/libaudit.la" \
_audit_la_DEPENDENCIES="${S}/lib/libaudit.h
${native_build}/lib/libaudit.la" \
- ${pydef} \
+ USE_PYTHON3=true \
DESTDIR="${D}" install
- emake -C
"${BUILD_DIR}"/bindings/python/python${pysuffix} \
-
VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}"
\
+ emake -C "${BUILD_DIR}"/bindings/python/python3 \
+
VPATH="${S}/bindings/python/python3:${native_build}/bindings/python/python3" \
auparse_la_LIBADD="${native_build}/auparse/libauparse.la
${native_build}/lib/libaudit.la" \
- ${pydef} \
+ USE_PYTHON3=true \
DESTDIR="${D}" install
}
diff --git a/sys-process/audit/audit-2.8.5.ebuild
b/sys-process/audit/audit-2.8.5.ebuild
index aebeceb470c..d743db4f3f5 100644
--- a/sys-process/audit/audit-2.8.5.ebuild
+++ b/sys-process/audit/audit-2.8.5.ebuild
@@ -83,11 +83,7 @@ multilib_src_configure() {
mkdir -p "${BUILD_DIR}" || die
cd "${BUILD_DIR}" || die
- if python_is_python3; then
- econf ${my_conf} --without-python --with-python3
- else
- econf ${my_conf} --with-python --without-python3
- fi
+ econf ${my_conf} --without-python --with-python3
}
use python && python_foreach_impl python_configure
@@ -107,25 +103,16 @@ multilib_src_compile() {
default
python_compile() {
- local pysuffix pydef
- if python_is_python3; then
- pysuffix=3
- pydef='USE_PYTHON3=true'
- else
- pysuffix=2
- pydef='HAVE_PYTHON=true'
- fi
-
emake -C "${BUILD_DIR}"/bindings/swig \
VPATH="${native_build}/lib" \
LIBS="${native_build}/lib/libaudit.la" \
_audit_la_LIBADD="${native_build}/lib/libaudit.la" \
_audit_la_DEPENDENCIES="${S}/lib/libaudit.h
${native_build}/lib/libaudit.la" \
- ${pydef}
- emake -C
"${BUILD_DIR}"/bindings/python/python${pysuffix} \
-
VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}"
\
+ USE_PYTHON3=true
+ emake -C "${BUILD_DIR}"/bindings/python/python3 \
+
VPATH="${S}/bindings/python/python3:${native_build}/bindings/python/python3" \
auparse_la_LIBADD="${native_build}/auparse/libauparse.la
${native_build}/lib/libaudit.la" \
- ${pydef}
+ USE_PYTHON3=true
}
local native_build="${BUILD_DIR}"
@@ -141,26 +128,17 @@ multilib_src_install() {
emake DESTDIR="${D}" initdir="$(systemd_get_systemunitdir)"
install
python_install() {
- local pysuffix pydef
- if python_is_python3; then
- pysuffix=3
- pydef='USE_PYTHON3=true'
- else
- pysuffix=2
- pydef='HAVE_PYTHON=true'
- fi
-
emake -C "${BUILD_DIR}"/bindings/swig \
VPATH="${native_build}/lib" \
LIBS="${native_build}/lib/libaudit.la" \
_audit_la_LIBADD="${native_build}/lib/libaudit.la" \
_audit_la_DEPENDENCIES="${S}/lib/libaudit.h
${native_build}/lib/libaudit.la" \
- ${pydef} \
+ USE_PYTHON3=true \
DESTDIR="${D}" install
- emake -C
"${BUILD_DIR}"/bindings/python/python${pysuffix} \
-
VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}"
\
+ emake -C "${BUILD_DIR}"/bindings/python/python3 \
+
VPATH="${S}/bindings/python/python3:${native_build}/bindings/python/python3" \
auparse_la_LIBADD="${native_build}/auparse/libauparse.la
${native_build}/lib/libaudit.la" \
- ${pydef} \
+ USE_PYTHON3=true \
DESTDIR="${D}" install
}
