diff options
| author |   Sam James <sam@gentoo.org> | 2023-07-27 08:17:45 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-07-27 08:17:45 +0100 |
| commit | 645de9036095d802b0bbf0eaf103916faba8d05a (patch) | |
| tree | 81c85f189803652ac320d0c16c85febe66fad3c0 | |
| parent | app-forensics/yara: Stabilize 4.3.2 amd64, #911282 (diff) | |
| download | gentoo-645de9036095d802b0bbf0eaf103916faba8d05a.tar.gz gentoo-645de9036095d802b0bbf0eaf103916faba8d05a.tar.bz2 gentoo-645de9036095d802b0bbf0eaf103916faba8d05a.zip | |
app-admin/setools: fix patch application w/ USE=-X
The cython-3 patch wasn't applied w/ USE=-X because of the sneaky 'local'
which I'd only partially cleaned up.
Closes: https://bugs.gentoo.org/911289
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | app-admin/setools/setools-4.4.1-r1.ebuild | 2 | ||||
| -rw-r--r-- | app-admin/setools/setools-4.4.1.ebuild | 4 | ||||
| -rw-r--r-- | app-admin/setools/setools-4.4.2.ebuild | 2 | ||||
| -rw-r--r-- | app-admin/setools/setools-9999.ebuild | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/app-admin/setools/setools-4.4.1-r1.ebuild b/app-admin/setools/setools-4.4.1-r1.ebuild index b2f3219fe402..b47388f73018 100644 --- a/app-admin/setools/setools-4.4.1-r1.ebuild +++ b/app-admin/setools/setools-4.4.1-r1.ebuild @@ -55,6 +55,6 @@ python_prepare_all() { sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \ die "failed to set lib_dirs" - use X || local PATCHES+=( "${FILESDIR}"/setools-4.4.0-remove-gui.patch ) + use X || PATCHES+=( "${FILESDIR}"/setools-4.4.0-remove-gui.patch ) distutils-r1_python_prepare_all } diff --git a/app-admin/setools/setools-4.4.1.ebuild b/app-admin/setools/setools-4.4.1.ebuild index b7b5f128a984..52dcc404d73c 100644 --- a/app-admin/setools/setools-4.4.1.ebuild +++ b/app-admin/setools/setools-4.4.1.ebuild @@ -46,8 +46,8 @@ python_prepare_all() { sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \ die "failed to set lib_dirs" - local PATCHES=( "${FILESDIR}"/0001-__init__.py-Make-NetworkX-dep-optional.patch ) - use X || local PATCHES+=( "${FILESDIR}"/setools-4.4.0-remove-gui.patch ) + PATCHES=( "${FILESDIR}"/0001-__init__.py-Make-NetworkX-dep-optional.patch ) + use X || PATCHES+=( "${FILESDIR}"/setools-4.4.0-remove-gui.patch ) distutils-r1_python_prepare_all } diff --git a/app-admin/setools/setools-4.4.2.ebuild b/app-admin/setools/setools-4.4.2.ebuild index c8bb3da428c1..b56099e25e94 100644 --- a/app-admin/setools/setools-4.4.2.ebuild +++ b/app-admin/setools/setools-4.4.2.ebuild @@ -51,7 +51,7 @@ python_prepare_all() { sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \ die "failed to set lib_dirs" - use X || local PATCHES+=( "${FILESDIR}"/setools-4.4.2-remove-gui.patch ) + use X || PATCHES+=( "${FILESDIR}"/setools-4.4.2-remove-gui.patch ) distutils-r1_python_prepare_all } diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild index 45491fdc5939..2d9636b33744 100644 --- a/app-admin/setools/setools-9999.ebuild +++ b/app-admin/setools/setools-9999.ebuild @@ -47,7 +47,7 @@ python_prepare_all() { sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \ die "failed to set lib_dirs" - use X || local PATCHES+=( "${FILESDIR}"/setools-4.4.2-remove-gui.patch ) + use X || PATCHES+=( "${FILESDIR}"/setools-4.4.2-remove-gui.patch ) distutils-r1_python_prepare_all } |