| 1 |
commit: b9fd64557974fa02bc719f282a1776623072a864 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Aug 3 21:25:56 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 14 23:21:35 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9fd6455 |
| 7 |
|
| 8 |
sys-process/audit: Drop superfluous calls to python_is_python3 |
| 9 |
|
| 10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-process/audit/audit-2.8.4.ebuild | 40 ++++++++------------------------- |
| 13 |
sys-process/audit/audit-2.8.5-r1.ebuild | 40 ++++++++------------------------- |
| 14 |
sys-process/audit/audit-2.8.5.ebuild | 40 ++++++++------------------------- |
| 15 |
3 files changed, 27 insertions(+), 93 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-process/audit/audit-2.8.4.ebuild b/sys-process/audit/audit-2.8.4.ebuild |
| 18 |
index 9e94441dc51..fb5ec3ac098 100644 |
| 19 |
--- a/sys-process/audit/audit-2.8.4.ebuild |
| 20 |
+++ b/sys-process/audit/audit-2.8.4.ebuild |
| 21 |
@@ -85,11 +85,7 @@ multilib_src_configure() { |
| 22 |
mkdir -p "${BUILD_DIR}" || die |
| 23 |
cd "${BUILD_DIR}" || die |
| 24 |
|
| 25 |
- if python_is_python3; then |
| 26 |
- econf --without-python --with-python3 |
| 27 |
- else |
| 28 |
- econf --with-python --without-python3 |
| 29 |
- fi |
| 30 |
+ econf --without-python --with-python3 |
| 31 |
} |
| 32 |
|
| 33 |
use python && python_foreach_impl python_configure |
| 34 |
@@ -109,25 +105,16 @@ multilib_src_compile() { |
| 35 |
default |
| 36 |
|
| 37 |
python_compile() { |
| 38 |
- local pysuffix pydef |
| 39 |
- if python_is_python3; then |
| 40 |
- pysuffix=3 |
| 41 |
- pydef='USE_PYTHON3=true' |
| 42 |
- else |
| 43 |
- pysuffix=2 |
| 44 |
- pydef='HAVE_PYTHON=true' |
| 45 |
- fi |
| 46 |
- |
| 47 |
emake -C "${BUILD_DIR}"/bindings/swig \ |
| 48 |
VPATH="${native_build}/lib" \ |
| 49 |
LIBS="${native_build}/lib/libaudit.la" \ |
| 50 |
_audit_la_LIBADD="${native_build}/lib/libaudit.la" \ |
| 51 |
_audit_la_DEPENDENCIES="${S}/lib/libaudit.h ${native_build}/lib/libaudit.la" \ |
| 52 |
- ${pydef} |
| 53 |
- emake -C "${BUILD_DIR}"/bindings/python/python${pysuffix} \ |
| 54 |
- VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}" \ |
| 55 |
+ USE_PYTHON3=true |
| 56 |
+ emake -C "${BUILD_DIR}"/bindings/python/python3 \ |
| 57 |
+ VPATH="${S}/bindings/python/python3:${native_build}/bindings/python/python3" \ |
| 58 |
auparse_la_LIBADD="${native_build}/auparse/libauparse.la ${native_build}/lib/libaudit.la" \ |
| 59 |
- ${pydef} |
| 60 |
+ USE_PYTHON3=true |
| 61 |
} |
| 62 |
|
| 63 |
local native_build="${BUILD_DIR}" |
| 64 |
@@ -143,26 +130,17 @@ multilib_src_install() { |
| 65 |
emake DESTDIR="${D}" initdir="$(systemd_get_systemunitdir)" install |
| 66 |
|
| 67 |
python_install() { |
| 68 |
- local pysuffix pydef |
| 69 |
- if python_is_python3; then |
| 70 |
- pysuffix=3 |
| 71 |
- pydef='USE_PYTHON3=true' |
| 72 |
- else |
| 73 |
- pysuffix=2 |
| 74 |
- pydef='HAVE_PYTHON=true' |
| 75 |
- fi |
| 76 |
- |
| 77 |
emake -C "${BUILD_DIR}"/bindings/swig \ |
| 78 |
VPATH="${native_build}/lib" \ |
| 79 |
LIBS="${native_build}/lib/libaudit.la" \ |
| 80 |
_audit_la_LIBADD="${native_build}/lib/libaudit.la" \ |
| 81 |
_audit_la_DEPENDENCIES="${S}/lib/libaudit.h ${native_build}/lib/libaudit.la" \ |
| 82 |
- ${pydef} \ |
| 83 |
+ USE_PYTHON3=true \ |
| 84 |
DESTDIR="${D}" install |
| 85 |
- emake -C "${BUILD_DIR}"/bindings/python/python${pysuffix} \ |
| 86 |
- VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}" \ |
| 87 |
+ emake -C "${BUILD_DIR}"/bindings/python/python3 \ |
| 88 |
+ VPATH="${S}/bindings/python/python3:${native_build}/bindings/python/python3" \ |
| 89 |
auparse_la_LIBADD="${native_build}/auparse/libauparse.la ${native_build}/lib/libaudit.la" \ |
| 90 |
- ${pydef} \ |
| 91 |
+ USE_PYTHON3=true \ |
| 92 |
DESTDIR="${D}" install |
| 93 |
} |
| 94 |
|
| 95 |
|
| 96 |
diff --git a/sys-process/audit/audit-2.8.5-r1.ebuild b/sys-process/audit/audit-2.8.5-r1.ebuild |
| 97 |
index 4206c41eaf9..dba672537b5 100644 |
| 98 |
--- a/sys-process/audit/audit-2.8.5-r1.ebuild |
| 99 |
+++ b/sys-process/audit/audit-2.8.5-r1.ebuild |
| 100 |
@@ -95,11 +95,7 @@ multilib_src_configure() { |
| 101 |
mkdir -p "${BUILD_DIR}" || die |
| 102 |
cd "${BUILD_DIR}" || die |
| 103 |
|
| 104 |
- if python_is_python3; then |
| 105 |
- econf ${my_conf} --without-python --with-python3 |
| 106 |
- else |
| 107 |
- econf ${my_conf} --with-python --without-python3 |
| 108 |
- fi |
| 109 |
+ econf ${my_conf} --without-python --with-python3 |
| 110 |
} |
| 111 |
|
| 112 |
use python && python_foreach_impl python_configure |
| 113 |
@@ -119,25 +115,16 @@ multilib_src_compile() { |
| 114 |
default |
| 115 |
|
| 116 |
python_compile() { |
| 117 |
- local pysuffix pydef |
| 118 |
- if python_is_python3; then |
| 119 |
- pysuffix=3 |
| 120 |
- pydef='USE_PYTHON3=true' |
| 121 |
- else |
| 122 |
- pysuffix=2 |
| 123 |
- pydef='HAVE_PYTHON=true' |
| 124 |
- fi |
| 125 |
- |
| 126 |
emake -C "${BUILD_DIR}"/bindings/swig \ |
| 127 |
VPATH="${native_build}/lib" \ |
| 128 |
LIBS="${native_build}/lib/libaudit.la" \ |
| 129 |
_audit_la_LIBADD="${native_build}/lib/libaudit.la" \ |
| 130 |
_audit_la_DEPENDENCIES="${S}/lib/libaudit.h ${native_build}/lib/libaudit.la" \ |
| 131 |
- ${pydef} |
| 132 |
- emake -C "${BUILD_DIR}"/bindings/python/python${pysuffix} \ |
| 133 |
- VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}" \ |
| 134 |
+ USE_PYTHON3=true |
| 135 |
+ emake -C "${BUILD_DIR}"/bindings/python/python3 \ |
| 136 |
+ VPATH="${S}/bindings/python/python3:${native_build}/bindings/python/python3" \ |
| 137 |
auparse_la_LIBADD="${native_build}/auparse/libauparse.la ${native_build}/lib/libaudit.la" \ |
| 138 |
- ${pydef} |
| 139 |
+ USE_PYTHON3=true |
| 140 |
} |
| 141 |
|
| 142 |
local native_build="${BUILD_DIR}" |
| 143 |
@@ -153,26 +140,17 @@ multilib_src_install() { |
| 144 |
emake DESTDIR="${D}" initdir="$(systemd_get_systemunitdir)" install |
| 145 |
|
| 146 |
python_install() { |
| 147 |
- local pysuffix pydef |
| 148 |
- if python_is_python3; then |
| 149 |
- pysuffix=3 |
| 150 |
- pydef='USE_PYTHON3=true' |
| 151 |
- else |
| 152 |
- pysuffix=2 |
| 153 |
- pydef='HAVE_PYTHON=true' |
| 154 |
- fi |
| 155 |
- |
| 156 |
emake -C "${BUILD_DIR}"/bindings/swig \ |
| 157 |
VPATH="${native_build}/lib" \ |
| 158 |
LIBS="${native_build}/lib/libaudit.la" \ |
| 159 |
_audit_la_LIBADD="${native_build}/lib/libaudit.la" \ |
| 160 |
_audit_la_DEPENDENCIES="${S}/lib/libaudit.h ${native_build}/lib/libaudit.la" \ |
| 161 |
- ${pydef} \ |
| 162 |
+ USE_PYTHON3=true \ |
| 163 |
DESTDIR="${D}" install |
| 164 |
- emake -C "${BUILD_DIR}"/bindings/python/python${pysuffix} \ |
| 165 |
- VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}" \ |
| 166 |
+ emake -C "${BUILD_DIR}"/bindings/python/python3 \ |
| 167 |
+ VPATH="${S}/bindings/python/python3:${native_build}/bindings/python/python3" \ |
| 168 |
auparse_la_LIBADD="${native_build}/auparse/libauparse.la ${native_build}/lib/libaudit.la" \ |
| 169 |
- ${pydef} \ |
| 170 |
+ USE_PYTHON3=true \ |
| 171 |
DESTDIR="${D}" install |
| 172 |
} |
| 173 |
|
| 174 |
|
| 175 |
diff --git a/sys-process/audit/audit-2.8.5.ebuild b/sys-process/audit/audit-2.8.5.ebuild |
| 176 |
index aebeceb470c..d743db4f3f5 100644 |
| 177 |
--- a/sys-process/audit/audit-2.8.5.ebuild |
| 178 |
+++ b/sys-process/audit/audit-2.8.5.ebuild |
| 179 |
@@ -83,11 +83,7 @@ multilib_src_configure() { |
| 180 |
mkdir -p "${BUILD_DIR}" || die |
| 181 |
cd "${BUILD_DIR}" || die |
| 182 |
|
| 183 |
- if python_is_python3; then |
| 184 |
- econf ${my_conf} --without-python --with-python3 |
| 185 |
- else |
| 186 |
- econf ${my_conf} --with-python --without-python3 |
| 187 |
- fi |
| 188 |
+ econf ${my_conf} --without-python --with-python3 |
| 189 |
} |
| 190 |
|
| 191 |
use python && python_foreach_impl python_configure |
| 192 |
@@ -107,25 +103,16 @@ multilib_src_compile() { |
| 193 |
default |
| 194 |
|
| 195 |
python_compile() { |
| 196 |
- local pysuffix pydef |
| 197 |
- if python_is_python3; then |
| 198 |
- pysuffix=3 |
| 199 |
- pydef='USE_PYTHON3=true' |
| 200 |
- else |
| 201 |
- pysuffix=2 |
| 202 |
- pydef='HAVE_PYTHON=true' |
| 203 |
- fi |
| 204 |
- |
| 205 |
emake -C "${BUILD_DIR}"/bindings/swig \ |
| 206 |
VPATH="${native_build}/lib" \ |
| 207 |
LIBS="${native_build}/lib/libaudit.la" \ |
| 208 |
_audit_la_LIBADD="${native_build}/lib/libaudit.la" \ |
| 209 |
_audit_la_DEPENDENCIES="${S}/lib/libaudit.h ${native_build}/lib/libaudit.la" \ |
| 210 |
- ${pydef} |
| 211 |
- emake -C "${BUILD_DIR}"/bindings/python/python${pysuffix} \ |
| 212 |
- VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}" \ |
| 213 |
+ USE_PYTHON3=true |
| 214 |
+ emake -C "${BUILD_DIR}"/bindings/python/python3 \ |
| 215 |
+ VPATH="${S}/bindings/python/python3:${native_build}/bindings/python/python3" \ |
| 216 |
auparse_la_LIBADD="${native_build}/auparse/libauparse.la ${native_build}/lib/libaudit.la" \ |
| 217 |
- ${pydef} |
| 218 |
+ USE_PYTHON3=true |
| 219 |
} |
| 220 |
|
| 221 |
local native_build="${BUILD_DIR}" |
| 222 |
@@ -141,26 +128,17 @@ multilib_src_install() { |
| 223 |
emake DESTDIR="${D}" initdir="$(systemd_get_systemunitdir)" install |
| 224 |
|
| 225 |
python_install() { |
| 226 |
- local pysuffix pydef |
| 227 |
- if python_is_python3; then |
| 228 |
- pysuffix=3 |
| 229 |
- pydef='USE_PYTHON3=true' |
| 230 |
- else |
| 231 |
- pysuffix=2 |
| 232 |
- pydef='HAVE_PYTHON=true' |
| 233 |
- fi |
| 234 |
- |
| 235 |
emake -C "${BUILD_DIR}"/bindings/swig \ |
| 236 |
VPATH="${native_build}/lib" \ |
| 237 |
LIBS="${native_build}/lib/libaudit.la" \ |
| 238 |
_audit_la_LIBADD="${native_build}/lib/libaudit.la" \ |
| 239 |
_audit_la_DEPENDENCIES="${S}/lib/libaudit.h ${native_build}/lib/libaudit.la" \ |
| 240 |
- ${pydef} \ |
| 241 |
+ USE_PYTHON3=true \ |
| 242 |
DESTDIR="${D}" install |
| 243 |
- emake -C "${BUILD_DIR}"/bindings/python/python${pysuffix} \ |
| 244 |
- VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}" \ |
| 245 |
+ emake -C "${BUILD_DIR}"/bindings/python/python3 \ |
| 246 |
+ VPATH="${S}/bindings/python/python3:${native_build}/bindings/python/python3" \ |
| 247 |
auparse_la_LIBADD="${native_build}/auparse/libauparse.la ${native_build}/lib/libaudit.la" \ |
| 248 |
- ${pydef} \ |
| 249 |
+ USE_PYTHON3=true \ |
| 250 |
DESTDIR="${D}" install |
| 251 |
} |
Archives