[gentoo-commits] repo/gentoo:master commit in: sys-process/audit/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/audit/
Date: Fri, 14 Aug 2020 23:22:22 +0000 (UTC)	[thread overview]
Message-ID: <1597447295.b9fd64557974fa02bc719f282a1776623072a864.asturm@gentoo> (raw)

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
 		}

next             reply	other threads:[~2020-08-14 23:22 UTC|newest]

Thread overview: 154+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-14 23:22 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-12-02 21:47 [gentoo-commits] repo/gentoo:master commit in: sys-process/audit/ Sam James
2024-11-22 18:24 Sam James
2024-11-22 18:24 Sam James
2024-11-21 12:23 Sam James
2024-10-13 22:43 Sam James
2024-10-13 22:43 Sam James
2024-10-13 22:43 Sam James
2024-10-13 22:43 Sam James
2024-10-13 22:43 Sam James
2024-10-13 22:43 Sam James
2024-09-08 23:37 Jason Zaman
2024-09-08 23:26 Jason Zaman
2024-09-08 23:26 Jason Zaman
2024-07-23 16:09 Mike Gilbert
2024-07-14 23:15 Jason Zaman
2024-07-03  5:17 Ionen Wolkens
2024-06-09 20:06 Sam James
2024-06-09 16:25 Sam James
2024-06-09 16:25 Sam James
2024-06-09 16:25 Sam James
2024-06-09 16:25 Sam James
2024-06-09 16:25 Sam James
2024-06-09 16:25 Sam James
2024-06-07 13:27 Kenton Groombridge
2024-06-06 13:49 Kenton Groombridge
2024-05-26 23:12 Sam James
2024-02-20  5:14 Sam James
2023-08-21  5:58 Sam James
2023-08-16 10:47 Arthur Zamarin
2023-08-07  5:43 Sam James
2023-08-02 15:11 Sam James
2023-08-02  7:33 Sam James
2023-07-25 18:52 Sam James
2023-07-25 18:14 Arthur Zamarin
2023-07-25 15:29 Jakov Smolić
2023-05-03  6:23 Sam James
2023-05-01 12:49 Sam James
2023-01-01 23:07 Matt Turner
2022-12-25 23:34 Georgy Yakovlev
2022-12-08  6:50 WANG Xuerui
2022-10-27 23:46 Sam James
2022-10-27 23:46 Sam James
2022-10-27 15:40 Arthur Zamarin
2022-10-27 15:40 Arthur Zamarin
2022-10-27 15:40 Arthur Zamarin
2022-10-27 15:40 Arthur Zamarin
2022-10-27 15:40 Arthur Zamarin
2022-10-27 15:40 Arthur Zamarin
2022-08-29 22:32 Sam James
2022-06-04  1:03 Kenton Groombridge
2022-03-23  0:14 Sam James
2022-03-06  9:18 Sam James
2022-03-06  9:18 Sam James
2021-12-22  9:36 Arthur Zamarin
2021-12-21 20:33 Arthur Zamarin
2021-12-21 11:30 Jakov Smolić
2021-12-21 11:24 Arthur Zamarin
2021-12-21 11:07 Arthur Zamarin
2021-12-21 11:07 Arthur Zamarin
2021-12-21  7:19 Agostino Sarubbo
2021-12-21  3:50 Sam James
2021-11-20 23:20 Sam James
2021-11-03  2:07 Sam James
2021-11-03  2:05 Sam James
2021-11-03  2:02 Sam James
2021-11-03  2:02 Sam James
2021-08-01 20:30 Matt Turner
2021-07-16  1:34 Sam James
2021-03-30 23:39 Thomas Deutschmann
2021-02-15  0:38 Sam James
2021-02-09 21:31 Sam James
2021-02-09 14:11 Sergei Trofimovich
2021-02-08 15:08 Sergei Trofimovich
2021-02-08  6:12 Sam James
2021-02-07  4:19 Jason Zaman
2021-01-07 10:42 Michał Górny
2021-01-04 19:38 Sergei Trofimovich
2021-01-04 11:11 Andreas K. Hüttel
2021-01-03  8:21 Jason Zaman
2020-12-14  1:24 Sam James
2020-12-13 23:23 Sam James
2020-12-12 21:25 Sergei Trofimovich
2020-12-05 11:43 Sergei Trofimovich
2020-12-04 18:37 Sergei Trofimovich
2020-12-04 18:31 Sergei Trofimovich
2020-12-03  3:12 Jason Zaman
2020-10-25 21:29 Jason Zaman
2020-07-05 22:36 Robin H. Johnson
2020-02-10 21:25 Michał Górny
2019-12-25  5:32 Robin H. Johnson
2019-08-17 10:09 Jason Zaman
2019-05-04 15:13 Mikle Kolyada
2019-02-08  8:46 Mikle Kolyada
2019-02-04 20:16 Markus Meier
2019-01-30 13:20 Tobias Klausmann
2019-01-26  8:51 Sergei Trofimovich
2019-01-25 14:20 Mikle Kolyada
2019-01-24 21:43 Sergei Trofimovich
2019-01-23 21:12 Sergei Trofimovich
2019-01-23 21:01 Sergei Trofimovich
2019-01-23 20:55 Sergei Trofimovich
2018-10-17 11:14 Mikle Kolyada
2018-10-14 16:18 Mikle Kolyada
2018-10-13  6:56 Tobias Klausmann
2018-10-06 22:08 Sergei Trofimovich
2018-10-06 18:23 Sergei Trofimovich
2018-10-06 17:13 Sergei Trofimovich
2018-10-06 16:48 Matt Turner
2018-10-06 16:48 Matt Turner
2018-10-05 12:25 Thomas Deutschmann
2018-10-05  9:44 Jason Zaman
2018-08-06 19:29 Robin H. Johnson
2018-07-20 22:24 Sergei Trofimovich
2018-06-04  7:50 Jason Zaman
2018-06-04  7:50 Jason Zaman
2018-06-03 19:59 Mikle Kolyada
2018-06-02 13:57 Mikle Kolyada
2018-04-19 20:43 Mikle Kolyada
2018-04-08  9:52 Sergei Trofimovich
2018-03-05 20:26 Sergei Trofimovich
2018-03-05 17:14 Tobias Klausmann
2018-03-02 23:39 Sergei Trofimovich
2018-03-02 14:15 Jason Zaman
2018-03-02 10:37 Jason Zaman
2018-03-02 10:37 Jason Zaman
2018-03-02  6:27 Jason Zaman
2018-03-02  6:27 Jason Zaman
2017-11-26 23:26 David Seifert
2017-05-26 22:54 David Seifert
2017-05-12 12:06 Manuel Rüger
2017-02-10  1:49 Mike Frysinger
2017-02-10  1:49 Mike Frysinger
2017-02-10  1:49 Mike Frysinger
2017-02-10  1:49 Mike Frysinger
2017-02-10  1:49 Mike Frysinger
2017-01-09 14:02 Jeroen Roovers
2016-12-22  9:34 Agostino Sarubbo
2016-12-20  9:44 Agostino Sarubbo
2016-12-19 15:12 Agostino Sarubbo
2016-12-19 14:35 Agostino Sarubbo
2016-12-02 14:21 Tobias Klausmann
2016-11-30 19:33 Markus Meier
2016-11-29 10:43 Agostino Sarubbo
2016-11-29 10:41 Agostino Sarubbo
2016-07-18 17:25 Markus Meier
2016-07-17  6:51 Jeroen Roovers
2016-07-17  5:48 Jason Zaman
2016-07-17  5:48 Jason Zaman
2016-07-17  5:48 Jason Zaman
2016-07-13  6:35 Jeroen Roovers
2016-05-27 13:02 Tobias Klausmann
2016-03-26 16:39 Agostino Sarubbo
2016-02-17 16:04 Mike Frysinger

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:9e94441dc5 dfblob:fb5ec3ac09 dfblob:4206c41eaf
dfblob:dba672537b dfblob:aebeceb470 dfblob:d743db4f3f )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: sys-process/audit/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1597447295.b9fd64557974fa02bc719f282a1776623072a864.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox