commit: bbfe0c7dad92adc575284a16e2405a1d0efc1166
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Dec 11 18:37:57 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Dec 23 19:50:16 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbfe0c7d
app-emulation/qemu: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
app-emulation/qemu/files/qemu-8.0.0-make.patch | 13 -------
.../qemu-8.0.0-remove-python-meson-check.patch | 40 ----------------------
2 files changed, 53 deletions(-)
diff --git a/app-emulation/qemu/files/qemu-8.0.0-make.patch
b/app-emulation/qemu/files/qemu-8.0.0-make.patch
deleted file mode 100644
index 40bafd490052..000000000000
--- a/app-emulation/qemu/files/qemu-8.0.0-make.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure b/configure
-index 800b5850f..331e8950d 100755
---- a/configure
-+++ b/configure
-@@ -1069,7 +1069,7 @@ then
- fi
- fi
-
--if ! has "$make"
-+if ! has $make
- then
- error_exit "GNU make ($make) not found"
- fi
diff --git
a/app-emulation/qemu/files/qemu-8.0.0-remove-python-meson-check.patch
b/app-emulation/qemu/files/qemu-8.0.0-remove-python-meson-check.patch
deleted file mode 100644
index 07d3836c57e4..000000000000
--- a/app-emulation/qemu/files/qemu-8.0.0-remove-python-meson-check.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/configure b/configure
-index 4369fa5..7807ad5 100755
---- a/configure
-+++ b/configure
-@@ -1095,34 +1095,7 @@ has_meson() {
- fi
- }
-
--if test -z "$meson"; then
-- if test "$explicit_python" = no && has_meson && version_ge "$(meson
--version)" 0.61.5; then
-- meson=meson
-- elif test "$git_submodules_action" != 'ignore' ; then
-- meson=git
-- elif test -e "${source_path}/meson/meson.py" ; then
-- meson=internal
-- else
-- if test "$explicit_python" = yes; then
-- error_exit "--python requires using QEMU's embedded Meson
distribution, but it was not found."
-- else
-- error_exit "Meson not found. Use --meson=/path/to/meson"
-- fi
-- fi
--else
-- # Meson uses its own Python interpreter to invoke other Python scripts,
-- # but the user wants to use the one they specified with --python.
-- #
-- # We do not want to override the distro Python interpreter (and sometimes
-- # cannot: for example in Homebrew /usr/bin/meson is a bash script), so
-- # just require --meson=git|internal together with --python.
-- if test "$explicit_python" = yes; then
-- case "$meson" in
-- git | internal) ;;
-- *) error_exit "--python requires using QEMU's embedded Meson
distribution." ;;
-- esac
-- fi
--fi
-+meson=meson
-
- if test "$meson" = git; then
- git_submodules="${git_submodules} meson"
