commit: dadb2f72c60034e5c7b339f9ea2e51d9689c6fe4 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Wed May 26 06:52:40 2021 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Wed May 26 06:53:57 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dadb2f72
app-emulation/qemu: revert "apply sphinx-4 workaround" This reverts commit 65b728346b8f8833906f796f16bafb8361931879. Reported-by: Michael Moon Bug: https://bugs.gentoo.org/789561 Bug: https://bugs.gentoo.org/791331 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> app-emulation/qemu/files/qemu-6.0.0-sphinx-4.patch | 35 ---------------------- app-emulation/qemu/qemu-6.0.0.ebuild | 1 - 2 files changed, 36 deletions(-) diff --git a/app-emulation/qemu/files/qemu-6.0.0-sphinx-4.patch b/app-emulation/qemu/files/qemu-6.0.0-sphinx-4.patch deleted file mode 100644 index 2a1e6f9f5f4..00000000000 --- a/app-emulation/qemu/files/qemu-6.0.0-sphinx-4.patch +++ /dev/null @@ -1,35 +0,0 @@ -https://patchew.org/QEMU/[email protected]/ -https://gitlab.com/qemu-project/qemu/-/issues/256 -https://bugs.gentoo.org/789561 - -From c1155afabf1a3e093049975ba1748cf39734aa52 Mon Sep 17 00:00:00 2001 -From: Damien Goutte-Gattat via <[email protected]> -Date: Mon, 3 May 2021 17:14:22 +0100 -Subject: [PATCH] docs: Fix installation of man pages with Sphinx 4.x - -The 4.x branch of Sphinx introduces a breaking change, as generated man -pages are now written to subdirectories corresponding to the manual -section they belong to. This results in `make install` erroring out when -attempting to install the man pages, because they are not where it -expects to find them. - -This patch restores the behavior of Sphinx 3.x regarding man pages. - -Signed-off-by: Damien Goutte-Gattat <[email protected]> ---- - docs/conf.py | 1 + - 1 file changed, 1 insertion(+) - ---- a/docs/conf.py -+++ b/docs/conf.py -@@ -269,6 +269,7 @@ - ['Stefan Hajnoczi <[email protected]>', - 'Masayoshi Mizuma <[email protected]>'], 1), - ] -+man_make_section_directory = False - - # -- Options for Texinfo output ------------------------------------------- - --- -2.31.1 - diff --git a/app-emulation/qemu/qemu-6.0.0.ebuild b/app-emulation/qemu/qemu-6.0.0.ebuild index ddc49199235..b3bbda4c9b8 100644 --- a/app-emulation/qemu/qemu-6.0.0.ebuild +++ b/app-emulation/qemu/qemu-6.0.0.ebuild @@ -274,7 +274,6 @@ PATCHES=( "${FILESDIR}"/${PN}-5.2.0-cleaner-werror.patch "${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch "${FILESDIR}"/${PN}-5.2.0-dce-locks.patch - "${FILESDIR}"/${PN}-6.0.0-sphinx-4.patch ) QA_PREBUILT="
