commit: 197fa637eb382e4abb3b33379d093bea2f33d708 Author: John Helmert III <ajak <AT> gentoo <DOT> org> AuthorDate: Mon Sep 20 00:49:43 2021 +0000 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> CommitDate: Thu Sep 23 02:08:22 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=197fa637
app-emulation/qemu: bump to 6.1.0 Closes: https://bugs.gentoo.org/804525 Signed-off-by: John Helmert III <ajak <AT> gentoo.org> Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> app-emulation/qemu/Manifest | 1 + app-emulation/qemu/files/qemu-6.1.0-strings.patch | 26 ++++++++++++++++++++++ .../qemu/{qemu-9999.ebuild => qemu-6.1.0.ebuild} | 21 +++++++++-------- app-emulation/qemu/qemu-9999.ebuild | 21 +++++++++-------- 4 files changed, 47 insertions(+), 22 deletions(-) diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest index 4e6705f4885..6a6dd677a0e 100644 --- a/app-emulation/qemu/Manifest +++ b/app-emulation/qemu/Manifest @@ -1 +1,2 @@ DIST qemu-6.0.0.tar.xz 107333232 BLAKE2B 7746329d3e13782b7c346ce4052cc517cfc65cd9b2d514d199e4d5b8570ca79566ec04b0c114db2e97c84e68eb551e0d4cdce1b14b91a88fe08d2a5f682c1418 SHA512 ee3ff00aebec4d8891d2ff6dabe4e667e510b2a4fe3f6190aa34673a91ea32dcd2db2e9bf94c2f1bf05aa79788f17cfbbedc6027c0988ea08a92587b79ee05e4 +DIST qemu-6.1.0.tar.xz 111258808 BLAKE2B 412eecf6d39debd6089b26d3b22e5d25c6c8c30d2eaf31b17c25cc2b3a1b10794a30218dfb151c78801aa295255aa974b297f1fe05b93f14334f203c2af5ccee SHA512 3378ae21c75b77ee6a759827f1fcf7b2a50a0fef07e3b0e89117108022a8d8655fa977e4d65596f4f24f7c735c6594d44b0c6f69732ea4465e88a7406b1d5d3c diff --git a/app-emulation/qemu/files/qemu-6.1.0-strings.patch b/app-emulation/qemu/files/qemu-6.1.0-strings.patch new file mode 100644 index 00000000000..2efe7b29330 --- /dev/null +++ b/app-emulation/qemu/files/qemu-6.1.0-strings.patch @@ -0,0 +1,26 @@ +Forward-ported from original patch for 5.2.0. + +diff --git a/configure b/configure +index da2501489f..4660ee3ee5 100755 +--- a/configure ++++ b/configure +@@ -516,6 +516,7 @@ ld="${LD-${cross_prefix}ld}" + ranlib="${RANLIB-${cross_prefix}ranlib}" + nm="${NM-${cross_prefix}nm}" + strip="${STRIP-${cross_prefix}strip}" ++strings="${STRINGS-${cross_prefix}strings}" + windres="${WINDRES-${cross_prefix}windres}" + pkg_config_exe="${PKG_CONFIG-${cross_prefix}pkg-config}" + query_pkg_config() { +@@ -2380,9 +2381,9 @@ int main(int argc, char *argv[]) + EOF + + if compile_prog ; then +- if strings -a $TMPE | grep -q BiGeNdIaN ; then ++ if $strings -a $TMPE | grep -q BiGeNdIaN ; then + bigendian="yes" +- elif strings -a $TMPE | grep -q LiTtLeEnDiAn ; then ++ elif $strings -a $TMPE | grep -q LiTtLeEnDiAn ; then + bigendian="no" + else + echo big/little test failed diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-6.1.0.ebuild similarity index 98% copy from app-emulation/qemu/qemu-9999.ebuild copy to app-emulation/qemu/qemu-6.1.0.ebuild index 8aa463f41c8..d887f5b1537 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-6.1.0.ebuild @@ -6,10 +6,10 @@ EAPI="7" PYTHON_COMPAT=( python3_{7,8,9,10} ) PYTHON_REQ_USE="ncurses,readline" -FIRMWARE_ABI_VERSION="6.0.0-r50" +FIRMWARE_ABI_VERSION="6.1.0" -inherit eutils linux-info toolchain-funcs multilib python-r1 -inherit udev fcaps readme.gentoo-r1 pax-utils xdg-utils +inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \ + pax-utils xdg-utils if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://git.qemu.org/git/qemu.git"; @@ -75,11 +75,8 @@ COMMON_TARGETS=" IUSE_SOFTMMU_TARGETS=" ${COMMON_TARGETS} avr - lm32 - moxie rx tricore - unicore32 " IUSE_USER_TARGETS=" ${COMMON_TARGETS} @@ -243,7 +240,10 @@ BDEPEND=" dev-lang/perl sys-apps/texinfo virtual/pkgconfig - doc? ( dev-python/sphinx ) + doc? ( + dev-python/sphinx + dev-python/sphinx_rtd_theme + ) gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] @@ -273,10 +273,9 @@ RDEPEND="${CDEPEND} PATCHES=( "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch - "${FILESDIR}"/${PN}-5.2.0-strings.patch - "${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-make.patch + "${FILESDIR}"/${PN}-6.1.0-strings.patch ) QA_PREBUILT=" @@ -389,7 +388,7 @@ check_targets() { local var=$1 mak=$2 local detected sorted - pushd "${S}"/default-configs/targets/ >/dev/null || die + pushd "${S}"/configs/targets/ >/dev/null || die # Force C locale until glibc is updated. #564936 detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u)) diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 8aa463f41c8..d887f5b1537 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -6,10 +6,10 @@ EAPI="7" PYTHON_COMPAT=( python3_{7,8,9,10} ) PYTHON_REQ_USE="ncurses,readline" -FIRMWARE_ABI_VERSION="6.0.0-r50" +FIRMWARE_ABI_VERSION="6.1.0" -inherit eutils linux-info toolchain-funcs multilib python-r1 -inherit udev fcaps readme.gentoo-r1 pax-utils xdg-utils +inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \ + pax-utils xdg-utils if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://git.qemu.org/git/qemu.git"; @@ -75,11 +75,8 @@ COMMON_TARGETS=" IUSE_SOFTMMU_TARGETS=" ${COMMON_TARGETS} avr - lm32 - moxie rx tricore - unicore32 " IUSE_USER_TARGETS=" ${COMMON_TARGETS} @@ -243,7 +240,10 @@ BDEPEND=" dev-lang/perl sys-apps/texinfo virtual/pkgconfig - doc? ( dev-python/sphinx ) + doc? ( + dev-python/sphinx + dev-python/sphinx_rtd_theme + ) gtk? ( nls? ( sys-devel/gettext ) ) test? ( dev-libs/glib[utils] @@ -273,10 +273,9 @@ RDEPEND="${CDEPEND} PATCHES=( "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch - "${FILESDIR}"/${PN}-5.2.0-strings.patch - "${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-make.patch + "${FILESDIR}"/${PN}-6.1.0-strings.patch ) QA_PREBUILT=" @@ -389,7 +388,7 @@ check_targets() { local var=$1 mak=$2 local detected sorted - pushd "${S}"/default-configs/targets/ >/dev/null || die + pushd "${S}"/configs/targets/ >/dev/null || die # Force C locale until glibc is updated. #564936 detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
