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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 306CE138359 for ; Fri, 14 Aug 2020 23:22:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A8490E08FE; Fri, 14 Aug 2020 23:22:27 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 85A61E08F7 for ; Fri, 14 Aug 2020 23:22:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8BAD134F3B1 for ; Fri, 14 Aug 2020 23:22:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0F1A2332 for ; Fri, 14 Aug 2020 23:22:22 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1597447295.b9fd64557974fa02bc719f282a1776623072a864.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/audit/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-process/audit/audit-2.8.4.ebuild sys-process/audit/audit-2.8.5-r1.ebuild sys-process/audit/audit-2.8.5.ebuild X-VCS-Directories: sys-process/audit/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b9fd64557974fa02bc719f282a1776623072a864 X-VCS-Branch: master Date: Fri, 14 Aug 2020 23:22:22 +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: 49cb3801-cfbd-46e1-9a96-b53e1ef509d3 X-Archives-Hash: d32a05f1839f13f6247568333564b902 commit: b9fd64557974fa02bc719f282a1776623072a864 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Aug 3 21:25:56 2020 +0000 Commit: Andreas Sturmlechner gentoo 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 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 }