subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: app\-emulation\/qemu\/"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2024-03-23 Thread Sam James

commit: c8071bc68912c17f02a9e6af9b4a88d615a45421
Author: Raul E Rangel  chromium  org>
AuthorDate: Tue Jan 30 22:05:27 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 23 08:35:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8071bc6

app-emulation/qemu: Add missing ninja BDEPEND

```
ERROR: Cannot find Ninja

 * ERROR: app-emulation/qemu-7.2.8::portage-stable failed (configure phase):
 *   configure failed
 *
 * Call stack:
 *   ebuild.sh, line  125:  Called src_configure
 * environment, line 5053:  Called qemu_src_configure 'softmmu'
 * environment, line 4914:  Called die
 * The specific snippet of code:
 *   ../configure "${conf_opts[@]}" || die "configure failed"
```

Signed-off-by: Raul E Rangel  chromium.org>
Closes: https://github.com/gentoo/gentoo/pull/35108
Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/qemu-8.1.5.ebuild | 1 +
 app-emulation/qemu/qemu-8.2.2.ebuild | 1 +
 app-emulation/qemu/qemu-.ebuild  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/app-emulation/qemu/qemu-8.1.5.ebuild 
b/app-emulation/qemu/qemu-8.1.5.ebuild
index 8b54b300b566..05d55122f855 100644
--- a/app-emulation/qemu/qemu-8.1.5.ebuild
+++ b/app-emulation/qemu/qemu-8.1.5.ebuild
@@ -275,6 +275,7 @@ BDEPEND="
$(python_gen_impl_dep)
dev-lang/perl
>=dev-build/meson-0.63.0
+   app-alternatives/ninja
dev-python/pip[${PYTHON_USEDEP}]
virtual/pkgconfig
doc? (

diff --git a/app-emulation/qemu/qemu-8.2.2.ebuild 
b/app-emulation/qemu/qemu-8.2.2.ebuild
index 9523cdbfcf5e..b62207759882 100644
--- a/app-emulation/qemu/qemu-8.2.2.ebuild
+++ b/app-emulation/qemu/qemu-8.2.2.ebuild
@@ -280,6 +280,7 @@ BDEPEND="
$(python_gen_impl_dep)
dev-lang/perl
>=dev-build/meson-0.63.0
+   app-alternatives/ninja
dev-python/pip[${PYTHON_USEDEP}]
virtual/pkgconfig
doc? (

diff --git a/app-emulation/qemu/qemu-.ebuild 
b/app-emulation/qemu/qemu-.ebuild
index 8f55155deb33..381a891e0191 100644
--- a/app-emulation/qemu/qemu-.ebuild
+++ b/app-emulation/qemu/qemu-.ebuild
@@ -280,6 +280,7 @@ BDEPEND="
$(python_gen_impl_dep)
dev-lang/perl
>=dev-build/meson-0.63.0
+   app-alternatives/ninja
dev-python/pip[${PYTHON_USEDEP}]
virtual/pkgconfig
doc? (

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2024-03-07 Thread Sam James

commit: b6b8a58aa1e46a394ff365388fab23bde5980da5
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar  7 17:20:25 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar  7 17:20:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6b8a58a

app-emulation/qemu: add 8.2.2

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/Manifest  |   1 +
 app-emulation/qemu/qemu-8.2.2.ebuild | 991 +++
 2 files changed, 992 insertions(+)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 64b2b6a4264f..a6d749083741 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -12,3 +12,4 @@ DIST qemu-8.1.0-docs.tar.xz 2129912 BLAKE2B 
8aaf7b748538afdb5bcb6da15dbd96572d08
 DIST qemu-8.1.5.tar.xz 124007248 BLAKE2B 
0d5db3e18c4dc1035fed442116be98b7e7bbfae905e4facef3278ef5a488332fa2d8e6599169fa1f740e96a035027e989c5cdffc0bfd4e0ca0fca1d0a537e8da
 SHA512 
1005e0602a763979c4d0ec6e79a390e4232dcc3d0b8461fe42856c58e54ad25a2079f3850d27023fce8a2b382b36e3baa7882b69d48cbb72002984c160241c92
 DIST qemu-8.2.0-docs.tar.xz 2233352 BLAKE2B 
22b9499fdf4ff93e72399dab3803f3171c855859dc7fe111612e2f9146db244ca6d2e0aad16aefdf29b231d2b3a2fbc22171fe6bac13b03445d54555ce798d16
 SHA512 
f57e78c28277c153fff00b25097d0df5c6ad36cb4e9f3acf30382bfb1c99508503c186c1bbecf266810ef24fd618428fdf3e0eee41c715a552918c9e6ef9e8e5
 DIST qemu-8.2.1.tar.xz 129848448 BLAKE2B 
af5b03fecd41c376daece7598c01755c458d38e045486f33e2915cc7d4856f23b4478a2c1a32a7eb600c4fc675c24df55007840c8a3c6d1fd2d585c74848f02e
 SHA512 
e72d3e13339c03e8d371ca060ac700c45af2ca37523cddb6b02dcaf8430d75c8cef194cf496df9816440b281f368457def1126677db757928805d93ceca2f9af
+DIST qemu-8.2.2.tar.xz 129398020 BLAKE2B 
ceecbae945d9ac1bd85935266c33b91aedbc201796b38a9cb721d778ba8b35f07d01af8c5ce572e68e637ae94455c70ddcf9087579231613f92828bccafa93f4
 SHA512 
dfd2e1305f9e51bfbc90a7738c69336d5f805481a626ea527b971bdfb6dbe6867e5df7461d48d1c22b79be2dc18e057ea9fa36ef593127cd8b262a5c33f1aa41

diff --git a/app-emulation/qemu/qemu-8.2.2.ebuild 
b/app-emulation/qemu/qemu-8.2.2.ebuild
new file mode 100644
index ..9523cdbfcf5e
--- /dev/null
+++ b/app-emulation/qemu/qemu-8.2.2.ebuild
@@ -0,0 +1,991 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
+QEMU_DOCS_PREBUILT_DEV=sam
+QEMU_DOCS_VERSION=$(ver_cut 1-2).0
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# bug #830088
+QEMU_DOC_USEFLAG="+doc"
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="ncurses,readline"
+
+FIRMWARE_ABI_VERSION="7.2.0"
+
+inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
+   pax-utils xdg-utils
+
+if [[ ${PV} == ** ]]; then
+   QEMU_DOCS_PREBUILT=0
+
+   EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/;
+   EGIT_SUBMODULES=()
+   inherit git-r3
+   SRC_URI=""
+   declare -A SUBPROJECTS=(
+   [keycodemapdb]="f5772a62ec52591ff6870b7e8ef32482371f22c6"
+   
[berkeley-softfloat-3]="b64af41c3276f97f0e181920400ee056b9c88037"
+   
[berkeley-testfloat-3]="40619cbb3bf32872df8c53cc457039229428a263"
+   )
+
+   for proj in "${!SUBPROJECTS[@]}"; do
+   c=${SUBPROJECTS[${proj}]}
+   SRC_URI+=" 
https://gitlab.com/qemu-project/${proj}/-/archive/${c}/${proj}-${c}.tar.bz2;
+   done
+else
+   MY_P="${PN}-${PV/_rc/-rc}"
+   SRC_URI="https://download.qemu.org/${MY_P}.tar.xz;
+
+   if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
+   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz
 )"
+   fi
+
+   S="${WORKDIR}/${MY_P}"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org;
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+
+[[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc"
+
+IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug 
${QEMU_DOC_USEFLAG}
+   +fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
+   jack jemalloc +jpeg keyutils
+   lzo multipath
+   ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs pipewire
+   plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
+   +slirp
+   smartcard snappy spice ssh static-user systemtap test udev usb
+   usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen
+   zstd"
+
+COMMON_TARGETS="
+   aarch64
+   alpha
+   arm
+

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2024-03-07 Thread Sam James

commit: d4c884764e286bc66146414b72dc178f86f26740
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar  7 17:12:00 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar  7 17:20:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4c88476

app-emulation/qemu: add 7.2.10

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/Manifest   |   1 +
 app-emulation/qemu/qemu-7.2.10.ebuild | 971 ++
 2 files changed, 972 insertions(+)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 2ce90ccae121..64b2b6a4264f 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -2,6 +2,7 @@ DIST 
berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037.tar.bz2 84094
 DIST berkeley-testfloat-3-40619cbb3bf32872df8c53cc457039229428a263.tar.bz2 
90086 BLAKE2B 
ab2070622453a7a0a1fbcf234df68cc7316474c04482b2ac13c700edbb5624968c5274f337dc84f06c4ab6c3e82698cd7b0b30fe206d004b0715f15a2cc7cfd1
 SHA512 
969892af9fdf16d45660753ed02bbd8d6159928e5e6ef2f87aed8a08d995bb19d2115fb6b559522074492b2595716d314c5c059bfa69c7fbb5aab9275582c22e
 DIST keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6.tar.bz2 27971 
BLAKE2B 
0ed69ad24c53bd459c8753565814bcc1cd858f20d3a046c38912a35bcb0ba6d388ef5d2b93157cd028959284b330caf5467d82071c3df56a405dd8e08fd177c7
 SHA512 
8f2cc14e8bd46cb045e3ebfe32e463793ab7472ebda9b57b8ea0b06fa107a1a99c3ebcacb9c4548e30698d8ec154c0e56f789385201182b680819b8068a103f2
 DIST qemu-7.2.0-docs.tar.xz 1984184 BLAKE2B 
103900fb7903ed8d75f7f012bf61fa2d6fce345b657c851d0437c3384f5735bd1cfd3129320683ea7846ea0b0940e5af5b2663c9320f12fee74b058523a8ea06
 SHA512 
a7edd448982865e07533c300d3e44a8b50cefbdde1982b73c24d0b2aa74315439252c59b634c75de312860874c7b06c75aa72629da681b5105f28ee936794585
+DIST qemu-7.2.10.tar.xz 121311584 BLAKE2B 
e3b5156302cc699c38ad966340f68b1c72d00a2c420732368a22a9671a27d87ccd64e06c97b2e47d1dddf2d1d202b5103a6fc51221502b1c812d1c63a082d976
 SHA512 
d402dc49b9ed5da773785ce9c8ed75b66985286ab8a2f0956cb88277b9da88a5a86cf02226c6b24fe63635405f2fe89ebac9288cf2d4b59df22b4d05c2a8fe30
 DIST qemu-7.2.4.tar.xz 121849100 BLAKE2B 
a9c5ffce9ff0fac4e2d1fa4be1a1dcee2f5d7f793ddf726871c5ae9a68c22f7ba03692a8a5096de3051030d3c2f34e46697d5af2d66c34984b8161ae3bb07b42
 SHA512 
fa765673833a1f2cbecdb9d47dc7dc29d7613be5a5c8fc63925ae70e1f5aafb4f9f02e45b212a329f17b689351b8a9cdf5f5235ab6adb71bb40e41868898d95b
 DIST qemu-7.2.9.tar.xz 121870204 BLAKE2B 
3336541124f96c09aec05721ce77e8187f8d29c716a05419fcb2b9510976683e58dd791205971d9daa11d3053eb211343225597de1bae72b07467e5acac2a851
 SHA512 
b1aa2316f6e2fe1e972b6d1aabf7c04b06bca3863143c6a523b5fda40bb8841bec27e0774f24adc4b3267cf1f1d39ba81246eb3d15d7273904a0df8e8503077d
 DIST qemu-8.0.0-docs.tar.xz 3218024 BLAKE2B 
b764a625024e78a39470048355471e12cfb57ab3c34e764dc4200fdf5c1aea635d26095ec961979bf46f177101c5bd38618bacf7e98e04bd64688ab5e29591aa
 SHA512 
d9dfe191372e105fe16fe8f66f41ed793ade4c89b5ab1d84b39459f3419a1ca61bd49422a83981965cc257c05eca7fd49054703f58f179f5c7b656e9473a1054

diff --git a/app-emulation/qemu/qemu-7.2.10.ebuild 
b/app-emulation/qemu/qemu-7.2.10.ebuild
new file mode 100644
index ..ac517632fb22
--- /dev/null
+++ b/app-emulation/qemu/qemu-7.2.10.ebuild
@@ -0,0 +1,971 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
+QEMU_DOCS_PREBUILT_DEV=ajak
+QEMU_DOCS_VERSION="7.2.0"
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# bug #830088
+QEMU_DOC_USEFLAG="+doc"
+
+PYTHON_COMPAT=( python3_{10,11} )
+PYTHON_REQ_USE="ncurses,readline"
+
+FIRMWARE_ABI_VERSION="7.2.0"
+
+inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
+   pax-utils xdg-utils
+
+if [[ ${PV} == ** ]]; then
+   QEMU_DOCS_PREBUILT=0
+
+   EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/;
+   EGIT_SUBMODULES=(
+   tests/fp/berkeley-softfloat-3
+   tests/fp/berkeley-testfloat-3
+   ui/keycodemapdb
+   )
+   inherit git-r3
+   SRC_URI=""
+else
+   MY_P="${PN}-${PV/_rc/-rc}"
+   SRC_URI="https://download.qemu.org/${MY_P}.tar.xz;
+
+   if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
+   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz
 )"
+   fi
+
+   S="${WORKDIR}/${MY_P}"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org;
+
+LICENSE="GPL-2 LGPL-2 BSD-2"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2024-03-04 Thread Sam James

commit: a1ed0fe3ffbb5bb85808bf504ed06c53be23e3f4
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar  4 10:23:32 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar  4 10:23:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1ed0fe3

app-emulation/qemu: drop 7.2.8

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/Manifest  |   1 -
 app-emulation/qemu/qemu-7.2.8.ebuild | 971 ---
 2 files changed, 972 deletions(-)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 3daa701af7ef..2ce90ccae121 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -3,7 +3,6 @@ DIST 
berkeley-testfloat-3-40619cbb3bf32872df8c53cc457039229428a263.tar.bz2 90086
 DIST keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6.tar.bz2 27971 
BLAKE2B 
0ed69ad24c53bd459c8753565814bcc1cd858f20d3a046c38912a35bcb0ba6d388ef5d2b93157cd028959284b330caf5467d82071c3df56a405dd8e08fd177c7
 SHA512 
8f2cc14e8bd46cb045e3ebfe32e463793ab7472ebda9b57b8ea0b06fa107a1a99c3ebcacb9c4548e30698d8ec154c0e56f789385201182b680819b8068a103f2
 DIST qemu-7.2.0-docs.tar.xz 1984184 BLAKE2B 
103900fb7903ed8d75f7f012bf61fa2d6fce345b657c851d0437c3384f5735bd1cfd3129320683ea7846ea0b0940e5af5b2663c9320f12fee74b058523a8ea06
 SHA512 
a7edd448982865e07533c300d3e44a8b50cefbdde1982b73c24d0b2aa74315439252c59b634c75de312860874c7b06c75aa72629da681b5105f28ee936794585
 DIST qemu-7.2.4.tar.xz 121849100 BLAKE2B 
a9c5ffce9ff0fac4e2d1fa4be1a1dcee2f5d7f793ddf726871c5ae9a68c22f7ba03692a8a5096de3051030d3c2f34e46697d5af2d66c34984b8161ae3bb07b42
 SHA512 
fa765673833a1f2cbecdb9d47dc7dc29d7613be5a5c8fc63925ae70e1f5aafb4f9f02e45b212a329f17b689351b8a9cdf5f5235ab6adb71bb40e41868898d95b
-DIST qemu-7.2.8.tar.xz 121858732 BLAKE2B 
0041346f68e9792f58591b361ff4206f8d16e76ff7ae6b8c4f7c276000b7e12d228bc8cfb32bc812b384725bbe272da893b15c9ad2ce821c003d4159942b47e7
 SHA512 
16d4e609b8c4af8eb86d9beffc09c9c797f06475a5b8c292d4389737cf873b8e7765d7f505892461a92631a3b6e44212d6568a102f9bc43ae0798d538d5525a6
 DIST qemu-7.2.9.tar.xz 121870204 BLAKE2B 
3336541124f96c09aec05721ce77e8187f8d29c716a05419fcb2b9510976683e58dd791205971d9daa11d3053eb211343225597de1bae72b07467e5acac2a851
 SHA512 
b1aa2316f6e2fe1e972b6d1aabf7c04b06bca3863143c6a523b5fda40bb8841bec27e0774f24adc4b3267cf1f1d39ba81246eb3d15d7273904a0df8e8503077d
 DIST qemu-8.0.0-docs.tar.xz 3218024 BLAKE2B 
b764a625024e78a39470048355471e12cfb57ab3c34e764dc4200fdf5c1aea635d26095ec961979bf46f177101c5bd38618bacf7e98e04bd64688ab5e29591aa
 SHA512 
d9dfe191372e105fe16fe8f66f41ed793ade4c89b5ab1d84b39459f3419a1ca61bd49422a83981965cc257c05eca7fd49054703f58f179f5c7b656e9473a1054
 DIST qemu-8.0.4.tar.xz 126179324 BLAKE2B 
dfb98964c629b251f0004b4630ae4500a52465579417d6f5c7dbbb1f672e10d8d7ffb98a4b00e26fb98b3c867208146dbdca026e4d30cbf1752ac733c4d9b915
 SHA512 
bd5ed682d51f974abd4be93f949701f9b5bfb87fd9929e31df130534da2f2c03b99adc9f924b3efd47d3b254e0e3c0046f4e69fbe9f6d0c4ac1f6babecb29449

diff --git a/app-emulation/qemu/qemu-7.2.8.ebuild 
b/app-emulation/qemu/qemu-7.2.8.ebuild
deleted file mode 100644
index ac517632fb22..
--- a/app-emulation/qemu/qemu-7.2.8.ebuild
+++ /dev/null
@@ -1,971 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
-QEMU_DOCS_PREBUILT_DEV=ajak
-QEMU_DOCS_VERSION="7.2.0"
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-# bug #830088
-QEMU_DOC_USEFLAG="+doc"
-
-PYTHON_COMPAT=( python3_{10,11} )
-PYTHON_REQ_USE="ncurses,readline"
-
-FIRMWARE_ABI_VERSION="7.2.0"
-
-inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
-   pax-utils xdg-utils
-
-if [[ ${PV} == ** ]]; then
-   QEMU_DOCS_PREBUILT=0
-
-   EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/;
-   EGIT_SUBMODULES=(
-   tests/fp/berkeley-softfloat-3
-   tests/fp/berkeley-testfloat-3
-   ui/keycodemapdb
-   )
-   inherit git-r3
-   SRC_URI=""
-else
-   MY_P="${PN}-${PV/_rc/-rc}"
-   SRC_URI="https://download.qemu.org/${MY_P}.tar.xz;
-
-   if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
-   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz
 )"
-   fi
-
-   S="${WORKDIR}/${MY_P}"
-   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org;
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-
-[[ ${QEMU_DOCS_PREBUILT} == 1 ]] &&

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2024-03-04 Thread Sam James

commit: 8b5470419a7a2bf37d268a520f1796c4096e66c0
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar  4 10:23:22 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar  4 10:23:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b547041

app-emulation/qemu: drop 8.2.0

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/Manifest  |   1 -
 app-emulation/qemu/qemu-8.2.0.ebuild | 991 ---
 2 files changed, 992 deletions(-)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 001d3577ac6d..3daa701af7ef 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -11,5 +11,4 @@ DIST qemu-8.0.5.tar.xz 126175064 BLAKE2B 
1d1f78c185ab64b4ca946a44ad04d0bbb6ea48d
 DIST qemu-8.1.0-docs.tar.xz 2129912 BLAKE2B 
8aaf7b748538afdb5bcb6da15dbd96572d086824377c4b0e93f1ddc695f9a4775471e360a9616d2d481dbf8113e91d2601c69d92cef565fb90b65ffacfdb304e
 SHA512 
905515742bb56a439fc8117ec48ea668e7b2bf0244587673e4352d9e8e49911eb84ff093596ff566e44787197cf9789ec8950e3d75fb7a670c5546394a322ac9
 DIST qemu-8.1.5.tar.xz 124007248 BLAKE2B 
0d5db3e18c4dc1035fed442116be98b7e7bbfae905e4facef3278ef5a488332fa2d8e6599169fa1f740e96a035027e989c5cdffc0bfd4e0ca0fca1d0a537e8da
 SHA512 
1005e0602a763979c4d0ec6e79a390e4232dcc3d0b8461fe42856c58e54ad25a2079f3850d27023fce8a2b382b36e3baa7882b69d48cbb72002984c160241c92
 DIST qemu-8.2.0-docs.tar.xz 2233352 BLAKE2B 
22b9499fdf4ff93e72399dab3803f3171c855859dc7fe111612e2f9146db244ca6d2e0aad16aefdf29b231d2b3a2fbc22171fe6bac13b03445d54555ce798d16
 SHA512 
f57e78c28277c153fff00b25097d0df5c6ad36cb4e9f3acf30382bfb1c99508503c186c1bbecf266810ef24fd618428fdf3e0eee41c715a552918c9e6ef9e8e5
-DIST qemu-8.2.0.tar.xz 13000 BLAKE2B 
a63667042e1e19c635568072d8dcc117320117e81e374a93cfb79e2363ebf505df3217fb098638e53c899eb6f83435221e8031f2aae003c27ec25af8654683b3
 SHA512 
92ec41196ff145cdbb98948f6b6e43214fa4b4419554a8a1927fb4527080c8212ccb703e184baf8ee0bdfa50ad7a84689e8f5a69eba1bd7bbbdfd69e3b91256c
 DIST qemu-8.2.1.tar.xz 129848448 BLAKE2B 
af5b03fecd41c376daece7598c01755c458d38e045486f33e2915cc7d4856f23b4478a2c1a32a7eb600c4fc675c24df55007840c8a3c6d1fd2d585c74848f02e
 SHA512 
e72d3e13339c03e8d371ca060ac700c45af2ca37523cddb6b02dcaf8430d75c8cef194cf496df9816440b281f368457def1126677db757928805d93ceca2f9af

diff --git a/app-emulation/qemu/qemu-8.2.0.ebuild 
b/app-emulation/qemu/qemu-8.2.0.ebuild
deleted file mode 100644
index 9523cdbfcf5e..
--- a/app-emulation/qemu/qemu-8.2.0.ebuild
+++ /dev/null
@@ -1,991 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
-QEMU_DOCS_PREBUILT_DEV=sam
-QEMU_DOCS_VERSION=$(ver_cut 1-2).0
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-# bug #830088
-QEMU_DOC_USEFLAG="+doc"
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="ncurses,readline"
-
-FIRMWARE_ABI_VERSION="7.2.0"
-
-inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
-   pax-utils xdg-utils
-
-if [[ ${PV} == ** ]]; then
-   QEMU_DOCS_PREBUILT=0
-
-   EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/;
-   EGIT_SUBMODULES=()
-   inherit git-r3
-   SRC_URI=""
-   declare -A SUBPROJECTS=(
-   [keycodemapdb]="f5772a62ec52591ff6870b7e8ef32482371f22c6"
-   
[berkeley-softfloat-3]="b64af41c3276f97f0e181920400ee056b9c88037"
-   
[berkeley-testfloat-3]="40619cbb3bf32872df8c53cc457039229428a263"
-   )
-
-   for proj in "${!SUBPROJECTS[@]}"; do
-   c=${SUBPROJECTS[${proj}]}
-   SRC_URI+=" 
https://gitlab.com/qemu-project/${proj}/-/archive/${c}/${proj}-${c}.tar.bz2;
-   done
-else
-   MY_P="${PN}-${PV/_rc/-rc}"
-   SRC_URI="https://download.qemu.org/${MY_P}.tar.xz;
-
-   if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
-   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz
 )"
-   fi
-
-   S="${WORKDIR}/${MY_P}"
-   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org;
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-
-[[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc"
-
-IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug 
${QEMU_DOC_USEFLAG}
-   +fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
-   jack jemalloc +jpeg keyutils
-   lzo multipath
-   ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2024-03-04 Thread Sam James

commit: 845c2168e0820e29c7114be0724cfd8eae1e5a03
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar  4 10:23:16 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar  4 10:23:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=845c2168

app-emulation/qemu: drop 8.1.4

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/Manifest  |   1 -
 app-emulation/qemu/qemu-8.1.4.ebuild | 971 ---
 2 files changed, 972 deletions(-)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index b4ca7c1ed3d0..001d3577ac6d 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -9,7 +9,6 @@ DIST qemu-8.0.0-docs.tar.xz 3218024 BLAKE2B 
b764a625024e78a39470048355471e12cfb5
 DIST qemu-8.0.4.tar.xz 126179324 BLAKE2B 
dfb98964c629b251f0004b4630ae4500a52465579417d6f5c7dbbb1f672e10d8d7ffb98a4b00e26fb98b3c867208146dbdca026e4d30cbf1752ac733c4d9b915
 SHA512 
bd5ed682d51f974abd4be93f949701f9b5bfb87fd9929e31df130534da2f2c03b99adc9f924b3efd47d3b254e0e3c0046f4e69fbe9f6d0c4ac1f6babecb29449
 DIST qemu-8.0.5.tar.xz 126175064 BLAKE2B 
1d1f78c185ab64b4ca946a44ad04d0bbb6ea48de058037e4ba18176abeb0f0528754c6e832f742f93227182bbce145544eca5b908a366006e7ee58876aca0bda
 SHA512 
ec9679473dda84a2f56ae8ee0039ec4dafb056414bfc5a3a147b2b6bb45ae3b130dd80f6385e8567b5d18f4be94f3536bc8acc45c61eddf40c9678b46cb8bddc
 DIST qemu-8.1.0-docs.tar.xz 2129912 BLAKE2B 
8aaf7b748538afdb5bcb6da15dbd96572d086824377c4b0e93f1ddc695f9a4775471e360a9616d2d481dbf8113e91d2601c69d92cef565fb90b65ffacfdb304e
 SHA512 
905515742bb56a439fc8117ec48ea668e7b2bf0244587673e4352d9e8e49911eb84ff093596ff566e44787197cf9789ec8950e3d75fb7a670c5546394a322ac9
-DIST qemu-8.1.4.tar.xz 124037140 BLAKE2B 
b9e183508071383b41e1ad21c4ead2d1147affcbfc488e085ba7f7a968071523656b7a5d931b32e17ae2f857a6dc317ee350721fdb32585dc138476fd59b1e07
 SHA512 
b67afcf6d58808b02d015438c60dc74067b409c723b2736e69e66ffa3ed80a71d51b941a53e2bb944aa90a5538d631bcbd287d833ea9a78e3dd64ce299cb47ca
 DIST qemu-8.1.5.tar.xz 124007248 BLAKE2B 
0d5db3e18c4dc1035fed442116be98b7e7bbfae905e4facef3278ef5a488332fa2d8e6599169fa1f740e96a035027e989c5cdffc0bfd4e0ca0fca1d0a537e8da
 SHA512 
1005e0602a763979c4d0ec6e79a390e4232dcc3d0b8461fe42856c58e54ad25a2079f3850d27023fce8a2b382b36e3baa7882b69d48cbb72002984c160241c92
 DIST qemu-8.2.0-docs.tar.xz 2233352 BLAKE2B 
22b9499fdf4ff93e72399dab3803f3171c855859dc7fe111612e2f9146db244ca6d2e0aad16aefdf29b231d2b3a2fbc22171fe6bac13b03445d54555ce798d16
 SHA512 
f57e78c28277c153fff00b25097d0df5c6ad36cb4e9f3acf30382bfb1c99508503c186c1bbecf266810ef24fd618428fdf3e0eee41c715a552918c9e6ef9e8e5
 DIST qemu-8.2.0.tar.xz 13000 BLAKE2B 
a63667042e1e19c635568072d8dcc117320117e81e374a93cfb79e2363ebf505df3217fb098638e53c899eb6f83435221e8031f2aae003c27ec25af8654683b3
 SHA512 
92ec41196ff145cdbb98948f6b6e43214fa4b4419554a8a1927fb4527080c8212ccb703e184baf8ee0bdfa50ad7a84689e8f5a69eba1bd7bbbdfd69e3b91256c

diff --git a/app-emulation/qemu/qemu-8.1.4.ebuild 
b/app-emulation/qemu/qemu-8.1.4.ebuild
deleted file mode 100644
index 1db988202783..
--- a/app-emulation/qemu/qemu-8.1.4.ebuild
+++ /dev/null
@@ -1,971 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
-QEMU_DOCS_PREBUILT_DEV=sam
-#QEMU_DOCS_VERSION=$(ver_cut 1-3)
-QEMU_DOCS_VERSION=8.1.0
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-# bug #830088
-QEMU_DOC_USEFLAG="+doc"
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="ncurses,readline"
-
-FIRMWARE_ABI_VERSION="7.2.0"
-
-inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
-   pax-utils xdg-utils
-
-if [[ ${PV} == ** ]]; then
-   QEMU_DOCS_PREBUILT=0
-
-   EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/;
-   EGIT_SUBMODULES=(
-   tests/fp/berkeley-softfloat-3
-   tests/fp/berkeley-testfloat-3
-   subprojects/keycodemapdb
-   )
-   inherit git-r3
-   SRC_URI=""
-else
-   MY_P="${PN}-${PV/_rc/-rc}"
-   SRC_URI="https://download.qemu.org/${MY_P}.tar.xz;
-
-   if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
-   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz
 )"
-   fi
-
-   S="${WORKDIR}/${MY_P}"
-   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org;
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-
-[[ ${QEMU_DOCS_PREBUILT} == 1 ]] &&

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2024-02-20 Thread Arthur Zamarin

commit: 1b53de9a59fb9d38f04a2916f3f9cb8ad9ccb065
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Feb 20 19:13:21 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Feb 20 19:13:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b53de9a

app-emulation/qemu: Stabilize 8.1.5 arm64, #923565

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-emulation/qemu/qemu-8.1.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/qemu/qemu-8.1.5.ebuild 
b/app-emulation/qemu/qemu-8.1.5.ebuild
index acb584a7cd44..8b54b300b566 100644
--- a/app-emulation/qemu/qemu-8.1.5.ebuild
+++ b/app-emulation/qemu/qemu-8.1.5.ebuild
@@ -42,7 +42,7 @@ else
fi
 
S="${WORKDIR}/${MY_P}"
-   [[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 
~riscv x86"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 
~riscv x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu-guest-agent/

2024-02-02 Thread Ionen Wolkens

commit: b7c2dad7a8bc9a6793372acd60686935125c96a2
Author: Matoro Mahri  matoro  tk>
AuthorDate: Fri Feb  2 04:33:17 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Feb  3 03:39:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7c2dad7

app-emulation/qemu-guest-agent: Keyword 8.2.0 arm64, #917080

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild 
b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild
index 46f8a50f74d1..19ce1d04753c 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz;
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="dev-libs/glib"
 DEPEND="${RDEPEND}"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2024-02-02 Thread Arthur Zamarin

commit: 2d5cbe27723f8d659b1e5af8ba55a5ac261e76a2
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Feb  2 16:27:07 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Feb  2 16:27:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d5cbe27

app-emulation/qemu: Stabilize 8.1.5 amd64, #923565

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-emulation/qemu/qemu-8.1.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/qemu/qemu-8.1.5.ebuild 
b/app-emulation/qemu/qemu-8.1.5.ebuild
index 842cec679f0a..acb584a7cd44 100644
--- a/app-emulation/qemu/qemu-8.1.5.ebuild
+++ b/app-emulation/qemu/qemu-8.1.5.ebuild
@@ -42,7 +42,7 @@ else
fi
 
S="${WORKDIR}/${MY_P}"
-   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
ppc64 ~riscv x86"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 
~riscv x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2024-02-02 Thread Arthur Zamarin

commit: c766e13861402130b7487678b63892a3ccbbdb0b
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Feb  2 13:50:48 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Feb  2 13:50:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c766e138

app-emulation/qemu: Stabilize 8.1.5 x86, #923565

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-emulation/qemu/qemu-8.1.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/qemu/qemu-8.1.5.ebuild 
b/app-emulation/qemu/qemu-8.1.5.ebuild
index 9fe07493727e..842cec679f0a 100644
--- a/app-emulation/qemu/qemu-8.1.5.ebuild
+++ b/app-emulation/qemu/qemu-8.1.5.ebuild
@@ -42,7 +42,7 @@ else
fi
 
S="${WORKDIR}/${MY_P}"
-   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
ppc64 ~riscv ~x86"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2024-02-02 Thread Arthur Zamarin

commit: 6d0f4263aef3ed11c208004e3570d1cc1a530668
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Feb  2 12:38:24 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Feb  2 12:38:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d0f4263

app-emulation/qemu: Stabilize 8.1.5 ppc64, #923565

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-emulation/qemu/qemu-8.1.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/qemu/qemu-8.1.5.ebuild 
b/app-emulation/qemu/qemu-8.1.5.ebuild
index 1db988202783..9fe07493727e 100644
--- a/app-emulation/qemu/qemu-8.1.5.ebuild
+++ b/app-emulation/qemu/qemu-8.1.5.ebuild
@@ -42,7 +42,7 @@ else
fi
 
S="${WORKDIR}/${MY_P}"
-   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu-guest-agent/, app-emulation/qemu-guest-agent/files/

2024-02-02 Thread Sam James

commit: 5d1b5f7e2e1098e8eb7ee935baa9fe90e3d129ba
Author: V3n3RiX  koprulu  sector>
AuthorDate: Fri Feb  2 07:51:26 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  2 08:01:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d1b5f7e

app-emulation/qemu-guest-agent: find sphinx

Closes: https://bugs.gentoo.org/923573
Signed-off-by: Ghiunhan Mamut  redcorelinux.org>
Closes: https://github.com/gentoo/gentoo/pull/35143
Signed-off-by: Sam James  gentoo.org>

 .../qemu-guest-agent/files/qemu-8.1.0-find-sphinx.patch| 10 ++
 app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild   |  1 +
 2 files changed, 11 insertions(+)

diff --git a/app-emulation/qemu-guest-agent/files/qemu-8.1.0-find-sphinx.patch 
b/app-emulation/qemu-guest-agent/files/qemu-8.1.0-find-sphinx.patch
new file mode 100644
index ..b6ef6214af55
--- /dev/null
+++ b/app-emulation/qemu-guest-agent/files/qemu-8.1.0-find-sphinx.patch
@@ -0,0 +1,10 @@
+This gets confused by python-any-r1 and tries to find sphinx-build in ${T}.
+--- a/docs/meson.build
 b/docs/meson.build
+@@ -1,5 +1,4 @@
+-sphinx_build = find_program(fs.parent(python.full_path()) / 'sphinx-build',
+-required: get_option('docs'))
++sphinx_build = find_program('sphinx-build', required: get_option('docs'))
+ 
+ # Check if tools are available to build documentation.
+ build_docs = false

diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild 
b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild
index ab7a0c145b03..46f8a50f74d1 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild
@@ -27,6 +27,7 @@ BDEPEND="${PYTHON_DEPS}
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
+   "${FILESDIR}"/qemu-8.1.0-find-sphinx.patch
 )
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu-guest-agent/

2024-02-01 Thread Sam James

commit: 99decf1e1533778a58f3c9bc7898c58526e7b780
Author: Matoro Mahri  matoro  tk>
AuthorDate: Thu Jan 18 06:39:01 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  2 03:54:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99decf1e

app-emulation/qemu-guest-agent: add 8.2.0, limit test suite

As noted, the only relevant test for the guest agent is test-qga, which
is part of the qobject test suite, so limit to just this test suite.

Bug: https://bugs.gentoo.org/917080
Signed-off-by: Matoro Mahri  matoro.tk>
Closes: https://github.com/gentoo/gentoo/pull/34876
Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu-guest-agent/Manifest|  1 +
 .../qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild | 88 ++
 2 files changed, 89 insertions(+)

diff --git a/app-emulation/qemu-guest-agent/Manifest 
b/app-emulation/qemu-guest-agent/Manifest
index 9dd0cb50cdb7..44032f6790ed 100644
--- a/app-emulation/qemu-guest-agent/Manifest
+++ b/app-emulation/qemu-guest-agent/Manifest
@@ -3,3 +3,4 @@ DIST qemu-7.1.0.tar.xz 121833004 BLAKE2B 
e05f91ce4993c7591a2df08b5fb017f8b8ec214
 DIST qemu-8.0.0.tar.xz 127835148 BLAKE2B 
9b54aae10fe09691a26e68374723ded5fdda6409673b4de9461a25ee060cfd03968a16ddeadc21d48b9262e53aa6d4e5eb645376969f97c65807fad19607b04f
 SHA512 
1f31d1e653dec2d35f1b7a5468ee3f471553b48eca8c8afafffcf9243c6b2260e78a5b73da3fe567f9b85d4133573eebd397747b3aec501fb24076263eb07b27
 DIST qemu-8.0.2.tar.xz 126707132 BLAKE2B 
f2b1a63e10c42aabfe39722c7732d0f04818ad367b769b3deb29c5bf9adcabc3aca1706f3c40fafeeb57ac1f7a61ded5066de32134c483e2fd27bc65b4b7d30a
 SHA512 
4e915d33a662bf55b09247fb85150be376c92270d3764e3d6470c452cb70cc558f54e84de5610dd60a9eb3ea02d5d4277b1ec75c9804967d278fa8361c7f9b9a
 DIST qemu-8.0.3.tar.xz 126710536 BLAKE2B 
071cc1a35209a02e8c5dd4f43cb112f110b4655adb0f870a04fdf9a6e2c761699574e8c9426f70f60787a99acf252d7a64d94a8e837cdfeda93d89428d7866f3
 SHA512 
18b2ccb65f7ec2ae92f0e04406539620c881e2b75f63816588c86043a07464bb99d16a83e792ed9508de393f4b694c46d52f4d07edf52741e85224c8b8d5d5c3
+DIST qemu-8.2.0.tar.xz 13000 BLAKE2B 
a63667042e1e19c635568072d8dcc117320117e81e374a93cfb79e2363ebf505df3217fb098638e53c899eb6f83435221e8031f2aae003c27ec25af8654683b3
 SHA512 
92ec41196ff145cdbb98948f6b6e43214fa4b4419554a8a1927fb4527080c8212ccb703e184baf8ee0bdfa50ad7a84689e8f5a69eba1bd7bbbdfd69e3b91256c

diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild 
b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild
new file mode 100644
index ..ab7a0c145b03
--- /dev/null
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit edo systemd toolchain-funcs python-any-r1 udev
+
+MY_PN="qemu"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
+HOMEPAGE="https://wiki.qemu.org/Features/GuestAgent;
+SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz;
+
+LICENSE="GPL-2 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="dev-libs/glib"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+   dev-lang/perl
+   app-alternatives/ninja"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+)
+
+src_configure() {
+   tc-export AR LD OBJCOPY RANLIB
+
+   local myconf=(
+   --prefix=/usr
+   --sysconfdir=/etc
+   --libdir="/usr/$(get_libdir)"
+   --localstatedir=/
+   --disable-bsd-user
+   --disable-linux-user
+   --disable-system
+   --disable-strip
+   --enable-tools
+   --disable-werror
+   --without-default-features
+   --enable-guest-agent
+   --python="${PYTHON}"
+   --cc="$(tc-getCC)"
+   --cxx="$(tc-getCXX)"
+   --host-cc="$(tc-getBUILD_CC)"
+   )
+
+   edo ./configure "${myconf[@]}"
+}
+
+src_test() {
+   # qga only uses generic code covered by qobject tests,
+   # the full test suite requires at least one softmmu binary
+   emake check-unit
+}
+
+src_install() {
+   dobin build/qga/qemu-ga
+
+   # Normal init stuff
+   newinitd "${FILESDIR}/qemu-ga.init-r1" qemu-guest-agent
+   newconfd "${FILESDIR}/qemu-ga.conf-r1" qemu-guest-agent
+
+   insinto /etc/logrotate.d
+   newins "${FILESDIR}/qemu-ga.logrotate" qemu-guest-agent
+
+   # systemd stuff
+   udev_newrules "${FILESDIR}/qemu-ga-systemd.udev" 
99-qemu-guest-agent.rules
+
+   systemd_newunit "${FILESDIR}/qemu-ga-systemd.service" \
+   qemu-guest-agent.service
+}
+
+pkg_postinst() {
+   elog "You should add 'qemu-guest-agent' to the default runlevel."
+   elog "e.g. rc-update add qemu-guest-agent default"
+   udev_reload
+}
+
+pkg_postrm() {
+

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2024-02-01 Thread Sam James

commit: a63c719fb6f700a34877f1834830d6590c6b8fce
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb  2 01:03:02 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  2 01:03:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a63c719f

app-emulation/qemu: drop 7.2.6, 7.2.7

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/Manifest  |   2 -
 app-emulation/qemu/qemu-7.2.6.ebuild | 972 ---
 app-emulation/qemu/qemu-7.2.7.ebuild | 971 --
 3 files changed, 1945 deletions(-)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 59a7e5c1e69b..185e25111a4d 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -3,8 +3,6 @@ DIST 
berkeley-testfloat-3-40619cbb3bf32872df8c53cc457039229428a263.tar.bz2 90086
 DIST keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6.tar.bz2 27971 
BLAKE2B 
0ed69ad24c53bd459c8753565814bcc1cd858f20d3a046c38912a35bcb0ba6d388ef5d2b93157cd028959284b330caf5467d82071c3df56a405dd8e08fd177c7
 SHA512 
8f2cc14e8bd46cb045e3ebfe32e463793ab7472ebda9b57b8ea0b06fa107a1a99c3ebcacb9c4548e30698d8ec154c0e56f789385201182b680819b8068a103f2
 DIST qemu-7.2.0-docs.tar.xz 1984184 BLAKE2B 
103900fb7903ed8d75f7f012bf61fa2d6fce345b657c851d0437c3384f5735bd1cfd3129320683ea7846ea0b0940e5af5b2663c9320f12fee74b058523a8ea06
 SHA512 
a7edd448982865e07533c300d3e44a8b50cefbdde1982b73c24d0b2aa74315439252c59b634c75de312860874c7b06c75aa72629da681b5105f28ee936794585
 DIST qemu-7.2.4.tar.xz 121849100 BLAKE2B 
a9c5ffce9ff0fac4e2d1fa4be1a1dcee2f5d7f793ddf726871c5ae9a68c22f7ba03692a8a5096de3051030d3c2f34e46697d5af2d66c34984b8161ae3bb07b42
 SHA512 
fa765673833a1f2cbecdb9d47dc7dc29d7613be5a5c8fc63925ae70e1f5aafb4f9f02e45b212a329f17b689351b8a9cdf5f5235ab6adb71bb40e41868898d95b
-DIST qemu-7.2.6.tar.xz 121322888 BLAKE2B 
c3f51cc1647f5c75774513f624c2e1a1e4badd7275c9f9a64a175809daf17d0b3c58eab0c36fa98fc46834d4d79f8552d1c9f34e840ee21ddd049cc3adba480a
 SHA512 
534fffe2d751a707a7cf15db8d5b9eddc2468fd7fe875715e79ee879fb20d7370553588384d345b586eeaddf9284de36f2d0d69f747380ee55161cc6eb09bf30
-DIST qemu-7.2.7.tar.xz 121869000 BLAKE2B 
b8d754c4c4e4aea63dc884ec568edf308829fe869e4eb8b9c0ae6a4f30debcbaa6a584decce416eed7bd4dd4913263238ed28575a1cf56db939bc141815de25a
 SHA512 
44c0023a9f6177706be5e565297b0ff5fd62a0ea17b085fe478677ada33ab4c922968e4e8fca7aecb310b2b7809a08c075262cc640981a42bcee618e6ae4e592
 DIST qemu-7.2.8.tar.xz 121858732 BLAKE2B 
0041346f68e9792f58591b361ff4206f8d16e76ff7ae6b8c4f7c276000b7e12d228bc8cfb32bc812b384725bbe272da893b15c9ad2ce821c003d4159942b47e7
 SHA512 
16d4e609b8c4af8eb86d9beffc09c9c797f06475a5b8c292d4389737cf873b8e7765d7f505892461a92631a3b6e44212d6568a102f9bc43ae0798d538d5525a6
 DIST qemu-7.2.9.tar.xz 121870204 BLAKE2B 
3336541124f96c09aec05721ce77e8187f8d29c716a05419fcb2b9510976683e58dd791205971d9daa11d3053eb211343225597de1bae72b07467e5acac2a851
 SHA512 
b1aa2316f6e2fe1e972b6d1aabf7c04b06bca3863143c6a523b5fda40bb8841bec27e0774f24adc4b3267cf1f1d39ba81246eb3d15d7273904a0df8e8503077d
 DIST qemu-8.0.0-docs.tar.xz 3218024 BLAKE2B 
b764a625024e78a39470048355471e12cfb57ab3c34e764dc4200fdf5c1aea635d26095ec961979bf46f177101c5bd38618bacf7e98e04bd64688ab5e29591aa
 SHA512 
d9dfe191372e105fe16fe8f66f41ed793ade4c89b5ab1d84b39459f3419a1ca61bd49422a83981965cc257c05eca7fd49054703f58f179f5c7b656e9473a1054

diff --git a/app-emulation/qemu/qemu-7.2.6.ebuild 
b/app-emulation/qemu/qemu-7.2.6.ebuild
deleted file mode 100644
index a9f6df604bd8..
--- a/app-emulation/qemu/qemu-7.2.6.ebuild
+++ /dev/null
@@ -1,972 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
-QEMU_DOCS_PREBUILT_DEV=ajak
-QEMU_DOCS_VERSION="7.2.0"
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-# bug #830088
-QEMU_DOC_USEFLAG="+doc"
-
-PYTHON_COMPAT=( python3_{10,11} )
-PYTHON_REQ_USE="ncurses,readline"
-
-FIRMWARE_ABI_VERSION="7.2.0"
-
-inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
-   pax-utils xdg-utils
-
-if [[ ${PV} == ** ]]; then
-   QEMU_DOCS_PREBUILT=0
-
-   EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/;
-   EGIT_SUBMODULES=(
-   tests/fp/berkeley-softfloat-3
-   tests/fp/berkeley-testfloat-3
-   ui/keycodemapdb
-   )
-   inherit git-r3
-   SRC_URI=""
-else
-   MY_P="${PN}-${PV/_rc/-rc}"
-   SRC_URI="https://download.qemu.org/${MY_P}.tar.xz;
-
-   if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
-   SRC_URI+=" !doc? (

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2024-02-01 Thread Sam James

commit: ab9af59d5ec339241a28312cbff5255b6bac5bf8
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb  2 01:03:13 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  2 01:03:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab9af59d

app-emulation/qemu: drop 8.1.2, 8.1.3

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/Manifest  |   2 -
 app-emulation/qemu/qemu-8.1.2.ebuild | 971 ---
 app-emulation/qemu/qemu-8.1.3.ebuild | 971 ---
 3 files changed, 1944 deletions(-)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 185e25111a4d..b4ca7c1ed3d0 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -9,8 +9,6 @@ DIST qemu-8.0.0-docs.tar.xz 3218024 BLAKE2B 
b764a625024e78a39470048355471e12cfb5
 DIST qemu-8.0.4.tar.xz 126179324 BLAKE2B 
dfb98964c629b251f0004b4630ae4500a52465579417d6f5c7dbbb1f672e10d8d7ffb98a4b00e26fb98b3c867208146dbdca026e4d30cbf1752ac733c4d9b915
 SHA512 
bd5ed682d51f974abd4be93f949701f9b5bfb87fd9929e31df130534da2f2c03b99adc9f924b3efd47d3b254e0e3c0046f4e69fbe9f6d0c4ac1f6babecb29449
 DIST qemu-8.0.5.tar.xz 126175064 BLAKE2B 
1d1f78c185ab64b4ca946a44ad04d0bbb6ea48de058037e4ba18176abeb0f0528754c6e832f742f93227182bbce145544eca5b908a366006e7ee58876aca0bda
 SHA512 
ec9679473dda84a2f56ae8ee0039ec4dafb056414bfc5a3a147b2b6bb45ae3b130dd80f6385e8567b5d18f4be94f3536bc8acc45c61eddf40c9678b46cb8bddc
 DIST qemu-8.1.0-docs.tar.xz 2129912 BLAKE2B 
8aaf7b748538afdb5bcb6da15dbd96572d086824377c4b0e93f1ddc695f9a4775471e360a9616d2d481dbf8113e91d2601c69d92cef565fb90b65ffacfdb304e
 SHA512 
905515742bb56a439fc8117ec48ea668e7b2bf0244587673e4352d9e8e49911eb84ff093596ff566e44787197cf9789ec8950e3d75fb7a670c5546394a322ac9
-DIST qemu-8.1.2.tar.xz 123553328 BLAKE2B 
8f48638cd1f0285356aae2d14862f56cc79da09bb9ff9f09e90221fdca851e9c3f8a3d940039f578d24d0b4435baf19cb52a3e927e97bf978ea674d148ecd746
 SHA512 
d95ba8b294115b86b7f3bd1b438b059e38c7ccc68f14e76b455b355b4b68ec84fb799bef44dbf96befcad7c40a15f4660096b5ad5be4396d54dfeaba34c89db8
-DIST qemu-8.1.3.tar.xz 124040288 BLAKE2B 
365b5fa508c57f4738b73666c6f7306985b5d3fe00d1f1bd14d9277121adbd7ffda7764fbded834512e88d19f96b2c3def39bdf336396c27b26dc388c3821852
 SHA512 
d3847f1c0c0099937d08bba604713ac288b6151867a8da230297ee1d93b7e741fa406a2f7bf6645ce3293c0a98458dc9c79454746e7c2920e9a73e0574753e5a
 DIST qemu-8.1.4.tar.xz 124037140 BLAKE2B 
b9e183508071383b41e1ad21c4ead2d1147affcbfc488e085ba7f7a968071523656b7a5d931b32e17ae2f857a6dc317ee350721fdb32585dc138476fd59b1e07
 SHA512 
b67afcf6d58808b02d015438c60dc74067b409c723b2736e69e66ffa3ed80a71d51b941a53e2bb944aa90a5538d631bcbd287d833ea9a78e3dd64ce299cb47ca
 DIST qemu-8.1.5.tar.xz 124007248 BLAKE2B 
0d5db3e18c4dc1035fed442116be98b7e7bbfae905e4facef3278ef5a488332fa2d8e6599169fa1f740e96a035027e989c5cdffc0bfd4e0ca0fca1d0a537e8da
 SHA512 
1005e0602a763979c4d0ec6e79a390e4232dcc3d0b8461fe42856c58e54ad25a2079f3850d27023fce8a2b382b36e3baa7882b69d48cbb72002984c160241c92
 DIST qemu-8.2.0-docs.tar.xz 2233352 BLAKE2B 
22b9499fdf4ff93e72399dab3803f3171c855859dc7fe111612e2f9146db244ca6d2e0aad16aefdf29b231d2b3a2fbc22171fe6bac13b03445d54555ce798d16
 SHA512 
f57e78c28277c153fff00b25097d0df5c6ad36cb4e9f3acf30382bfb1c99508503c186c1bbecf266810ef24fd618428fdf3e0eee41c715a552918c9e6ef9e8e5

diff --git a/app-emulation/qemu/qemu-8.1.2.ebuild 
b/app-emulation/qemu/qemu-8.1.2.ebuild
deleted file mode 100644
index 1db988202783..
--- a/app-emulation/qemu/qemu-8.1.2.ebuild
+++ /dev/null
@@ -1,971 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
-QEMU_DOCS_PREBUILT_DEV=sam
-#QEMU_DOCS_VERSION=$(ver_cut 1-3)
-QEMU_DOCS_VERSION=8.1.0
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-# bug #830088
-QEMU_DOC_USEFLAG="+doc"
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="ncurses,readline"
-
-FIRMWARE_ABI_VERSION="7.2.0"
-
-inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
-   pax-utils xdg-utils
-
-if [[ ${PV} == ** ]]; then
-   QEMU_DOCS_PREBUILT=0
-
-   EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/;
-   EGIT_SUBMODULES=(
-   tests/fp/berkeley-softfloat-3
-   tests/fp/berkeley-testfloat-3
-   subprojects/keycodemapdb
-   )
-   inherit git-r3
-   SRC_URI=""
-else
-   MY_P="${PN}-${PV/_rc/-rc}"
-   SRC_URI="https://download.qemu.org/${MY_P}.tar.xz;
-
-   if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
-   SRC_URI+=" !doc? (

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2024-02-01 Thread Sam James

commit: 4e98db7be7c56eb7484a4158720c4466804175f6
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb  2 00:37:54 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  2 01:01:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e98db7b

app-emulation/qemu: add 7.2.9

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/Manifest  |   1 +
 app-emulation/qemu/qemu-7.2.9.ebuild | 971 +++
 2 files changed, 972 insertions(+)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 3e31703322d7..ad2701e6d929 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -6,6 +6,7 @@ DIST qemu-7.2.4.tar.xz 121849100 BLAKE2B 
a9c5ffce9ff0fac4e2d1fa4be1a1dcee2f5d7f7
 DIST qemu-7.2.6.tar.xz 121322888 BLAKE2B 
c3f51cc1647f5c75774513f624c2e1a1e4badd7275c9f9a64a175809daf17d0b3c58eab0c36fa98fc46834d4d79f8552d1c9f34e840ee21ddd049cc3adba480a
 SHA512 
534fffe2d751a707a7cf15db8d5b9eddc2468fd7fe875715e79ee879fb20d7370553588384d345b586eeaddf9284de36f2d0d69f747380ee55161cc6eb09bf30
 DIST qemu-7.2.7.tar.xz 121869000 BLAKE2B 
b8d754c4c4e4aea63dc884ec568edf308829fe869e4eb8b9c0ae6a4f30debcbaa6a584decce416eed7bd4dd4913263238ed28575a1cf56db939bc141815de25a
 SHA512 
44c0023a9f6177706be5e565297b0ff5fd62a0ea17b085fe478677ada33ab4c922968e4e8fca7aecb310b2b7809a08c075262cc640981a42bcee618e6ae4e592
 DIST qemu-7.2.8.tar.xz 121858732 BLAKE2B 
0041346f68e9792f58591b361ff4206f8d16e76ff7ae6b8c4f7c276000b7e12d228bc8cfb32bc812b384725bbe272da893b15c9ad2ce821c003d4159942b47e7
 SHA512 
16d4e609b8c4af8eb86d9beffc09c9c797f06475a5b8c292d4389737cf873b8e7765d7f505892461a92631a3b6e44212d6568a102f9bc43ae0798d538d5525a6
+DIST qemu-7.2.9.tar.xz 121870204 BLAKE2B 
3336541124f96c09aec05721ce77e8187f8d29c716a05419fcb2b9510976683e58dd791205971d9daa11d3053eb211343225597de1bae72b07467e5acac2a851
 SHA512 
b1aa2316f6e2fe1e972b6d1aabf7c04b06bca3863143c6a523b5fda40bb8841bec27e0774f24adc4b3267cf1f1d39ba81246eb3d15d7273904a0df8e8503077d
 DIST qemu-8.0.0-docs.tar.xz 3218024 BLAKE2B 
b764a625024e78a39470048355471e12cfb57ab3c34e764dc4200fdf5c1aea635d26095ec961979bf46f177101c5bd38618bacf7e98e04bd64688ab5e29591aa
 SHA512 
d9dfe191372e105fe16fe8f66f41ed793ade4c89b5ab1d84b39459f3419a1ca61bd49422a83981965cc257c05eca7fd49054703f58f179f5c7b656e9473a1054
 DIST qemu-8.0.4.tar.xz 126179324 BLAKE2B 
dfb98964c629b251f0004b4630ae4500a52465579417d6f5c7dbbb1f672e10d8d7ffb98a4b00e26fb98b3c867208146dbdca026e4d30cbf1752ac733c4d9b915
 SHA512 
bd5ed682d51f974abd4be93f949701f9b5bfb87fd9929e31df130534da2f2c03b99adc9f924b3efd47d3b254e0e3c0046f4e69fbe9f6d0c4ac1f6babecb29449
 DIST qemu-8.0.5.tar.xz 126175064 BLAKE2B 
1d1f78c185ab64b4ca946a44ad04d0bbb6ea48de058037e4ba18176abeb0f0528754c6e832f742f93227182bbce145544eca5b908a366006e7ee58876aca0bda
 SHA512 
ec9679473dda84a2f56ae8ee0039ec4dafb056414bfc5a3a147b2b6bb45ae3b130dd80f6385e8567b5d18f4be94f3536bc8acc45c61eddf40c9678b46cb8bddc

diff --git a/app-emulation/qemu/qemu-7.2.9.ebuild 
b/app-emulation/qemu/qemu-7.2.9.ebuild
new file mode 100644
index ..ac517632fb22
--- /dev/null
+++ b/app-emulation/qemu/qemu-7.2.9.ebuild
@@ -0,0 +1,971 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
+QEMU_DOCS_PREBUILT_DEV=ajak
+QEMU_DOCS_VERSION="7.2.0"
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# bug #830088
+QEMU_DOC_USEFLAG="+doc"
+
+PYTHON_COMPAT=( python3_{10,11} )
+PYTHON_REQ_USE="ncurses,readline"
+
+FIRMWARE_ABI_VERSION="7.2.0"
+
+inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
+   pax-utils xdg-utils
+
+if [[ ${PV} == ** ]]; then
+   QEMU_DOCS_PREBUILT=0
+
+   EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/;
+   EGIT_SUBMODULES=(
+   tests/fp/berkeley-softfloat-3
+   tests/fp/berkeley-testfloat-3
+   ui/keycodemapdb
+   )
+   inherit git-r3
+   SRC_URI=""
+else
+   MY_P="${PN}-${PV/_rc/-rc}"
+   SRC_URI="https://download.qemu.org/${MY_P}.tar.xz;
+
+   if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
+   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz
 )"
+   fi
+
+   S="${WORKDIR}/${MY_P}"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org;
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+
+[[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc"
+
+IUSE="accessibility +aio

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2024-02-01 Thread Sam James

commit: 1841e462d4cca610efff1851dacbf882c6fb3b84
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb  2 01:01:51 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  2 01:02:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1841e462

app-emulation/qemu: add 8.2.1

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/Manifest  |   1 +
 app-emulation/qemu/qemu-8.2.1.ebuild | 991 +++
 2 files changed, 992 insertions(+)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 826827e7f8aa..59a7e5c1e69b 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -17,3 +17,4 @@ DIST qemu-8.1.4.tar.xz 124037140 BLAKE2B 
b9e183508071383b41e1ad21c4ead2d1147affc
 DIST qemu-8.1.5.tar.xz 124007248 BLAKE2B 
0d5db3e18c4dc1035fed442116be98b7e7bbfae905e4facef3278ef5a488332fa2d8e6599169fa1f740e96a035027e989c5cdffc0bfd4e0ca0fca1d0a537e8da
 SHA512 
1005e0602a763979c4d0ec6e79a390e4232dcc3d0b8461fe42856c58e54ad25a2079f3850d27023fce8a2b382b36e3baa7882b69d48cbb72002984c160241c92
 DIST qemu-8.2.0-docs.tar.xz 2233352 BLAKE2B 
22b9499fdf4ff93e72399dab3803f3171c855859dc7fe111612e2f9146db244ca6d2e0aad16aefdf29b231d2b3a2fbc22171fe6bac13b03445d54555ce798d16
 SHA512 
f57e78c28277c153fff00b25097d0df5c6ad36cb4e9f3acf30382bfb1c99508503c186c1bbecf266810ef24fd618428fdf3e0eee41c715a552918c9e6ef9e8e5
 DIST qemu-8.2.0.tar.xz 13000 BLAKE2B 
a63667042e1e19c635568072d8dcc117320117e81e374a93cfb79e2363ebf505df3217fb098638e53c899eb6f83435221e8031f2aae003c27ec25af8654683b3
 SHA512 
92ec41196ff145cdbb98948f6b6e43214fa4b4419554a8a1927fb4527080c8212ccb703e184baf8ee0bdfa50ad7a84689e8f5a69eba1bd7bbbdfd69e3b91256c
+DIST qemu-8.2.1.tar.xz 129848448 BLAKE2B 
af5b03fecd41c376daece7598c01755c458d38e045486f33e2915cc7d4856f23b4478a2c1a32a7eb600c4fc675c24df55007840c8a3c6d1fd2d585c74848f02e
 SHA512 
e72d3e13339c03e8d371ca060ac700c45af2ca37523cddb6b02dcaf8430d75c8cef194cf496df9816440b281f368457def1126677db757928805d93ceca2f9af

diff --git a/app-emulation/qemu/qemu-8.2.1.ebuild 
b/app-emulation/qemu/qemu-8.2.1.ebuild
new file mode 100644
index ..9523cdbfcf5e
--- /dev/null
+++ b/app-emulation/qemu/qemu-8.2.1.ebuild
@@ -0,0 +1,991 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
+QEMU_DOCS_PREBUILT_DEV=sam
+QEMU_DOCS_VERSION=$(ver_cut 1-2).0
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# bug #830088
+QEMU_DOC_USEFLAG="+doc"
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="ncurses,readline"
+
+FIRMWARE_ABI_VERSION="7.2.0"
+
+inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
+   pax-utils xdg-utils
+
+if [[ ${PV} == ** ]]; then
+   QEMU_DOCS_PREBUILT=0
+
+   EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/;
+   EGIT_SUBMODULES=()
+   inherit git-r3
+   SRC_URI=""
+   declare -A SUBPROJECTS=(
+   [keycodemapdb]="f5772a62ec52591ff6870b7e8ef32482371f22c6"
+   
[berkeley-softfloat-3]="b64af41c3276f97f0e181920400ee056b9c88037"
+   
[berkeley-testfloat-3]="40619cbb3bf32872df8c53cc457039229428a263"
+   )
+
+   for proj in "${!SUBPROJECTS[@]}"; do
+   c=${SUBPROJECTS[${proj}]}
+   SRC_URI+=" 
https://gitlab.com/qemu-project/${proj}/-/archive/${c}/${proj}-${c}.tar.bz2;
+   done
+else
+   MY_P="${PN}-${PV/_rc/-rc}"
+   SRC_URI="https://download.qemu.org/${MY_P}.tar.xz;
+
+   if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
+   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz
 )"
+   fi
+
+   S="${WORKDIR}/${MY_P}"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org;
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+
+[[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc"
+
+IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug 
${QEMU_DOC_USEFLAG}
+   +fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
+   jack jemalloc +jpeg keyutils
+   lzo multipath
+   ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs pipewire
+   plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
+   +slirp
+   smartcard snappy spice ssh static-user systemtap test udev usb
+   usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen
+   zstd"
+
+COMMON_TARGETS="
+   aarch64
+   alpha
+   arm
+

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2024-02-01 Thread Sam James

commit: cfe8a0366713af6a89eed7a10db696acbecfdfa5
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb  2 00:51:57 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  2 01:01:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfe8a036

app-emulation/qemu: add 8.1.5

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/Manifest  |   1 +
 app-emulation/qemu/qemu-8.1.5.ebuild | 971 +++
 2 files changed, 972 insertions(+)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index ad2701e6d929..826827e7f8aa 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -14,5 +14,6 @@ DIST qemu-8.1.0-docs.tar.xz 2129912 BLAKE2B 
8aaf7b748538afdb5bcb6da15dbd96572d08
 DIST qemu-8.1.2.tar.xz 123553328 BLAKE2B 
8f48638cd1f0285356aae2d14862f56cc79da09bb9ff9f09e90221fdca851e9c3f8a3d940039f578d24d0b4435baf19cb52a3e927e97bf978ea674d148ecd746
 SHA512 
d95ba8b294115b86b7f3bd1b438b059e38c7ccc68f14e76b455b355b4b68ec84fb799bef44dbf96befcad7c40a15f4660096b5ad5be4396d54dfeaba34c89db8
 DIST qemu-8.1.3.tar.xz 124040288 BLAKE2B 
365b5fa508c57f4738b73666c6f7306985b5d3fe00d1f1bd14d9277121adbd7ffda7764fbded834512e88d19f96b2c3def39bdf336396c27b26dc388c3821852
 SHA512 
d3847f1c0c0099937d08bba604713ac288b6151867a8da230297ee1d93b7e741fa406a2f7bf6645ce3293c0a98458dc9c79454746e7c2920e9a73e0574753e5a
 DIST qemu-8.1.4.tar.xz 124037140 BLAKE2B 
b9e183508071383b41e1ad21c4ead2d1147affcbfc488e085ba7f7a968071523656b7a5d931b32e17ae2f857a6dc317ee350721fdb32585dc138476fd59b1e07
 SHA512 
b67afcf6d58808b02d015438c60dc74067b409c723b2736e69e66ffa3ed80a71d51b941a53e2bb944aa90a5538d631bcbd287d833ea9a78e3dd64ce299cb47ca
+DIST qemu-8.1.5.tar.xz 124007248 BLAKE2B 
0d5db3e18c4dc1035fed442116be98b7e7bbfae905e4facef3278ef5a488332fa2d8e6599169fa1f740e96a035027e989c5cdffc0bfd4e0ca0fca1d0a537e8da
 SHA512 
1005e0602a763979c4d0ec6e79a390e4232dcc3d0b8461fe42856c58e54ad25a2079f3850d27023fce8a2b382b36e3baa7882b69d48cbb72002984c160241c92
 DIST qemu-8.2.0-docs.tar.xz 2233352 BLAKE2B 
22b9499fdf4ff93e72399dab3803f3171c855859dc7fe111612e2f9146db244ca6d2e0aad16aefdf29b231d2b3a2fbc22171fe6bac13b03445d54555ce798d16
 SHA512 
f57e78c28277c153fff00b25097d0df5c6ad36cb4e9f3acf30382bfb1c99508503c186c1bbecf266810ef24fd618428fdf3e0eee41c715a552918c9e6ef9e8e5
 DIST qemu-8.2.0.tar.xz 13000 BLAKE2B 
a63667042e1e19c635568072d8dcc117320117e81e374a93cfb79e2363ebf505df3217fb098638e53c899eb6f83435221e8031f2aae003c27ec25af8654683b3
 SHA512 
92ec41196ff145cdbb98948f6b6e43214fa4b4419554a8a1927fb4527080c8212ccb703e184baf8ee0bdfa50ad7a84689e8f5a69eba1bd7bbbdfd69e3b91256c

diff --git a/app-emulation/qemu/qemu-8.1.5.ebuild 
b/app-emulation/qemu/qemu-8.1.5.ebuild
new file mode 100644
index ..1db988202783
--- /dev/null
+++ b/app-emulation/qemu/qemu-8.1.5.ebuild
@@ -0,0 +1,971 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
+QEMU_DOCS_PREBUILT_DEV=sam
+#QEMU_DOCS_VERSION=$(ver_cut 1-3)
+QEMU_DOCS_VERSION=8.1.0
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# bug #830088
+QEMU_DOC_USEFLAG="+doc"
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="ncurses,readline"
+
+FIRMWARE_ABI_VERSION="7.2.0"
+
+inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
+   pax-utils xdg-utils
+
+if [[ ${PV} == ** ]]; then
+   QEMU_DOCS_PREBUILT=0
+
+   EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/;
+   EGIT_SUBMODULES=(
+   tests/fp/berkeley-softfloat-3
+   tests/fp/berkeley-testfloat-3
+   subprojects/keycodemapdb
+   )
+   inherit git-r3
+   SRC_URI=""
+else
+   MY_P="${PN}-${PV/_rc/-rc}"
+   SRC_URI="https://download.qemu.org/${MY_P}.tar.xz;
+
+   if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
+   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz
 )"
+   fi
+
+   S="${WORKDIR}/${MY_P}"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org;
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+
+[[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc"
+
+IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug 
${QEMU_DOC_USEFLAG}
+   +fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
+   jack jemalloc +jpeg keyutils
+   lzo multipath
+   ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs pipewire
+

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-12-28 Thread Sam James

commit: f970262650f9c845e2bd38481c919f6a460da84c
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 29 00:52:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 29 00:52:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9702626

app-emulation/qemu: add 7.2.8

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/Manifest  |   1 +
 app-emulation/qemu/qemu-7.2.8.ebuild | 971 +++
 2 files changed, 972 insertions(+)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index ef392d9c48f4..2090cdbaf1f4 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -5,6 +5,7 @@ DIST qemu-7.2.0-docs.tar.xz 1984184 BLAKE2B 
103900fb7903ed8d75f7f012bf61fa2d6fce
 DIST qemu-7.2.4.tar.xz 121849100 BLAKE2B 
a9c5ffce9ff0fac4e2d1fa4be1a1dcee2f5d7f793ddf726871c5ae9a68c22f7ba03692a8a5096de3051030d3c2f34e46697d5af2d66c34984b8161ae3bb07b42
 SHA512 
fa765673833a1f2cbecdb9d47dc7dc29d7613be5a5c8fc63925ae70e1f5aafb4f9f02e45b212a329f17b689351b8a9cdf5f5235ab6adb71bb40e41868898d95b
 DIST qemu-7.2.6.tar.xz 121322888 BLAKE2B 
c3f51cc1647f5c75774513f624c2e1a1e4badd7275c9f9a64a175809daf17d0b3c58eab0c36fa98fc46834d4d79f8552d1c9f34e840ee21ddd049cc3adba480a
 SHA512 
534fffe2d751a707a7cf15db8d5b9eddc2468fd7fe875715e79ee879fb20d7370553588384d345b586eeaddf9284de36f2d0d69f747380ee55161cc6eb09bf30
 DIST qemu-7.2.7.tar.xz 121869000 BLAKE2B 
b8d754c4c4e4aea63dc884ec568edf308829fe869e4eb8b9c0ae6a4f30debcbaa6a584decce416eed7bd4dd4913263238ed28575a1cf56db939bc141815de25a
 SHA512 
44c0023a9f6177706be5e565297b0ff5fd62a0ea17b085fe478677ada33ab4c922968e4e8fca7aecb310b2b7809a08c075262cc640981a42bcee618e6ae4e592
+DIST qemu-7.2.8.tar.xz 121858732 BLAKE2B 
0041346f68e9792f58591b361ff4206f8d16e76ff7ae6b8c4f7c276000b7e12d228bc8cfb32bc812b384725bbe272da893b15c9ad2ce821c003d4159942b47e7
 SHA512 
16d4e609b8c4af8eb86d9beffc09c9c797f06475a5b8c292d4389737cf873b8e7765d7f505892461a92631a3b6e44212d6568a102f9bc43ae0798d538d5525a6
 DIST qemu-8.0.0-docs.tar.xz 3218024 BLAKE2B 
b764a625024e78a39470048355471e12cfb57ab3c34e764dc4200fdf5c1aea635d26095ec961979bf46f177101c5bd38618bacf7e98e04bd64688ab5e29591aa
 SHA512 
d9dfe191372e105fe16fe8f66f41ed793ade4c89b5ab1d84b39459f3419a1ca61bd49422a83981965cc257c05eca7fd49054703f58f179f5c7b656e9473a1054
 DIST qemu-8.0.4.tar.xz 126179324 BLAKE2B 
dfb98964c629b251f0004b4630ae4500a52465579417d6f5c7dbbb1f672e10d8d7ffb98a4b00e26fb98b3c867208146dbdca026e4d30cbf1752ac733c4d9b915
 SHA512 
bd5ed682d51f974abd4be93f949701f9b5bfb87fd9929e31df130534da2f2c03b99adc9f924b3efd47d3b254e0e3c0046f4e69fbe9f6d0c4ac1f6babecb29449
 DIST qemu-8.0.5.tar.xz 126175064 BLAKE2B 
1d1f78c185ab64b4ca946a44ad04d0bbb6ea48de058037e4ba18176abeb0f0528754c6e832f742f93227182bbce145544eca5b908a366006e7ee58876aca0bda
 SHA512 
ec9679473dda84a2f56ae8ee0039ec4dafb056414bfc5a3a147b2b6bb45ae3b130dd80f6385e8567b5d18f4be94f3536bc8acc45c61eddf40c9678b46cb8bddc

diff --git a/app-emulation/qemu/qemu-7.2.8.ebuild 
b/app-emulation/qemu/qemu-7.2.8.ebuild
new file mode 100644
index ..dd5799797dad
--- /dev/null
+++ b/app-emulation/qemu/qemu-7.2.8.ebuild
@@ -0,0 +1,971 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
+QEMU_DOCS_PREBUILT_DEV=ajak
+QEMU_DOCS_VERSION="7.2.0"
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# bug #830088
+QEMU_DOC_USEFLAG="+doc"
+
+PYTHON_COMPAT=( python3_{9,10,11} )
+PYTHON_REQ_USE="ncurses,readline"
+
+FIRMWARE_ABI_VERSION="7.2.0"
+
+inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
+   pax-utils xdg-utils
+
+if [[ ${PV} == ** ]]; then
+   QEMU_DOCS_PREBUILT=0
+
+   EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/;
+   EGIT_SUBMODULES=(
+   tests/fp/berkeley-softfloat-3
+   tests/fp/berkeley-testfloat-3
+   ui/keycodemapdb
+   )
+   inherit git-r3
+   SRC_URI=""
+else
+   MY_P="${PN}-${PV/_rc/-rc}"
+   SRC_URI="https://download.qemu.org/${MY_P}.tar.xz;
+
+   if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
+   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz
 )"
+   fi
+
+   S="${WORKDIR}/${MY_P}"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org;
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+
+[[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc"
+
+IUSE="accessibility +aio

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-12-28 Thread Sam James

commit: ada41158ff3c251083836e2f019d7b8876bef3bb
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 29 01:01:55 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 29 01:01:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ada41158

app-emulation/qemu: add 8.1.4

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/Manifest  |   1 +
 app-emulation/qemu/qemu-8.1.4.ebuild | 971 +++
 2 files changed, 972 insertions(+)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 2090cdbaf1f4..3e31703322d7 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -12,5 +12,6 @@ DIST qemu-8.0.5.tar.xz 126175064 BLAKE2B 
1d1f78c185ab64b4ca946a44ad04d0bbb6ea48d
 DIST qemu-8.1.0-docs.tar.xz 2129912 BLAKE2B 
8aaf7b748538afdb5bcb6da15dbd96572d086824377c4b0e93f1ddc695f9a4775471e360a9616d2d481dbf8113e91d2601c69d92cef565fb90b65ffacfdb304e
 SHA512 
905515742bb56a439fc8117ec48ea668e7b2bf0244587673e4352d9e8e49911eb84ff093596ff566e44787197cf9789ec8950e3d75fb7a670c5546394a322ac9
 DIST qemu-8.1.2.tar.xz 123553328 BLAKE2B 
8f48638cd1f0285356aae2d14862f56cc79da09bb9ff9f09e90221fdca851e9c3f8a3d940039f578d24d0b4435baf19cb52a3e927e97bf978ea674d148ecd746
 SHA512 
d95ba8b294115b86b7f3bd1b438b059e38c7ccc68f14e76b455b355b4b68ec84fb799bef44dbf96befcad7c40a15f4660096b5ad5be4396d54dfeaba34c89db8
 DIST qemu-8.1.3.tar.xz 124040288 BLAKE2B 
365b5fa508c57f4738b73666c6f7306985b5d3fe00d1f1bd14d9277121adbd7ffda7764fbded834512e88d19f96b2c3def39bdf336396c27b26dc388c3821852
 SHA512 
d3847f1c0c0099937d08bba604713ac288b6151867a8da230297ee1d93b7e741fa406a2f7bf6645ce3293c0a98458dc9c79454746e7c2920e9a73e0574753e5a
+DIST qemu-8.1.4.tar.xz 124037140 BLAKE2B 
b9e183508071383b41e1ad21c4ead2d1147affcbfc488e085ba7f7a968071523656b7a5d931b32e17ae2f857a6dc317ee350721fdb32585dc138476fd59b1e07
 SHA512 
b67afcf6d58808b02d015438c60dc74067b409c723b2736e69e66ffa3ed80a71d51b941a53e2bb944aa90a5538d631bcbd287d833ea9a78e3dd64ce299cb47ca
 DIST qemu-8.2.0-docs.tar.xz 2233352 BLAKE2B 
22b9499fdf4ff93e72399dab3803f3171c855859dc7fe111612e2f9146db244ca6d2e0aad16aefdf29b231d2b3a2fbc22171fe6bac13b03445d54555ce798d16
 SHA512 
f57e78c28277c153fff00b25097d0df5c6ad36cb4e9f3acf30382bfb1c99508503c186c1bbecf266810ef24fd618428fdf3e0eee41c715a552918c9e6ef9e8e5
 DIST qemu-8.2.0.tar.xz 13000 BLAKE2B 
a63667042e1e19c635568072d8dcc117320117e81e374a93cfb79e2363ebf505df3217fb098638e53c899eb6f83435221e8031f2aae003c27ec25af8654683b3
 SHA512 
92ec41196ff145cdbb98948f6b6e43214fa4b4419554a8a1927fb4527080c8212ccb703e184baf8ee0bdfa50ad7a84689e8f5a69eba1bd7bbbdfd69e3b91256c

diff --git a/app-emulation/qemu/qemu-8.1.4.ebuild 
b/app-emulation/qemu/qemu-8.1.4.ebuild
new file mode 100644
index ..9557c4eff16f
--- /dev/null
+++ b/app-emulation/qemu/qemu-8.1.4.ebuild
@@ -0,0 +1,971 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
+QEMU_DOCS_PREBUILT_DEV=sam
+#QEMU_DOCS_VERSION=$(ver_cut 1-3)
+QEMU_DOCS_VERSION=8.1.0
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# bug #830088
+QEMU_DOC_USEFLAG="+doc"
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="ncurses,readline"
+
+FIRMWARE_ABI_VERSION="7.2.0"
+
+inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
+   pax-utils xdg-utils
+
+if [[ ${PV} == ** ]]; then
+   QEMU_DOCS_PREBUILT=0
+
+   EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/;
+   EGIT_SUBMODULES=(
+   tests/fp/berkeley-softfloat-3
+   tests/fp/berkeley-testfloat-3
+   subprojects/keycodemapdb
+   )
+   inherit git-r3
+   SRC_URI=""
+else
+   MY_P="${PN}-${PV/_rc/-rc}"
+   SRC_URI="https://download.qemu.org/${MY_P}.tar.xz;
+
+   if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
+   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz
 )"
+   fi
+
+   S="${WORKDIR}/${MY_P}"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org;
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+
+[[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc"
+
+IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug 
${QEMU_DOC_USEFLAG}
+   +fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
+   jack jemalloc +jpeg keyutils
+   lzo multipath
+   ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs pipewire
+

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-12-20 Thread Sam James

commit: 9699c3ef7c352f47b3af72ac51d0878c6f336936
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec 20 09:58:46 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 20 10:03:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9699c3ef

app-emulation/qemu: add 8.2.0

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/Manifest  | 1 +
 app-emulation/qemu/qemu-8.2.0.ebuild | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 8d288da77a28..ef392d9c48f4 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -11,4 +11,5 @@ DIST qemu-8.0.5.tar.xz 126175064 BLAKE2B 
1d1f78c185ab64b4ca946a44ad04d0bbb6ea48d
 DIST qemu-8.1.0-docs.tar.xz 2129912 BLAKE2B 
8aaf7b748538afdb5bcb6da15dbd96572d086824377c4b0e93f1ddc695f9a4775471e360a9616d2d481dbf8113e91d2601c69d92cef565fb90b65ffacfdb304e
 SHA512 
905515742bb56a439fc8117ec48ea668e7b2bf0244587673e4352d9e8e49911eb84ff093596ff566e44787197cf9789ec8950e3d75fb7a670c5546394a322ac9
 DIST qemu-8.1.2.tar.xz 123553328 BLAKE2B 
8f48638cd1f0285356aae2d14862f56cc79da09bb9ff9f09e90221fdca851e9c3f8a3d940039f578d24d0b4435baf19cb52a3e927e97bf978ea674d148ecd746
 SHA512 
d95ba8b294115b86b7f3bd1b438b059e38c7ccc68f14e76b455b355b4b68ec84fb799bef44dbf96befcad7c40a15f4660096b5ad5be4396d54dfeaba34c89db8
 DIST qemu-8.1.3.tar.xz 124040288 BLAKE2B 
365b5fa508c57f4738b73666c6f7306985b5d3fe00d1f1bd14d9277121adbd7ffda7764fbded834512e88d19f96b2c3def39bdf336396c27b26dc388c3821852
 SHA512 
d3847f1c0c0099937d08bba604713ac288b6151867a8da230297ee1d93b7e741fa406a2f7bf6645ce3293c0a98458dc9c79454746e7c2920e9a73e0574753e5a
+DIST qemu-8.2.0-docs.tar.xz 2233352 BLAKE2B 
22b9499fdf4ff93e72399dab3803f3171c855859dc7fe111612e2f9146db244ca6d2e0aad16aefdf29b231d2b3a2fbc22171fe6bac13b03445d54555ce798d16
 SHA512 
f57e78c28277c153fff00b25097d0df5c6ad36cb4e9f3acf30382bfb1c99508503c186c1bbecf266810ef24fd618428fdf3e0eee41c715a552918c9e6ef9e8e5
 DIST qemu-8.2.0.tar.xz 13000 BLAKE2B 
a63667042e1e19c635568072d8dcc117320117e81e374a93cfb79e2363ebf505df3217fb098638e53c899eb6f83435221e8031f2aae003c27ec25af8654683b3
 SHA512 
92ec41196ff145cdbb98948f6b6e43214fa4b4419554a8a1927fb4527080c8212ccb703e184baf8ee0bdfa50ad7a84689e8f5a69eba1bd7bbbdfd69e3b91256c

diff --git a/app-emulation/qemu/qemu-8.2.0.ebuild 
b/app-emulation/qemu/qemu-8.2.0.ebuild
index cef7e03b44b6..518d7a5b6bda 100644
--- a/app-emulation/qemu/qemu-8.2.0.ebuild
+++ b/app-emulation/qemu/qemu-8.2.0.ebuild
@@ -6,9 +6,9 @@ EAPI=8
 # Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
 # Set to 1 if prebuilt, 0 if not
 # (the construct below is to allow overriding from env for script)
-QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-0}
+QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
 QEMU_DOCS_PREBUILT_DEV=sam
-QEMU_DOCS_VERSION=$(ver_cut 1-3)
+QEMU_DOCS_VERSION=$(ver_cut 1-2).0
 # Default to generating docs (inc. man pages) if no prebuilt; overridden later
 # bug #830088
 QEMU_DOC_USEFLAG="+doc"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-12-20 Thread Sam James

commit: 9ce2b9d650cf8906b3476e10fe916a6454d0053a
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec 20 09:39:09 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 20 10:03:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ce2b9d6

app-emulation/qemu: add 8.2.0

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/Manifest  |   1 +
 app-emulation/qemu/qemu-8.2.0.ebuild | 991 +++
 2 files changed, 992 insertions(+)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 237f5e529e84..8d288da77a28 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -11,3 +11,4 @@ DIST qemu-8.0.5.tar.xz 126175064 BLAKE2B 
1d1f78c185ab64b4ca946a44ad04d0bbb6ea48d
 DIST qemu-8.1.0-docs.tar.xz 2129912 BLAKE2B 
8aaf7b748538afdb5bcb6da15dbd96572d086824377c4b0e93f1ddc695f9a4775471e360a9616d2d481dbf8113e91d2601c69d92cef565fb90b65ffacfdb304e
 SHA512 
905515742bb56a439fc8117ec48ea668e7b2bf0244587673e4352d9e8e49911eb84ff093596ff566e44787197cf9789ec8950e3d75fb7a670c5546394a322ac9
 DIST qemu-8.1.2.tar.xz 123553328 BLAKE2B 
8f48638cd1f0285356aae2d14862f56cc79da09bb9ff9f09e90221fdca851e9c3f8a3d940039f578d24d0b4435baf19cb52a3e927e97bf978ea674d148ecd746
 SHA512 
d95ba8b294115b86b7f3bd1b438b059e38c7ccc68f14e76b455b355b4b68ec84fb799bef44dbf96befcad7c40a15f4660096b5ad5be4396d54dfeaba34c89db8
 DIST qemu-8.1.3.tar.xz 124040288 BLAKE2B 
365b5fa508c57f4738b73666c6f7306985b5d3fe00d1f1bd14d9277121adbd7ffda7764fbded834512e88d19f96b2c3def39bdf336396c27b26dc388c3821852
 SHA512 
d3847f1c0c0099937d08bba604713ac288b6151867a8da230297ee1d93b7e741fa406a2f7bf6645ce3293c0a98458dc9c79454746e7c2920e9a73e0574753e5a
+DIST qemu-8.2.0.tar.xz 13000 BLAKE2B 
a63667042e1e19c635568072d8dcc117320117e81e374a93cfb79e2363ebf505df3217fb098638e53c899eb6f83435221e8031f2aae003c27ec25af8654683b3
 SHA512 
92ec41196ff145cdbb98948f6b6e43214fa4b4419554a8a1927fb4527080c8212ccb703e184baf8ee0bdfa50ad7a84689e8f5a69eba1bd7bbbdfd69e3b91256c

diff --git a/app-emulation/qemu/qemu-8.2.0.ebuild 
b/app-emulation/qemu/qemu-8.2.0.ebuild
new file mode 100644
index ..cef7e03b44b6
--- /dev/null
+++ b/app-emulation/qemu/qemu-8.2.0.ebuild
@@ -0,0 +1,991 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-0}
+QEMU_DOCS_PREBUILT_DEV=sam
+QEMU_DOCS_VERSION=$(ver_cut 1-3)
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# bug #830088
+QEMU_DOC_USEFLAG="+doc"
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="ncurses,readline"
+
+FIRMWARE_ABI_VERSION="7.2.0"
+
+inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
+   pax-utils xdg-utils
+
+if [[ ${PV} == ** ]]; then
+   QEMU_DOCS_PREBUILT=0
+
+   EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/;
+   EGIT_SUBMODULES=()
+   inherit git-r3
+   SRC_URI=""
+   declare -A SUBPROJECTS=(
+   [keycodemapdb]="f5772a62ec52591ff6870b7e8ef32482371f22c6"
+   
[berkeley-softfloat-3]="b64af41c3276f97f0e181920400ee056b9c88037"
+   
[berkeley-testfloat-3]="40619cbb3bf32872df8c53cc457039229428a263"
+   )
+
+   for proj in "${!SUBPROJECTS[@]}"; do
+   c=${SUBPROJECTS[${proj}]}
+   SRC_URI+=" 
https://gitlab.com/qemu-project/${proj}/-/archive/${c}/${proj}-${c}.tar.bz2;
+   done
+else
+   MY_P="${PN}-${PV/_rc/-rc}"
+   SRC_URI="https://download.qemu.org/${MY_P}.tar.xz;
+
+   if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
+   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz
 )"
+   fi
+
+   S="${WORKDIR}/${MY_P}"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org;
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+
+[[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc"
+
+IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug 
${QEMU_DOC_USEFLAG}
+   +fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
+   jack jemalloc +jpeg keyutils
+   lzo multipath
+   ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs pipewire
+   plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
+   +slirp
+   smartcard snappy spice ssh static-user systemtap test udev usb
+   usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen
+   zstd"
+
+COMMON_TARGETS="
+   aarch64
+   alpha
+   arm
+

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-11-21 Thread Sam James

commit: c13fab3f1990bd30acb1ba8f41df346424f695a8
Author: Sam James  gentoo  org>
AuthorDate: Tue Nov 21 19:40:27 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Nov 21 19:51:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c13fab3f

app-emulation/qemu: add 7.2.7

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/Manifest  |   1 +
 app-emulation/qemu/qemu-7.2.7.ebuild | 971 +++
 2 files changed, 972 insertions(+)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 910dd2f70ad1..7bd5660cf48e 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -4,6 +4,7 @@ DIST 
keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6.tar.bz2 27971 BLAKE2B
 DIST qemu-7.2.0-docs.tar.xz 1984184 BLAKE2B 
103900fb7903ed8d75f7f012bf61fa2d6fce345b657c851d0437c3384f5735bd1cfd3129320683ea7846ea0b0940e5af5b2663c9320f12fee74b058523a8ea06
 SHA512 
a7edd448982865e07533c300d3e44a8b50cefbdde1982b73c24d0b2aa74315439252c59b634c75de312860874c7b06c75aa72629da681b5105f28ee936794585
 DIST qemu-7.2.4.tar.xz 121849100 BLAKE2B 
a9c5ffce9ff0fac4e2d1fa4be1a1dcee2f5d7f793ddf726871c5ae9a68c22f7ba03692a8a5096de3051030d3c2f34e46697d5af2d66c34984b8161ae3bb07b42
 SHA512 
fa765673833a1f2cbecdb9d47dc7dc29d7613be5a5c8fc63925ae70e1f5aafb4f9f02e45b212a329f17b689351b8a9cdf5f5235ab6adb71bb40e41868898d95b
 DIST qemu-7.2.6.tar.xz 121322888 BLAKE2B 
c3f51cc1647f5c75774513f624c2e1a1e4badd7275c9f9a64a175809daf17d0b3c58eab0c36fa98fc46834d4d79f8552d1c9f34e840ee21ddd049cc3adba480a
 SHA512 
534fffe2d751a707a7cf15db8d5b9eddc2468fd7fe875715e79ee879fb20d7370553588384d345b586eeaddf9284de36f2d0d69f747380ee55161cc6eb09bf30
+DIST qemu-7.2.7.tar.xz 121869000 BLAKE2B 
b8d754c4c4e4aea63dc884ec568edf308829fe869e4eb8b9c0ae6a4f30debcbaa6a584decce416eed7bd4dd4913263238ed28575a1cf56db939bc141815de25a
 SHA512 
44c0023a9f6177706be5e565297b0ff5fd62a0ea17b085fe478677ada33ab4c922968e4e8fca7aecb310b2b7809a08c075262cc640981a42bcee618e6ae4e592
 DIST qemu-8.0.0-docs.tar.xz 3218024 BLAKE2B 
b764a625024e78a39470048355471e12cfb57ab3c34e764dc4200fdf5c1aea635d26095ec961979bf46f177101c5bd38618bacf7e98e04bd64688ab5e29591aa
 SHA512 
d9dfe191372e105fe16fe8f66f41ed793ade4c89b5ab1d84b39459f3419a1ca61bd49422a83981965cc257c05eca7fd49054703f58f179f5c7b656e9473a1054
 DIST qemu-8.0.4.tar.xz 126179324 BLAKE2B 
dfb98964c629b251f0004b4630ae4500a52465579417d6f5c7dbbb1f672e10d8d7ffb98a4b00e26fb98b3c867208146dbdca026e4d30cbf1752ac733c4d9b915
 SHA512 
bd5ed682d51f974abd4be93f949701f9b5bfb87fd9929e31df130534da2f2c03b99adc9f924b3efd47d3b254e0e3c0046f4e69fbe9f6d0c4ac1f6babecb29449
 DIST qemu-8.0.5.tar.xz 126175064 BLAKE2B 
1d1f78c185ab64b4ca946a44ad04d0bbb6ea48de058037e4ba18176abeb0f0528754c6e832f742f93227182bbce145544eca5b908a366006e7ee58876aca0bda
 SHA512 
ec9679473dda84a2f56ae8ee0039ec4dafb056414bfc5a3a147b2b6bb45ae3b130dd80f6385e8567b5d18f4be94f3536bc8acc45c61eddf40c9678b46cb8bddc

diff --git a/app-emulation/qemu/qemu-7.2.7.ebuild 
b/app-emulation/qemu/qemu-7.2.7.ebuild
new file mode 100644
index ..dd5799797dad
--- /dev/null
+++ b/app-emulation/qemu/qemu-7.2.7.ebuild
@@ -0,0 +1,971 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
+QEMU_DOCS_PREBUILT_DEV=ajak
+QEMU_DOCS_VERSION="7.2.0"
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# bug #830088
+QEMU_DOC_USEFLAG="+doc"
+
+PYTHON_COMPAT=( python3_{9,10,11} )
+PYTHON_REQ_USE="ncurses,readline"
+
+FIRMWARE_ABI_VERSION="7.2.0"
+
+inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
+   pax-utils xdg-utils
+
+if [[ ${PV} == ** ]]; then
+   QEMU_DOCS_PREBUILT=0
+
+   EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/;
+   EGIT_SUBMODULES=(
+   tests/fp/berkeley-softfloat-3
+   tests/fp/berkeley-testfloat-3
+   ui/keycodemapdb
+   )
+   inherit git-r3
+   SRC_URI=""
+else
+   MY_P="${PN}-${PV/_rc/-rc}"
+   SRC_URI="https://download.qemu.org/${MY_P}.tar.xz;
+
+   if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
+   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz
 )"
+   fi
+
+   S="${WORKDIR}/${MY_P}"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org;
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+
+[[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc"
+
+IUSE="accessibility

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-11-21 Thread Sam James

commit: d2337bc589e6659eb8589bb3885638a8d45da737
Author: Sam James  gentoo  org>
AuthorDate: Tue Nov 21 19:51:42 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Nov 21 19:51:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2337bc5

app-emulation/qemu: add 8.1.3

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/Manifest  |   1 +
 app-emulation/qemu/qemu-8.1.3.ebuild | 969 +++
 2 files changed, 970 insertions(+)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 7bd5660cf48e..237f5e529e84 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -10,3 +10,4 @@ DIST qemu-8.0.4.tar.xz 126179324 BLAKE2B 
dfb98964c629b251f0004b4630ae4500a524655
 DIST qemu-8.0.5.tar.xz 126175064 BLAKE2B 
1d1f78c185ab64b4ca946a44ad04d0bbb6ea48de058037e4ba18176abeb0f0528754c6e832f742f93227182bbce145544eca5b908a366006e7ee58876aca0bda
 SHA512 
ec9679473dda84a2f56ae8ee0039ec4dafb056414bfc5a3a147b2b6bb45ae3b130dd80f6385e8567b5d18f4be94f3536bc8acc45c61eddf40c9678b46cb8bddc
 DIST qemu-8.1.0-docs.tar.xz 2129912 BLAKE2B 
8aaf7b748538afdb5bcb6da15dbd96572d086824377c4b0e93f1ddc695f9a4775471e360a9616d2d481dbf8113e91d2601c69d92cef565fb90b65ffacfdb304e
 SHA512 
905515742bb56a439fc8117ec48ea668e7b2bf0244587673e4352d9e8e49911eb84ff093596ff566e44787197cf9789ec8950e3d75fb7a670c5546394a322ac9
 DIST qemu-8.1.2.tar.xz 123553328 BLAKE2B 
8f48638cd1f0285356aae2d14862f56cc79da09bb9ff9f09e90221fdca851e9c3f8a3d940039f578d24d0b4435baf19cb52a3e927e97bf978ea674d148ecd746
 SHA512 
d95ba8b294115b86b7f3bd1b438b059e38c7ccc68f14e76b455b355b4b68ec84fb799bef44dbf96befcad7c40a15f4660096b5ad5be4396d54dfeaba34c89db8
+DIST qemu-8.1.3.tar.xz 124040288 BLAKE2B 
365b5fa508c57f4738b73666c6f7306985b5d3fe00d1f1bd14d9277121adbd7ffda7764fbded834512e88d19f96b2c3def39bdf336396c27b26dc388c3821852
 SHA512 
d3847f1c0c0099937d08bba604713ac288b6151867a8da230297ee1d93b7e741fa406a2f7bf6645ce3293c0a98458dc9c79454746e7c2920e9a73e0574753e5a

diff --git a/app-emulation/qemu/qemu-8.1.3.ebuild 
b/app-emulation/qemu/qemu-8.1.3.ebuild
new file mode 100644
index ..2ea790325cf1
--- /dev/null
+++ b/app-emulation/qemu/qemu-8.1.3.ebuild
@@ -0,0 +1,969 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
+QEMU_DOCS_PREBUILT_DEV=sam
+#QEMU_DOCS_VERSION=$(ver_cut 1-3)
+QEMU_DOCS_VERSION=8.1.0
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# bug #830088
+QEMU_DOC_USEFLAG="+doc"
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="ncurses,readline"
+
+FIRMWARE_ABI_VERSION="7.2.0"
+
+inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
+   pax-utils xdg-utils
+
+if [[ ${PV} == ** ]]; then
+   QEMU_DOCS_PREBUILT=0
+
+   EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/;
+   EGIT_SUBMODULES=(
+   tests/fp/berkeley-softfloat-3
+   tests/fp/berkeley-testfloat-3
+   subprojects/keycodemapdb
+   )
+   inherit git-r3
+   SRC_URI=""
+else
+   MY_P="${PN}-${PV/_rc/-rc}"
+   SRC_URI="https://download.qemu.org/${MY_P}.tar.xz;
+
+   if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
+   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz
 )"
+   fi
+
+   S="${WORKDIR}/${MY_P}"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org;
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+
+[[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc"
+
+IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug 
${QEMU_DOC_USEFLAG}
+   +fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
+   jack jemalloc +jpeg keyutils
+   lzo multipath
+   ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs pipewire
+   plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
+   +slirp
+   smartcard snappy spice ssh static-user systemtap test udev usb
+   usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen
+   zstd"
+
+COMMON_TARGETS="
+   aarch64
+   alpha
+   arm
+   cris
+   hppa
+   i386
+   loongarch64
+   m68k
+   microblaze
+   microblazeel
+   mips
+   mips64
+   mips64el
+   mipsel
+   nios2
+   or1k
+   ppc
+   ppc64
+   riscv32
+   riscv64
+   s390x
+   sh4
+   sh4eb
+   sparc
+   sparc64

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/files/

2023-11-20 Thread Ulrich Müller

commit: 467b4eb965534778ef9bc685ffe8038940d6b232
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Tue Nov  7 18:00:41 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Nov 20 20:19:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=467b4eb9

app-emulation/qemu: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Ulrich Müller  gentoo.org>

 .../qemu/files/qemu-7.2.0-tcg-curl-ssl.patch   | 182 -
 1 file changed, 182 deletions(-)

diff --git a/app-emulation/qemu/files/qemu-7.2.0-tcg-curl-ssl.patch 
b/app-emulation/qemu/files/qemu-7.2.0-tcg-curl-ssl.patch
deleted file mode 100644
index 2b0a9f630371..
--- a/app-emulation/qemu/files/qemu-7.2.0-tcg-curl-ssl.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-https://bugs.gentoo.org/895746#c3
-https://gitlab.com/qemu-project/qemu/-/issues/1471
-https://gitlab.com/qemu-project/qemu/-/commit/60c7dd22e1383754d5f150bc9f7c2785c662a7b6
-
-From 60c7dd22e1383754d5f150bc9f7c2785c662a7b6 Mon Sep 17 00:00:00 2001
-From: Paolo Bonzini 
-Date: Tue, 31 Jan 2023 09:48:03 +0100
-Subject: [PATCH] target/i386: fix ADOX followed by ADCX
-
-When ADCX is followed by ADOX or vice versa, the second instruction's
-carry comes from EFLAGS and the condition codes use the CC_OP_ADCOX
-operation.  Retrieving the carry from EFLAGS is handled by this bit
-of gen_ADCOX:
-
-tcg_gen_extract_tl(carry_in, cpu_cc_src,
-ctz32(cc_op == CC_OP_ADCX ? CC_C : CC_O), 1);
-
-Unfortunately, in this case cc_op has been overwritten by the previous
-"if" statement to CC_OP_ADCOX.  This works by chance when the first
-instruction is ADCX; however, if the first instruction is ADOX,
-ADCX will incorrectly take its carry from OF instead of CF.
-
-Fix by moving the computation of the new cc_op at the end of the function.
-The included exhaustive test case fails without this patch and passes
-afterwards.
-
-Because ADCX/ADOX need not be invoked through the VEX prefix, this
-regression bisects to commit 16fc5726a6e2 ("target/i386: reimplement
-0x0f 0x38, add AVX", 2022-10-18).  However, the mistake happened a
-little earlier, when BMI instructions were rewritten using the new
-decoder framework.
-
-Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1471
-Reported-by: Paul Jolly 
-Fixes: 1d0b926150e5 ("target/i386: move scalar 0F 38 and 0F 3A instruction to 
new decoder", 2022-10-18)
-Cc: qemu-sta...@nongnu.org
-Signed-off-by: Paolo Bonzini 
 a/target/i386/tcg/emit.c.inc
-+++ b/target/i386/tcg/emit.c.inc
-@@ -1015,6 +1015,7 @@ VSIB_AVX(VPGATHERQ, vpgatherq)
- 
- static void gen_ADCOX(DisasContext *s, CPUX86State *env, MemOp ot, int cc_op)
- {
-+int opposite_cc_op;
- TCGv carry_in = NULL;
- TCGv carry_out = (cc_op == CC_OP_ADCX ? cpu_cc_dst : cpu_cc_src2);
- TCGv zero;
-@@ -1022,14 +1023,8 @@ static void gen_ADCOX(DisasContext *s, CPUX86State 
*env, MemOp ot, int cc_op)
- if (cc_op == s->cc_op || s->cc_op == CC_OP_ADCOX) {
- /* Re-use the carry-out from a previous round.  */
- carry_in = carry_out;
--cc_op = s->cc_op;
--} else if (s->cc_op == CC_OP_ADCX || s->cc_op == CC_OP_ADOX) {
--/* Merge with the carry-out from the opposite instruction.  */
--cc_op = CC_OP_ADCOX;
--}
--
--/* If we don't have a carry-in, get it out of EFLAGS.  */
--if (!carry_in) {
-+} else {
-+/* We don't have a carry-in, get it out of EFLAGS.  */
- if (s->cc_op != CC_OP_ADCX && s->cc_op != CC_OP_ADOX) {
- gen_compute_eflags(s);
- }
-@@ -1053,7 +1048,14 @@ static void gen_ADCOX(DisasContext *s, CPUX86State 
*env, MemOp ot, int cc_op)
- tcg_gen_add2_tl(s->T0, carry_out, s->T0, carry_out, s->T1, zero);
- break;
- }
--set_cc_op(s, cc_op);
-+
-+opposite_cc_op = cc_op == CC_OP_ADCX ? CC_OP_ADOX : CC_OP_ADCX;
-+if (s->cc_op == CC_OP_ADCOX || s->cc_op == opposite_cc_op) {
-+/* Merge with the carry-out from the opposite instruction.  */
-+set_cc_op(s, CC_OP_ADCOX);
-+} else {
-+set_cc_op(s, cc_op);
-+}
- }
- 
- static void gen_ADCX(DisasContext *s, CPUX86State *env, X86DecodedInsn 
*decode)
 a/tests/tcg/i386/Makefile.target
-+++ b/tests/tcg/i386/Makefile.target
-@@ -14,7 +14,7 @@ config-cc.mak: Makefile
- I386_SRCS=$(notdir $(wildcard $(I386_SRC)/*.c))
- ALL_X86_TESTS=$(I386_SRCS:.c=)
- SKIP_I386_TESTS=test-i386-ssse3 test-avx test-3dnow test-mmx
--X86_64_TESTS:=$(filter test-i386-bmi2 $(SKIP_I386_TESTS), $(ALL_X86_TESTS))
-+X86_64_TESTS:=$(filter test-i386-adcox test-i386-bmi2 $(SKIP_I386_TESTS), 
$(ALL_X86_TESTS))
- 
- test-i386-sse-exceptions: CFLAGS += -msse4.1 -mfpmath=sse
- run-test-i386-sse-exceptions: QEMU_OPTS += -cpu max
-@@ -28,6 +28,10 @@ test-i386-bmi2: CFLAGS=-O2
- run-test-i386-bmi2: QEMU_OPTS += -cpu max
- run-plugin-test-i386-bmi2-%: QEMU_OPTS += -cpu max
- 
-+test-i386-adcox:

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-10-29 Thread John Helmert III

commit: 50ad24c08d86326adcff296e6beb26107e0ab028
Author: John Helmert III  gentoo  org>
AuthorDate: Mon Oct 30 02:57:34 2023 +
Commit: John Helmert III  gentoo  org>
CommitDate: Mon Oct 30 02:58:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50ad24c0

app-emulation/qemu: drop 7.2.0-r3, 7.2.3

Bug: https://bugs.gentoo.org/909542
Bug: https://bugs.gentoo.org/865112
Signed-off-by: John Helmert III  gentoo.org>

 app-emulation/qemu/Manifest |   2 -
 app-emulation/qemu/qemu-7.2.0-r3.ebuild | 973 
 app-emulation/qemu/qemu-7.2.3.ebuild| 972 ---
 3 files changed, 1947 deletions(-)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index c7a9ac42888d..910dd2f70ad1 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -2,8 +2,6 @@ DIST 
berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037.tar.bz2 84094
 DIST berkeley-testfloat-3-40619cbb3bf32872df8c53cc457039229428a263.tar.bz2 
90086 BLAKE2B 
ab2070622453a7a0a1fbcf234df68cc7316474c04482b2ac13c700edbb5624968c5274f337dc84f06c4ab6c3e82698cd7b0b30fe206d004b0715f15a2cc7cfd1
 SHA512 
969892af9fdf16d45660753ed02bbd8d6159928e5e6ef2f87aed8a08d995bb19d2115fb6b559522074492b2595716d314c5c059bfa69c7fbb5aab9275582c22e
 DIST keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6.tar.bz2 27971 
BLAKE2B 
0ed69ad24c53bd459c8753565814bcc1cd858f20d3a046c38912a35bcb0ba6d388ef5d2b93157cd028959284b330caf5467d82071c3df56a405dd8e08fd177c7
 SHA512 
8f2cc14e8bd46cb045e3ebfe32e463793ab7472ebda9b57b8ea0b06fa107a1a99c3ebcacb9c4548e30698d8ec154c0e56f789385201182b680819b8068a103f2
 DIST qemu-7.2.0-docs.tar.xz 1984184 BLAKE2B 
103900fb7903ed8d75f7f012bf61fa2d6fce345b657c851d0437c3384f5735bd1cfd3129320683ea7846ea0b0940e5af5b2663c9320f12fee74b058523a8ea06
 SHA512 
a7edd448982865e07533c300d3e44a8b50cefbdde1982b73c24d0b2aa74315439252c59b634c75de312860874c7b06c75aa72629da681b5105f28ee936794585
-DIST qemu-7.2.0.tar.xz 122408576 BLAKE2B 
415ff621356c59f88b29cfe3ef5db1e282b26bbafbee3d535477c6125ccb060ec9762d9e3ab9f70ce5478804dca0a46a59bcf12c112a2462029a93e578e61530
 SHA512 
f3cfa00da739ba819a218d7e6e95c77fb79a8e0f487b024ddd281602e785249b81144595e3f8c746c32a4f5c4d1a88c6aebae3c162603edfbb50ae3722d7ed13
-DIST qemu-7.2.3.tar.xz 122395692 BLAKE2B 
4e65cac7505a56da85c1d98dc6029d516dd4f07f0211ea5213724d231d448d9b49cc91a3058a2a89908608078854d97da480e6f0bc7ce47d9555c2bb1177fbdc
 SHA512 
09523d456175da47d58d8d56fe9a95416ee3e6fd8aa7766383033396a1e5bd10f7758832f7f2b8662068ef94b21ab6a3a351c9158fb6bde0e1d7d5fb393bf6c7
 DIST qemu-7.2.4.tar.xz 121849100 BLAKE2B 
a9c5ffce9ff0fac4e2d1fa4be1a1dcee2f5d7f793ddf726871c5ae9a68c22f7ba03692a8a5096de3051030d3c2f34e46697d5af2d66c34984b8161ae3bb07b42
 SHA512 
fa765673833a1f2cbecdb9d47dc7dc29d7613be5a5c8fc63925ae70e1f5aafb4f9f02e45b212a329f17b689351b8a9cdf5f5235ab6adb71bb40e41868898d95b
 DIST qemu-7.2.6.tar.xz 121322888 BLAKE2B 
c3f51cc1647f5c75774513f624c2e1a1e4badd7275c9f9a64a175809daf17d0b3c58eab0c36fa98fc46834d4d79f8552d1c9f34e840ee21ddd049cc3adba480a
 SHA512 
534fffe2d751a707a7cf15db8d5b9eddc2468fd7fe875715e79ee879fb20d7370553588384d345b586eeaddf9284de36f2d0d69f747380ee55161cc6eb09bf30
 DIST qemu-8.0.0-docs.tar.xz 3218024 BLAKE2B 
b764a625024e78a39470048355471e12cfb57ab3c34e764dc4200fdf5c1aea635d26095ec961979bf46f177101c5bd38618bacf7e98e04bd64688ab5e29591aa
 SHA512 
d9dfe191372e105fe16fe8f66f41ed793ade4c89b5ab1d84b39459f3419a1ca61bd49422a83981965cc257c05eca7fd49054703f58f179f5c7b656e9473a1054

diff --git a/app-emulation/qemu/qemu-7.2.0-r3.ebuild 
b/app-emulation/qemu/qemu-7.2.0-r3.ebuild
deleted file mode 100644
index 74224d9d66ed..
--- a/app-emulation/qemu/qemu-7.2.0-r3.ebuild
+++ /dev/null
@@ -1,973 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
-QEMU_DOCS_PREBUILT_DEV=ajak
-QEMU_DOCS_VERSION="${PV}"
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-# bug #830088
-QEMU_DOC_USEFLAG="+doc"
-
-PYTHON_COMPAT=( python3_{9,10,11} )
-PYTHON_REQ_USE="ncurses,readline"
-
-FIRMWARE_ABI_VERSION="7.2.0"
-
-inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
-   pax-utils xdg-utils
-
-if [[ ${PV} == ** ]]; then
-   QEMU_DOCS_PREBUILT=0
-
-   EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/;
-   EGIT_SUBMODULES=(
-   tests/fp/berkeley-softfloat-3
-   tests/fp/berkeley-testfloat-3
-   ui/keycodemapdb
-   )
-   inherit git-r3
-   SRC_URI=""
-else
-   MY_P="${PN}-${PV/_rc/-rc}"
-   SRC_URI="https://download.qemu.org/${MY_P}.tar.xz;
-
-

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/files/

2023-10-22 Thread Joonas Niilola

commit: 196685c68adecedeb3c335e551924cab4aee55ea
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Oct 22 08:35:37 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Oct 22 16:32:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=196685c6

app-emulation/qemu: remove unused patches

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/33451
Signed-off-by: Joonas Niilola  gentoo.org>

 .../qemu/files/qemu-7.2.3-CVE-2023-2861.patch  | 162 
 .../qemu/files/qemu-8.0.2-CVE-2023-2861.patch  | 167 -
 2 files changed, 329 deletions(-)

diff --git a/app-emulation/qemu/files/qemu-7.2.3-CVE-2023-2861.patch 
b/app-emulation/qemu/files/qemu-7.2.3-CVE-2023-2861.patch
deleted file mode 100644
index 9a9c11a41d66..
--- a/app-emulation/qemu/files/qemu-7.2.3-CVE-2023-2861.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-https://bugs.gentoo.org/909542
-https://gitlab.com/qemu-project/qemu/-/commit/10fad73a2bf1c76c8aa9d6322755e5f877d83ce5
-
-From 10fad73a2bf1c76c8aa9d6322755e5f877d83ce5 Mon Sep 17 00:00:00 2001
-From: Christian Schoenebeck 
-Date: Wed, 7 Jun 2023 18:29:33 +0200
-Subject: [PATCH] 9pfs: prevent opening special files (CVE-2023-2861)
-
-The 9p protocol does not specifically define how server shall behave when
-client tries to open a special file, however from security POV it does
-make sense for 9p server to prohibit opening any special file on host side
-in general. A sane Linux 9p client for instance would never attempt to
-open a special file on host side, it would always handle those exclusively
-on its guest side. A malicious client however could potentially escape
-from the exported 9p tree by creating and opening a device file on host
-side.
-
-With QEMU this could only be exploited in the following unsafe setups:
-
-  - Running QEMU binary as root AND 9p 'local' fs driver AND 'passthrough'
-security model.
-
-or
-
-  - Using 9p 'proxy' fs driver (which is running its helper daemon as
-root).
-
-These setups were already discouraged for safety reasons before,
-however for obvious reasons we are now tightening behaviour on this.
-
-Fixes: CVE-2023-2861
-Reported-by: Yanwu Shen 
-Reported-by: Jietao Xiao 
-Reported-by: Jinku Li 
-Reported-by: Wenbo Shen 
-Signed-off-by: Christian Schoenebeck 
-Reviewed-by: Greg Kurz 
-Reviewed-by: Michael Tokarev 
-Message-Id: 
-(cherry picked from commit f6b0de53fb87ddefed348a39284c8e2f28dc4eda)
-Signed-off-by: Michael Tokarev 
-(Mjt: drop adding qemu_fstat wrapper for 7.2 where wrappers aren't used)
 a/fsdev/virtfs-proxy-helper.c
-+++ b/fsdev/virtfs-proxy-helper.c
-@@ -26,6 +26,7 @@
- #include "qemu/xattr.h"
- #include "9p-iov-marshal.h"
- #include "hw/9pfs/9p-proxy.h"
-+#include "hw/9pfs/9p-util.h"
- #include "fsdev/9p-iov-marshal.h"
- 
- #define PROGNAME "virtfs-proxy-helper"
-@@ -338,6 +339,28 @@ static void resetugid(int suid, int sgid)
- }
- }
- 
-+/*
-+ * Open regular file or directory. Attempts to open any special file are
-+ * rejected.
-+ *
-+ * returns file descriptor or -1 on error
-+ */
-+static int open_regular(const char *pathname, int flags, mode_t mode)
-+{
-+int fd;
-+
-+fd = open(pathname, flags, mode);
-+if (fd < 0) {
-+return fd;
-+}
-+
-+if (close_if_special_file(fd) < 0) {
-+return -1;
-+}
-+
-+return fd;
-+}
-+
- /*
-  * send response in two parts
-  * 1) ProxyHeader
-@@ -682,7 +705,7 @@ static int do_create(struct iovec *iovec)
- if (ret < 0) {
- goto unmarshal_err_out;
- }
--ret = open(path.data, flags, mode);
-+ret = open_regular(path.data, flags, mode);
- if (ret < 0) {
- ret = -errno;
- }
-@@ -707,7 +730,7 @@ static int do_open(struct iovec *iovec)
- if (ret < 0) {
- goto err_out;
- }
--ret = open(path.data, flags);
-+ret = open_regular(path.data, flags, 0);
- if (ret < 0) {
- ret = -errno;
- }
 a/hw/9pfs/9p-util.h
-+++ b/hw/9pfs/9p-util.h
-@@ -13,6 +13,8 @@
- #ifndef QEMU_9P_UTIL_H
- #define QEMU_9P_UTIL_H
- 
-+#include "qemu/error-report.h"
-+
- #ifdef O_PATH
- #define O_PATH_9P_UTIL O_PATH
- #else
-@@ -112,6 +114,38 @@ static inline void close_preserve_errno(int fd)
- errno = serrno;
- }
- 
-+/**
-+ * close_if_special_file() - Close @fd if neither regular file nor directory.
-+ *
-+ * @fd: file descriptor of open file
-+ * Return: 0 on regular file or directory, -1 otherwise
-+ *
-+ * CVE-2023-2861: Prohibit opening any special file directly on host
-+ * (especially device files), as a compromised client could potentially gain
-+ * access outside exported tree under certain, unsafe setups. We expect
-+ * client to handle I/O on special files exclusively on guest side.
-+ */
-+static inline int close_if_special_file(int fd)
-+{
-+struct stat stbuf;
-+
-+if (fstat(fd, ) < 0) {
-+close_preserve_errno(fd);
-+return

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-10-19 Thread Sam James

commit: 77d8300ef52dd44b43b1505401927fba9ca658db
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 20 01:33:28 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 20 01:33:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77d8300e

app-emulation/qemu: drop 8.0.0-r1, 8.0.2, 8.0.2-r2, 8.0.3

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/Manifest |   3 -
 app-emulation/qemu/qemu-8.0.0-r1.ebuild | 963 ---
 app-emulation/qemu/qemu-8.0.2-r2.ebuild | 964 ---
 app-emulation/qemu/qemu-8.0.2.ebuild| 963 ---
 app-emulation/qemu/qemu-8.0.3.ebuild| 970 
 5 files changed, 3863 deletions(-)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 3cf819e1855c..5aa320c9a0f7 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -7,9 +7,6 @@ DIST qemu-7.2.3.tar.xz 122395692 BLAKE2B 
4e65cac7505a56da85c1d98dc6029d516dd4f07
 DIST qemu-7.2.4.tar.xz 121849100 BLAKE2B 
a9c5ffce9ff0fac4e2d1fa4be1a1dcee2f5d7f793ddf726871c5ae9a68c22f7ba03692a8a5096de3051030d3c2f34e46697d5af2d66c34984b8161ae3bb07b42
 SHA512 
fa765673833a1f2cbecdb9d47dc7dc29d7613be5a5c8fc63925ae70e1f5aafb4f9f02e45b212a329f17b689351b8a9cdf5f5235ab6adb71bb40e41868898d95b
 DIST qemu-7.2.6.tar.xz 121322888 BLAKE2B 
c3f51cc1647f5c75774513f624c2e1a1e4badd7275c9f9a64a175809daf17d0b3c58eab0c36fa98fc46834d4d79f8552d1c9f34e840ee21ddd049cc3adba480a
 SHA512 
534fffe2d751a707a7cf15db8d5b9eddc2468fd7fe875715e79ee879fb20d7370553588384d345b586eeaddf9284de36f2d0d69f747380ee55161cc6eb09bf30
 DIST qemu-8.0.0-docs.tar.xz 3218024 BLAKE2B 
b764a625024e78a39470048355471e12cfb57ab3c34e764dc4200fdf5c1aea635d26095ec961979bf46f177101c5bd38618bacf7e98e04bd64688ab5e29591aa
 SHA512 
d9dfe191372e105fe16fe8f66f41ed793ade4c89b5ab1d84b39459f3419a1ca61bd49422a83981965cc257c05eca7fd49054703f58f179f5c7b656e9473a1054
-DIST qemu-8.0.0.tar.xz 127835148 BLAKE2B 
9b54aae10fe09691a26e68374723ded5fdda6409673b4de9461a25ee060cfd03968a16ddeadc21d48b9262e53aa6d4e5eb645376969f97c65807fad19607b04f
 SHA512 
1f31d1e653dec2d35f1b7a5468ee3f471553b48eca8c8afafffcf9243c6b2260e78a5b73da3fe567f9b85d4133573eebd397747b3aec501fb24076263eb07b27
-DIST qemu-8.0.2.tar.xz 126707132 BLAKE2B 
f2b1a63e10c42aabfe39722c7732d0f04818ad367b769b3deb29c5bf9adcabc3aca1706f3c40fafeeb57ac1f7a61ded5066de32134c483e2fd27bc65b4b7d30a
 SHA512 
4e915d33a662bf55b09247fb85150be376c92270d3764e3d6470c452cb70cc558f54e84de5610dd60a9eb3ea02d5d4277b1ec75c9804967d278fa8361c7f9b9a
-DIST qemu-8.0.3.tar.xz 126710536 BLAKE2B 
071cc1a35209a02e8c5dd4f43cb112f110b4655adb0f870a04fdf9a6e2c761699574e8c9426f70f60787a99acf252d7a64d94a8e837cdfeda93d89428d7866f3
 SHA512 
18b2ccb65f7ec2ae92f0e04406539620c881e2b75f63816588c86043a07464bb99d16a83e792ed9508de393f4b694c46d52f4d07edf52741e85224c8b8d5d5c3
 DIST qemu-8.0.4.tar.xz 126179324 BLAKE2B 
dfb98964c629b251f0004b4630ae4500a52465579417d6f5c7dbbb1f672e10d8d7ffb98a4b00e26fb98b3c867208146dbdca026e4d30cbf1752ac733c4d9b915
 SHA512 
bd5ed682d51f974abd4be93f949701f9b5bfb87fd9929e31df130534da2f2c03b99adc9f924b3efd47d3b254e0e3c0046f4e69fbe9f6d0c4ac1f6babecb29449
 DIST qemu-8.0.5.tar.xz 126175064 BLAKE2B 
1d1f78c185ab64b4ca946a44ad04d0bbb6ea48de058037e4ba18176abeb0f0528754c6e832f742f93227182bbce145544eca5b908a366006e7ee58876aca0bda
 SHA512 
ec9679473dda84a2f56ae8ee0039ec4dafb056414bfc5a3a147b2b6bb45ae3b130dd80f6385e8567b5d18f4be94f3536bc8acc45c61eddf40c9678b46cb8bddc
 DIST qemu-8.1.0-docs.tar.xz 2129912 BLAKE2B 
8aaf7b748538afdb5bcb6da15dbd96572d086824377c4b0e93f1ddc695f9a4775471e360a9616d2d481dbf8113e91d2601c69d92cef565fb90b65ffacfdb304e
 SHA512 
905515742bb56a439fc8117ec48ea668e7b2bf0244587673e4352d9e8e49911eb84ff093596ff566e44787197cf9789ec8950e3d75fb7a670c5546394a322ac9

diff --git a/app-emulation/qemu/qemu-8.0.0-r1.ebuild 
b/app-emulation/qemu/qemu-8.0.0-r1.ebuild
deleted file mode 100644
index 3000130b6f90..
--- a/app-emulation/qemu/qemu-8.0.0-r1.ebuild
+++ /dev/null
@@ -1,963 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
-QEMU_DOCS_PREBUILT_DEV=sam
-QEMU_DOCS_VERSION="8.0.0"
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-# bug #830088
-QEMU_DOC_USEFLAG="+doc"
-
-PYTHON_COMPAT=( python3_{9,10,11} )
-PYTHON_REQ_USE="ncurses,readline"
-
-FIRMWARE_ABI_VERSION="7.2.0"
-
-inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
-   pax-utils xdg-utils
-
-if [[ ${PV} == ** ]]; then
-   QEMU_DOCS_PREBUILT=0
-
-   EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/;
-

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-10-19 Thread Sam James

commit: 1fd6a0b5b0d4ffcfb823a26dbb4955095e228f57
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 20 01:33:41 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 20 01:33:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fd6a0b5

app-emulation/qemu: drop 8.1.0-r1, 8.1.1

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/Manifest |   2 -
 app-emulation/qemu/qemu-8.1.0-r1.ebuild | 966 ---
 app-emulation/qemu/qemu-8.1.1.ebuild| 967 
 3 files changed, 1935 deletions(-)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 5aa320c9a0f7..c7a9ac42888d 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -10,6 +10,4 @@ DIST qemu-8.0.0-docs.tar.xz 3218024 BLAKE2B 
b764a625024e78a39470048355471e12cfb5
 DIST qemu-8.0.4.tar.xz 126179324 BLAKE2B 
dfb98964c629b251f0004b4630ae4500a52465579417d6f5c7dbbb1f672e10d8d7ffb98a4b00e26fb98b3c867208146dbdca026e4d30cbf1752ac733c4d9b915
 SHA512 
bd5ed682d51f974abd4be93f949701f9b5bfb87fd9929e31df130534da2f2c03b99adc9f924b3efd47d3b254e0e3c0046f4e69fbe9f6d0c4ac1f6babecb29449
 DIST qemu-8.0.5.tar.xz 126175064 BLAKE2B 
1d1f78c185ab64b4ca946a44ad04d0bbb6ea48de058037e4ba18176abeb0f0528754c6e832f742f93227182bbce145544eca5b908a366006e7ee58876aca0bda
 SHA512 
ec9679473dda84a2f56ae8ee0039ec4dafb056414bfc5a3a147b2b6bb45ae3b130dd80f6385e8567b5d18f4be94f3536bc8acc45c61eddf40c9678b46cb8bddc
 DIST qemu-8.1.0-docs.tar.xz 2129912 BLAKE2B 
8aaf7b748538afdb5bcb6da15dbd96572d086824377c4b0e93f1ddc695f9a4775471e360a9616d2d481dbf8113e91d2601c69d92cef565fb90b65ffacfdb304e
 SHA512 
905515742bb56a439fc8117ec48ea668e7b2bf0244587673e4352d9e8e49911eb84ff093596ff566e44787197cf9789ec8950e3d75fb7a670c5546394a322ac9
-DIST qemu-8.1.0.tar.xz 123550284 BLAKE2B 
b0fd87a19b13d4bbc6526caa46533073cb4dee6004df5d4fbbef204ee3bc8c2f10ec1eaff554adbb25c9f3143dd68abd09d4a0519c4766299a3ff261d03c73f2
 SHA512 
c5f5e7ce2d8e3c93a02012b136c866e8577df07da4705a0045916c71caeaa21fa1b2d59a4b22a660789a4159b192e12a443e7cbb0724ee85fea258251731724c
-DIST qemu-8.1.1.tar.xz 123558860 BLAKE2B 
71220fad7c9f74bed6211879f01566ac1e52835feb3d45eaa1b2fe1d5f95d9fa5db53b7aec72b4ef098c03d0c4070076c907fb3e6b839002de6f56ee5ab44340
 SHA512 
199db58f9a413cbe4449ff557bc362e666c6c0291f9963cb74e5542e8abd1edcd65001fa1fd453b850a376de455f93258707ce6feee5a44bf40753b12a2e956c
 DIST qemu-8.1.2.tar.xz 123553328 BLAKE2B 
8f48638cd1f0285356aae2d14862f56cc79da09bb9ff9f09e90221fdca851e9c3f8a3d940039f578d24d0b4435baf19cb52a3e927e97bf978ea674d148ecd746
 SHA512 
d95ba8b294115b86b7f3bd1b438b059e38c7ccc68f14e76b455b355b4b68ec84fb799bef44dbf96befcad7c40a15f4660096b5ad5be4396d54dfeaba34c89db8

diff --git a/app-emulation/qemu/qemu-8.1.0-r1.ebuild 
b/app-emulation/qemu/qemu-8.1.0-r1.ebuild
deleted file mode 100644
index 785f98ee1281..
--- a/app-emulation/qemu/qemu-8.1.0-r1.ebuild
+++ /dev/null
@@ -1,966 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
-QEMU_DOCS_PREBUILT_DEV=sam
-QEMU_DOCS_VERSION=$(ver_cut 1-3)
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-# bug #830088
-QEMU_DOC_USEFLAG="+doc"
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="ncurses,readline"
-
-FIRMWARE_ABI_VERSION="7.2.0"
-
-inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
-   pax-utils xdg-utils
-
-if [[ ${PV} == ** ]]; then
-   QEMU_DOCS_PREBUILT=0
-
-   EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/;
-   EGIT_SUBMODULES=(
-   tests/fp/berkeley-softfloat-3
-   tests/fp/berkeley-testfloat-3
-   subprojects/keycodemapdb
-   )
-   inherit git-r3
-   SRC_URI=""
-else
-   MY_P="${PN}-${PV/_rc/-rc}"
-   SRC_URI="https://download.qemu.org/${MY_P}.tar.xz;
-
-   if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
-   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz
 )"
-   fi
-
-   S="${WORKDIR}/${MY_P}"
-   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org;
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-
-[[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc"
-
-IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug 
${QEMU_DOC_USEFLAG}
-   +fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
-   jack jemalloc +jpeg
-   lzo multipath
-

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-10-19 Thread Sam James

commit: bfe2307d6a5903bd9ddce174bb7c24e040198cff
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 20 01:33:07 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 20 01:33:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfe2307d

app-emulation/qemu: drop 7.2.1, 7.2.3-r1

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/Manifest |   1 -
 app-emulation/qemu/qemu-7.2.1.ebuild| 972 ---
 app-emulation/qemu/qemu-7.2.3-r1.ebuild | 973 
 3 files changed, 1946 deletions(-)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 97e76bf76928..3cf819e1855c 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -3,7 +3,6 @@ DIST 
berkeley-testfloat-3-40619cbb3bf32872df8c53cc457039229428a263.tar.bz2 90086
 DIST keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6.tar.bz2 27971 
BLAKE2B 
0ed69ad24c53bd459c8753565814bcc1cd858f20d3a046c38912a35bcb0ba6d388ef5d2b93157cd028959284b330caf5467d82071c3df56a405dd8e08fd177c7
 SHA512 
8f2cc14e8bd46cb045e3ebfe32e463793ab7472ebda9b57b8ea0b06fa107a1a99c3ebcacb9c4548e30698d8ec154c0e56f789385201182b680819b8068a103f2
 DIST qemu-7.2.0-docs.tar.xz 1984184 BLAKE2B 
103900fb7903ed8d75f7f012bf61fa2d6fce345b657c851d0437c3384f5735bd1cfd3129320683ea7846ea0b0940e5af5b2663c9320f12fee74b058523a8ea06
 SHA512 
a7edd448982865e07533c300d3e44a8b50cefbdde1982b73c24d0b2aa74315439252c59b634c75de312860874c7b06c75aa72629da681b5105f28ee936794585
 DIST qemu-7.2.0.tar.xz 122408576 BLAKE2B 
415ff621356c59f88b29cfe3ef5db1e282b26bbafbee3d535477c6125ccb060ec9762d9e3ab9f70ce5478804dca0a46a59bcf12c112a2462029a93e578e61530
 SHA512 
f3cfa00da739ba819a218d7e6e95c77fb79a8e0f487b024ddd281602e785249b81144595e3f8c746c32a4f5c4d1a88c6aebae3c162603edfbb50ae3722d7ed13
-DIST qemu-7.2.1.tar.xz 122400592 BLAKE2B 
bae1df5d332beaca313c4bac88f06dd5992988d7c1b6fdc6ced4043d858f437339cd7d0009ae667f9e66705117697bee7ee44ec4e911cc203d34eecc3d8f139b
 SHA512 
e286dc66c923a5df77eb02d69235d048e80a7cced638fae52fbed385b4c3cd736cfea66bb3c9843bebf0a33e81ea141fc015e0bd82108df304f148ce59d9ae8a
 DIST qemu-7.2.3.tar.xz 122395692 BLAKE2B 
4e65cac7505a56da85c1d98dc6029d516dd4f07f0211ea5213724d231d448d9b49cc91a3058a2a89908608078854d97da480e6f0bc7ce47d9555c2bb1177fbdc
 SHA512 
09523d456175da47d58d8d56fe9a95416ee3e6fd8aa7766383033396a1e5bd10f7758832f7f2b8662068ef94b21ab6a3a351c9158fb6bde0e1d7d5fb393bf6c7
 DIST qemu-7.2.4.tar.xz 121849100 BLAKE2B 
a9c5ffce9ff0fac4e2d1fa4be1a1dcee2f5d7f793ddf726871c5ae9a68c22f7ba03692a8a5096de3051030d3c2f34e46697d5af2d66c34984b8161ae3bb07b42
 SHA512 
fa765673833a1f2cbecdb9d47dc7dc29d7613be5a5c8fc63925ae70e1f5aafb4f9f02e45b212a329f17b689351b8a9cdf5f5235ab6adb71bb40e41868898d95b
 DIST qemu-7.2.6.tar.xz 121322888 BLAKE2B 
c3f51cc1647f5c75774513f624c2e1a1e4badd7275c9f9a64a175809daf17d0b3c58eab0c36fa98fc46834d4d79f8552d1c9f34e840ee21ddd049cc3adba480a
 SHA512 
534fffe2d751a707a7cf15db8d5b9eddc2468fd7fe875715e79ee879fb20d7370553588384d345b586eeaddf9284de36f2d0d69f747380ee55161cc6eb09bf30

diff --git a/app-emulation/qemu/qemu-7.2.1.ebuild 
b/app-emulation/qemu/qemu-7.2.1.ebuild
deleted file mode 100644
index 2218435d4f6e..
--- a/app-emulation/qemu/qemu-7.2.1.ebuild
+++ /dev/null
@@ -1,972 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
-QEMU_DOCS_PREBUILT_DEV=ajak
-QEMU_DOCS_VERSION="7.2.0"
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-# bug #830088
-QEMU_DOC_USEFLAG="+doc"
-
-PYTHON_COMPAT=( python3_{9,10,11} )
-PYTHON_REQ_USE="ncurses,readline"
-
-FIRMWARE_ABI_VERSION="7.2.0"
-
-inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
-   pax-utils xdg-utils
-
-if [[ ${PV} == ** ]]; then
-   QEMU_DOCS_PREBUILT=0
-
-   EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/;
-   EGIT_SUBMODULES=(
-   tests/fp/berkeley-softfloat-3
-   tests/fp/berkeley-testfloat-3
-   ui/keycodemapdb
-   )
-   inherit git-r3
-   SRC_URI=""
-else
-   MY_P="${PN}-${PV/_rc/-rc}"
-   SRC_URI="https://download.qemu.org/${MY_P}.tar.xz;
-
-   if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
-   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz
 )"
-   fi
-
-   S="${WORKDIR}/${MY_P}"
-   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="https://www.qemu.org

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-10-18 Thread Sam James

commit: 9c701d4297209a9f9bafcce18ffd44b813fd84f6
Author: Sam James  gentoo  org>
AuthorDate: Wed Oct 18 17:10:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct 18 17:12:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c701d42

app-emulation/qemu: sync live

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/qemu-.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app-emulation/qemu/qemu-.ebuild 
b/app-emulation/qemu/qemu-.ebuild
index 3da439a4b7b4..cef7e03b44b6 100644
--- a/app-emulation/qemu/qemu-.ebuild
+++ b/app-emulation/qemu/qemu-.ebuild
@@ -60,7 +60,7 @@ SLOT="0"
 
 IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug 
${QEMU_DOC_USEFLAG}
+fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
-   jack jemalloc +jpeg
+   jack jemalloc +jpeg keyutils
lzo multipath
ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs pipewire
plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
@@ -195,6 +195,7 @@ SOFTMMU_TOOLS_DEPEND="
jemalloc? ( dev-libs/jemalloc )
jpeg? ( media-libs/libjpeg-turbo:=[static-libs(+)] )
kernel_linux? ( sys-libs/libcap-ng[static-libs(+)] )
+   keyutils? ( sys-apps/keyutils[static-libs(+)] )
lzo? ( dev-libs/lzo:2[static-libs(+)] )
multipath? ( sys-fs/multipath-tools )
ncurses? (
@@ -592,6 +593,7 @@ qemu_src_configure() {
$(conf_malloc jemalloc)
$(conf_notuser jpeg vnc-jpeg)
$(conf_notuser kernel_linux kvm)
+   $(conf_notuser keyutils libkeyutils)
$(conf_notuser lzo)
$(conf_notuser multipath mpath)
$(conf_notuser ncurses curses)

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-10-18 Thread Sam James

commit: 5e45b5888162fe490420a48f3aa0de1c070a4362
Author: Sam James  gentoo  org>
AuthorDate: Wed Oct 18 17:06:45 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct 18 17:07:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e45b588

app-emulation/qemu: add 8.1.2

Closes: https://bugs.gentoo.org/907425
Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/Manifest  |   1 +
 app-emulation/qemu/metadata.xml  |   1 +
 app-emulation/qemu/qemu-8.1.2.ebuild | 969 +++
 3 files changed, 971 insertions(+)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index fde1ca4adf8c..97e76bf76928 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -16,3 +16,4 @@ DIST qemu-8.0.5.tar.xz 126175064 BLAKE2B 
1d1f78c185ab64b4ca946a44ad04d0bbb6ea48d
 DIST qemu-8.1.0-docs.tar.xz 2129912 BLAKE2B 
8aaf7b748538afdb5bcb6da15dbd96572d086824377c4b0e93f1ddc695f9a4775471e360a9616d2d481dbf8113e91d2601c69d92cef565fb90b65ffacfdb304e
 SHA512 
905515742bb56a439fc8117ec48ea668e7b2bf0244587673e4352d9e8e49911eb84ff093596ff566e44787197cf9789ec8950e3d75fb7a670c5546394a322ac9
 DIST qemu-8.1.0.tar.xz 123550284 BLAKE2B 
b0fd87a19b13d4bbc6526caa46533073cb4dee6004df5d4fbbef204ee3bc8c2f10ec1eaff554adbb25c9f3143dd68abd09d4a0519c4766299a3ff261d03c73f2
 SHA512 
c5f5e7ce2d8e3c93a02012b136c866e8577df07da4705a0045916c71caeaa21fa1b2d59a4b22a660789a4159b192e12a443e7cbb0724ee85fea258251731724c
 DIST qemu-8.1.1.tar.xz 123558860 BLAKE2B 
71220fad7c9f74bed6211879f01566ac1e52835feb3d45eaa1b2fe1d5f95d9fa5db53b7aec72b4ef098c03d0c4070076c907fb3e6b839002de6f56ee5ab44340
 SHA512 
199db58f9a413cbe4449ff557bc362e666c6c0291f9963cb74e5542e8abd1edcd65001fa1fd453b850a376de455f93258707ce6feee5a44bf40753b12a2e956c
+DIST qemu-8.1.2.tar.xz 123553328 BLAKE2B 
8f48638cd1f0285356aae2d14862f56cc79da09bb9ff9f09e90221fdca851e9c3f8a3d940039f578d24d0b4435baf19cb52a3e927e97bf978ea674d148ecd746
 SHA512 
d95ba8b294115b86b7f3bd1b438b059e38c7ccc68f14e76b455b355b4b68ec84fb799bef44dbf96befcad7c40a15f4660096b5ad5be4396d54dfeaba34c89db8

diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml
index 93729e025ff6..adb556795249 100644
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@@ -27,6 +27,7 @@
net-libs/libiscsi instead of indirectly via the Linux
block layer that sys-block/open-iscsi does.
Enable efficient I/O via 
sys-libs/liburing.
+   Support Linux keyrings via 
sys-apps/keyutils
Enable multipath persistent reservation 
passthrough via
sys-fs/multipath-tools.
Enable the ncurses-based console

diff --git a/app-emulation/qemu/qemu-8.1.2.ebuild 
b/app-emulation/qemu/qemu-8.1.2.ebuild
new file mode 100644
index ..2ea790325cf1
--- /dev/null
+++ b/app-emulation/qemu/qemu-8.1.2.ebuild
@@ -0,0 +1,969 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
+QEMU_DOCS_PREBUILT_DEV=sam
+#QEMU_DOCS_VERSION=$(ver_cut 1-3)
+QEMU_DOCS_VERSION=8.1.0
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# bug #830088
+QEMU_DOC_USEFLAG="+doc"
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="ncurses,readline"
+
+FIRMWARE_ABI_VERSION="7.2.0"
+
+inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
+   pax-utils xdg-utils
+
+if [[ ${PV} == ** ]]; then
+   QEMU_DOCS_PREBUILT=0
+
+   EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/;
+   EGIT_SUBMODULES=(
+   tests/fp/berkeley-softfloat-3
+   tests/fp/berkeley-testfloat-3
+   subprojects/keycodemapdb
+   )
+   inherit git-r3
+   SRC_URI=""
+else
+   MY_P="${PN}-${PV/_rc/-rc}"
+   SRC_URI="https://download.qemu.org/${MY_P}.tar.xz;
+
+   if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
+   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz
 )"
+   fi
+
+   S="${WORKDIR}/${MY_P}"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org;
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+
+[[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc"
+
+IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug 
${QEMU_DOC_USEFLAG}
+   +fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
+   jack jemalloc +jpeg keyutils
+   lzo

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-09-27 Thread Sam James

commit: 5c12b485d94a4e670e3874ef15bc277384bfc6e7
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep 28 01:21:31 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep 28 01:21:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c12b485

app-emulation/qemu: don't conditionally define phase

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/qemu-.ebuild | 26 ++
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/app-emulation/qemu/qemu-.ebuild 
b/app-emulation/qemu/qemu-.ebuild
index de4d90b78216..1f63912672aa 100644
--- a/app-emulation/qemu/qemu-.ebuild
+++ b/app-emulation/qemu/qemu-.ebuild
@@ -446,20 +446,22 @@ check_targets() {
popd >/dev/null
 }
 
-if [[ ${PV} ==  ]]; then
 src_unpack() {
-   git-r3_src_unpack
-   for file in ${A}; do
-   unpack "${file}"
-   done
-   cd ${WORKDIR} || die
-   for proj in "${!SUBPROJECTS[@]}"; do
-   mv "${proj}-${SUBPROJECTS[${proj}]}" "${S}/subprojects/${proj}" 
|| die
-   done
-   cd "${S}" || die
-   meson subprojects packagefiles --apply || die
+   if [[ ${PV} ==  ]] ; then
+   git-r3_src_unpack
+   for file in ${A}; do
+   unpack "${file}"
+   done
+   cd "${WORKDIR}" || die
+   for proj in "${!SUBPROJECTS[@]}"; do
+   mv "${proj}-${SUBPROJECTS[${proj}]}" 
"${S}/subprojects/${proj}" || die
+   done
+   cd "${S}" || die
+   meson subprojects packagefiles --apply || die
+   else
+   default
+   fi
 }
-fi
 
 src_prepare() {
check_targets IUSE_SOFTMMU_TARGETS softmmu

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-09-27 Thread Sam James

commit: 3136510fe48f49348896e5f28ff01e49329936b4
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep 28 01:22:13 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep 28 01:22:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3136510f

app-emulation/qemu: fix BetterCompressionUri

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/Manifest | 6 +++---
 app-emulation/qemu/qemu-.ebuild | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index a38c71af25bf..fde1ca4adf8c 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1,6 +1,6 @@
-DIST berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz 
148741 BLAKE2B 
72014022926b636147e202d74c42df2ce9cfed00b91c275d5b2e0afbc5c68765445cbe7ac6389d7c2512bd1d45b0e16e36552d09bbc733ab66c92968bd31
 SHA512 
8420c29faa7ff57e06d6758b03e81ca0630c59946bc031e8611f1449e23634cf901b502161f2c1423c0cff949b5481445e36a3aa53dc885b61ca2c673b3ba567
-DIST berkeley-testfloat-3-40619cbb3bf32872df8c53cc457039229428a263.tar.gz 
139281 BLAKE2B 
b370befc6a08e09ee84fa19d22628470063b7780d6aa931fb0a4bc9271e970f652f4067cd86cfb5eb4937508174f25cb3b40d20f3f01261fff539067a1e50887
 SHA512 
842c784674d2d606838a6870f8d53818eea4a86adc498a40fcb0a65a5c657ab7c4fe266029d46fed7297384c7f0b9abab571ceeb301192818fa68007a8ad738c
-DIST keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6.tar.gz 29580 
BLAKE2B 
5511922dc8c4011a2c96f17f733c068e090fbb2b25227701bf73f66ea164892bdae09f08fb605aa7d018d97dfbc9872a907f3c55d293b2c5949d54ec9730
 SHA512 
6131753ed017fcdbf1d6b428d3dff79fd11800f9417c35ec45003b0b77ae7a36b9e1d4aec8e7fe256661baa367d9b0952a296afde4ccf3ed9e2a427b91009504
+DIST berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037.tar.bz2 
84094 BLAKE2B 
396f9df2e6ad559545054e89916915c3a3c8ff80e5e409498fec497b564d8b3ac9dd3cb966e26dce232ddff82af18a0e84e864ca18a80c2a2f4fe47e320249c2
 SHA512 
93c20d50a356c90f4293d8c7593611b2e0a9bc7567b6d946319f8ae06962ae1e297c8788f66fd38a1d3a0d44661bff9a07a63eaa84c8bb40ae01a45476be446c
+DIST berkeley-testfloat-3-40619cbb3bf32872df8c53cc457039229428a263.tar.bz2 
90086 BLAKE2B 
ab2070622453a7a0a1fbcf234df68cc7316474c04482b2ac13c700edbb5624968c5274f337dc84f06c4ab6c3e82698cd7b0b30fe206d004b0715f15a2cc7cfd1
 SHA512 
969892af9fdf16d45660753ed02bbd8d6159928e5e6ef2f87aed8a08d995bb19d2115fb6b559522074492b2595716d314c5c059bfa69c7fbb5aab9275582c22e
+DIST keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6.tar.bz2 27971 
BLAKE2B 
0ed69ad24c53bd459c8753565814bcc1cd858f20d3a046c38912a35bcb0ba6d388ef5d2b93157cd028959284b330caf5467d82071c3df56a405dd8e08fd177c7
 SHA512 
8f2cc14e8bd46cb045e3ebfe32e463793ab7472ebda9b57b8ea0b06fa107a1a99c3ebcacb9c4548e30698d8ec154c0e56f789385201182b680819b8068a103f2
 DIST qemu-7.2.0-docs.tar.xz 1984184 BLAKE2B 
103900fb7903ed8d75f7f012bf61fa2d6fce345b657c851d0437c3384f5735bd1cfd3129320683ea7846ea0b0940e5af5b2663c9320f12fee74b058523a8ea06
 SHA512 
a7edd448982865e07533c300d3e44a8b50cefbdde1982b73c24d0b2aa74315439252c59b634c75de312860874c7b06c75aa72629da681b5105f28ee936794585
 DIST qemu-7.2.0.tar.xz 122408576 BLAKE2B 
415ff621356c59f88b29cfe3ef5db1e282b26bbafbee3d535477c6125ccb060ec9762d9e3ab9f70ce5478804dca0a46a59bcf12c112a2462029a93e578e61530
 SHA512 
f3cfa00da739ba819a218d7e6e95c77fb79a8e0f487b024ddd281602e785249b81144595e3f8c746c32a4f5c4d1a88c6aebae3c162603edfbb50ae3722d7ed13
 DIST qemu-7.2.1.tar.xz 122400592 BLAKE2B 
bae1df5d332beaca313c4bac88f06dd5992988d7c1b6fdc6ced4043d858f437339cd7d0009ae667f9e66705117697bee7ee44ec4e911cc203d34eecc3d8f139b
 SHA512 
e286dc66c923a5df77eb02d69235d048e80a7cced638fae52fbed385b4c3cd736cfea66bb3c9843bebf0a33e81ea141fc015e0bd82108df304f148ce59d9ae8a

diff --git a/app-emulation/qemu/qemu-.ebuild 
b/app-emulation/qemu/qemu-.ebuild
index 1f63912672aa..3da439a4b7b4 100644
--- a/app-emulation/qemu/qemu-.ebuild
+++ b/app-emulation/qemu/qemu-.ebuild
@@ -36,7 +36,7 @@ if [[ ${PV} == ** ]]; then
 
for proj in "${!SUBPROJECTS[@]}"; do
c=${SUBPROJECTS[${proj}]}
-   SRC_URI+=" 
https://gitlab.com/qemu-project/${proj}/-/archive/${c}/${proj}-${c}.tar.gz;
+   SRC_URI+=" 
https://gitlab.com/qemu-project/${proj}/-/archive/${c}/${proj}-${c}.tar.bz2;
done
 else
MY_P="${PN}-${PV/_rc/-rc}"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-09-27 Thread Sam James

commit: e3b6ce2732f57003fda8023205cb7959fa517e8d
Author: Michal Privoznik  gmail  com>
AuthorDate: Thu Sep  7 14:00:27 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep 28 01:20:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3b6ce27

app-qemulation/qemu: Download subprojects in fetch phase

As suggested in [1], instead of using 'meson subprojects
download' in src_unpack() phase, the subproject tarballs can be
downloaded upfront and then merely just unpacked and moved to
their respective locations. This allows users to fetch sources
and build without network access.

1: https://github.com/gentoo/gentoo/pull/32484#discussion_r1308083818
Signed-off-by: Michal Privoznik  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32684
Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/Manifest |  3 +++
 app-emulation/qemu/qemu-.ebuild | 21 +++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index aeb71908b5db..a38c71af25bf 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1,3 +1,6 @@
+DIST berkeley-softfloat-3-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz 
148741 BLAKE2B 
72014022926b636147e202d74c42df2ce9cfed00b91c275d5b2e0afbc5c68765445cbe7ac6389d7c2512bd1d45b0e16e36552d09bbc733ab66c92968bd31
 SHA512 
8420c29faa7ff57e06d6758b03e81ca0630c59946bc031e8611f1449e23634cf901b502161f2c1423c0cff949b5481445e36a3aa53dc885b61ca2c673b3ba567
+DIST berkeley-testfloat-3-40619cbb3bf32872df8c53cc457039229428a263.tar.gz 
139281 BLAKE2B 
b370befc6a08e09ee84fa19d22628470063b7780d6aa931fb0a4bc9271e970f652f4067cd86cfb5eb4937508174f25cb3b40d20f3f01261fff539067a1e50887
 SHA512 
842c784674d2d606838a6870f8d53818eea4a86adc498a40fcb0a65a5c657ab7c4fe266029d46fed7297384c7f0b9abab571ceeb301192818fa68007a8ad738c
+DIST keycodemapdb-f5772a62ec52591ff6870b7e8ef32482371f22c6.tar.gz 29580 
BLAKE2B 
5511922dc8c4011a2c96f17f733c068e090fbb2b25227701bf73f66ea164892bdae09f08fb605aa7d018d97dfbc9872a907f3c55d293b2c5949d54ec9730
 SHA512 
6131753ed017fcdbf1d6b428d3dff79fd11800f9417c35ec45003b0b77ae7a36b9e1d4aec8e7fe256661baa367d9b0952a296afde4ccf3ed9e2a427b91009504
 DIST qemu-7.2.0-docs.tar.xz 1984184 BLAKE2B 
103900fb7903ed8d75f7f012bf61fa2d6fce345b657c851d0437c3384f5735bd1cfd3129320683ea7846ea0b0940e5af5b2663c9320f12fee74b058523a8ea06
 SHA512 
a7edd448982865e07533c300d3e44a8b50cefbdde1982b73c24d0b2aa74315439252c59b634c75de312860874c7b06c75aa72629da681b5105f28ee936794585
 DIST qemu-7.2.0.tar.xz 122408576 BLAKE2B 
415ff621356c59f88b29cfe3ef5db1e282b26bbafbee3d535477c6125ccb060ec9762d9e3ab9f70ce5478804dca0a46a59bcf12c112a2462029a93e578e61530
 SHA512 
f3cfa00da739ba819a218d7e6e95c77fb79a8e0f487b024ddd281602e785249b81144595e3f8c746c32a4f5c4d1a88c6aebae3c162603edfbb50ae3722d7ed13
 DIST qemu-7.2.1.tar.xz 122400592 BLAKE2B 
bae1df5d332beaca313c4bac88f06dd5992988d7c1b6fdc6ced4043d858f437339cd7d0009ae667f9e66705117697bee7ee44ec4e911cc203d34eecc3d8f139b
 SHA512 
e286dc66c923a5df77eb02d69235d048e80a7cced638fae52fbed385b4c3cd736cfea66bb3c9843bebf0a33e81ea141fc015e0bd82108df304f148ce59d9ae8a

diff --git a/app-emulation/qemu/qemu-.ebuild 
b/app-emulation/qemu/qemu-.ebuild
index 6bc1056cfd1c..de4d90b78216 100644
--- a/app-emulation/qemu/qemu-.ebuild
+++ b/app-emulation/qemu/qemu-.ebuild
@@ -28,6 +28,16 @@ if [[ ${PV} == ** ]]; then
EGIT_SUBMODULES=()
inherit git-r3
SRC_URI=""
+   declare -A SUBPROJECTS=(
+   [keycodemapdb]="f5772a62ec52591ff6870b7e8ef32482371f22c6"
+   
[berkeley-softfloat-3]="b64af41c3276f97f0e181920400ee056b9c88037"
+   
[berkeley-testfloat-3]="40619cbb3bf32872df8c53cc457039229428a263"
+   )
+
+   for proj in "${!SUBPROJECTS[@]}"; do
+   c=${SUBPROJECTS[${proj}]}
+   SRC_URI+=" 
https://gitlab.com/qemu-project/${proj}/-/archive/${c}/${proj}-${c}.tar.gz;
+   done
 else
MY_P="${PN}-${PV/_rc/-rc}"
SRC_URI="https://download.qemu.org/${MY_P}.tar.xz;
@@ -439,8 +449,15 @@ check_targets() {
 if [[ ${PV} ==  ]]; then
 src_unpack() {
git-r3_src_unpack
-   cd "${P}" || die
-   meson subprojects download keycodemapdb berkeley-softfloat-3 
berkeley-testfloat-3 || die
+   for file in ${A}; do
+   unpack "${file}"
+   done
+   cd ${WORKDIR} || die
+   for proj in "${!SUBPROJECTS[@]}"; do
+   mv "${proj}-${SUBPROJECTS[${proj}]}" "${S}/subprojects/${proj}" 
|| die
+   done
+   cd "${S}" || die
+   meson subprojects packagefiles --apply || die
 }
 fi

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-09-23 Thread Sam James

commit: c2bc483af422341934e01c07e8961620c9685628
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 24 02:47:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 24 03:18:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2bc483a

app-emulation/qemu: add 7.2.6

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/Manifest  |   1 +
 app-emulation/qemu/qemu-7.2.6.ebuild | 972 +++
 2 files changed, 973 insertions(+)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 76f90e7c8da0..9c3a5aa2aa4a 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -3,6 +3,7 @@ DIST qemu-7.2.0.tar.xz 122408576 BLAKE2B 
415ff621356c59f88b29cfe3ef5db1e282b26bb
 DIST qemu-7.2.1.tar.xz 122400592 BLAKE2B 
bae1df5d332beaca313c4bac88f06dd5992988d7c1b6fdc6ced4043d858f437339cd7d0009ae667f9e66705117697bee7ee44ec4e911cc203d34eecc3d8f139b
 SHA512 
e286dc66c923a5df77eb02d69235d048e80a7cced638fae52fbed385b4c3cd736cfea66bb3c9843bebf0a33e81ea141fc015e0bd82108df304f148ce59d9ae8a
 DIST qemu-7.2.3.tar.xz 122395692 BLAKE2B 
4e65cac7505a56da85c1d98dc6029d516dd4f07f0211ea5213724d231d448d9b49cc91a3058a2a89908608078854d97da480e6f0bc7ce47d9555c2bb1177fbdc
 SHA512 
09523d456175da47d58d8d56fe9a95416ee3e6fd8aa7766383033396a1e5bd10f7758832f7f2b8662068ef94b21ab6a3a351c9158fb6bde0e1d7d5fb393bf6c7
 DIST qemu-7.2.4.tar.xz 121849100 BLAKE2B 
a9c5ffce9ff0fac4e2d1fa4be1a1dcee2f5d7f793ddf726871c5ae9a68c22f7ba03692a8a5096de3051030d3c2f34e46697d5af2d66c34984b8161ae3bb07b42
 SHA512 
fa765673833a1f2cbecdb9d47dc7dc29d7613be5a5c8fc63925ae70e1f5aafb4f9f02e45b212a329f17b689351b8a9cdf5f5235ab6adb71bb40e41868898d95b
+DIST qemu-7.2.6.tar.xz 121322888 BLAKE2B 
c3f51cc1647f5c75774513f624c2e1a1e4badd7275c9f9a64a175809daf17d0b3c58eab0c36fa98fc46834d4d79f8552d1c9f34e840ee21ddd049cc3adba480a
 SHA512 
534fffe2d751a707a7cf15db8d5b9eddc2468fd7fe875715e79ee879fb20d7370553588384d345b586eeaddf9284de36f2d0d69f747380ee55161cc6eb09bf30
 DIST qemu-8.0.0-docs.tar.xz 3218024 BLAKE2B 
b764a625024e78a39470048355471e12cfb57ab3c34e764dc4200fdf5c1aea635d26095ec961979bf46f177101c5bd38618bacf7e98e04bd64688ab5e29591aa
 SHA512 
d9dfe191372e105fe16fe8f66f41ed793ade4c89b5ab1d84b39459f3419a1ca61bd49422a83981965cc257c05eca7fd49054703f58f179f5c7b656e9473a1054
 DIST qemu-8.0.0.tar.xz 127835148 BLAKE2B 
9b54aae10fe09691a26e68374723ded5fdda6409673b4de9461a25ee060cfd03968a16ddeadc21d48b9262e53aa6d4e5eb645376969f97c65807fad19607b04f
 SHA512 
1f31d1e653dec2d35f1b7a5468ee3f471553b48eca8c8afafffcf9243c6b2260e78a5b73da3fe567f9b85d4133573eebd397747b3aec501fb24076263eb07b27
 DIST qemu-8.0.2.tar.xz 126707132 BLAKE2B 
f2b1a63e10c42aabfe39722c7732d0f04818ad367b769b3deb29c5bf9adcabc3aca1706f3c40fafeeb57ac1f7a61ded5066de32134c483e2fd27bc65b4b7d30a
 SHA512 
4e915d33a662bf55b09247fb85150be376c92270d3764e3d6470c452cb70cc558f54e84de5610dd60a9eb3ea02d5d4277b1ec75c9804967d278fa8361c7f9b9a

diff --git a/app-emulation/qemu/qemu-7.2.6.ebuild 
b/app-emulation/qemu/qemu-7.2.6.ebuild
new file mode 100644
index ..2218435d4f6e
--- /dev/null
+++ b/app-emulation/qemu/qemu-7.2.6.ebuild
@@ -0,0 +1,972 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
+QEMU_DOCS_PREBUILT_DEV=ajak
+QEMU_DOCS_VERSION="7.2.0"
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# bug #830088
+QEMU_DOC_USEFLAG="+doc"
+
+PYTHON_COMPAT=( python3_{9,10,11} )
+PYTHON_REQ_USE="ncurses,readline"
+
+FIRMWARE_ABI_VERSION="7.2.0"
+
+inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
+   pax-utils xdg-utils
+
+if [[ ${PV} == ** ]]; then
+   QEMU_DOCS_PREBUILT=0
+
+   EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/;
+   EGIT_SUBMODULES=(
+   tests/fp/berkeley-softfloat-3
+   tests/fp/berkeley-testfloat-3
+   ui/keycodemapdb
+   )
+   inherit git-r3
+   SRC_URI=""
+else
+   MY_P="${PN}-${PV/_rc/-rc}"
+   SRC_URI="https://download.qemu.org/${MY_P}.tar.xz;
+
+   if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
+   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz
 )"
+   fi
+
+   S="${WORKDIR}/${MY_P}"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org;
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+
+[[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc"
+
+IUSE="accessibility +aio

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-09-23 Thread Sam James

commit: 311aadb4901daa5e15ebd011f27f2763e7043fbc
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 24 03:10:49 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 24 03:18:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=311aadb4

app-emulation/qemu: add 8.0.5

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/Manifest  |   1 +
 app-emulation/qemu/qemu-8.0.5.ebuild | 970 +++
 2 files changed, 971 insertions(+)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 9c3a5aa2aa4a..6f12917d198f 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -9,5 +9,6 @@ DIST qemu-8.0.0.tar.xz 127835148 BLAKE2B 
9b54aae10fe09691a26e68374723ded5fdda640
 DIST qemu-8.0.2.tar.xz 126707132 BLAKE2B 
f2b1a63e10c42aabfe39722c7732d0f04818ad367b769b3deb29c5bf9adcabc3aca1706f3c40fafeeb57ac1f7a61ded5066de32134c483e2fd27bc65b4b7d30a
 SHA512 
4e915d33a662bf55b09247fb85150be376c92270d3764e3d6470c452cb70cc558f54e84de5610dd60a9eb3ea02d5d4277b1ec75c9804967d278fa8361c7f9b9a
 DIST qemu-8.0.3.tar.xz 126710536 BLAKE2B 
071cc1a35209a02e8c5dd4f43cb112f110b4655adb0f870a04fdf9a6e2c761699574e8c9426f70f60787a99acf252d7a64d94a8e837cdfeda93d89428d7866f3
 SHA512 
18b2ccb65f7ec2ae92f0e04406539620c881e2b75f63816588c86043a07464bb99d16a83e792ed9508de393f4b694c46d52f4d07edf52741e85224c8b8d5d5c3
 DIST qemu-8.0.4.tar.xz 126179324 BLAKE2B 
dfb98964c629b251f0004b4630ae4500a52465579417d6f5c7dbbb1f672e10d8d7ffb98a4b00e26fb98b3c867208146dbdca026e4d30cbf1752ac733c4d9b915
 SHA512 
bd5ed682d51f974abd4be93f949701f9b5bfb87fd9929e31df130534da2f2c03b99adc9f924b3efd47d3b254e0e3c0046f4e69fbe9f6d0c4ac1f6babecb29449
+DIST qemu-8.0.5.tar.xz 126175064 BLAKE2B 
1d1f78c185ab64b4ca946a44ad04d0bbb6ea48de058037e4ba18176abeb0f0528754c6e832f742f93227182bbce145544eca5b908a366006e7ee58876aca0bda
 SHA512 
ec9679473dda84a2f56ae8ee0039ec4dafb056414bfc5a3a147b2b6bb45ae3b130dd80f6385e8567b5d18f4be94f3536bc8acc45c61eddf40c9678b46cb8bddc
 DIST qemu-8.1.0-docs.tar.xz 2129912 BLAKE2B 
8aaf7b748538afdb5bcb6da15dbd96572d086824377c4b0e93f1ddc695f9a4775471e360a9616d2d481dbf8113e91d2601c69d92cef565fb90b65ffacfdb304e
 SHA512 
905515742bb56a439fc8117ec48ea668e7b2bf0244587673e4352d9e8e49911eb84ff093596ff566e44787197cf9789ec8950e3d75fb7a670c5546394a322ac9
 DIST qemu-8.1.0.tar.xz 123550284 BLAKE2B 
b0fd87a19b13d4bbc6526caa46533073cb4dee6004df5d4fbbef204ee3bc8c2f10ec1eaff554adbb25c9f3143dd68abd09d4a0519c4766299a3ff261d03c73f2
 SHA512 
c5f5e7ce2d8e3c93a02012b136c866e8577df07da4705a0045916c71caeaa21fa1b2d59a4b22a660789a4159b192e12a443e7cbb0724ee85fea258251731724c

diff --git a/app-emulation/qemu/qemu-8.0.5.ebuild 
b/app-emulation/qemu/qemu-8.0.5.ebuild
new file mode 100644
index ..438e63f95e5b
--- /dev/null
+++ b/app-emulation/qemu/qemu-8.0.5.ebuild
@@ -0,0 +1,970 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
+QEMU_DOCS_PREBUILT_DEV=sam
+QEMU_DOCS_VERSION="8.0.0"
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# bug #830088
+QEMU_DOC_USEFLAG="+doc"
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="ncurses,readline"
+
+FIRMWARE_ABI_VERSION="7.2.0"
+
+inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
+   pax-utils xdg-utils
+
+if [[ ${PV} == ** ]]; then
+   QEMU_DOCS_PREBUILT=0
+
+   EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/;
+   EGIT_SUBMODULES=(
+   tests/fp/berkeley-softfloat-3
+   tests/fp/berkeley-testfloat-3
+   ui/keycodemapdb
+   )
+   inherit git-r3
+   SRC_URI=""
+else
+   MY_P="${PN}-${PV/_rc/-rc}"
+   SRC_URI="https://download.qemu.org/${MY_P}.tar.xz;
+
+   if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
+   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz
 )"
+   fi
+
+   S="${WORKDIR}/${MY_P}"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org;
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+
+[[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc"
+
+IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug 
${QEMU_DOC_USEFLAG}
+   +fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
+   jack jemalloc +jpeg
+   lzo multipath
+   ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs
+   plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-09-23 Thread Sam James

commit: a0fbb5dba4afc6885e4abf16e36fc118510c1cb3
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 24 03:18:28 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 24 03:18:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0fbb5db

app-emulation/qemu: add 8.1.1

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/Manifest  |   1 +
 app-emulation/qemu/qemu-8.1.1.ebuild | 967 +++
 2 files changed, 968 insertions(+)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 6f12917d198f..aeb71908b5db 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -12,3 +12,4 @@ DIST qemu-8.0.4.tar.xz 126179324 BLAKE2B 
dfb98964c629b251f0004b4630ae4500a524655
 DIST qemu-8.0.5.tar.xz 126175064 BLAKE2B 
1d1f78c185ab64b4ca946a44ad04d0bbb6ea48de058037e4ba18176abeb0f0528754c6e832f742f93227182bbce145544eca5b908a366006e7ee58876aca0bda
 SHA512 
ec9679473dda84a2f56ae8ee0039ec4dafb056414bfc5a3a147b2b6bb45ae3b130dd80f6385e8567b5d18f4be94f3536bc8acc45c61eddf40c9678b46cb8bddc
 DIST qemu-8.1.0-docs.tar.xz 2129912 BLAKE2B 
8aaf7b748538afdb5bcb6da15dbd96572d086824377c4b0e93f1ddc695f9a4775471e360a9616d2d481dbf8113e91d2601c69d92cef565fb90b65ffacfdb304e
 SHA512 
905515742bb56a439fc8117ec48ea668e7b2bf0244587673e4352d9e8e49911eb84ff093596ff566e44787197cf9789ec8950e3d75fb7a670c5546394a322ac9
 DIST qemu-8.1.0.tar.xz 123550284 BLAKE2B 
b0fd87a19b13d4bbc6526caa46533073cb4dee6004df5d4fbbef204ee3bc8c2f10ec1eaff554adbb25c9f3143dd68abd09d4a0519c4766299a3ff261d03c73f2
 SHA512 
c5f5e7ce2d8e3c93a02012b136c866e8577df07da4705a0045916c71caeaa21fa1b2d59a4b22a660789a4159b192e12a443e7cbb0724ee85fea258251731724c
+DIST qemu-8.1.1.tar.xz 123558860 BLAKE2B 
71220fad7c9f74bed6211879f01566ac1e52835feb3d45eaa1b2fe1d5f95d9fa5db53b7aec72b4ef098c03d0c4070076c907fb3e6b839002de6f56ee5ab44340
 SHA512 
199db58f9a413cbe4449ff557bc362e666c6c0291f9963cb74e5542e8abd1edcd65001fa1fd453b850a376de455f93258707ce6feee5a44bf40753b12a2e956c

diff --git a/app-emulation/qemu/qemu-8.1.1.ebuild 
b/app-emulation/qemu/qemu-8.1.1.ebuild
new file mode 100644
index ..321b56dd29d8
--- /dev/null
+++ b/app-emulation/qemu/qemu-8.1.1.ebuild
@@ -0,0 +1,967 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
+QEMU_DOCS_PREBUILT_DEV=sam
+#QEMU_DOCS_VERSION=$(ver_cut 1-3)
+QEMU_DOCS_VERSION=8.1.0
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# bug #830088
+QEMU_DOC_USEFLAG="+doc"
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="ncurses,readline"
+
+FIRMWARE_ABI_VERSION="7.2.0"
+
+inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
+   pax-utils xdg-utils
+
+if [[ ${PV} == ** ]]; then
+   QEMU_DOCS_PREBUILT=0
+
+   EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/;
+   EGIT_SUBMODULES=(
+   tests/fp/berkeley-softfloat-3
+   tests/fp/berkeley-testfloat-3
+   subprojects/keycodemapdb
+   )
+   inherit git-r3
+   SRC_URI=""
+else
+   MY_P="${PN}-${PV/_rc/-rc}"
+   SRC_URI="https://download.qemu.org/${MY_P}.tar.xz;
+
+   if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
+   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz
 )"
+   fi
+
+   S="${WORKDIR}/${MY_P}"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org;
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+
+[[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc"
+
+IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug 
${QEMU_DOC_USEFLAG}
+   +fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
+   jack jemalloc +jpeg
+   lzo multipath
+   ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs pipewire
+   plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
+   +slirp
+   smartcard snappy spice ssh static-user systemtap test udev usb
+   usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen
+   zstd"
+
+COMMON_TARGETS="
+   aarch64
+   alpha
+   arm
+   cris
+   hppa
+   i386
+   loongarch64
+   m68k
+   microblaze
+   microblazeel
+   mips
+   mips64
+   mips64el
+   mipsel
+   nios2
+   or1k
+   ppc
+   ppc64
+   riscv32
+   riscv64
+   s390x
+   sh4
+   sh4eb
+   sparc
+   sparc64
+

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-09-12 Thread Sam James

commit: 1519e0ccbfa744e4d47d7d55d5bebeed8eff246e
Author: José Pekkarinen  gmail  com>
AuthorDate: Fri Sep  8 07:18:27 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Sep 13 02:12:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1519e0cc

app-emulation/qemu: build pipewire audio-drv

This patch adds the pipewire audio-drv to the
audio-drv list if pipewire USE flag is enabled.

Signed-off-by: José Pekkarinen  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32680
Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/{qemu-8.1.0.ebuild => qemu-8.1.0-r1.ebuild} | 1 +
 app-emulation/qemu/qemu-.ebuild| 1 +
 2 files changed, 2 insertions(+)

diff --git a/app-emulation/qemu/qemu-8.1.0.ebuild 
b/app-emulation/qemu/qemu-8.1.0-r1.ebuild
similarity index 99%
rename from app-emulation/qemu/qemu-8.1.0.ebuild
rename to app-emulation/qemu/qemu-8.1.0-r1.ebuild
index e46b8dd200ce..785f98ee1281 100644
--- a/app-emulation/qemu/qemu-8.1.0.ebuild
+++ b/app-emulation/qemu/qemu-8.1.0-r1.ebuild
@@ -609,6 +609,7 @@ qemu_src_configure() {
# Note: backend order matters here: #716202
# We iterate from higher-level to lower level.
$(usex pulseaudio pa "")
+   $(usev pipewire)
$(usev jack)
$(usev sdl)
$(usev alsa)

diff --git a/app-emulation/qemu/qemu-.ebuild 
b/app-emulation/qemu/qemu-.ebuild
index 6ca0885e7e59..6bc1056cfd1c 100644
--- a/app-emulation/qemu/qemu-.ebuild
+++ b/app-emulation/qemu/qemu-.ebuild
@@ -613,6 +613,7 @@ qemu_src_configure() {
# Note: backend order matters here: #716202
# We iterate from higher-level to lower level.
$(usex pulseaudio pa "")
+   $(usev pipewire)
$(usev jack)
$(usev sdl)
$(usev alsa)

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-09-06 Thread Sam James

commit: 0e33bcc6940a140cc273a66c41bd69d8ee4f5ba2
Author: Michal Privoznik  gmail  com>
AuthorDate: Mon Aug 28 08:31:29 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Sep  6 09:05:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e33bcc6

app-emulation/qemu: Adapt live ebuild to meson subprojects

The upstream is moving away from explicit git submodules to meson
subprojects. This renders EGIT_SUBMODULES useless (wrt submodules
we care about), but as there are still some submodules (that we
don't care about) set the variable to empty array. Unfortunately,
our meson.eclass doesn't support subpojects yet, therefore mimic
what at least one other ebuild does (sys-apps/dbus-broker):
provide an alternative implementation of src_unpack() for the
live ebuild that downloads additional repositories via 'meson
subprojects download'. The non-live ebuilds do not need this
because the release archive contains bundles all subprojects.

Signed-off-by: Michal Privoznik  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32484
Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/qemu-.ebuild | 16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/app-emulation/qemu/qemu-.ebuild 
b/app-emulation/qemu/qemu-.ebuild
index cca0a24a89c0..6ca0885e7e59 100644
--- a/app-emulation/qemu/qemu-.ebuild
+++ b/app-emulation/qemu/qemu-.ebuild
@@ -25,11 +25,7 @@ if [[ ${PV} == ** ]]; then
QEMU_DOCS_PREBUILT=0
 
EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/;
-   EGIT_SUBMODULES=(
-   tests/fp/berkeley-softfloat-3
-   tests/fp/berkeley-testfloat-3
-   subprojects/keycodemapdb
-   )
+   EGIT_SUBMODULES=()
inherit git-r3
SRC_URI=""
 else
@@ -440,6 +436,14 @@ check_targets() {
popd >/dev/null
 }
 
+if [[ ${PV} ==  ]]; then
+src_unpack() {
+   git-r3_src_unpack
+   cd "${P}" || die
+   meson subprojects download keycodemapdb berkeley-softfloat-3 
berkeley-testfloat-3 || die
+}
+fi
+
 src_prepare() {
check_targets IUSE_SOFTMMU_TARGETS softmmu
check_targets IUSE_USER_TARGETS linux-user
@@ -454,7 +458,7 @@ src_prepare() {
MAKEOPTS+=" V=1"
 
# Remove bundled modules
-   rm -r subprojects/dtc roms/*/ || die
+   rm -r roms/*/ || die
 }
 
 ##

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-08-28 Thread Sam James

commit: dafdf8f41fe242a8b2b51d2b8982a6e447115a58
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug 28 22:47:45 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 28 22:47:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dafdf8f4

app-emulation/qemu: BDEPEND on dev-python/pip for now

Better to do pip than python[ensurepip] given that's a heavier build. Hope
to be able to avoid pip entirely but this is a cheap add for now.

Bug: https://bugs.gentoo.org/913084
Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/qemu-8.1.0.ebuild | 2 ++
 app-emulation/qemu/qemu-.ebuild  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app-emulation/qemu/qemu-8.1.0.ebuild 
b/app-emulation/qemu/qemu-8.1.0.ebuild
index 9fb08f07e76f..e46b8dd200ce 100644
--- a/app-emulation/qemu/qemu-8.1.0.ebuild
+++ b/app-emulation/qemu/qemu-8.1.0.ebuild
@@ -268,10 +268,12 @@ PPC_FIRMWARE_DEPEND="
)
 "
 
+# See bug #913084 for pip dep
 BDEPEND="
$(python_gen_impl_dep)
dev-lang/perl
>=dev-util/meson-0.63.0
+   dev-python/pip[${PYTHON_USEDEP}]
virtual/pkgconfig
doc? (
>=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}]

diff --git a/app-emulation/qemu/qemu-.ebuild 
b/app-emulation/qemu/qemu-.ebuild
index e9ea36363d60..cca0a24a89c0 100644
--- a/app-emulation/qemu/qemu-.ebuild
+++ b/app-emulation/qemu/qemu-.ebuild
@@ -268,10 +268,12 @@ PPC_FIRMWARE_DEPEND="
)
 "
 
+# See bug #913084 for pip dep
 BDEPEND="
$(python_gen_impl_dep)
dev-lang/perl
>=dev-util/meson-0.63.0
+   dev-python/pip[${PYTHON_USEDEP}]
virtual/pkgconfig
doc? (
>=dev-python/sphinx-1.6.0[${PYTHON_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-08-25 Thread Sam James

commit: 464c0fbd2279825af92f72bc9851c0a0e6c16753
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 26 04:04:52 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 26 04:04:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=464c0fbd

app-emulation/qemu: Stabilize 8.0.4 ppc64, #912205

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/qemu-8.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/qemu/qemu-8.0.4.ebuild 
b/app-emulation/qemu/qemu-8.0.4.ebuild
index 92a94bbfe449..6bc18b93f167 100644
--- a/app-emulation/qemu/qemu-8.0.4.ebuild
+++ b/app-emulation/qemu/qemu-8.0.4.ebuild
@@ -41,7 +41,7 @@ else
fi
 
S="${WORKDIR}/${MY_P}"
-   [[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv x86"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 
~riscv x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-08-25 Thread Sam James

commit: d2e941a725ca06e3e6996361b65e92ca6ac94a35
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 26 04:04:01 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 26 04:04:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2e941a7

app-emulation/qemu: Stabilize 7.2.4 ppc64, #909541

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/qemu-7.2.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/qemu/qemu-7.2.4.ebuild 
b/app-emulation/qemu/qemu-7.2.4.ebuild
index 8e520271cd22..22af03591a19 100644
--- a/app-emulation/qemu/qemu-7.2.4.ebuild
+++ b/app-emulation/qemu/qemu-7.2.4.ebuild
@@ -41,7 +41,7 @@ else
fi
 
S="${WORKDIR}/${MY_P}"
-   [[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv x86"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 
~riscv x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-08-25 Thread Sam James

commit: 6a09aff5d16640f10e9b57ab693666f044b2425b
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 26 04:04:47 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 26 04:04:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a09aff5

app-emulation/qemu: Stabilize 8.0.4 x86, #912205

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/qemu-8.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/qemu/qemu-8.0.4.ebuild 
b/app-emulation/qemu/qemu-8.0.4.ebuild
index a24aa467c776..92a94bbfe449 100644
--- a/app-emulation/qemu/qemu-8.0.4.ebuild
+++ b/app-emulation/qemu/qemu-8.0.4.ebuild
@@ -41,7 +41,7 @@ else
fi
 
S="${WORKDIR}/${MY_P}"
-   [[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-08-25 Thread Sam James

commit: 90f303da8c863c830c2dc198721d04d0acf1f001
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 26 04:04:55 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 26 04:04:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90f303da

app-emulation/qemu: Stabilize 8.0.4 arm64, #912205

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/qemu-8.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/qemu/qemu-8.0.4.ebuild 
b/app-emulation/qemu/qemu-8.0.4.ebuild
index 6bc18b93f167..96f174d6b422 100644
--- a/app-emulation/qemu/qemu-8.0.4.ebuild
+++ b/app-emulation/qemu/qemu-8.0.4.ebuild
@@ -41,7 +41,7 @@ else
fi
 
S="${WORKDIR}/${MY_P}"
-   [[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 
~riscv x86"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 
~riscv x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-08-25 Thread Sam James

commit: d1ae887f0ac718f08efa3fcf9820317430ccfe2a
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 26 04:03:56 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 26 04:03:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1ae887f

app-emulation/qemu: Stabilize 7.2.4 x86, #909541

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/qemu-7.2.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/qemu/qemu-7.2.4.ebuild 
b/app-emulation/qemu/qemu-7.2.4.ebuild
index 722591a56c29..8e520271cd22 100644
--- a/app-emulation/qemu/qemu-7.2.4.ebuild
+++ b/app-emulation/qemu/qemu-7.2.4.ebuild
@@ -41,7 +41,7 @@ else
fi
 
S="${WORKDIR}/${MY_P}"
-   [[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-08-25 Thread Sam James

commit: 9741fe9725c7cc4b2155c9d553bd6dd3cd7b3c7a
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 26 04:04:45 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 26 04:04:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9741fe97

app-emulation/qemu: Stabilize 8.0.4 amd64, #912205

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/qemu-8.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/qemu/qemu-8.0.4.ebuild 
b/app-emulation/qemu/qemu-8.0.4.ebuild
index 438e63f95e5b..a24aa467c776 100644
--- a/app-emulation/qemu/qemu-8.0.4.ebuild
+++ b/app-emulation/qemu/qemu-8.0.4.ebuild
@@ -41,7 +41,7 @@ else
fi
 
S="${WORKDIR}/${MY_P}"
-   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-08-25 Thread Sam James

commit: 431a5875660adadb9edf8d17221d8539037b09fe
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 26 04:03:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 26 04:03:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=431a5875

app-emulation/qemu: Stabilize 7.2.4 amd64, #909541

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/qemu-7.2.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/qemu/qemu-7.2.4.ebuild 
b/app-emulation/qemu/qemu-7.2.4.ebuild
index 2218435d4f6e..722591a56c29 100644
--- a/app-emulation/qemu/qemu-7.2.4.ebuild
+++ b/app-emulation/qemu/qemu-7.2.4.ebuild
@@ -41,7 +41,7 @@ else
fi
 
S="${WORKDIR}/${MY_P}"
-   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-08-25 Thread Sam James

commit: 1cfb0d4717960e9e0f8f5b3e6a8def690278c511
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 26 04:04:03 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 26 04:04:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cfb0d47

app-emulation/qemu: Stabilize 7.2.4 arm64, #909541

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/qemu-7.2.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/qemu/qemu-7.2.4.ebuild 
b/app-emulation/qemu/qemu-7.2.4.ebuild
index 22af03591a19..f7d70d6891b4 100644
--- a/app-emulation/qemu/qemu-7.2.4.ebuild
+++ b/app-emulation/qemu/qemu-7.2.4.ebuild
@@ -41,7 +41,7 @@ else
fi
 
S="${WORKDIR}/${MY_P}"
-   [[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 
~riscv x86"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 
~riscv x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/, app-emulation/qemu/files/

2023-08-25 Thread Sam James

commit: ce974471d1bc7a9b33fa138f54f35f0e9bc7a77b
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 26 03:49:00 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 26 03:49:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce974471

app-emulation/qemu: add 8.1.0

Fix some test failures too (skip a test which fails for me, probably kernel
config or network-sandbox related + crank up timeouts).

Closes: https://bugs.gentoo.org/865647
Closes: https://bugs.gentoo.org/867766
Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/Manifest|  2 +
 .../qemu/files/qemu-8.1.0-find-sphinx.patch| 10 
 .../qemu/files/qemu-8.1.0-skip-tests.patch | 64 ++
 .../qemu/{qemu-.ebuild => qemu-8.1.0.ebuild}   | 21 +++
 app-emulation/qemu/qemu-.ebuild| 19 +++
 5 files changed, 93 insertions(+), 23 deletions(-)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index e871a96f3f50..76f90e7c8da0 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -8,3 +8,5 @@ DIST qemu-8.0.0.tar.xz 127835148 BLAKE2B 
9b54aae10fe09691a26e68374723ded5fdda640
 DIST qemu-8.0.2.tar.xz 126707132 BLAKE2B 
f2b1a63e10c42aabfe39722c7732d0f04818ad367b769b3deb29c5bf9adcabc3aca1706f3c40fafeeb57ac1f7a61ded5066de32134c483e2fd27bc65b4b7d30a
 SHA512 
4e915d33a662bf55b09247fb85150be376c92270d3764e3d6470c452cb70cc558f54e84de5610dd60a9eb3ea02d5d4277b1ec75c9804967d278fa8361c7f9b9a
 DIST qemu-8.0.3.tar.xz 126710536 BLAKE2B 
071cc1a35209a02e8c5dd4f43cb112f110b4655adb0f870a04fdf9a6e2c761699574e8c9426f70f60787a99acf252d7a64d94a8e837cdfeda93d89428d7866f3
 SHA512 
18b2ccb65f7ec2ae92f0e04406539620c881e2b75f63816588c86043a07464bb99d16a83e792ed9508de393f4b694c46d52f4d07edf52741e85224c8b8d5d5c3
 DIST qemu-8.0.4.tar.xz 126179324 BLAKE2B 
dfb98964c629b251f0004b4630ae4500a52465579417d6f5c7dbbb1f672e10d8d7ffb98a4b00e26fb98b3c867208146dbdca026e4d30cbf1752ac733c4d9b915
 SHA512 
bd5ed682d51f974abd4be93f949701f9b5bfb87fd9929e31df130534da2f2c03b99adc9f924b3efd47d3b254e0e3c0046f4e69fbe9f6d0c4ac1f6babecb29449
+DIST qemu-8.1.0-docs.tar.xz 2129912 BLAKE2B 
8aaf7b748538afdb5bcb6da15dbd96572d086824377c4b0e93f1ddc695f9a4775471e360a9616d2d481dbf8113e91d2601c69d92cef565fb90b65ffacfdb304e
 SHA512 
905515742bb56a439fc8117ec48ea668e7b2bf0244587673e4352d9e8e49911eb84ff093596ff566e44787197cf9789ec8950e3d75fb7a670c5546394a322ac9
+DIST qemu-8.1.0.tar.xz 123550284 BLAKE2B 
b0fd87a19b13d4bbc6526caa46533073cb4dee6004df5d4fbbef204ee3bc8c2f10ec1eaff554adbb25c9f3143dd68abd09d4a0519c4766299a3ff261d03c73f2
 SHA512 
c5f5e7ce2d8e3c93a02012b136c866e8577df07da4705a0045916c71caeaa21fa1b2d59a4b22a660789a4159b192e12a443e7cbb0724ee85fea258251731724c

diff --git a/app-emulation/qemu/files/qemu-8.1.0-find-sphinx.patch 
b/app-emulation/qemu/files/qemu-8.1.0-find-sphinx.patch
new file mode 100644
index ..b6ef6214af55
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-8.1.0-find-sphinx.patch
@@ -0,0 +1,10 @@
+This gets confused by python-any-r1 and tries to find sphinx-build in ${T}.
+--- a/docs/meson.build
 b/docs/meson.build
+@@ -1,5 +1,4 @@
+-sphinx_build = find_program(fs.parent(python.full_path()) / 'sphinx-build',
+-required: get_option('docs'))
++sphinx_build = find_program('sphinx-build', required: get_option('docs'))
+ 
+ # Check if tools are available to build documentation.
+ build_docs = false

diff --git a/app-emulation/qemu/files/qemu-8.1.0-skip-tests.patch 
b/app-emulation/qemu/files/qemu-8.1.0-skip-tests.patch
new file mode 100644
index ..f668584e8d4b
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-8.1.0-skip-tests.patch
@@ -0,0 +1,64 @@
+* netdev-socket.c
+qtest-i386/netdev-socket fails with:
+```
+stderr:
+qemu-system-i386: -netdev 
dgram,id=st0,remote.type=inet,remote.host=230.0.0.1,remote.port=1234: can't add 
socket to multicast group 230.0.0.1: No such device
+Broken pipe
+../tests/qtest/libqtest.c:191: kill_qemu() tried to terminate QEMU process but 
encountered exit status 1 (expected 0)
+```
+
+* vhost-user-test.c
+qtest-x86_64/qos-test fails with a timeout:
+```
+qemu-system-x86_64: Failed to set msg fds.
+qemu-system-x86_64: vhost VQ 0 ring restore failed: -22: Invalid argument (22)
+qemu-system-x86_64: Failed to set msg fds.
+qemu-system-x86_64: vhost VQ 1 ring restore failed: -22: Invalid argument (22)
+**
+ERROR:../tests/qtest/vhost-user-test.c:892:wait_for_rings_started: assertion 
failed (ctpop64(s->rings) == count): (1 == 2)
+**
+ERROR:../tests/qtest/qos-test.c:191:subprocess_run_one_test: child process 
(/x86_64/pc/i440FX-pcihost/pci-bus-pc/pci-bus/virtio-net-pci/virtio-net/virtio-net-tests/vhost-user/reconnect/subprocess
 [6082]) failed unexpectedl
+```
+
+--- a/tests/qtest/netdev-socket.c
 b/tests/qtest/netdev-socket.c
+@@ -498,6 +498,10 @@ int main(int argc, char **argv)
+ socket_init();
+ g_test_init(, , NULL);
+ 
++/*

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu-guest-agent/

2023-08-13 Thread Joonas Niilola

commit: 21a30fbb9cb34c9241bbabaae9747d277f40006c
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Aug 13 07:41:48 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Aug 13 07:42:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21a30fbb

app-emulation/qemu-guest-agent: Stabilize 8.0.3 x86, #912207

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.3.ebuild 
b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.3.ebuild
index 4fab43ffa098..31007620573e 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.3.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz;
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 
 RDEPEND="dev-libs/glib"
 DEPEND="${RDEPEND}"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu-guest-agent/

2023-08-13 Thread Joonas Niilola

commit: e1845324ee6a2ce336a348cabc9f26fc53b15c76
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Aug 13 07:41:31 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Aug 13 07:42:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1845324

app-emulation/qemu-guest-agent: Stabilize 8.0.3 amd64, #912207

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.3.ebuild 
b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.3.ebuild
index c0c5794a73ac..4fab43ffa098 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.3.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz;
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="dev-libs/glib"
 DEPEND="${RDEPEND}"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-08-12 Thread Sam James

commit: 9c1c465c54cc1d8044c2af997c7f1736d17a23e1
Author: Sam James  gentoo  org>
AuthorDate: Sun Aug 13 01:08:49 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Aug 13 01:08:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c1c465c

app-emulation/qemu: add 8.0.4

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/Manifest  |   1 +
 app-emulation/qemu/qemu-8.0.4.ebuild | 970 +++
 2 files changed, 971 insertions(+)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 649c6fd810d4..e871a96f3f50 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -7,3 +7,4 @@ DIST qemu-8.0.0-docs.tar.xz 3218024 BLAKE2B 
b764a625024e78a39470048355471e12cfb5
 DIST qemu-8.0.0.tar.xz 127835148 BLAKE2B 
9b54aae10fe09691a26e68374723ded5fdda6409673b4de9461a25ee060cfd03968a16ddeadc21d48b9262e53aa6d4e5eb645376969f97c65807fad19607b04f
 SHA512 
1f31d1e653dec2d35f1b7a5468ee3f471553b48eca8c8afafffcf9243c6b2260e78a5b73da3fe567f9b85d4133573eebd397747b3aec501fb24076263eb07b27
 DIST qemu-8.0.2.tar.xz 126707132 BLAKE2B 
f2b1a63e10c42aabfe39722c7732d0f04818ad367b769b3deb29c5bf9adcabc3aca1706f3c40fafeeb57ac1f7a61ded5066de32134c483e2fd27bc65b4b7d30a
 SHA512 
4e915d33a662bf55b09247fb85150be376c92270d3764e3d6470c452cb70cc558f54e84de5610dd60a9eb3ea02d5d4277b1ec75c9804967d278fa8361c7f9b9a
 DIST qemu-8.0.3.tar.xz 126710536 BLAKE2B 
071cc1a35209a02e8c5dd4f43cb112f110b4655adb0f870a04fdf9a6e2c761699574e8c9426f70f60787a99acf252d7a64d94a8e837cdfeda93d89428d7866f3
 SHA512 
18b2ccb65f7ec2ae92f0e04406539620c881e2b75f63816588c86043a07464bb99d16a83e792ed9508de393f4b694c46d52f4d07edf52741e85224c8b8d5d5c3
+DIST qemu-8.0.4.tar.xz 126179324 BLAKE2B 
dfb98964c629b251f0004b4630ae4500a52465579417d6f5c7dbbb1f672e10d8d7ffb98a4b00e26fb98b3c867208146dbdca026e4d30cbf1752ac733c4d9b915
 SHA512 
bd5ed682d51f974abd4be93f949701f9b5bfb87fd9929e31df130534da2f2c03b99adc9f924b3efd47d3b254e0e3c0046f4e69fbe9f6d0c4ac1f6babecb29449

diff --git a/app-emulation/qemu/qemu-8.0.4.ebuild 
b/app-emulation/qemu/qemu-8.0.4.ebuild
new file mode 100644
index ..438e63f95e5b
--- /dev/null
+++ b/app-emulation/qemu/qemu-8.0.4.ebuild
@@ -0,0 +1,970 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
+QEMU_DOCS_PREBUILT_DEV=sam
+QEMU_DOCS_VERSION="8.0.0"
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# bug #830088
+QEMU_DOC_USEFLAG="+doc"
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="ncurses,readline"
+
+FIRMWARE_ABI_VERSION="7.2.0"
+
+inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
+   pax-utils xdg-utils
+
+if [[ ${PV} == ** ]]; then
+   QEMU_DOCS_PREBUILT=0
+
+   EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/;
+   EGIT_SUBMODULES=(
+   tests/fp/berkeley-softfloat-3
+   tests/fp/berkeley-testfloat-3
+   ui/keycodemapdb
+   )
+   inherit git-r3
+   SRC_URI=""
+else
+   MY_P="${PN}-${PV/_rc/-rc}"
+   SRC_URI="https://download.qemu.org/${MY_P}.tar.xz;
+
+   if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
+   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz
 )"
+   fi
+
+   S="${WORKDIR}/${MY_P}"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org;
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+
+[[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc"
+
+IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug 
${QEMU_DOC_USEFLAG}
+   +fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
+   jack jemalloc +jpeg
+   lzo multipath
+   ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs
+   plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
+   +slirp
+   smartcard snappy spice ssh static-user systemtap test udev usb
+   usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen
+   zstd"
+
+COMMON_TARGETS="
+   aarch64
+   alpha
+   arm
+   cris
+   hppa
+   i386
+   loongarch64
+   m68k
+   microblaze
+   microblazeel
+   mips
+   mips64
+   mips64el
+   mipsel
+   nios2
+   or1k
+   ppc
+   ppc64
+   riscv32
+   riscv64
+   s390x
+   sh4
+   sh4eb
+   sparc
+   sparc64
+   x86_64
+   xtensa
+   xtensaeb
+"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu-guest-agent/

2023-08-01 Thread Sam James

commit: dacdd43faeb28603ebc309270da07f16fb752d25
Author: Alexander Tsoy  tsoy  me>
AuthorDate: Wed Jul 26 22:18:22 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug  1 07:27:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dacdd43f

app-emulation/qemu-guest-agent: version bump to 8.0.3

Also pass --without-default-features to configure. As a result
-Dauto_features=disabled will be passed to meson.

Closes: https://bugs.gentoo.org/911268
Signed-off-by: Alexander Tsoy  tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/32060
Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu-guest-agent/Manifest|  1 +
 .../qemu-guest-agent/qemu-guest-agent-8.0.3.ebuild | 82 ++
 2 files changed, 83 insertions(+)

diff --git a/app-emulation/qemu-guest-agent/Manifest 
b/app-emulation/qemu-guest-agent/Manifest
index b4bf0c1f18c3..9dd0cb50cdb7 100644
--- a/app-emulation/qemu-guest-agent/Manifest
+++ b/app-emulation/qemu-guest-agent/Manifest
@@ -2,3 +2,4 @@ DIST qemu-6.0.0.tar.xz 107333232 BLAKE2B 
7746329d3e13782b7c346ce4052cc517cfc65cd
 DIST qemu-7.1.0.tar.xz 121833004 BLAKE2B 
e05f91ce4993c7591a2df08b5fb017f8b8ec2141ab7bfd55d14730ea6b793ac1091de539992058392a5522d4e58beee92a87752707be58e3619b8213ef9f35bf
 SHA512 
c60c5ff8ec99b7552e485768908920658fdd8035ff7a6fa370fb6881957dc8b7e5f18ff1a8f49bd6aa22909ede2a7c084986d8244f12074ccd33ebe40a0c411f
 DIST qemu-8.0.0.tar.xz 127835148 BLAKE2B 
9b54aae10fe09691a26e68374723ded5fdda6409673b4de9461a25ee060cfd03968a16ddeadc21d48b9262e53aa6d4e5eb645376969f97c65807fad19607b04f
 SHA512 
1f31d1e653dec2d35f1b7a5468ee3f471553b48eca8c8afafffcf9243c6b2260e78a5b73da3fe567f9b85d4133573eebd397747b3aec501fb24076263eb07b27
 DIST qemu-8.0.2.tar.xz 126707132 BLAKE2B 
f2b1a63e10c42aabfe39722c7732d0f04818ad367b769b3deb29c5bf9adcabc3aca1706f3c40fafeeb57ac1f7a61ded5066de32134c483e2fd27bc65b4b7d30a
 SHA512 
4e915d33a662bf55b09247fb85150be376c92270d3764e3d6470c452cb70cc558f54e84de5610dd60a9eb3ea02d5d4277b1ec75c9804967d278fa8361c7f9b9a
+DIST qemu-8.0.3.tar.xz 126710536 BLAKE2B 
071cc1a35209a02e8c5dd4f43cb112f110b4655adb0f870a04fdf9a6e2c761699574e8c9426f70f60787a99acf252d7a64d94a8e837cdfeda93d89428d7866f3
 SHA512 
18b2ccb65f7ec2ae92f0e04406539620c881e2b75f63816588c86043a07464bb99d16a83e792ed9508de393f4b694c46d52f4d07edf52741e85224c8b8d5d5c3

diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.3.ebuild 
b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.3.ebuild
new file mode 100644
index ..c0c5794a73ac
--- /dev/null
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit edo systemd toolchain-funcs python-any-r1 udev
+
+MY_PN="qemu"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
+HOMEPAGE="https://wiki.qemu.org/Features/GuestAgent;
+SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz;
+
+LICENSE="GPL-2 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="dev-libs/glib"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+   dev-lang/perl
+   dev-util/ninja"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+)
+
+src_configure() {
+   tc-export AR LD OBJCOPY RANLIB
+
+   local myconf=(
+   --prefix=/usr
+   --sysconfdir=/etc
+   --libdir="/usr/$(get_libdir)"
+   --localstatedir=/
+   --disable-bsd-user
+   --disable-linux-user
+   --disable-system
+   --disable-strip
+   --enable-tools
+   --disable-werror
+   --without-default-features
+   --enable-guest-agent
+   --python="${PYTHON}"
+   --cc="$(tc-getCC)"
+   --cxx="$(tc-getCXX)"
+   --host-cc="$(tc-getBUILD_CC)"
+   )
+
+   edo ./configure "${myconf[@]}"
+}
+
+src_install() {
+   dobin build/qga/qemu-ga
+
+   # Normal init stuff
+   newinitd "${FILESDIR}/qemu-ga.init-r1" qemu-guest-agent
+   newconfd "${FILESDIR}/qemu-ga.conf-r1" qemu-guest-agent
+
+   insinto /etc/logrotate.d
+   newins "${FILESDIR}/qemu-ga.logrotate" qemu-guest-agent
+
+   # systemd stuff
+   udev_newrules "${FILESDIR}/qemu-ga-systemd.udev" 
99-qemu-guest-agent.rules
+
+   systemd_newunit "${FILESDIR}/qemu-ga-systemd.service" \
+   qemu-guest-agent.service
+}
+
+pkg_postinst() {
+   elog "You should add 'qemu-guest-agent' to the default runlevel."
+   elog "e.g. rc-update add qemu-guest-agent default"
+   udev_reload
+}
+
+pkg_postrm() {
+   udev_reload
+}

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-07-18 Thread Arthur Zamarin

commit: d56eacc902c0346101d91ae6620694baceb42300
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Jul 18 17:55:22 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Jul 18 17:55:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d56eacc9

app-emulation/qemu: Stabilize 8.0.3 amd64, #910493

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-emulation/qemu/qemu-8.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/qemu/qemu-8.0.3.ebuild 
b/app-emulation/qemu/qemu-8.0.3.ebuild
index 438e63f95e5b..a24aa467c776 100644
--- a/app-emulation/qemu/qemu-8.0.3.ebuild
+++ b/app-emulation/qemu/qemu-8.0.3.ebuild
@@ -41,7 +41,7 @@ else
fi
 
S="${WORKDIR}/${MY_P}"
-   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-07-18 Thread Arthur Zamarin

commit: ca25ab71194adaf7623f3eaff349ebdf53bae6c8
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Jul 18 17:55:32 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Jul 18 17:55:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca25ab71

app-emulation/qemu: Stabilize 8.0.3 arm64, #910493

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-emulation/qemu/qemu-8.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/qemu/qemu-8.0.3.ebuild 
b/app-emulation/qemu/qemu-8.0.3.ebuild
index a24aa467c776..e0cb9e006fb6 100644
--- a/app-emulation/qemu/qemu-8.0.3.ebuild
+++ b/app-emulation/qemu/qemu-8.0.3.ebuild
@@ -41,7 +41,7 @@ else
fi
 
S="${WORKDIR}/${MY_P}"
-   [[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 
~riscv ~x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-07-18 Thread Arthur Zamarin

commit: dfc2699a4aa52a21040de52ba2babae5e745d5b5
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Jul 18 17:55:38 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Jul 18 17:55:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfc2699a

app-emulation/qemu: Stabilize 8.0.3 ppc64, #910493

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-emulation/qemu/qemu-8.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/qemu/qemu-8.0.3.ebuild 
b/app-emulation/qemu/qemu-8.0.3.ebuild
index fae1efc32775..96f174d6b422 100644
--- a/app-emulation/qemu/qemu-8.0.3.ebuild
+++ b/app-emulation/qemu/qemu-8.0.3.ebuild
@@ -41,7 +41,7 @@ else
fi
 
S="${WORKDIR}/${MY_P}"
-   [[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 
~riscv x86"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 
~riscv x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-07-18 Thread Arthur Zamarin

commit: c1ef8fee344b86757d47935e2035b9461b11a91e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Jul 18 17:55:35 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Jul 18 17:55:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1ef8fee

app-emulation/qemu: Stabilize 8.0.3 x86, #910493

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-emulation/qemu/qemu-8.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/qemu/qemu-8.0.3.ebuild 
b/app-emulation/qemu/qemu-8.0.3.ebuild
index e0cb9e006fb6..fae1efc32775 100644
--- a/app-emulation/qemu/qemu-8.0.3.ebuild
+++ b/app-emulation/qemu/qemu-8.0.3.ebuild
@@ -41,7 +41,7 @@ else
fi
 
S="${WORKDIR}/${MY_P}"
-   [[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 
~riscv ~x86"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 
~riscv x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-07-15 Thread David Seifert

commit: d3435536085ed0678934486c1eff1549794181fc
Author: David Seifert  gentoo  org>
AuthorDate: Sat Jul 15 07:39:25 2023 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jul 15 07:39:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3435536

Reverts: 9137676 (app-emulation/qemu: update sys-firmware/ipxe version 
specifier)

* qemu is too brittle wrt to firmware.

Signed-off-by: David Seifert  gentoo.org>

 app-emulation/qemu/qemu-7.2.0-r3.ebuild | 2 +-
 app-emulation/qemu/qemu-7.2.1.ebuild| 2 +-
 app-emulation/qemu/qemu-7.2.3-r1.ebuild | 2 +-
 app-emulation/qemu/qemu-7.2.3.ebuild| 2 +-
 app-emulation/qemu/qemu-7.2.4.ebuild| 2 +-
 app-emulation/qemu/qemu-8.0.0-r1.ebuild | 2 +-
 app-emulation/qemu/qemu-8.0.2-r2.ebuild | 2 +-
 app-emulation/qemu/qemu-8.0.2.ebuild| 2 +-
 app-emulation/qemu/qemu-8.0.3.ebuild| 2 +-
 app-emulation/qemu/qemu-.ebuild | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app-emulation/qemu/qemu-7.2.0-r3.ebuild 
b/app-emulation/qemu/qemu-7.2.0-r3.ebuild
index 436242121e30..74224d9d66ed 100644
--- a/app-emulation/qemu/qemu-7.2.0-r3.ebuild
+++ b/app-emulation/qemu/qemu-7.2.0-r3.ebuild
@@ -241,7 +241,7 @@ SEABIOS_VERSION="1.16.0"
 X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
-   ~sys-firmware/ipxe-1.21.1_p20230601[binary,qemu]
+   ~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
)

diff --git a/app-emulation/qemu/qemu-7.2.1.ebuild 
b/app-emulation/qemu/qemu-7.2.1.ebuild
index b8c4404750ca..2218435d4f6e 100644
--- a/app-emulation/qemu/qemu-7.2.1.ebuild
+++ b/app-emulation/qemu/qemu-7.2.1.ebuild
@@ -241,7 +241,7 @@ SEABIOS_VERSION="1.16.0"
 X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
-   ~sys-firmware/ipxe-1.21.1_p20230601[binary,qemu]
+   ~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
)

diff --git a/app-emulation/qemu/qemu-7.2.3-r1.ebuild 
b/app-emulation/qemu/qemu-7.2.3-r1.ebuild
index 3e0ee0899b3a..ff2370fb88dc 100644
--- a/app-emulation/qemu/qemu-7.2.3-r1.ebuild
+++ b/app-emulation/qemu/qemu-7.2.3-r1.ebuild
@@ -241,7 +241,7 @@ SEABIOS_VERSION="1.16.0"
 X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
-   ~sys-firmware/ipxe-1.21.1_p20230601[binary,qemu]
+   ~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
)

diff --git a/app-emulation/qemu/qemu-7.2.3.ebuild 
b/app-emulation/qemu/qemu-7.2.3.ebuild
index e70221138867..722591a56c29 100644
--- a/app-emulation/qemu/qemu-7.2.3.ebuild
+++ b/app-emulation/qemu/qemu-7.2.3.ebuild
@@ -241,7 +241,7 @@ SEABIOS_VERSION="1.16.0"
 X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
-   ~sys-firmware/ipxe-1.21.1_p20230601[binary,qemu]
+   ~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
)

diff --git a/app-emulation/qemu/qemu-7.2.4.ebuild 
b/app-emulation/qemu/qemu-7.2.4.ebuild
index b8c4404750ca..2218435d4f6e 100644
--- a/app-emulation/qemu/qemu-7.2.4.ebuild
+++ b/app-emulation/qemu/qemu-7.2.4.ebuild
@@ -241,7 +241,7 @@ SEABIOS_VERSION="1.16.0"
 X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
-   ~sys-firmware/ipxe-1.21.1_p20230601[binary,qemu]
+   ~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
)

diff --git a/app-emulation/qemu/qemu-8.0.0-r1.ebuild 
b/app-emulation/qemu/qemu-8.0.0-r1.ebuild
index 24cea5c2853a..3000130b6f90 100644
--- a/app-emulation/qemu/qemu-8.0.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-8.0.0-r1.ebuild
@@ -240,7 +240,7 @@ SEABIOS_VERSION="1.16.0"
 X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
-   ~sys-firmware/ipxe-1.21.1_p20230601[binary,qemu]
+   ~sys-firmware/ipxe-1.21.1[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
)

diff --git a/app-emulation/qemu/qemu-8.0.2-r2.ebuild 
b/app-emulation/qemu/qemu-8.0.2-r2.ebuild
index 658c447918e1..78edcdb58018 100644
--- a/app-emulation/qemu/qemu-8.0.2-r2.ebuild
+++

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-07-15 Thread David Seifert

commit: 913767629401ed6997091638a4aeb3a4a31d2399
Author: David Seifert  gentoo  org>
AuthorDate: Sat Jul 15 07:32:32 2023 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jul 15 07:32:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91376762

app-emulation/qemu: update sys-firmware/ipxe version specifier

Signed-off-by: David Seifert  gentoo.org>

 app-emulation/qemu/qemu-7.2.0-r3.ebuild | 2 +-
 app-emulation/qemu/qemu-7.2.1.ebuild| 2 +-
 app-emulation/qemu/qemu-7.2.3-r1.ebuild | 2 +-
 app-emulation/qemu/qemu-7.2.3.ebuild| 2 +-
 app-emulation/qemu/qemu-7.2.4.ebuild| 2 +-
 app-emulation/qemu/qemu-8.0.0-r1.ebuild | 2 +-
 app-emulation/qemu/qemu-8.0.2-r2.ebuild | 2 +-
 app-emulation/qemu/qemu-8.0.2.ebuild| 2 +-
 app-emulation/qemu/qemu-8.0.3.ebuild| 2 +-
 app-emulation/qemu/qemu-.ebuild | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app-emulation/qemu/qemu-7.2.0-r3.ebuild 
b/app-emulation/qemu/qemu-7.2.0-r3.ebuild
index 74224d9d66ed..436242121e30 100644
--- a/app-emulation/qemu/qemu-7.2.0-r3.ebuild
+++ b/app-emulation/qemu/qemu-7.2.0-r3.ebuild
@@ -241,7 +241,7 @@ SEABIOS_VERSION="1.16.0"
 X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
-   ~sys-firmware/ipxe-1.21.1[binary,qemu]
+   ~sys-firmware/ipxe-1.21.1_p20230601[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
)

diff --git a/app-emulation/qemu/qemu-7.2.1.ebuild 
b/app-emulation/qemu/qemu-7.2.1.ebuild
index 2218435d4f6e..b8c4404750ca 100644
--- a/app-emulation/qemu/qemu-7.2.1.ebuild
+++ b/app-emulation/qemu/qemu-7.2.1.ebuild
@@ -241,7 +241,7 @@ SEABIOS_VERSION="1.16.0"
 X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
-   ~sys-firmware/ipxe-1.21.1[binary,qemu]
+   ~sys-firmware/ipxe-1.21.1_p20230601[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
)

diff --git a/app-emulation/qemu/qemu-7.2.3-r1.ebuild 
b/app-emulation/qemu/qemu-7.2.3-r1.ebuild
index ff2370fb88dc..3e0ee0899b3a 100644
--- a/app-emulation/qemu/qemu-7.2.3-r1.ebuild
+++ b/app-emulation/qemu/qemu-7.2.3-r1.ebuild
@@ -241,7 +241,7 @@ SEABIOS_VERSION="1.16.0"
 X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
-   ~sys-firmware/ipxe-1.21.1[binary,qemu]
+   ~sys-firmware/ipxe-1.21.1_p20230601[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
)

diff --git a/app-emulation/qemu/qemu-7.2.3.ebuild 
b/app-emulation/qemu/qemu-7.2.3.ebuild
index 722591a56c29..e70221138867 100644
--- a/app-emulation/qemu/qemu-7.2.3.ebuild
+++ b/app-emulation/qemu/qemu-7.2.3.ebuild
@@ -241,7 +241,7 @@ SEABIOS_VERSION="1.16.0"
 X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
-   ~sys-firmware/ipxe-1.21.1[binary,qemu]
+   ~sys-firmware/ipxe-1.21.1_p20230601[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
)

diff --git a/app-emulation/qemu/qemu-7.2.4.ebuild 
b/app-emulation/qemu/qemu-7.2.4.ebuild
index 2218435d4f6e..b8c4404750ca 100644
--- a/app-emulation/qemu/qemu-7.2.4.ebuild
+++ b/app-emulation/qemu/qemu-7.2.4.ebuild
@@ -241,7 +241,7 @@ SEABIOS_VERSION="1.16.0"
 X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
-   ~sys-firmware/ipxe-1.21.1[binary,qemu]
+   ~sys-firmware/ipxe-1.21.1_p20230601[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
)

diff --git a/app-emulation/qemu/qemu-8.0.0-r1.ebuild 
b/app-emulation/qemu/qemu-8.0.0-r1.ebuild
index 3000130b6f90..24cea5c2853a 100644
--- a/app-emulation/qemu/qemu-8.0.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-8.0.0-r1.ebuild
@@ -240,7 +240,7 @@ SEABIOS_VERSION="1.16.0"
 X86_FIRMWARE_DEPEND="
pin-upstream-blobs? (
~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
-   ~sys-firmware/ipxe-1.21.1[binary,qemu]
+   ~sys-firmware/ipxe-1.21.1_p20230601[binary,qemu]
~sys-firmware/seabios-bin-${SEABIOS_VERSION}
~sys-firmware/sgabios-0.1_pre10[binary]
)

diff --git a/app-emulation/qemu/qemu-8.0.2-r2.ebuild 
b/app-emulation/qemu/qemu-8.0.2-r2.ebuild
index 78edcdb58018..658c447918e1 100644
--- a/app-emulation/qemu/qemu-8.0.2-r2.ebuild
+++ b/app-emulation/qemu/qemu-8.0.2-r2.ebuild
@@ -240,7 +240,7 @@

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-07-12 Thread Sam James

commit: a1a143b4ebfd09d8ecf085910305fbb6bb6d9b30
Author: Sam James  gentoo  org>
AuthorDate: Wed Jul 12 08:06:18 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul 12 08:45:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1a143b4

app-emulation/qemu: add 8.0.3

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/Manifest|  1 +
 .../qemu/{qemu-.ebuild => qemu-8.0.3.ebuild}   | 45 ++
 app-emulation/qemu/qemu-.ebuild| 21 ++
 3 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 0f44b6aa00db..b28ada6714a4 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -5,3 +5,4 @@ DIST qemu-7.2.3.tar.xz 122395692 BLAKE2B 
4e65cac7505a56da85c1d98dc6029d516dd4f07
 DIST qemu-8.0.0-docs.tar.xz 3218024 BLAKE2B 
b764a625024e78a39470048355471e12cfb57ab3c34e764dc4200fdf5c1aea635d26095ec961979bf46f177101c5bd38618bacf7e98e04bd64688ab5e29591aa
 SHA512 
d9dfe191372e105fe16fe8f66f41ed793ade4c89b5ab1d84b39459f3419a1ca61bd49422a83981965cc257c05eca7fd49054703f58f179f5c7b656e9473a1054
 DIST qemu-8.0.0.tar.xz 127835148 BLAKE2B 
9b54aae10fe09691a26e68374723ded5fdda6409673b4de9461a25ee060cfd03968a16ddeadc21d48b9262e53aa6d4e5eb645376969f97c65807fad19607b04f
 SHA512 
1f31d1e653dec2d35f1b7a5468ee3f471553b48eca8c8afafffcf9243c6b2260e78a5b73da3fe567f9b85d4133573eebd397747b3aec501fb24076263eb07b27
 DIST qemu-8.0.2.tar.xz 126707132 BLAKE2B 
f2b1a63e10c42aabfe39722c7732d0f04818ad367b769b3deb29c5bf9adcabc3aca1706f3c40fafeeb57ac1f7a61ded5066de32134c483e2fd27bc65b4b7d30a
 SHA512 
4e915d33a662bf55b09247fb85150be376c92270d3764e3d6470c452cb70cc558f54e84de5610dd60a9eb3ea02d5d4277b1ec75c9804967d278fa8361c7f9b9a
+DIST qemu-8.0.3.tar.xz 126710536 BLAKE2B 
071cc1a35209a02e8c5dd4f43cb112f110b4655adb0f870a04fdf9a6e2c761699574e8c9426f70f60787a99acf252d7a64d94a8e837cdfeda93d89428d7866f3
 SHA512 
18b2ccb65f7ec2ae92f0e04406539620c881e2b75f63816588c86043a07464bb99d16a83e792ed9508de393f4b694c46d52f4d07edf52741e85224c8b8d5d5c3

diff --git a/app-emulation/qemu/qemu-.ebuild 
b/app-emulation/qemu/qemu-8.0.3.ebuild
similarity index 97%
copy from app-emulation/qemu/qemu-.ebuild
copy to app-emulation/qemu/qemu-8.0.3.ebuild
index a1f76a8c5a77..438e63f95e5b 100644
--- a/app-emulation/qemu/qemu-.ebuild
+++ b/app-emulation/qemu/qemu-8.0.3.ebuild
@@ -6,14 +6,14 @@ EAPI=8
 # Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
 # Set to 1 if prebuilt, 0 if not
 # (the construct below is to allow overriding from env for script)
-QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-0}
+QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
 QEMU_DOCS_PREBUILT_DEV=sam
-QEMU_DOCS_VERSION=$(ver_cut 1-3)
+QEMU_DOCS_VERSION="8.0.0"
 # Default to generating docs (inc. man pages) if no prebuilt; overridden later
 # bug #830088
 QEMU_DOC_USEFLAG="+doc"
 
-PYTHON_COMPAT=( python3_{9,10,11,12} )
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="ncurses,readline"
 
 FIRMWARE_ABI_VERSION="7.2.0"
@@ -28,7 +28,7 @@ if [[ ${PV} == ** ]]; then
EGIT_SUBMODULES=(
tests/fp/berkeley-softfloat-3
tests/fp/berkeley-testfloat-3
-   subprojects/keycodemapdb
+   ui/keycodemapdb
)
inherit git-r3
SRC_URI=""
@@ -56,7 +56,7 @@ IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug 
${QEMU_DOC_USEFLAG}
+fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
jack jemalloc +jpeg
lzo multipath
-   ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs pipewire
+   ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs
plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
+slirp
smartcard snappy spice ssh static-user systemtap test udev usb
@@ -154,7 +154,8 @@ ALL_DEPEND="
sys-libs/zlib[static-libs(+)]
python? ( ${PYTHON_DEPS} )
systemtap? ( dev-util/systemtap )
-   xattr? ( sys-apps/attr[static-libs(+)] )"
+   xattr? ( sys-apps/attr[static-libs(+)] )
+"
 
 # Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
 # softmmu targets (qemu-system-*).
@@ -178,7 +179,10 @@ SOFTMMU_TOOLS_DEPEND="
dev-libs/nettle:=[static-libs(+)]
)
gtk? (
+   x11-libs/cairo
+   x11-libs/gdk-pixbuf:2
x11-libs/gtk+:3
+   x11-libs/libX11
vte? ( x11-libs/vte:2.91 )
)
infiniband? ( sys-cluster/rdma-core[static-libs(+)] )
@@ -203,7 +207,6 @@ SOFTMMU_TOOLS_DEPEND="
media-libs/mesa[egl(+),gbm(+)]
)
pam? ( sys-libs/pam )
-   pipewire? ( media-video/pipewire )
png? ( >=media-libs/libpng-1.6.34:=[static-libs(+)] )
pulseaudio? ( media-libs/libpulse )
rbd? ( sys-cluster/ceph )
@@

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-07-12 Thread Sam James

commit: 3344588229f2c54c2697d8b4d0ff429c21f2bfa6
Author: Sam James  gentoo  org>
AuthorDate: Wed Jul 12 08:45:34 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul 12 08:45:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33445882

app-emulation/qemu: add 7.2.4

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/Manifest  |   1 +
 app-emulation/qemu/qemu-7.2.4.ebuild | 972 +++
 2 files changed, 973 insertions(+)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index b28ada6714a4..649c6fd810d4 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -2,6 +2,7 @@ DIST qemu-7.2.0-docs.tar.xz 1984184 BLAKE2B 
103900fb7903ed8d75f7f012bf61fa2d6fce
 DIST qemu-7.2.0.tar.xz 122408576 BLAKE2B 
415ff621356c59f88b29cfe3ef5db1e282b26bbafbee3d535477c6125ccb060ec9762d9e3ab9f70ce5478804dca0a46a59bcf12c112a2462029a93e578e61530
 SHA512 
f3cfa00da739ba819a218d7e6e95c77fb79a8e0f487b024ddd281602e785249b81144595e3f8c746c32a4f5c4d1a88c6aebae3c162603edfbb50ae3722d7ed13
 DIST qemu-7.2.1.tar.xz 122400592 BLAKE2B 
bae1df5d332beaca313c4bac88f06dd5992988d7c1b6fdc6ced4043d858f437339cd7d0009ae667f9e66705117697bee7ee44ec4e911cc203d34eecc3d8f139b
 SHA512 
e286dc66c923a5df77eb02d69235d048e80a7cced638fae52fbed385b4c3cd736cfea66bb3c9843bebf0a33e81ea141fc015e0bd82108df304f148ce59d9ae8a
 DIST qemu-7.2.3.tar.xz 122395692 BLAKE2B 
4e65cac7505a56da85c1d98dc6029d516dd4f07f0211ea5213724d231d448d9b49cc91a3058a2a89908608078854d97da480e6f0bc7ce47d9555c2bb1177fbdc
 SHA512 
09523d456175da47d58d8d56fe9a95416ee3e6fd8aa7766383033396a1e5bd10f7758832f7f2b8662068ef94b21ab6a3a351c9158fb6bde0e1d7d5fb393bf6c7
+DIST qemu-7.2.4.tar.xz 121849100 BLAKE2B 
a9c5ffce9ff0fac4e2d1fa4be1a1dcee2f5d7f793ddf726871c5ae9a68c22f7ba03692a8a5096de3051030d3c2f34e46697d5af2d66c34984b8161ae3bb07b42
 SHA512 
fa765673833a1f2cbecdb9d47dc7dc29d7613be5a5c8fc63925ae70e1f5aafb4f9f02e45b212a329f17b689351b8a9cdf5f5235ab6adb71bb40e41868898d95b
 DIST qemu-8.0.0-docs.tar.xz 3218024 BLAKE2B 
b764a625024e78a39470048355471e12cfb57ab3c34e764dc4200fdf5c1aea635d26095ec961979bf46f177101c5bd38618bacf7e98e04bd64688ab5e29591aa
 SHA512 
d9dfe191372e105fe16fe8f66f41ed793ade4c89b5ab1d84b39459f3419a1ca61bd49422a83981965cc257c05eca7fd49054703f58f179f5c7b656e9473a1054
 DIST qemu-8.0.0.tar.xz 127835148 BLAKE2B 
9b54aae10fe09691a26e68374723ded5fdda6409673b4de9461a25ee060cfd03968a16ddeadc21d48b9262e53aa6d4e5eb645376969f97c65807fad19607b04f
 SHA512 
1f31d1e653dec2d35f1b7a5468ee3f471553b48eca8c8afafffcf9243c6b2260e78a5b73da3fe567f9b85d4133573eebd397747b3aec501fb24076263eb07b27
 DIST qemu-8.0.2.tar.xz 126707132 BLAKE2B 
f2b1a63e10c42aabfe39722c7732d0f04818ad367b769b3deb29c5bf9adcabc3aca1706f3c40fafeeb57ac1f7a61ded5066de32134c483e2fd27bc65b4b7d30a
 SHA512 
4e915d33a662bf55b09247fb85150be376c92270d3764e3d6470c452cb70cc558f54e84de5610dd60a9eb3ea02d5d4277b1ec75c9804967d278fa8361c7f9b9a

diff --git a/app-emulation/qemu/qemu-7.2.4.ebuild 
b/app-emulation/qemu/qemu-7.2.4.ebuild
new file mode 100644
index ..2218435d4f6e
--- /dev/null
+++ b/app-emulation/qemu/qemu-7.2.4.ebuild
@@ -0,0 +1,972 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
+QEMU_DOCS_PREBUILT_DEV=ajak
+QEMU_DOCS_VERSION="7.2.0"
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# bug #830088
+QEMU_DOC_USEFLAG="+doc"
+
+PYTHON_COMPAT=( python3_{9,10,11} )
+PYTHON_REQ_USE="ncurses,readline"
+
+FIRMWARE_ABI_VERSION="7.2.0"
+
+inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
+   pax-utils xdg-utils
+
+if [[ ${PV} == ** ]]; then
+   QEMU_DOCS_PREBUILT=0
+
+   EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/;
+   EGIT_SUBMODULES=(
+   tests/fp/berkeley-softfloat-3
+   tests/fp/berkeley-testfloat-3
+   ui/keycodemapdb
+   )
+   inherit git-r3
+   SRC_URI=""
+else
+   MY_P="${PN}-${PV/_rc/-rc}"
+   SRC_URI="https://download.qemu.org/${MY_P}.tar.xz;
+
+   if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
+   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz
 )"
+   fi
+
+   S="${WORKDIR}/${MY_P}"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org;
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+
+[[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc"
+
+IUSE="accessibility +aio

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/files/, app-emulation/qemu/

2023-07-02 Thread Sam James

commit: 229d28a525799ae2f65b1a2cd206b07189241026
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul  2 23:34:19 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul  2 23:34:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=229d28a5

app-emulation/qemu: use right CVE-2023-2861 patch for 8.0.2

Fixes: d2d08ad4d9a70136bf79818eb698e3cb7eead3b0
Bug: https://bugs.gentoo.org/909542
Signed-off-by: Sam James  gentoo.org>

 .../qemu/files/qemu-8.0.2-CVE-2023-2861.patch  | 23 +-
 .../{qemu-8.0.2-r1.ebuild => qemu-8.0.2-r2.ebuild} |  0
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app-emulation/qemu/files/qemu-8.0.2-CVE-2023-2861.patch 
b/app-emulation/qemu/files/qemu-8.0.2-CVE-2023-2861.patch
index 9a9c11a41d66..75fa534b4f1c 100644
--- a/app-emulation/qemu/files/qemu-8.0.2-CVE-2023-2861.patch
+++ b/app-emulation/qemu/files/qemu-8.0.2-CVE-2023-2861.patch
@@ -1,7 +1,7 @@
 https://bugs.gentoo.org/909542
-https://gitlab.com/qemu-project/qemu/-/commit/10fad73a2bf1c76c8aa9d6322755e5f877d83ce5
+https://gitlab.com/qemu-project/qemu/-/commit/b9d2887be4e616cdaeedd0b7456bfaa71ee798af
 
-From 10fad73a2bf1c76c8aa9d6322755e5f877d83ce5 Mon Sep 17 00:00:00 2001
+From b9d2887be4e616cdaeedd0b7456bfaa71ee798af Mon Sep 17 00:00:00 2001
 From: Christian Schoenebeck 
 Date: Wed, 7 Jun 2023 18:29:33 +0200
 Subject: [PATCH] 9pfs: prevent opening special files (CVE-2023-2861)
@@ -39,7 +39,6 @@ Reviewed-by: Michael Tokarev 
 Message-Id: 
 (cherry picked from commit f6b0de53fb87ddefed348a39284c8e2f28dc4eda)
 Signed-off-by: Michael Tokarev 
-(Mjt: drop adding qemu_fstat wrapper for 7.2 where wrappers aren't used)
 --- a/fsdev/virtfs-proxy-helper.c
 +++ b/fsdev/virtfs-proxy-helper.c
 @@ -26,6 +26,7 @@
@@ -108,7 +107,15 @@ Signed-off-by: Michael Tokarev 
  #ifdef O_PATH
  #define O_PATH_9P_UTIL O_PATH
  #else
-@@ -112,6 +114,38 @@ static inline void close_preserve_errno(int fd)
+@@ -95,6 +97,7 @@ static inline int errno_to_dotl(int err) {
+ #endif
+ 
+ #define qemu_openat openat
++#define qemu_fstat  fstat
+ #define qemu_fstatatfstatat
+ #define qemu_mkdiratmkdirat
+ #define qemu_renameat   renameat
+@@ -108,6 +111,38 @@ static inline void close_preserve_errno(int fd)
  errno = serrno;
  }
  
@@ -127,7 +134,7 @@ Signed-off-by: Michael Tokarev 
 +{
 +struct stat stbuf;
 +
-+if (fstat(fd, ) < 0) {
++if (qemu_fstat(fd, ) < 0) {
 +close_preserve_errno(fd);
 +return -1;
 +}
@@ -146,8 +153,8 @@ Signed-off-by: Michael Tokarev 
 +
  static inline int openat_dir(int dirfd, const char *name)
  {
- return openat(dirfd, name,
-@@ -146,6 +180,10 @@ again:
+ return qemu_openat(dirfd, name,
+@@ -142,6 +177,10 @@ again:
  return -1;
  }
  
@@ -158,5 +165,3 @@ Signed-off-by: Michael Tokarev 
  serrno = errno;
  /* O_NONBLOCK was only needed to open the file. Let's drop it. We don't
   * do that with O_PATH since fcntl(F_SETFL) isn't supported, and openat()
--- 
-GitLab

diff --git a/app-emulation/qemu/qemu-8.0.2-r1.ebuild 
b/app-emulation/qemu/qemu-8.0.2-r2.ebuild
similarity index 100%
rename from app-emulation/qemu/qemu-8.0.2-r1.ebuild
rename to app-emulation/qemu/qemu-8.0.2-r2.ebuild

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-07-02 Thread Sam James

commit: 5374625d0c8ed0491354725058eecd3dc587ee05
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul  2 23:01:50 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul  2 23:01:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5374625d

app-emulation/qemu: destabilize 7.2.3-r1 for ~amd64

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/qemu-7.2.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/qemu/qemu-7.2.3-r1.ebuild 
b/app-emulation/qemu/qemu-7.2.3-r1.ebuild
index 0d3fe65bb11f..ff2370fb88dc 100644
--- a/app-emulation/qemu/qemu-7.2.3-r1.ebuild
+++ b/app-emulation/qemu/qemu-7.2.3-r1.ebuild
@@ -41,7 +41,7 @@ else
fi
 
S="${WORKDIR}/${MY_P}"
-   [[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/files/, app-emulation/qemu/

2023-07-02 Thread Sam James

commit: d2d08ad4d9a70136bf79818eb698e3cb7eead3b0
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul  2 23:00:41 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul  2 23:00:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2d08ad4

app-emulation/qemu: fix CVE-2023-2861 for 8.0.2

Bug: https://bugs.gentoo.org/909542
Signed-off-by: Sam James  gentoo.org>

 .../qemu/files/qemu-8.0.2-CVE-2023-2861.patch  | 162 
 app-emulation/qemu/qemu-8.0.2-r1.ebuild| 964 +
 2 files changed, 1126 insertions(+)

diff --git a/app-emulation/qemu/files/qemu-8.0.2-CVE-2023-2861.patch 
b/app-emulation/qemu/files/qemu-8.0.2-CVE-2023-2861.patch
new file mode 100644
index ..9a9c11a41d66
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-8.0.2-CVE-2023-2861.patch
@@ -0,0 +1,162 @@
+https://bugs.gentoo.org/909542
+https://gitlab.com/qemu-project/qemu/-/commit/10fad73a2bf1c76c8aa9d6322755e5f877d83ce5
+
+From 10fad73a2bf1c76c8aa9d6322755e5f877d83ce5 Mon Sep 17 00:00:00 2001
+From: Christian Schoenebeck 
+Date: Wed, 7 Jun 2023 18:29:33 +0200
+Subject: [PATCH] 9pfs: prevent opening special files (CVE-2023-2861)
+
+The 9p protocol does not specifically define how server shall behave when
+client tries to open a special file, however from security POV it does
+make sense for 9p server to prohibit opening any special file on host side
+in general. A sane Linux 9p client for instance would never attempt to
+open a special file on host side, it would always handle those exclusively
+on its guest side. A malicious client however could potentially escape
+from the exported 9p tree by creating and opening a device file on host
+side.
+
+With QEMU this could only be exploited in the following unsafe setups:
+
+  - Running QEMU binary as root AND 9p 'local' fs driver AND 'passthrough'
+security model.
+
+or
+
+  - Using 9p 'proxy' fs driver (which is running its helper daemon as
+root).
+
+These setups were already discouraged for safety reasons before,
+however for obvious reasons we are now tightening behaviour on this.
+
+Fixes: CVE-2023-2861
+Reported-by: Yanwu Shen 
+Reported-by: Jietao Xiao 
+Reported-by: Jinku Li 
+Reported-by: Wenbo Shen 
+Signed-off-by: Christian Schoenebeck 
+Reviewed-by: Greg Kurz 
+Reviewed-by: Michael Tokarev 
+Message-Id: 
+(cherry picked from commit f6b0de53fb87ddefed348a39284c8e2f28dc4eda)
+Signed-off-by: Michael Tokarev 
+(Mjt: drop adding qemu_fstat wrapper for 7.2 where wrappers aren't used)
+--- a/fsdev/virtfs-proxy-helper.c
 b/fsdev/virtfs-proxy-helper.c
+@@ -26,6 +26,7 @@
+ #include "qemu/xattr.h"
+ #include "9p-iov-marshal.h"
+ #include "hw/9pfs/9p-proxy.h"
++#include "hw/9pfs/9p-util.h"
+ #include "fsdev/9p-iov-marshal.h"
+ 
+ #define PROGNAME "virtfs-proxy-helper"
+@@ -338,6 +339,28 @@ static void resetugid(int suid, int sgid)
+ }
+ }
+ 
++/*
++ * Open regular file or directory. Attempts to open any special file are
++ * rejected.
++ *
++ * returns file descriptor or -1 on error
++ */
++static int open_regular(const char *pathname, int flags, mode_t mode)
++{
++int fd;
++
++fd = open(pathname, flags, mode);
++if (fd < 0) {
++return fd;
++}
++
++if (close_if_special_file(fd) < 0) {
++return -1;
++}
++
++return fd;
++}
++
+ /*
+  * send response in two parts
+  * 1) ProxyHeader
+@@ -682,7 +705,7 @@ static int do_create(struct iovec *iovec)
+ if (ret < 0) {
+ goto unmarshal_err_out;
+ }
+-ret = open(path.data, flags, mode);
++ret = open_regular(path.data, flags, mode);
+ if (ret < 0) {
+ ret = -errno;
+ }
+@@ -707,7 +730,7 @@ static int do_open(struct iovec *iovec)
+ if (ret < 0) {
+ goto err_out;
+ }
+-ret = open(path.data, flags);
++ret = open_regular(path.data, flags, 0);
+ if (ret < 0) {
+ ret = -errno;
+ }
+--- a/hw/9pfs/9p-util.h
 b/hw/9pfs/9p-util.h
+@@ -13,6 +13,8 @@
+ #ifndef QEMU_9P_UTIL_H
+ #define QEMU_9P_UTIL_H
+ 
++#include "qemu/error-report.h"
++
+ #ifdef O_PATH
+ #define O_PATH_9P_UTIL O_PATH
+ #else
+@@ -112,6 +114,38 @@ static inline void close_preserve_errno(int fd)
+ errno = serrno;
+ }
+ 
++/**
++ * close_if_special_file() - Close @fd if neither regular file nor directory.
++ *
++ * @fd: file descriptor of open file
++ * Return: 0 on regular file or directory, -1 otherwise
++ *
++ * CVE-2023-2861: Prohibit opening any special file directly on host
++ * (especially device files), as a compromised client could potentially gain
++ * access outside exported tree under certain, unsafe setups. We expect
++ * client to handle I/O on special files exclusively on guest side.
++ */
++static inline int close_if_special_file(int fd)
++{
++struct stat stbuf;
++
++if (fstat(fd, ) < 0) {
++close_preserve_errno(fd);
++return -1;
++}
++if (!S_ISREG(stbuf.st_mode) && !S_ISDIR(stbuf.st_mode)) {
++error_report_once(
++

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/, app-emulation/qemu/files/

2023-07-02 Thread Sam James

commit: dde094e8f986b73ffdcb3f71226aac92e415408a
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul  2 22:58:04 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul  2 22:58:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dde094e8

app-emulation/qemu: fix CVE-2023-2861 for 7.2.3

Bug: https://bugs.gentoo.org/909542
Signed-off-by: Sam James  gentoo.org>

 .../qemu/files/qemu-7.2.3-CVE-2023-2861.patch  | 162 
 app-emulation/qemu/qemu-7.2.3-r1.ebuild| 973 +
 2 files changed, 1135 insertions(+)

diff --git a/app-emulation/qemu/files/qemu-7.2.3-CVE-2023-2861.patch 
b/app-emulation/qemu/files/qemu-7.2.3-CVE-2023-2861.patch
new file mode 100644
index ..9a9c11a41d66
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-7.2.3-CVE-2023-2861.patch
@@ -0,0 +1,162 @@
+https://bugs.gentoo.org/909542
+https://gitlab.com/qemu-project/qemu/-/commit/10fad73a2bf1c76c8aa9d6322755e5f877d83ce5
+
+From 10fad73a2bf1c76c8aa9d6322755e5f877d83ce5 Mon Sep 17 00:00:00 2001
+From: Christian Schoenebeck 
+Date: Wed, 7 Jun 2023 18:29:33 +0200
+Subject: [PATCH] 9pfs: prevent opening special files (CVE-2023-2861)
+
+The 9p protocol does not specifically define how server shall behave when
+client tries to open a special file, however from security POV it does
+make sense for 9p server to prohibit opening any special file on host side
+in general. A sane Linux 9p client for instance would never attempt to
+open a special file on host side, it would always handle those exclusively
+on its guest side. A malicious client however could potentially escape
+from the exported 9p tree by creating and opening a device file on host
+side.
+
+With QEMU this could only be exploited in the following unsafe setups:
+
+  - Running QEMU binary as root AND 9p 'local' fs driver AND 'passthrough'
+security model.
+
+or
+
+  - Using 9p 'proxy' fs driver (which is running its helper daemon as
+root).
+
+These setups were already discouraged for safety reasons before,
+however for obvious reasons we are now tightening behaviour on this.
+
+Fixes: CVE-2023-2861
+Reported-by: Yanwu Shen 
+Reported-by: Jietao Xiao 
+Reported-by: Jinku Li 
+Reported-by: Wenbo Shen 
+Signed-off-by: Christian Schoenebeck 
+Reviewed-by: Greg Kurz 
+Reviewed-by: Michael Tokarev 
+Message-Id: 
+(cherry picked from commit f6b0de53fb87ddefed348a39284c8e2f28dc4eda)
+Signed-off-by: Michael Tokarev 
+(Mjt: drop adding qemu_fstat wrapper for 7.2 where wrappers aren't used)
+--- a/fsdev/virtfs-proxy-helper.c
 b/fsdev/virtfs-proxy-helper.c
+@@ -26,6 +26,7 @@
+ #include "qemu/xattr.h"
+ #include "9p-iov-marshal.h"
+ #include "hw/9pfs/9p-proxy.h"
++#include "hw/9pfs/9p-util.h"
+ #include "fsdev/9p-iov-marshal.h"
+ 
+ #define PROGNAME "virtfs-proxy-helper"
+@@ -338,6 +339,28 @@ static void resetugid(int suid, int sgid)
+ }
+ }
+ 
++/*
++ * Open regular file or directory. Attempts to open any special file are
++ * rejected.
++ *
++ * returns file descriptor or -1 on error
++ */
++static int open_regular(const char *pathname, int flags, mode_t mode)
++{
++int fd;
++
++fd = open(pathname, flags, mode);
++if (fd < 0) {
++return fd;
++}
++
++if (close_if_special_file(fd) < 0) {
++return -1;
++}
++
++return fd;
++}
++
+ /*
+  * send response in two parts
+  * 1) ProxyHeader
+@@ -682,7 +705,7 @@ static int do_create(struct iovec *iovec)
+ if (ret < 0) {
+ goto unmarshal_err_out;
+ }
+-ret = open(path.data, flags, mode);
++ret = open_regular(path.data, flags, mode);
+ if (ret < 0) {
+ ret = -errno;
+ }
+@@ -707,7 +730,7 @@ static int do_open(struct iovec *iovec)
+ if (ret < 0) {
+ goto err_out;
+ }
+-ret = open(path.data, flags);
++ret = open_regular(path.data, flags, 0);
+ if (ret < 0) {
+ ret = -errno;
+ }
+--- a/hw/9pfs/9p-util.h
 b/hw/9pfs/9p-util.h
+@@ -13,6 +13,8 @@
+ #ifndef QEMU_9P_UTIL_H
+ #define QEMU_9P_UTIL_H
+ 
++#include "qemu/error-report.h"
++
+ #ifdef O_PATH
+ #define O_PATH_9P_UTIL O_PATH
+ #else
+@@ -112,6 +114,38 @@ static inline void close_preserve_errno(int fd)
+ errno = serrno;
+ }
+ 
++/**
++ * close_if_special_file() - Close @fd if neither regular file nor directory.
++ *
++ * @fd: file descriptor of open file
++ * Return: 0 on regular file or directory, -1 otherwise
++ *
++ * CVE-2023-2861: Prohibit opening any special file directly on host
++ * (especially device files), as a compromised client could potentially gain
++ * access outside exported tree under certain, unsafe setups. We expect
++ * client to handle I/O on special files exclusively on guest side.
++ */
++static inline int close_if_special_file(int fd)
++{
++struct stat stbuf;
++
++if (fstat(fd, ) < 0) {
++close_preserve_errno(fd);
++return -1;
++}
++if (!S_ISREG(stbuf.st_mode) && !S_ISDIR(stbuf.st_mode)) {
++error_report_once(
++

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-07-02 Thread Sam James

commit: f9a6dcfc01181f638ef4fc38e3fc0bc38ccf27fd
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul  2 22:41:38 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul  2 22:41:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9a6dcfc

app-emulation/qemu: Stabilize 7.2.3 amd64, #909541

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/qemu-7.2.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/qemu/qemu-7.2.3.ebuild 
b/app-emulation/qemu/qemu-7.2.3.ebuild
index 2218435d4f6e..722591a56c29 100644
--- a/app-emulation/qemu/qemu-7.2.3.ebuild
+++ b/app-emulation/qemu/qemu-7.2.3.ebuild
@@ -41,7 +41,7 @@ else
fi
 
S="${WORKDIR}/${MY_P}"
-   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu-guest-agent/

2023-06-17 Thread Matthias Maier

commit: c6fcd181c9f137a2787be8201cd56136bc91bbd8
Author: Matthias Maier  gentoo  org>
AuthorDate: Sun Jun 18 02:35:18 2023 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Sun Jun 18 03:00:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6fcd181

app-emulation/qemu-guest-agent: add 8.0.2

Signed-off-by: Matthias Maier  gentoo.org>

 app-emulation/qemu-guest-agent/Manifest|  1 +
 .../qemu-guest-agent/qemu-guest-agent-8.0.2.ebuild | 81 ++
 2 files changed, 82 insertions(+)

diff --git a/app-emulation/qemu-guest-agent/Manifest 
b/app-emulation/qemu-guest-agent/Manifest
index b33e329c0338..b4bf0c1f18c3 100644
--- a/app-emulation/qemu-guest-agent/Manifest
+++ b/app-emulation/qemu-guest-agent/Manifest
@@ -1,3 +1,4 @@
 DIST qemu-6.0.0.tar.xz 107333232 BLAKE2B 
7746329d3e13782b7c346ce4052cc517cfc65cd9b2d514d199e4d5b8570ca79566ec04b0c114db2e97c84e68eb551e0d4cdce1b14b91a88fe08d2a5f682c1418
 SHA512 
ee3ff00aebec4d8891d2ff6dabe4e667e510b2a4fe3f6190aa34673a91ea32dcd2db2e9bf94c2f1bf05aa79788f17cfbbedc6027c0988ea08a92587b79ee05e4
 DIST qemu-7.1.0.tar.xz 121833004 BLAKE2B 
e05f91ce4993c7591a2df08b5fb017f8b8ec2141ab7bfd55d14730ea6b793ac1091de539992058392a5522d4e58beee92a87752707be58e3619b8213ef9f35bf
 SHA512 
c60c5ff8ec99b7552e485768908920658fdd8035ff7a6fa370fb6881957dc8b7e5f18ff1a8f49bd6aa22909ede2a7c084986d8244f12074ccd33ebe40a0c411f
 DIST qemu-8.0.0.tar.xz 127835148 BLAKE2B 
9b54aae10fe09691a26e68374723ded5fdda6409673b4de9461a25ee060cfd03968a16ddeadc21d48b9262e53aa6d4e5eb645376969f97c65807fad19607b04f
 SHA512 
1f31d1e653dec2d35f1b7a5468ee3f471553b48eca8c8afafffcf9243c6b2260e78a5b73da3fe567f9b85d4133573eebd397747b3aec501fb24076263eb07b27
+DIST qemu-8.0.2.tar.xz 126707132 BLAKE2B 
f2b1a63e10c42aabfe39722c7732d0f04818ad367b769b3deb29c5bf9adcabc3aca1706f3c40fafeeb57ac1f7a61ded5066de32134c483e2fd27bc65b4b7d30a
 SHA512 
4e915d33a662bf55b09247fb85150be376c92270d3764e3d6470c452cb70cc558f54e84de5610dd60a9eb3ea02d5d4277b1ec75c9804967d278fa8361c7f9b9a

diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.2.ebuild 
b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.2.ebuild
new file mode 100644
index ..7fe0fb48886c
--- /dev/null
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit edo systemd toolchain-funcs python-any-r1 udev
+
+MY_PN="qemu"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
+HOMEPAGE="https://wiki.qemu.org/Features/GuestAgent;
+SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz;
+
+LICENSE="GPL-2 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="dev-libs/glib"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+   dev-lang/perl
+   dev-util/ninja"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+)
+
+src_configure() {
+   tc-export AR LD OBJCOPY RANLIB
+
+   local myconf=(
+   --prefix=/usr
+   --sysconfdir=/etc
+   --libdir="/usr/$(get_libdir)"
+   --localstatedir=/
+   --disable-bsd-user
+   --disable-linux-user
+   --disable-system
+   --disable-strip
+   --enable-tools
+   --disable-werror
+   --enable-guest-agent
+   --python="${PYTHON}"
+   --cc="$(tc-getCC)"
+   --cxx="$(tc-getCXX)"
+   --host-cc="$(tc-getBUILD_CC)"
+   )
+
+   edo ./configure "${myconf[@]}"
+}
+
+src_install() {
+   dobin build/qga/qemu-ga
+
+   # Normal init stuff
+   newinitd "${FILESDIR}/qemu-ga.init-r1" qemu-guest-agent
+   newconfd "${FILESDIR}/qemu-ga.conf-r1" qemu-guest-agent
+
+   insinto /etc/logrotate.d
+   newins "${FILESDIR}/qemu-ga.logrotate" qemu-guest-agent
+
+   # systemd stuff
+   udev_newrules "${FILESDIR}/qemu-ga-systemd.udev" 
99-qemu-guest-agent.rules
+
+   systemd_newunit "${FILESDIR}/qemu-ga-systemd.service" \
+   qemu-guest-agent.service
+}
+
+pkg_postinst() {
+   elog "You should add 'qemu-guest-agent' to the default runlevel."
+   elog "e.g. rc-update add qemu-guest-agent default"
+   udev_reload
+}
+
+pkg_postrm() {
+   udev_reload
+}

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-06-12 Thread Patrick McLean

commit: 427e581ba2a5c87f443da659aa05e982c4d65732
Author: Patrick McLean  gentoo  org>
AuthorDate: Mon Jun 12 21:54:24 2023 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Mon Jun 12 21:54:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=427e581b

app-emulation/qemu: add 7.2.3

Signed-off-by: Patrick McLean  gentoo.org>

 app-emulation/qemu/Manifest  |   1 +
 app-emulation/qemu/qemu-7.2.3.ebuild | 972 +++
 2 files changed, 973 insertions(+)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index ecf04b209cad..0f44b6aa00db 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1,6 +1,7 @@
 DIST qemu-7.2.0-docs.tar.xz 1984184 BLAKE2B 
103900fb7903ed8d75f7f012bf61fa2d6fce345b657c851d0437c3384f5735bd1cfd3129320683ea7846ea0b0940e5af5b2663c9320f12fee74b058523a8ea06
 SHA512 
a7edd448982865e07533c300d3e44a8b50cefbdde1982b73c24d0b2aa74315439252c59b634c75de312860874c7b06c75aa72629da681b5105f28ee936794585
 DIST qemu-7.2.0.tar.xz 122408576 BLAKE2B 
415ff621356c59f88b29cfe3ef5db1e282b26bbafbee3d535477c6125ccb060ec9762d9e3ab9f70ce5478804dca0a46a59bcf12c112a2462029a93e578e61530
 SHA512 
f3cfa00da739ba819a218d7e6e95c77fb79a8e0f487b024ddd281602e785249b81144595e3f8c746c32a4f5c4d1a88c6aebae3c162603edfbb50ae3722d7ed13
 DIST qemu-7.2.1.tar.xz 122400592 BLAKE2B 
bae1df5d332beaca313c4bac88f06dd5992988d7c1b6fdc6ced4043d858f437339cd7d0009ae667f9e66705117697bee7ee44ec4e911cc203d34eecc3d8f139b
 SHA512 
e286dc66c923a5df77eb02d69235d048e80a7cced638fae52fbed385b4c3cd736cfea66bb3c9843bebf0a33e81ea141fc015e0bd82108df304f148ce59d9ae8a
+DIST qemu-7.2.3.tar.xz 122395692 BLAKE2B 
4e65cac7505a56da85c1d98dc6029d516dd4f07f0211ea5213724d231d448d9b49cc91a3058a2a89908608078854d97da480e6f0bc7ce47d9555c2bb1177fbdc
 SHA512 
09523d456175da47d58d8d56fe9a95416ee3e6fd8aa7766383033396a1e5bd10f7758832f7f2b8662068ef94b21ab6a3a351c9158fb6bde0e1d7d5fb393bf6c7
 DIST qemu-8.0.0-docs.tar.xz 3218024 BLAKE2B 
b764a625024e78a39470048355471e12cfb57ab3c34e764dc4200fdf5c1aea635d26095ec961979bf46f177101c5bd38618bacf7e98e04bd64688ab5e29591aa
 SHA512 
d9dfe191372e105fe16fe8f66f41ed793ade4c89b5ab1d84b39459f3419a1ca61bd49422a83981965cc257c05eca7fd49054703f58f179f5c7b656e9473a1054
 DIST qemu-8.0.0.tar.xz 127835148 BLAKE2B 
9b54aae10fe09691a26e68374723ded5fdda6409673b4de9461a25ee060cfd03968a16ddeadc21d48b9262e53aa6d4e5eb645376969f97c65807fad19607b04f
 SHA512 
1f31d1e653dec2d35f1b7a5468ee3f471553b48eca8c8afafffcf9243c6b2260e78a5b73da3fe567f9b85d4133573eebd397747b3aec501fb24076263eb07b27
 DIST qemu-8.0.2.tar.xz 126707132 BLAKE2B 
f2b1a63e10c42aabfe39722c7732d0f04818ad367b769b3deb29c5bf9adcabc3aca1706f3c40fafeeb57ac1f7a61ded5066de32134c483e2fd27bc65b4b7d30a
 SHA512 
4e915d33a662bf55b09247fb85150be376c92270d3764e3d6470c452cb70cc558f54e84de5610dd60a9eb3ea02d5d4277b1ec75c9804967d278fa8361c7f9b9a

diff --git a/app-emulation/qemu/qemu-7.2.3.ebuild 
b/app-emulation/qemu/qemu-7.2.3.ebuild
new file mode 100644
index ..2218435d4f6e
--- /dev/null
+++ b/app-emulation/qemu/qemu-7.2.3.ebuild
@@ -0,0 +1,972 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
+QEMU_DOCS_PREBUILT_DEV=ajak
+QEMU_DOCS_VERSION="7.2.0"
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# bug #830088
+QEMU_DOC_USEFLAG="+doc"
+
+PYTHON_COMPAT=( python3_{9,10,11} )
+PYTHON_REQ_USE="ncurses,readline"
+
+FIRMWARE_ABI_VERSION="7.2.0"
+
+inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
+   pax-utils xdg-utils
+
+if [[ ${PV} == ** ]]; then
+   QEMU_DOCS_PREBUILT=0
+
+   EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/;
+   EGIT_SUBMODULES=(
+   tests/fp/berkeley-softfloat-3
+   tests/fp/berkeley-testfloat-3
+   ui/keycodemapdb
+   )
+   inherit git-r3
+   SRC_URI=""
+else
+   MY_P="${PN}-${PV/_rc/-rc}"
+   SRC_URI="https://download.qemu.org/${MY_P}.tar.xz;
+
+   if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
+   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz
 )"
+   fi
+
+   S="${WORKDIR}/${MY_P}"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org;
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+
+[[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc"
+
+IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug 
${QEMU_DOC_USEFLAG}
+

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-06-11 Thread Andreas Sturmlechner

commit: a1ce0b8eead88e6b729966b5d2c2240ef28625de
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jun 11 06:51:36 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jun 11 17:09:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1ce0b8e

app-emulation/qemu: drop 7.2.0, 7.2.0-r2

Drops last media-sound/pulseaudio revdep remnant ebuild in here.

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-emulation/qemu/qemu-7.2.0-r2.ebuild | 972 
 app-emulation/qemu/qemu-7.2.0.ebuild| 963 ---
 2 files changed, 1935 deletions(-)

diff --git a/app-emulation/qemu/qemu-7.2.0-r2.ebuild 
b/app-emulation/qemu/qemu-7.2.0-r2.ebuild
deleted file mode 100644
index c13da1572122..
--- a/app-emulation/qemu/qemu-7.2.0-r2.ebuild
+++ /dev/null
@@ -1,972 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
-QEMU_DOCS_PREBUILT_DEV=ajak
-QEMU_DOCS_VERSION="${PV}"
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-# bug #830088
-QEMU_DOC_USEFLAG="+doc"
-
-PYTHON_COMPAT=( python3_{9,10,11} )
-PYTHON_REQ_USE="ncurses,readline"
-
-FIRMWARE_ABI_VERSION="7.2.0"
-
-inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
-   pax-utils xdg-utils
-
-if [[ ${PV} == ** ]]; then
-   QEMU_DOCS_PREBUILT=0
-
-   EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/;
-   EGIT_SUBMODULES=(
-   tests/fp/berkeley-softfloat-3
-   tests/fp/berkeley-testfloat-3
-   ui/keycodemapdb
-   )
-   inherit git-r3
-   SRC_URI=""
-else
-   MY_P="${PN}-${PV/_rc/-rc}"
-   SRC_URI="https://download.qemu.org/${MY_P}.tar.xz;
-
-   if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
-   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz
 )"
-   fi
-
-   S="${WORKDIR}/${MY_P}"
-   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org;
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-
-[[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc"
-
-IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug 
${QEMU_DOC_USEFLAG}
-   +fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
-   jack jemalloc +jpeg
-   lzo multipath
-   ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs
-   plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
-   +slirp
-   smartcard snappy spice ssh static static-user systemtap test udev usb
-   usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen
-   zstd"
-
-COMMON_TARGETS="
-   aarch64
-   alpha
-   arm
-   cris
-   hppa
-   i386
-   loongarch64
-   m68k
-   microblaze
-   microblazeel
-   mips
-   mips64
-   mips64el
-   mipsel
-   nios2
-   or1k
-   ppc
-   ppc64
-   riscv32
-   riscv64
-   s390x
-   sh4
-   sh4eb
-   sparc
-   sparc64
-   x86_64
-   xtensa
-   xtensaeb
-"
-IUSE_SOFTMMU_TARGETS="
-   ${COMMON_TARGETS}
-   avr
-   rx
-   tricore
-"
-IUSE_USER_TARGETS="
-   ${COMMON_TARGETS}
-   aarch64_be
-   armeb
-   hexagon
-   mipsn32
-   mipsn32el
-   ppc64le
-   sparc32plus
-"
-
-use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' 
${IUSE_SOFTMMU_TARGETS})
-use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
-IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
-
-RESTRICT="!test? ( test )"
-
-# Allow no targets to be built so that people can get a tools-only build.
-# Block USE flag configurations known to not work.
-REQUIRED_USE="
-   ${PYTHON_REQUIRED_USE}
-   qemu_softmmu_targets_arm? ( fdt )
-   qemu_softmmu_targets_microblaze? ( fdt )
-   qemu_softmmu_targets_mips64el? ( fdt )
-   qemu_softmmu_targets_ppc64? ( fdt )
-   qemu_softmmu_targets_ppc? ( fdt )
-   qemu_softmmu_targets_riscv32? ( fdt )
-   qemu_softmmu_targets_riscv64? ( fdt )
-   qemu_softmmu_targets_x86_64? ( fdt )
-   sdl-image? ( sdl )
-   static? ( static-user !alsa !gtk !jack !opengl !pam !pulseaudio 
!plugins !rbd !snappy !udev )
-   static-user? ( !plugins )
-   virgl? ( opengl )
-   virtfs? ( xattr )
-   vnc? ( gnutls )
-   vte? ( gtk )
-   multipath? ( udev )
-   plugins? ( !static !static-user

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-06-05 Thread Sam James

commit: da051d72cb91e5f80d619c97da17a524ca84b8e0
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun  6 02:46:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun  6 02:54:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da051d72

app-emulation/qemu: tweak REQUIRED_USE to not require seccomp on macOS

Doesn't exist there.

Reported-by: Konstantin Kliakhandler
Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/qemu-8.0.2.ebuild | 2 +-
 app-emulation/qemu/qemu-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/qemu/qemu-8.0.2.ebuild 
b/app-emulation/qemu/qemu-8.0.2.ebuild
index ee863ac4f621..11af4686f95b 100644
--- a/app-emulation/qemu/qemu-8.0.2.ebuild
+++ b/app-emulation/qemu/qemu-8.0.2.ebuild
@@ -138,7 +138,7 @@ REQUIRED_USE="
plugins? ( !static-user )
 "
 for smname in ${IUSE_SOFTMMU_TARGETS} ; do
-   REQUIRED_USE+=" qemu_softmmu_targets_${smname}? ( seccomp ) "
+   REQUIRED_USE+=" qemu_softmmu_targets_${smname}? ( kernel_linux? ( 
seccomp ) )"
 done
 
 # Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)

diff --git a/app-emulation/qemu/qemu-.ebuild 
b/app-emulation/qemu/qemu-.ebuild
index 59436ebd0802..a1f76a8c5a77 100644
--- a/app-emulation/qemu/qemu-.ebuild
+++ b/app-emulation/qemu/qemu-.ebuild
@@ -138,7 +138,7 @@ REQUIRED_USE="
plugins? ( !static-user )
 "
 for smname in ${IUSE_SOFTMMU_TARGETS} ; do
-   REQUIRED_USE+=" qemu_softmmu_targets_${smname}? ( seccomp ) "
+   REQUIRED_USE+=" qemu_softmmu_targets_${smname}? ( kernel_linux? ( 
seccomp ) )"
 done
 
 # Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-06-05 Thread Sam James

commit: 6a3f028e55c22fdf9601c2e2ef6a75e2456fbc6e
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun  6 01:48:06 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun  6 01:49:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a3f028e

app-emulation/qemu: only depend on libcap-ng on linux

Reported by shwouchk in #gentoo-prefix. QEMU can work on macOS but libcap-ng
doesn't make sense there.

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/qemu-8.0.2.ebuild | 2 +-
 app-emulation/qemu/qemu-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/qemu/qemu-8.0.2.ebuild 
b/app-emulation/qemu/qemu-8.0.2.ebuild
index 3000130b6f90..ee863ac4f621 100644
--- a/app-emulation/qemu/qemu-8.0.2.ebuild
+++ b/app-emulation/qemu/qemu-8.0.2.ebuild
@@ -159,7 +159,6 @@ ALL_DEPEND="
 # Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
 # softmmu targets (qemu-system-*).
 SOFTMMU_TOOLS_DEPEND="
-   sys-libs/libcap-ng[static-libs(+)]
>=x11-libs/pixman-0.28.0[static-libs(+)]
accessibility? (
app-accessibility/brltty[api]
@@ -191,6 +190,7 @@ SOFTMMU_TOOLS_DEPEND="
jack? ( virtual/jack )
jemalloc? ( dev-libs/jemalloc )
jpeg? ( media-libs/libjpeg-turbo:=[static-libs(+)] )
+   kernel_linux? ( sys-libs/libcap-ng[static-libs(+)] )
lzo? ( dev-libs/lzo:2[static-libs(+)] )
multipath? ( sys-fs/multipath-tools )
ncurses? (

diff --git a/app-emulation/qemu/qemu-.ebuild 
b/app-emulation/qemu/qemu-.ebuild
index 507154de3161..59436ebd0802 100644
--- a/app-emulation/qemu/qemu-.ebuild
+++ b/app-emulation/qemu/qemu-.ebuild
@@ -159,7 +159,6 @@ ALL_DEPEND="
 # Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
 # softmmu targets (qemu-system-*).
 SOFTMMU_TOOLS_DEPEND="
-   sys-libs/libcap-ng[static-libs(+)]
>=x11-libs/pixman-0.28.0[static-libs(+)]
accessibility? (
app-accessibility/brltty[api]
@@ -188,6 +187,7 @@ SOFTMMU_TOOLS_DEPEND="
jack? ( virtual/jack )
jemalloc? ( dev-libs/jemalloc )
jpeg? ( media-libs/libjpeg-turbo:=[static-libs(+)] )
+   kernel_linux? ( sys-libs/libcap-ng[static-libs(+)] )
lzo? ( dev-libs/lzo:2[static-libs(+)] )
multipath? ( sys-fs/multipath-tools )
ncurses? (

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-06-03 Thread Sam James

commit: 27b1e2d7ca67da5e21653f7c0876180ffc4faade
Author: Michal Privoznik  gmail  com>
AuthorDate: Tue May 30 08:52:00 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun  4 01:05:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27b1e2d7

app-emulation/qemu: update live ebuild

Couple of things:

1) Upstream removed checking of $make (commit
   v8.0.0-1332-gb17bbf835c) , rendering our qemu-8.0.0-make.patch
   useless. Just stop applying it.

2) Subprojects are moved under subprojects/ gradually
   (v8.0.0-1330-g58e48b2e72 for dtc, v8.0.0-1331-gc53648abba for
   keycodemapdb). Update corresponding paths in the ebuild.

3) QEMU gained native pipewire support (v8.0.0-403-gc2d3d1c294).

Signed-off-by: Michal Privoznik  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31225
Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/metadata.xml |  1 +
 app-emulation/qemu/qemu-.ebuild | 11 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml
index 55860ffa1847..93729e025ff6 100644
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@@ -35,6 +35,7 @@
Pin the versions of BIOS 
firmware to the version included in the upstream release.
This is needed to sanely support 
migration/suspend/resume/snapshotting/etc... of instances.
When the blobs are different, random 
corruption/bugs/crashes/etc... may be observed.
+   Enable pipewire output for sound 
emulation
Enable qemu plugin API via shared library 
loading.
Enable pulseaudio output for sound 
emulation
Enable rados block device backend support, see 
https://docs.ceph.com/en/mimic/rbd/qemu-rbd/

diff --git a/app-emulation/qemu/qemu-.ebuild 
b/app-emulation/qemu/qemu-.ebuild
index 39ab489f9ca0..507154de3161 100644
--- a/app-emulation/qemu/qemu-.ebuild
+++ b/app-emulation/qemu/qemu-.ebuild
@@ -13,7 +13,7 @@ QEMU_DOCS_VERSION=$(ver_cut 1-3)
 # bug #830088
 QEMU_DOC_USEFLAG="+doc"
 
-PYTHON_COMPAT=( python3_{9,10,11} )
+PYTHON_COMPAT=( python3_{9,10,11,12} )
 PYTHON_REQ_USE="ncurses,readline"
 
 FIRMWARE_ABI_VERSION="7.2.0"
@@ -28,7 +28,7 @@ if [[ ${PV} == ** ]]; then
EGIT_SUBMODULES=(
tests/fp/berkeley-softfloat-3
tests/fp/berkeley-testfloat-3
-   ui/keycodemapdb
+   subprojects/keycodemapdb
)
inherit git-r3
SRC_URI=""
@@ -56,7 +56,7 @@ IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug 
${QEMU_DOC_USEFLAG}
+fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
jack jemalloc +jpeg
lzo multipath
-   ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs
+   ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs pipewire
plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
+slirp
smartcard snappy spice ssh static-user systemtap test udev usb
@@ -203,6 +203,7 @@ SOFTMMU_TOOLS_DEPEND="
media-libs/mesa[egl(+),gbm(+)]
)
pam? ( sys-libs/pam )
+   pipewire? ( media-video/pipewire )
png? ( >=media-libs/libpng-1.6.34:=[static-libs(+)] )
pulseaudio? ( media-libs/libpulse )
rbd? ( sys-cluster/ceph )
@@ -301,7 +302,6 @@ RDEPEND="${CDEPEND}
 
 PATCHES=(
"${FILESDIR}"/${PN}-8.0.0-disable-keymap.patch
-   "${FILESDIR}"/${PN}-8.0.0-make.patch
"${FILESDIR}"/${PN}-7.1.0-capstone-include-path.patch
"${FILESDIR}"/${PN}-8.1.0-also-build-virtfs-proxy-helper.patch
 )
@@ -449,7 +449,7 @@ src_prepare() {
sed -i -e 's/-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2//' configure || die
 
# Remove bundled modules
-   rm -r dtc roms/*/ || die
+   rm -r subprojects/dtc roms/*/ || die
 }
 
 ##
@@ -504,6 +504,7 @@ qemu_src_configure() {
$(use_enable jack)
$(use_enable nls gettext)
$(use_enable oss)
+   $(use_enable pipewire)
$(use_enable plugins)
$(use_enable pulseaudio pa)
$(use_enable selinux)

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-06-03 Thread Sam James

commit: 9bdd3ce95b8131c069bc4921d7cfdd75eea92f35
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun  3 06:06:41 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun  3 06:06:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bdd3ce9

app-emulation/qemu: add 8.0.2

Fixes CVE-2023-0330.

Bug: https://bugs.gentoo.org/905342
Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/Manifest  |   1 +
 app-emulation/qemu/qemu-8.0.2.ebuild | 963 +++
 2 files changed, 964 insertions(+)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 2fae7fda437d..ecf04b209cad 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -3,3 +3,4 @@ DIST qemu-7.2.0.tar.xz 122408576 BLAKE2B 
415ff621356c59f88b29cfe3ef5db1e282b26bb
 DIST qemu-7.2.1.tar.xz 122400592 BLAKE2B 
bae1df5d332beaca313c4bac88f06dd5992988d7c1b6fdc6ced4043d858f437339cd7d0009ae667f9e66705117697bee7ee44ec4e911cc203d34eecc3d8f139b
 SHA512 
e286dc66c923a5df77eb02d69235d048e80a7cced638fae52fbed385b4c3cd736cfea66bb3c9843bebf0a33e81ea141fc015e0bd82108df304f148ce59d9ae8a
 DIST qemu-8.0.0-docs.tar.xz 3218024 BLAKE2B 
b764a625024e78a39470048355471e12cfb57ab3c34e764dc4200fdf5c1aea635d26095ec961979bf46f177101c5bd38618bacf7e98e04bd64688ab5e29591aa
 SHA512 
d9dfe191372e105fe16fe8f66f41ed793ade4c89b5ab1d84b39459f3419a1ca61bd49422a83981965cc257c05eca7fd49054703f58f179f5c7b656e9473a1054
 DIST qemu-8.0.0.tar.xz 127835148 BLAKE2B 
9b54aae10fe09691a26e68374723ded5fdda6409673b4de9461a25ee060cfd03968a16ddeadc21d48b9262e53aa6d4e5eb645376969f97c65807fad19607b04f
 SHA512 
1f31d1e653dec2d35f1b7a5468ee3f471553b48eca8c8afafffcf9243c6b2260e78a5b73da3fe567f9b85d4133573eebd397747b3aec501fb24076263eb07b27
+DIST qemu-8.0.2.tar.xz 126707132 BLAKE2B 
f2b1a63e10c42aabfe39722c7732d0f04818ad367b769b3deb29c5bf9adcabc3aca1706f3c40fafeeb57ac1f7a61ded5066de32134c483e2fd27bc65b4b7d30a
 SHA512 
4e915d33a662bf55b09247fb85150be376c92270d3764e3d6470c452cb70cc558f54e84de5610dd60a9eb3ea02d5d4277b1ec75c9804967d278fa8361c7f9b9a

diff --git a/app-emulation/qemu/qemu-8.0.2.ebuild 
b/app-emulation/qemu/qemu-8.0.2.ebuild
new file mode 100644
index ..3000130b6f90
--- /dev/null
+++ b/app-emulation/qemu/qemu-8.0.2.ebuild
@@ -0,0 +1,963 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
+QEMU_DOCS_PREBUILT_DEV=sam
+QEMU_DOCS_VERSION="8.0.0"
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# bug #830088
+QEMU_DOC_USEFLAG="+doc"
+
+PYTHON_COMPAT=( python3_{9,10,11} )
+PYTHON_REQ_USE="ncurses,readline"
+
+FIRMWARE_ABI_VERSION="7.2.0"
+
+inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
+   pax-utils xdg-utils
+
+if [[ ${PV} == ** ]]; then
+   QEMU_DOCS_PREBUILT=0
+
+   EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/;
+   EGIT_SUBMODULES=(
+   tests/fp/berkeley-softfloat-3
+   tests/fp/berkeley-testfloat-3
+   ui/keycodemapdb
+   )
+   inherit git-r3
+   SRC_URI=""
+else
+   MY_P="${PN}-${PV/_rc/-rc}"
+   SRC_URI="https://download.qemu.org/${MY_P}.tar.xz;
+
+   if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
+   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz
 )"
+   fi
+
+   S="${WORKDIR}/${MY_P}"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org;
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+
+[[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc"
+
+IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug 
${QEMU_DOC_USEFLAG}
+   +fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
+   jack jemalloc +jpeg
+   lzo multipath
+   ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs
+   plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
+   +slirp
+   smartcard snappy spice ssh static-user systemtap test udev usb
+   usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen
+   zstd"
+
+COMMON_TARGETS="
+   aarch64
+   alpha
+   arm
+   cris
+   hppa
+   i386
+   loongarch64
+   m68k
+   microblaze
+   microblazeel
+   mips
+   mips64
+   mips64el
+   mipsel
+   nios2
+   or1k
+   ppc
+   ppc64
+   riscv32
+   riscv64
+   s390x
+   sh4
+   sh4eb
+   sparc
+   sparc64
+

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-06-02 Thread Sam James

commit: 39504a093c9d78e92bbe6c3df4b7beaa22805f08
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun  3 05:49:20 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun  3 05:49:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39504a09

app-emulation/qemu: Stabilize 7.2.0-r3 amd64, #905866

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/qemu-7.2.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/qemu/qemu-7.2.0-r3.ebuild 
b/app-emulation/qemu/qemu-7.2.0-r3.ebuild
index c7c0a1525b2b..fc7b591339aa 100644
--- a/app-emulation/qemu/qemu-7.2.0-r3.ebuild
+++ b/app-emulation/qemu/qemu-7.2.0-r3.ebuild
@@ -41,7 +41,7 @@ else
fi
 
S="${WORKDIR}/${MY_P}"
-   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
ppc64 ~riscv x86"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 
~riscv x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-06-02 Thread Sam James

commit: d67c4feb2152db6254f129a4f2b97dc61e0b42cd
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun  3 05:49:23 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun  3 05:49:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d67c4feb

app-emulation/qemu: Stabilize 7.2.0-r3 arm64, #905866

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/qemu-7.2.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/qemu/qemu-7.2.0-r3.ebuild 
b/app-emulation/qemu/qemu-7.2.0-r3.ebuild
index fc7b591339aa..74224d9d66ed 100644
--- a/app-emulation/qemu/qemu-7.2.0-r3.ebuild
+++ b/app-emulation/qemu/qemu-7.2.0-r3.ebuild
@@ -41,7 +41,7 @@ else
fi
 
S="${WORKDIR}/${MY_P}"
-   [[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 
~riscv x86"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 
~riscv x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-05-18 Thread Matthias Maier

commit: 400c439321719b5c0329648922b4c6cd85a9
Author: Matthias Maier  gentoo  org>
AuthorDate: Thu May 18 21:24:51 2023 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Thu May 18 21:25:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=400c4393

app-emulation/qemu: update live ebuild

Signed-off-by: Matthias Maier  gentoo.org>

 app-emulation/qemu/qemu-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/qemu/qemu-.ebuild 
b/app-emulation/qemu/qemu-.ebuild
index 1446d5189be7..39ab489f9ca0 100644
--- a/app-emulation/qemu/qemu-.ebuild
+++ b/app-emulation/qemu/qemu-.ebuild
@@ -833,7 +833,7 @@ src_install() {
doins "${FILESDIR}/bridge.conf"
 
cd "${S}" || die
-   dodoc MAINTAINERS docs/specs/pci-ids.txt
+   dodoc MAINTAINERS
newdoc pc-bios/README README.pc-bios
 
# Disallow stripping of prebuilt firmware files.

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/files/, app-emulation/qemu/

2023-05-18 Thread Matthias Maier

commit: 25a4aeed4827c51fb13b41315a9d52c9b4b9de41
Author: Matthias Maier  gentoo  org>
AuthorDate: Thu May 18 21:03:43 2023 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Thu May 18 21:07:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25a4aeed

app-emulation/qemu: update live ebuild

Thanks to Paolo Bonzini for the update regarding
qemu-8.0.0-remove-python-meson-check.patch

Signed-off-by: Matthias Maier  gentoo.org>

 ...qemu-8.1.0-also-build-virtfs-proxy-helper.patch | 32 ++
 app-emulation/qemu/qemu-.ebuild|  5 ++--
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git 
a/app-emulation/qemu/files/qemu-8.1.0-also-build-virtfs-proxy-helper.patch 
b/app-emulation/qemu/files/qemu-8.1.0-also-build-virtfs-proxy-helper.patch
new file mode 100644
index ..61ea0f36d90a
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-8.1.0-also-build-virtfs-proxy-helper.patch
@@ -0,0 +1,32 @@
+From d02ea89239768c93651a161d057f2bf04d56a024 Mon Sep 17 00:00:00 2001
+From: Matthias Maier 
+Date: Mon, 4 Apr 2022 12:56:59 +0200
+Subject: [PATCH] also build virtfs-proxy-helper
+
+The Gentoo ebuild splits the qemu build into a softmmu, user and tool
+phase in order to be able to build and link some of the qemu emulators
+statically. This unfortunately has the consequence that we never
+configure with "have_virtfs" and "have_tools" at the same time.
+
+As a workaround, simply build the virtfs userland unconditionally. After
+all, it is a tiny executable
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 063c736aee..fda8639293 100644
+--- a/meson.build
 b/meson.build
+@@ -2008,8 +2008,6 @@ have_virtfs = get_option('virtfs') \
+ .allowed()
+ 
+ have_virtfs_proxy_helper = get_option('virtfs_proxy_helper') \
+-.require(targetos != 'darwin', error_message: 'the virtfs proxy helper is 
incompatible with macOS') \
+-.require(have_virtfs, error_message: 'the virtfs proxy helper requires 
that virtfs is enabled') \
+ .disable_auto_if(not have_tools) \
+ .require(libcap_ng.found(), error_message: 'the virtfs proxy helper 
requires libcap-ng') \
+ .allowed()
+-- 
+2.35.1
+

diff --git a/app-emulation/qemu/qemu-.ebuild 
b/app-emulation/qemu/qemu-.ebuild
index 3129dc21e59e..1446d5189be7 100644
--- a/app-emulation/qemu/qemu-.ebuild
+++ b/app-emulation/qemu/qemu-.ebuild
@@ -302,9 +302,8 @@ RDEPEND="${CDEPEND}
 PATCHES=(
"${FILESDIR}"/${PN}-8.0.0-disable-keymap.patch
"${FILESDIR}"/${PN}-8.0.0-make.patch
-   "${FILESDIR}"/${PN}-7.1.0-also-build-virtfs-proxy-helper.patch
"${FILESDIR}"/${PN}-7.1.0-capstone-include-path.patch
-   "${FILESDIR}"/${PN}-8.0.0-remove-python-meson-check.patch
+   "${FILESDIR}"/${PN}-8.1.0-also-build-virtfs-proxy-helper.patch
 )
 
 QA_PREBUILT="
@@ -450,7 +449,7 @@ src_prepare() {
sed -i -e 's/-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2//' configure || die
 
# Remove bundled modules
-   rm -r dtc meson roms/*/ || die
+   rm -r dtc roms/*/ || die
 }
 
 ##

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-05-10 Thread Arthur Zamarin

commit: 1aae65eb8bd1d6092e5dcf04f4858a49cb454256
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed May 10 16:34:38 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed May 10 16:34:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aae65eb

app-emulation/qemu: Stabilize 7.2.0-r3 ppc64, #905866

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-emulation/qemu/qemu-7.2.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/qemu/qemu-7.2.0-r3.ebuild 
b/app-emulation/qemu/qemu-7.2.0-r3.ebuild
index d4f099114765..c7c0a1525b2b 100644
--- a/app-emulation/qemu/qemu-7.2.0-r3.ebuild
+++ b/app-emulation/qemu/qemu-7.2.0-r3.ebuild
@@ -41,7 +41,7 @@ else
fi
 
S="${WORKDIR}/${MY_P}"
-   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv x86"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-05-08 Thread Arthur Zamarin

commit: 5905bb199472db421d8972a2fbbac42d0e28e77e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue May  9 05:52:27 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue May  9 05:52:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5905bb19

app-emulation/qemu: Stabilize 7.2.0-r3 x86, #905866

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-emulation/qemu/qemu-7.2.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/qemu/qemu-7.2.0-r3.ebuild 
b/app-emulation/qemu/qemu-7.2.0-r3.ebuild
index 39afad4b1b90..d4f099114765 100644
--- a/app-emulation/qemu/qemu-7.2.0-r3.ebuild
+++ b/app-emulation/qemu/qemu-7.2.0-r3.ebuild
@@ -41,7 +41,7 @@ else
fi
 
S="${WORKDIR}/${MY_P}"
-   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-05-05 Thread Sam James

commit: 6bfab7d105e15419509a730333aa78dda09487d0
Author: Sam James  gentoo  org>
AuthorDate: Fri May  5 22:57:16 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May  6 00:03:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bfab7d1

app-emulation/qemu: revbump for added docs

USE=-doc before/after changed meaning.

Fixes: ce5466223d0749e07aa0c04a20abcef6e4bf9098
Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/{qemu-8.0.0.ebuild => qemu-8.0.0-r1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app-emulation/qemu/qemu-8.0.0.ebuild 
b/app-emulation/qemu/qemu-8.0.0-r1.ebuild
similarity index 100%
rename from app-emulation/qemu/qemu-8.0.0.ebuild
rename to app-emulation/qemu/qemu-8.0.0-r1.ebuild

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-05-05 Thread Matthias Maier

commit: c37413d540e7d5b53abb6b49ac3802de78093ba8
Author: Matthias Maier  gentoo  org>
AuthorDate: Fri May  5 23:34:14 2023 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Fri May  5 23:34:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c37413d5

app-emulation/qemu: update live ebuild

Signed-off-by: Matthias Maier  gentoo.org>

 app-emulation/qemu/qemu-.ebuild | 16 +++-
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/app-emulation/qemu/qemu-.ebuild 
b/app-emulation/qemu/qemu-.ebuild
index 0be0f8edae3c..3129dc21e59e 100644
--- a/app-emulation/qemu/qemu-.ebuild
+++ b/app-emulation/qemu/qemu-.ebuild
@@ -6,8 +6,7 @@ EAPI=8
 # Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
 # Set to 1 if prebuilt, 0 if not
 # (the construct below is to allow overriding from env for script)
-: ${QEMU_DOCS_PREBUILT:=1}
-
+QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-0}
 QEMU_DOCS_PREBUILT_DEV=sam
 QEMU_DOCS_VERSION=$(ver_cut 1-3)
 # Default to generating docs (inc. man pages) if no prebuilt; overridden later
@@ -151,7 +150,7 @@ done
 # respected).  This is because qemu supports using the C library's API
 # when available rather than always using the external library.
 ALL_DEPEND="
-   >=dev-libs/glib-2.0[static-libs(+)]
+   dev-libs/glib:2[static-libs(+)]
sys-libs/zlib[static-libs(+)]
python? ( ${PYTHON_DEPS} )
systemtap? ( dev-util/systemtap )
@@ -176,8 +175,8 @@ SOFTMMU_TOOLS_DEPEND="
fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] )
glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
gnutls? (
-   dev-libs/nettle:=[static-libs(+)]
>=net-libs/gnutls-3.0:=[static-libs(+)]
+   dev-libs/nettle:=[static-libs(+)]
)
gtk? (
x11-libs/gtk+:3
@@ -205,7 +204,7 @@ SOFTMMU_TOOLS_DEPEND="
)
pam? ( sys-libs/pam )
png? ( >=media-libs/libpng-1.6.34:=[static-libs(+)] )
-   pulseaudio? ( media-sound/pulseaudio )
+   pulseaudio? ( media-libs/libpulse )
rbd? ( sys-cluster/ceph )
sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
sdl? (
@@ -223,7 +222,7 @@ SOFTMMU_TOOLS_DEPEND="
)
ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
udev? ( virtual/libudev:= )
-   usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
+   usb? ( >=virtual/libusb-1-r2:1[static-libs(+)] )
usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
vde? ( net-misc/vde[static-libs(+)] )
virgl? ( media-libs/virglrenderer[static-libs(+)] )
@@ -305,6 +304,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-8.0.0-make.patch
"${FILESDIR}"/${PN}-7.1.0-also-build-virtfs-proxy-helper.patch
"${FILESDIR}"/${PN}-7.1.0-capstone-include-path.patch
+   "${FILESDIR}"/${PN}-8.0.0-remove-python-meson-check.patch
 )
 
 QA_PREBUILT="
@@ -618,7 +618,6 @@ qemu_src_configure() {
conf_opts+=(
--enable-linux-user
--disable-system
-   --disable-install-blobs
--disable-tools
--disable-cap-ng
--disable-seccomp
@@ -639,7 +638,6 @@ qemu_src_configure() {
conf_opts+=(
--disable-linux-user
--disable-system
-   --disable-install-blobs
--enable-tools
--enable-cap-ng
)
@@ -651,7 +649,7 @@ qemu_src_configure() {
[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
 
# Add support for SystemTAP
-   use systemtap && conf_opts+=( --enable-trace-backends=dtrace )
+   use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
 
# We always want to attempt to build with PIE support as it results
# in a more secure binary. But it doesn't work with static or if

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu-guest-agent/

2023-05-05 Thread Matthias Maier

commit: 3cb251f07a1fc9f276ef87d1b113188a495bbe4f
Author: Matthias Maier  gentoo  org>
AuthorDate: Fri May  5 23:31:46 2023 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Fri May  5 23:31:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cb251f0

app-emulation/qemu-guest-agent: add 8.0.0

Signed-off-by: Matthias Maier  gentoo.org>

 app-emulation/qemu-guest-agent/Manifest|  1 +
 .../qemu-guest-agent/qemu-guest-agent-8.0.0.ebuild | 81 ++
 2 files changed, 82 insertions(+)

diff --git a/app-emulation/qemu-guest-agent/Manifest 
b/app-emulation/qemu-guest-agent/Manifest
index f79e76b6986d..b33e329c0338 100644
--- a/app-emulation/qemu-guest-agent/Manifest
+++ b/app-emulation/qemu-guest-agent/Manifest
@@ -1,2 +1,3 @@
 DIST qemu-6.0.0.tar.xz 107333232 BLAKE2B 
7746329d3e13782b7c346ce4052cc517cfc65cd9b2d514d199e4d5b8570ca79566ec04b0c114db2e97c84e68eb551e0d4cdce1b14b91a88fe08d2a5f682c1418
 SHA512 
ee3ff00aebec4d8891d2ff6dabe4e667e510b2a4fe3f6190aa34673a91ea32dcd2db2e9bf94c2f1bf05aa79788f17cfbbedc6027c0988ea08a92587b79ee05e4
 DIST qemu-7.1.0.tar.xz 121833004 BLAKE2B 
e05f91ce4993c7591a2df08b5fb017f8b8ec2141ab7bfd55d14730ea6b793ac1091de539992058392a5522d4e58beee92a87752707be58e3619b8213ef9f35bf
 SHA512 
c60c5ff8ec99b7552e485768908920658fdd8035ff7a6fa370fb6881957dc8b7e5f18ff1a8f49bd6aa22909ede2a7c084986d8244f12074ccd33ebe40a0c411f
+DIST qemu-8.0.0.tar.xz 127835148 BLAKE2B 
9b54aae10fe09691a26e68374723ded5fdda6409673b4de9461a25ee060cfd03968a16ddeadc21d48b9262e53aa6d4e5eb645376969f97c65807fad19607b04f
 SHA512 
1f31d1e653dec2d35f1b7a5468ee3f471553b48eca8c8afafffcf9243c6b2260e78a5b73da3fe567f9b85d4133573eebd397747b3aec501fb24076263eb07b27

diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.0.ebuild 
b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.0.ebuild
new file mode 100644
index ..52a9e45d3b55
--- /dev/null
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit edo systemd toolchain-funcs python-any-r1 udev
+
+MY_PN="qemu"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
+HOMEPAGE="https://wiki.qemu.org/Features/GuestAgent;
+SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz;
+
+LICENSE="GPL-2 BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+
+RDEPEND="dev-libs/glib"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+   dev-lang/perl
+   dev-util/ninja"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+)
+
+src_configure() {
+   tc-export AR LD OBJCOPY RANLIB
+
+   local myconf=(
+   --prefix=/usr
+   --sysconfdir=/etc
+   --libdir="/usr/$(get_libdir)"
+   --localstatedir=/
+   --disable-bsd-user
+   --disable-linux-user
+   --disable-system
+   --disable-strip
+   --enable-tools
+   --disable-werror
+   --enable-guest-agent
+   --python="${PYTHON}"
+   --cc="$(tc-getCC)"
+   --cxx="$(tc-getCXX)"
+   --host-cc="$(tc-getBUILD_CC)"
+   )
+
+   edo ./configure "${myconf[@]}"
+}
+
+src_install() {
+   dobin build/qga/qemu-ga
+
+   # Normal init stuff
+   newinitd "${FILESDIR}/qemu-ga.init-r1" qemu-guest-agent
+   newconfd "${FILESDIR}/qemu-ga.conf-r1" qemu-guest-agent
+
+   insinto /etc/logrotate.d
+   newins "${FILESDIR}/qemu-ga.logrotate" qemu-guest-agent
+
+   # systemd stuff
+   udev_newrules "${FILESDIR}/qemu-ga-systemd.udev" 
99-qemu-guest-agent.rules
+
+   systemd_newunit "${FILESDIR}/qemu-ga-systemd.service" \
+   qemu-guest-agent.service
+}
+
+pkg_postinst() {
+   elog "You should add 'qemu-guest-agent' to the default runlevel."
+   elog "e.g. rc-update add qemu-guest-agent default"
+   udev_reload
+}
+
+pkg_postrm() {
+   udev_reload
+}

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-05-05 Thread Sam James

commit: ce5466223d0749e07aa0c04a20abcef6e4bf9098
Author: Sam James  gentoo  org>
AuthorDate: Fri May  5 22:27:01 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May  5 22:27:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce546622

app-emulation/qemu: add pre-generated docs for 8.0.0

Signed-off-by: Sam James  gentoo.org>

 app-emulation/qemu/Manifest  | 1 +
 app-emulation/qemu/qemu-8.0.0.ebuild | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 3d2659b0fa71..2fae7fda437d 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1,4 +1,5 @@
 DIST qemu-7.2.0-docs.tar.xz 1984184 BLAKE2B 
103900fb7903ed8d75f7f012bf61fa2d6fce345b657c851d0437c3384f5735bd1cfd3129320683ea7846ea0b0940e5af5b2663c9320f12fee74b058523a8ea06
 SHA512 
a7edd448982865e07533c300d3e44a8b50cefbdde1982b73c24d0b2aa74315439252c59b634c75de312860874c7b06c75aa72629da681b5105f28ee936794585
 DIST qemu-7.2.0.tar.xz 122408576 BLAKE2B 
415ff621356c59f88b29cfe3ef5db1e282b26bbafbee3d535477c6125ccb060ec9762d9e3ab9f70ce5478804dca0a46a59bcf12c112a2462029a93e578e61530
 SHA512 
f3cfa00da739ba819a218d7e6e95c77fb79a8e0f487b024ddd281602e785249b81144595e3f8c746c32a4f5c4d1a88c6aebae3c162603edfbb50ae3722d7ed13
 DIST qemu-7.2.1.tar.xz 122400592 BLAKE2B 
bae1df5d332beaca313c4bac88f06dd5992988d7c1b6fdc6ced4043d858f437339cd7d0009ae667f9e66705117697bee7ee44ec4e911cc203d34eecc3d8f139b
 SHA512 
e286dc66c923a5df77eb02d69235d048e80a7cced638fae52fbed385b4c3cd736cfea66bb3c9843bebf0a33e81ea141fc015e0bd82108df304f148ce59d9ae8a
+DIST qemu-8.0.0-docs.tar.xz 3218024 BLAKE2B 
b764a625024e78a39470048355471e12cfb57ab3c34e764dc4200fdf5c1aea635d26095ec961979bf46f177101c5bd38618bacf7e98e04bd64688ab5e29591aa
 SHA512 
d9dfe191372e105fe16fe8f66f41ed793ade4c89b5ab1d84b39459f3419a1ca61bd49422a83981965cc257c05eca7fd49054703f58f179f5c7b656e9473a1054
 DIST qemu-8.0.0.tar.xz 127835148 BLAKE2B 
9b54aae10fe09691a26e68374723ded5fdda6409673b4de9461a25ee060cfd03968a16ddeadc21d48b9262e53aa6d4e5eb645376969f97c65807fad19607b04f
 SHA512 
1f31d1e653dec2d35f1b7a5468ee3f471553b48eca8c8afafffcf9243c6b2260e78a5b73da3fe567f9b85d4133573eebd397747b3aec501fb24076263eb07b27

diff --git a/app-emulation/qemu/qemu-8.0.0.ebuild 
b/app-emulation/qemu/qemu-8.0.0.ebuild
index 3048bf51382f..3000130b6f90 100644
--- a/app-emulation/qemu/qemu-8.0.0.ebuild
+++ b/app-emulation/qemu/qemu-8.0.0.ebuild
@@ -6,9 +6,9 @@ EAPI=8
 # Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
 # Set to 1 if prebuilt, 0 if not
 # (the construct below is to allow overriding from env for script)
-QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-0}
-QEMU_DOCS_PREBUILT_DEV=ajak
-QEMU_DOCS_VERSION="7.2.0"
+QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
+QEMU_DOCS_PREBUILT_DEV=sam
+QEMU_DOCS_VERSION="8.0.0"
 # Default to generating docs (inc. man pages) if no prebuilt; overridden later
 # bug #830088
 QEMU_DOC_USEFLAG="+doc"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/files/, app-emulation/qemu/

2023-05-05 Thread Matthias Maier

commit: be4c0fdfda7a00698701d61467154dba7009e38e
Author: Matthias Maier  gentoo  org>
AuthorDate: Fri May  5 16:19:24 2023 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Fri May  5 18:11:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be4c0fdf

app-emulation/qemu: add 8.0.0

 - merge qemu-7.2.1 and qemu- ebuilds
 - remove static keyword
 - update to --enable-trace-backends configuration option

Bug: https://bugs.gentoo.org/905342
Bug: https://bugs.gentoo.org/865121
Signed-off-by: Matthias Maier  gentoo.org>

 app-emulation/qemu/Manifest|   1 +
 .../qemu/files/qemu-8.0.0-disable-keymap.patch |  18 +-
 app-emulation/qemu/files/qemu-8.0.0-make.patch |   9 +-
 app-emulation/qemu/qemu-8.0.0.ebuild   | 962 +
 4 files changed, 978 insertions(+), 12 deletions(-)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index e5c01c80e350..3d2659b0fa71 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1,3 +1,4 @@
 DIST qemu-7.2.0-docs.tar.xz 1984184 BLAKE2B 
103900fb7903ed8d75f7f012bf61fa2d6fce345b657c851d0437c3384f5735bd1cfd3129320683ea7846ea0b0940e5af5b2663c9320f12fee74b058523a8ea06
 SHA512 
a7edd448982865e07533c300d3e44a8b50cefbdde1982b73c24d0b2aa74315439252c59b634c75de312860874c7b06c75aa72629da681b5105f28ee936794585
 DIST qemu-7.2.0.tar.xz 122408576 BLAKE2B 
415ff621356c59f88b29cfe3ef5db1e282b26bbafbee3d535477c6125ccb060ec9762d9e3ab9f70ce5478804dca0a46a59bcf12c112a2462029a93e578e61530
 SHA512 
f3cfa00da739ba819a218d7e6e95c77fb79a8e0f487b024ddd281602e785249b81144595e3f8c746c32a4f5c4d1a88c6aebae3c162603edfbb50ae3722d7ed13
 DIST qemu-7.2.1.tar.xz 122400592 BLAKE2B 
bae1df5d332beaca313c4bac88f06dd5992988d7c1b6fdc6ced4043d858f437339cd7d0009ae667f9e66705117697bee7ee44ec4e911cc203d34eecc3d8f139b
 SHA512 
e286dc66c923a5df77eb02d69235d048e80a7cced638fae52fbed385b4c3cd736cfea66bb3c9843bebf0a33e81ea141fc015e0bd82108df304f148ce59d9ae8a
+DIST qemu-8.0.0.tar.xz 127835148 BLAKE2B 
9b54aae10fe09691a26e68374723ded5fdda6409673b4de9461a25ee060cfd03968a16ddeadc21d48b9262e53aa6d4e5eb645376969f97c65807fad19607b04f
 SHA512 
1f31d1e653dec2d35f1b7a5468ee3f471553b48eca8c8afafffcf9243c6b2260e78a5b73da3fe567f9b85d4133573eebd397747b3aec501fb24076263eb07b27

diff --git a/app-emulation/qemu/files/qemu-8.0.0-disable-keymap.patch 
b/app-emulation/qemu/files/qemu-8.0.0-disable-keymap.patch
index aab5dde5fbd9..6a5437056e6f 100644
--- a/app-emulation/qemu/files/qemu-8.0.0-disable-keymap.patch
+++ b/app-emulation/qemu/files/qemu-8.0.0-disable-keymap.patch
@@ -1,7 +1,8 @@
-diff -ruN qemu-.orig/meson.build qemu-/meson.build
 qemu-.orig/meson.build 2023-03-12 01:17:38.273756012 +0100
-+++ qemu-/meson.build  2023-03-12 01:18:44.854716789 +0100
-@@ -667,6 +667,8 @@
+diff --git a/meson.build b/meson.build
+index c44d05a13..5c5c09894 100644
+--- a/meson.build
 b/meson.build
+@@ -671,6 +671,8 @@ endif
  
  if get_option('xkbcommon').auto() and not have_system and not have_tools
xkbcommon = not_found
@@ -10,10 +11,11 @@ diff -ruN qemu-.orig/meson.build qemu-/meson.build
  else
xkbcommon = dependency('xkbcommon', required: get_option('xkbcommon'),
   method: 'pkg-config', kwargs: static_kwargs)
-diff -ruN qemu-.orig/pc-bios/keymaps/meson.build 
qemu-/pc-bios/keymaps/meson.build
 qemu-.orig/pc-bios/keymaps/meson.build 2023-03-12 01:17:38.321756706 
+0100
-+++ qemu-/pc-bios/keymaps/meson.build  2023-03-12 01:20:22.015111600 
+0100
-@@ -33,8 +33,10 @@
+diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build
+index 158a3b410..3bb318a23 100644
+--- a/pc-bios/keymaps/meson.build
 b/pc-bios/keymaps/meson.build
+@@ -33,8 +33,10 @@ keymaps = {
'tr': '-l tr',
  }
  

diff --git a/app-emulation/qemu/files/qemu-8.0.0-make.patch 
b/app-emulation/qemu/files/qemu-8.0.0-make.patch
index 4bf3f7157713..40bafd490052 100644
--- a/app-emulation/qemu/files/qemu-8.0.0-make.patch
+++ b/app-emulation/qemu/files/qemu-8.0.0-make.patch
@@ -1,7 +1,8 @@
-diff -ruN qemu-.orig/configure qemu-/configure
 qemu-.orig/configure   2023-03-12 01:26:15.488133462 +0100
-+++ qemu-/configure2023-03-12 01:29:19.355724020 +0100
-@@ -1068,7 +1068,7 @@
+diff --git a/configure b/configure
+index 800b5850f..331e8950d 100755
+--- a/configure
 b/configure
+@@ -1069,7 +1069,7 @@ then
  fi
  fi
  

diff --git a/app-emulation/qemu/qemu-8.0.0.ebuild 
b/app-emulation/qemu/qemu-8.0.0.ebuild
new file mode 100644
index ..76c3d4ecfbfc
--- /dev/null
+++ b/app-emulation/qemu/qemu-8.0.0.ebuild
@@ -0,0 +1,962 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-05-05 Thread Matthias Maier

commit: 86d6f4fe402e468aed62e1f63479019cdad0d736
Author: Matthias Maier  gentoo  org>
AuthorDate: Fri May  5 16:05:49 2023 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Fri May  5 18:11:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86d6f4fe

app-emulation/qemu: add 7.2.1

Signed-off-by: Matthias Maier  gentoo.org>

 app-emulation/qemu/Manifest  |   1 +
 app-emulation/qemu/qemu-7.2.1.ebuild | 972 +++
 2 files changed, 973 insertions(+)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 0754b3215fa0..e5c01c80e350 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1,2 +1,3 @@
 DIST qemu-7.2.0-docs.tar.xz 1984184 BLAKE2B 
103900fb7903ed8d75f7f012bf61fa2d6fce345b657c851d0437c3384f5735bd1cfd3129320683ea7846ea0b0940e5af5b2663c9320f12fee74b058523a8ea06
 SHA512 
a7edd448982865e07533c300d3e44a8b50cefbdde1982b73c24d0b2aa74315439252c59b634c75de312860874c7b06c75aa72629da681b5105f28ee936794585
 DIST qemu-7.2.0.tar.xz 122408576 BLAKE2B 
415ff621356c59f88b29cfe3ef5db1e282b26bbafbee3d535477c6125ccb060ec9762d9e3ab9f70ce5478804dca0a46a59bcf12c112a2462029a93e578e61530
 SHA512 
f3cfa00da739ba819a218d7e6e95c77fb79a8e0f487b024ddd281602e785249b81144595e3f8c746c32a4f5c4d1a88c6aebae3c162603edfbb50ae3722d7ed13
+DIST qemu-7.2.1.tar.xz 122400592 BLAKE2B 
bae1df5d332beaca313c4bac88f06dd5992988d7c1b6fdc6ced4043d858f437339cd7d0009ae667f9e66705117697bee7ee44ec4e911cc203d34eecc3d8f139b
 SHA512 
e286dc66c923a5df77eb02d69235d048e80a7cced638fae52fbed385b4c3cd736cfea66bb3c9843bebf0a33e81ea141fc015e0bd82108df304f148ce59d9ae8a

diff --git a/app-emulation/qemu/qemu-7.2.1.ebuild 
b/app-emulation/qemu/qemu-7.2.1.ebuild
new file mode 100644
index ..2218435d4f6e
--- /dev/null
+++ b/app-emulation/qemu/qemu-7.2.1.ebuild
@@ -0,0 +1,972 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-qemu-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+QEMU_DOCS_PREBUILT=${QEMU_DOCS_PREBUILT:-1}
+QEMU_DOCS_PREBUILT_DEV=ajak
+QEMU_DOCS_VERSION="7.2.0"
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# bug #830088
+QEMU_DOC_USEFLAG="+doc"
+
+PYTHON_COMPAT=( python3_{9,10,11} )
+PYTHON_REQ_USE="ncurses,readline"
+
+FIRMWARE_ABI_VERSION="7.2.0"
+
+inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
+   pax-utils xdg-utils
+
+if [[ ${PV} == ** ]]; then
+   QEMU_DOCS_PREBUILT=0
+
+   EGIT_REPO_URI="https://gitlab.com/qemu-project/qemu.git/;
+   EGIT_SUBMODULES=(
+   tests/fp/berkeley-softfloat-3
+   tests/fp/berkeley-testfloat-3
+   ui/keycodemapdb
+   )
+   inherit git-r3
+   SRC_URI=""
+else
+   MY_P="${PN}-${PV/_rc/-rc}"
+   SRC_URI="https://download.qemu.org/${MY_P}.tar.xz;
+
+   if [[ ${QEMU_DOCS_PREBUILT} == 1 ]] ; then
+   SRC_URI+=" !doc? ( 
https://dev.gentoo.org/~${QEMU_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${QEMU_DOCS_VERSION}-docs.tar.xz
 )"
+   fi
+
+   S="${WORKDIR}/${MY_P}"
+   [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc 
~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org;
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+
+[[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc"
+
+IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug 
${QEMU_DOC_USEFLAG}
+   +fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
+   jack jemalloc +jpeg
+   lzo multipath
+   ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs
+   plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
+   +slirp
+   smartcard snappy spice ssh static static-user systemtap test udev usb
+   usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen
+   zstd"
+
+COMMON_TARGETS="
+   aarch64
+   alpha
+   arm
+   cris
+   hppa
+   i386
+   loongarch64
+   m68k
+   microblaze
+   microblazeel
+   mips
+   mips64
+   mips64el
+   mipsel
+   nios2
+   or1k
+   ppc
+   ppc64
+   riscv32
+   riscv64
+   s390x
+   sh4
+   sh4eb
+   sparc
+   sparc64
+   x86_64
+   xtensa
+   xtensaeb
+"
+IUSE_SOFTMMU_TARGETS="
+   ${COMMON_TARGETS}
+   avr
+   rx
+   tricore
+"
+IUSE_USER_TARGETS="
+   ${COMMON_TARGETS}
+   aarch64_be
+   armeb
+   hexagon
+   mipsn32
+   mipsn32el
+   ppc64le
+   sparc32plus
+"
+
+use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' 
${IUSE_SOFTMMU_TARGETS})
+use_user_targets=$(printf '

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/, app-emulation/qemu/files/

2023-05-05 Thread Matthias Maier

commit: 4d673acc71014d69e776c5e1e737bd2d1eb8d055
Author: Matthias Maier  gentoo  org>
AuthorDate: Fri May  5 17:38:34 2023 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Fri May  5 18:11:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d673acc

app-emulation/qemu: fix configure

Version 8.0.0 complains about not using internal meson when conifguring.
For the time being, simply disable the check. We should fix this
properly, though.

Signed-off-by: Matthias Maier  gentoo.org>

 .../qemu-8.0.0-remove-python-meson-check.patch | 40 ++
 app-emulation/qemu/qemu-8.0.0.ebuild   |  1 +
 2 files changed, 41 insertions(+)

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
new file mode 100644
index ..07d3836c57e4
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-8.0.0-remove-python-meson-check.patch
@@ -0,0 +1,40 @@
+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"

diff --git a/app-emulation/qemu/qemu-8.0.0.ebuild 
b/app-emulation/qemu/qemu-8.0.0.ebuild
index 76c3d4ecfbfc..3048bf51382f 100644
--- a/app-emulation/qemu/qemu-8.0.0.ebuild
+++ b/app-emulation/qemu/qemu-8.0.0.ebuild
@@ -308,6 +308,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.1.0-also-build-virtfs-proxy-helper.patch
"${FILESDIR}"/${PN}-7.1.0-capstone-include-path.patch
"${FILESDIR}"/${PN}-7.2.0-disable-gmp.patch
+   "${FILESDIR}"/${PN}-8.0.0-remove-python-meson-check.patch
 )
 
 QA_PREBUILT="

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-04-07 Thread Andreas K. Hüttel

commit: 6574ed72af5cc538aafbf125189cf6cc5437c4ed
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Fri Apr  7 23:08:56 2023 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Fri Apr  7 23:09:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6574ed72

app-emulation/qemu: drop useflag static, not really useful

Bug: https://bugs.gentoo.org/892327
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 app-emulation/qemu/qemu-.ebuild | 21 +++--
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/app-emulation/qemu/qemu-.ebuild 
b/app-emulation/qemu/qemu-.ebuild
index 874bcfff7852..0be0f8edae3c 100644
--- a/app-emulation/qemu/qemu-.ebuild
+++ b/app-emulation/qemu/qemu-.ebuild
@@ -60,7 +60,7 @@ IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug 
${QEMU_DOC_USEFLAG}
ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs
plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
+slirp
-   smartcard snappy spice ssh static static-user systemtap test udev usb
+   smartcard snappy spice ssh static-user systemtap test udev usb
usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen
zstd"
 
@@ -130,14 +130,13 @@ REQUIRED_USE="
qemu_softmmu_targets_riscv64? ( fdt )
qemu_softmmu_targets_x86_64? ( fdt )
sdl-image? ( sdl )
-   static? ( static-user !alsa !gtk !jack !opengl !pam !pulseaudio 
!plugins !rbd !snappy !udev )
static-user? ( !plugins )
virgl? ( opengl )
virtfs? ( xattr )
vnc? ( gnutls )
vte? ( gtk )
multipath? ( udev )
-   plugins? ( !static !static-user )
+   plugins? ( !static-user )
 "
 for smname in ${IUSE_SOFTMMU_TARGETS} ; do
REQUIRED_USE+=" qemu_softmmu_targets_${smname}? ( seccomp ) "
@@ -284,10 +283,8 @@ BDEPEND="
)
 "
 CDEPEND="
-   !static? (
-   ${ALL_DEPEND//\[static-libs(+)]}
-   ${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
-   )
+   ${ALL_DEPEND//\[static-libs(+)]}
+   ${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} )
@@ -295,10 +292,6 @@ CDEPEND="
 "
 DEPEND="${CDEPEND}
kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-   static? (
-   ${ALL_DEPEND}
-   ${SOFTMMU_TOOLS_DEPEND}
-   )
static-user? ( ${ALL_DEPEND} )"
 RDEPEND="${CDEPEND}
acct-group/kvm
@@ -640,7 +633,7 @@ qemu_src_configure() {
--enable-cap-ng
--enable-seccomp
)
-   local static_flag="static"
+   local static_flag="none"
;;
tools)
conf_opts+=(
@@ -650,7 +643,7 @@ qemu_src_configure() {
--enable-tools
--enable-cap-ng
)
-   local static_flag="static"
+   local static_flag="none"
;;
esac
 
@@ -663,7 +656,7 @@ qemu_src_configure() {
# We always want to attempt to build with PIE support as it results
# in a more secure binary. But it doesn't work with static or if
# the current GCC doesn't have PIE support.
-   if use ${static_flag}; then
+   if [[ ${static_flag} != "none" ]] && use ${static_flag}; then
conf_opts+=( --static --disable-pie )
else
tc-enables-pie && conf_opts+=( --enable-pie )

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/, app-emulation/qemu/files/

2023-03-11 Thread Andreas K. Hüttel

commit: 25016a2d27ade1c95fac6018c6fbe33ca5909347
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sun Mar 12 00:37:47 2023 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sun Mar 12 00:38:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25016a2d

app-emulation/qemu: rebase 2 patches for git master

Signed-off-by: Andreas K. Hüttel  gentoo.org>

 .../qemu/files/qemu-8.0.0-disable-keymap.patch | 27 ++
 app-emulation/qemu/files/qemu-8.0.0-make.patch | 12 ++
 app-emulation/qemu/qemu-.ebuild|  4 ++--
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/app-emulation/qemu/files/qemu-8.0.0-disable-keymap.patch 
b/app-emulation/qemu/files/qemu-8.0.0-disable-keymap.patch
new file mode 100644
index ..aab5dde5fbd9
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-8.0.0-disable-keymap.patch
@@ -0,0 +1,27 @@
+diff -ruN qemu-.orig/meson.build qemu-/meson.build
+--- qemu-.orig/meson.build 2023-03-12 01:17:38.273756012 +0100
 qemu-/meson.build  2023-03-12 01:18:44.854716789 +0100
+@@ -667,6 +667,8 @@
+ 
+ if get_option('xkbcommon').auto() and not have_system and not have_tools
+   xkbcommon = not_found
++elif get_option('xkbcommon').disabled()
++  xkbcommon = not_found
+ else
+   xkbcommon = dependency('xkbcommon', required: get_option('xkbcommon'),
+  method: 'pkg-config', kwargs: static_kwargs)
+diff -ruN qemu-.orig/pc-bios/keymaps/meson.build 
qemu-/pc-bios/keymaps/meson.build
+--- qemu-.orig/pc-bios/keymaps/meson.build 2023-03-12 01:17:38.321756706 
+0100
 qemu-/pc-bios/keymaps/meson.build  2023-03-12 01:20:22.015111600 
+0100
+@@ -33,8 +33,10 @@
+   'tr': '-l tr',
+ }
+ 
+-if meson.is_cross_build() or not xkbcommon.found()
++if meson.is_cross_build()
+   native_qemu_keymap = find_program('qemu-keymap', required: false, disabler: 
true)
++elif get_option('xkbcommon').disabled()
++  native_qemu_keymap = not_found
+ else
+   native_qemu_keymap = qemu_keymap
+ endif

diff --git a/app-emulation/qemu/files/qemu-8.0.0-make.patch 
b/app-emulation/qemu/files/qemu-8.0.0-make.patch
new file mode 100644
index ..4bf3f7157713
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-8.0.0-make.patch
@@ -0,0 +1,12 @@
+diff -ruN qemu-.orig/configure qemu-/configure
+--- qemu-.orig/configure   2023-03-12 01:26:15.488133462 +0100
 qemu-/configure2023-03-12 01:29:19.355724020 +0100
+@@ -1068,7 +1068,7 @@
+ fi
+ fi
+ 
+-if ! has "$make"
++if ! has $make
+ then
+ error_exit "GNU make ($make) not found"
+ fi

diff --git a/app-emulation/qemu/qemu-.ebuild 
b/app-emulation/qemu/qemu-.ebuild
index 61f5fdffb2eb..874bcfff7852 100644
--- a/app-emulation/qemu/qemu-.ebuild
+++ b/app-emulation/qemu/qemu-.ebuild
@@ -308,8 +308,8 @@ RDEPEND="${CDEPEND}
)"
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch
-   "${FILESDIR}"/${PN}-6.0.0-make.patch
+   "${FILESDIR}"/${PN}-8.0.0-disable-keymap.patch
+   "${FILESDIR}"/${PN}-8.0.0-make.patch
"${FILESDIR}"/${PN}-7.1.0-also-build-virtfs-proxy-helper.patch
"${FILESDIR}"/${PN}-7.1.0-capstone-include-path.patch
 )

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu-guest-agent/

2023-03-04 Thread Joonas Niilola

commit: a995e12397c3b9e7fcee49b21875f6ec74d11d69
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sat Mar  4 08:30:57 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Mar  4 08:31:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a995e123

app-emulation/qemu-guest-agent: add missing bdeps to 7.1.0

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild 
b/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild
index f4cbbda0fb9a..d2ba04536748 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild
@@ -20,7 +20,9 @@ KEYWORDS="amd64 ~ppc ~ppc64 x86"
 
 RDEPEND="dev-libs/glib"
 DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}"
+BDEPEND="${PYTHON_DEPS}
+   dev-lang/perl
+   dev-util/ninja"
 
 S="${WORKDIR}/${MY_P}"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu-guest-agent/

2023-03-04 Thread Joonas Niilola

commit: f31fd72d566b0d3883dd5b0d1316a6f9d9cec434
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sat Mar  4 08:27:13 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Mar  4 08:27:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f31fd72d

app-emulation/qemu-guest-agent: Stabilize 7.1.0 amd64, #899240

Signed-off-by: Joonas Niilola  gentoo.org>

 app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild 
b/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild
index 3a5afb4b3907..f4cbbda0fb9a 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz;
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 
 RDEPEND="dev-libs/glib"
 DEPEND="${RDEPEND}"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu-guest-agent/

2023-03-04 Thread Arthur Zamarin

commit: 20d319cd0b810e997ff0475882484b4defd79d48
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 08:26:15 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 08:26:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20d319cd

app-emulation/qemu-guest-agent: Stabilize 7.1.0 x86, #899240

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild 
b/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild
index 2bbb6c2c75b5..3a5afb4b3907 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-7.1.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz;
 
 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86"
 
 RDEPEND="dev-libs/glib"
 DEPEND="${RDEPEND}"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/, app-emulation/qemu/files/

2023-02-22 Thread Sam James

commit: 7e648ec4592e45730aefc986e949b73aefffdf8d
Author: Sam James  gentoo  org>
AuthorDate: Wed Feb 22 11:32:11 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb 22 11:32:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e648ec4

app-emulation/qemu: backport fix for TCG for x86

Bug: https://bugs.gentoo.org/895746
Signed-off-by: Sam James  gentoo.org>

 .../qemu/files/qemu-7.2.0-tcg-curl-ssl.patch   | 182 
 app-emulation/qemu/qemu-7.2.0-r3.ebuild| 973 +
 2 files changed, 1155 insertions(+)

diff --git a/app-emulation/qemu/files/qemu-7.2.0-tcg-curl-ssl.patch 
b/app-emulation/qemu/files/qemu-7.2.0-tcg-curl-ssl.patch
new file mode 100644
index ..2b0a9f630371
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-7.2.0-tcg-curl-ssl.patch
@@ -0,0 +1,182 @@
+https://bugs.gentoo.org/895746#c3
+https://gitlab.com/qemu-project/qemu/-/issues/1471
+https://gitlab.com/qemu-project/qemu/-/commit/60c7dd22e1383754d5f150bc9f7c2785c662a7b6
+
+From 60c7dd22e1383754d5f150bc9f7c2785c662a7b6 Mon Sep 17 00:00:00 2001
+From: Paolo Bonzini 
+Date: Tue, 31 Jan 2023 09:48:03 +0100
+Subject: [PATCH] target/i386: fix ADOX followed by ADCX
+
+When ADCX is followed by ADOX or vice versa, the second instruction's
+carry comes from EFLAGS and the condition codes use the CC_OP_ADCOX
+operation.  Retrieving the carry from EFLAGS is handled by this bit
+of gen_ADCOX:
+
+tcg_gen_extract_tl(carry_in, cpu_cc_src,
+ctz32(cc_op == CC_OP_ADCX ? CC_C : CC_O), 1);
+
+Unfortunately, in this case cc_op has been overwritten by the previous
+"if" statement to CC_OP_ADCOX.  This works by chance when the first
+instruction is ADCX; however, if the first instruction is ADOX,
+ADCX will incorrectly take its carry from OF instead of CF.
+
+Fix by moving the computation of the new cc_op at the end of the function.
+The included exhaustive test case fails without this patch and passes
+afterwards.
+
+Because ADCX/ADOX need not be invoked through the VEX prefix, this
+regression bisects to commit 16fc5726a6e2 ("target/i386: reimplement
+0x0f 0x38, add AVX", 2022-10-18).  However, the mistake happened a
+little earlier, when BMI instructions were rewritten using the new
+decoder framework.
+
+Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1471
+Reported-by: Paul Jolly 
+Fixes: 1d0b926150e5 ("target/i386: move scalar 0F 38 and 0F 3A instruction to 
new decoder", 2022-10-18)
+Cc: qemu-sta...@nongnu.org
+Signed-off-by: Paolo Bonzini 
+--- a/target/i386/tcg/emit.c.inc
 b/target/i386/tcg/emit.c.inc
+@@ -1015,6 +1015,7 @@ VSIB_AVX(VPGATHERQ, vpgatherq)
+ 
+ static void gen_ADCOX(DisasContext *s, CPUX86State *env, MemOp ot, int cc_op)
+ {
++int opposite_cc_op;
+ TCGv carry_in = NULL;
+ TCGv carry_out = (cc_op == CC_OP_ADCX ? cpu_cc_dst : cpu_cc_src2);
+ TCGv zero;
+@@ -1022,14 +1023,8 @@ static void gen_ADCOX(DisasContext *s, CPUX86State 
*env, MemOp ot, int cc_op)
+ if (cc_op == s->cc_op || s->cc_op == CC_OP_ADCOX) {
+ /* Re-use the carry-out from a previous round.  */
+ carry_in = carry_out;
+-cc_op = s->cc_op;
+-} else if (s->cc_op == CC_OP_ADCX || s->cc_op == CC_OP_ADOX) {
+-/* Merge with the carry-out from the opposite instruction.  */
+-cc_op = CC_OP_ADCOX;
+-}
+-
+-/* If we don't have a carry-in, get it out of EFLAGS.  */
+-if (!carry_in) {
++} else {
++/* We don't have a carry-in, get it out of EFLAGS.  */
+ if (s->cc_op != CC_OP_ADCX && s->cc_op != CC_OP_ADOX) {
+ gen_compute_eflags(s);
+ }
+@@ -1053,7 +1048,14 @@ static void gen_ADCOX(DisasContext *s, CPUX86State 
*env, MemOp ot, int cc_op)
+ tcg_gen_add2_tl(s->T0, carry_out, s->T0, carry_out, s->T1, zero);
+ break;
+ }
+-set_cc_op(s, cc_op);
++
++opposite_cc_op = cc_op == CC_OP_ADCX ? CC_OP_ADOX : CC_OP_ADCX;
++if (s->cc_op == CC_OP_ADCOX || s->cc_op == opposite_cc_op) {
++/* Merge with the carry-out from the opposite instruction.  */
++set_cc_op(s, CC_OP_ADCOX);
++} else {
++set_cc_op(s, cc_op);
++}
+ }
+ 
+ static void gen_ADCX(DisasContext *s, CPUX86State *env, X86DecodedInsn 
*decode)
+--- a/tests/tcg/i386/Makefile.target
 b/tests/tcg/i386/Makefile.target
+@@ -14,7 +14,7 @@ config-cc.mak: Makefile
+ I386_SRCS=$(notdir $(wildcard $(I386_SRC)/*.c))
+ ALL_X86_TESTS=$(I386_SRCS:.c=)
+ SKIP_I386_TESTS=test-i386-ssse3 test-avx test-3dnow test-mmx
+-X86_64_TESTS:=$(filter test-i386-bmi2 $(SKIP_I386_TESTS), $(ALL_X86_TESTS))
++X86_64_TESTS:=$(filter test-i386-adcox test-i386-bmi2 $(SKIP_I386_TESTS), 
$(ALL_X86_TESTS))
+ 
+ test-i386-sse-exceptions: CFLAGS += -msse4.1 -mfpmath=sse
+ run-test-i386-sse-exceptions: QEMU_OPTS += -cpu max
+@@ -28,6 +28,10 @@ test-i386-bmi2: CFLAGS=-O2
+ run-test-i386-bmi2: QEMU_OPTS += -cpu max
+ run-plugin-test-i386-bmi2-%: QEMU_OPTS += -cpu

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/files/

2023-02-22 Thread Sam James

commit: 5b8aab265a7189016df100a2551f9c72055e8cd7
Author: Sam James  gentoo  org>
AuthorDate: Wed Feb 22 11:28:44 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb 22 11:32:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b8aab26

app-emulation/qemu: add additional glibc-2.36/linux-headers-6.2 patch

Closes: https://bugs.gentoo.org/895662
Closes: https://bugs.gentoo.org/895746
Signed-off-by: Sam James  gentoo.org>

 .../qemu-7.2.0-linux-headers-6.2-glibc-2.36.patch  | 71 ++
 1 file changed, 71 insertions(+)

diff --git 
a/app-emulation/qemu/files/qemu-7.2.0-linux-headers-6.2-glibc-2.36.patch 
b/app-emulation/qemu/files/qemu-7.2.0-linux-headers-6.2-glibc-2.36.patch
index 856997886cc9..2a58ca1ad735 100644
--- a/app-emulation/qemu/files/qemu-7.2.0-linux-headers-6.2-glibc-2.36.patch
+++ b/app-emulation/qemu/files/qemu-7.2.0-linux-headers-6.2-glibc-2.36.patch
@@ -1,5 +1,6 @@
 https://bugs.gentoo.org/895662
 
https://gitlab.com/qemu-project/qemu/-/commit/9f0246539ae84a5e21efd1cc4516fc343f08115a
+https://gitlab.com/qemu-project/qemu/-/commit/6003159ce18faad4e1bc7bf9c85669019cd4950e
 
 From 9f0246539ae84a5e21efd1cc4516fc343f08115a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= 
@@ -64,3 +65,73 @@ Signed-off-by: Laurent Vivier 
  #endif
 -- 
 GitLab
+
+From 6003159ce18faad4e1bc7bf9c85669019cd4950e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= 
+Date: Tue, 10 Jan 2023 12:49:01 -0500
+Subject: [PATCH] Revert "linux-user: fix compat with glibc >= 2.36
+ sys/mount.h"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This reverts commit 3cd3df2a9584e6f753bb62a0028bd67124ab5532.
+
+glibc has fixed (in 2.36.9000-40-g774058d729) the problem
+that caused a clash when both sys/mount.h annd linux/mount.h
+are included, and backported this to the 2.36 stable release
+too:
+
+  
https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
+
+It is saner for QEMU to remove the workaround it applied for
+glibc 2.36 and expect distros to ship the 2.36 maint release
+with the fix. This avoids needing to add a further workaround
+to QEMU to deal with the fact that linux/brtfs.h now also pulls
+in linux/mount.h via linux/fs.h since Linux 6.1
+
+Signed-off-by: Daniel P. BerrangÃ© 
+Reviewed-by: Marc-AndrÃ© Lureau 
+Message-Id: <20230110174901.2580297-3-berra...@redhat.com>
+Signed-off-by: Laurent Vivier 
+--- a/linux-user/syscall.c
 b/linux-user/syscall.c
+@@ -95,25 +95,7 @@
+ #include 
+ #include 
+ #include 
+-
+-#ifdef HAVE_SYS_MOUNT_FSCONFIG
+-/*
+- * glibc >= 2.36 linux/mount.h conflicts with sys/mount.h,
+- * which in turn prevents use of linux/fs.h. So we have to
+- * define the constants ourselves for now.
+- */
+-#define FS_IOC_GETFLAGS_IOR('f', 1, long)
+-#define FS_IOC_SETFLAGS_IOW('f', 2, long)
+-#define FS_IOC_GETVERSION  _IOR('v', 1, long)
+-#define FS_IOC_SETVERSION  _IOW('v', 2, long)
+-#define FS_IOC_FIEMAP  _IOWR('f', 11, struct fiemap)
+-#define FS_IOC32_GETFLAGS  _IOR('f', 1, int)
+-#define FS_IOC32_SETFLAGS  _IOW('f', 2, int)
+-#define FS_IOC32_GETVERSION_IOR('v', 1, int)
+-#define FS_IOC32_SETVERSION_IOW('v', 2, int)
+-#else
+ #include 
+-#endif
+ #include 
+ #if defined(CONFIG_FIEMAP)
+ #include 
+--- a/meson.build
 b/meson.build
+@@ -2046,8 +2046,6 @@ config_host_data.set('HAVE_OPTRESET',
+  cc.has_header_symbol('getopt.h', 'optreset'))
+ config_host_data.set('HAVE_IPPROTO_MPTCP',
+  cc.has_header_symbol('netinet/in.h', 'IPPROTO_MPTCP'))
+-config_host_data.set('HAVE_SYS_MOUNT_FSCONFIG',
+- cc.has_header_symbol('sys/mount.h', 'FSCONFIG_SET_FLAG'))
+ 
+ # has_member
+ config_host_data.set('HAVE_SIGEV_NOTIFY_THREAD_ID',
+-- 
+GitLab

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/files/, app-emulation/qemu/

2023-02-20 Thread Sam James

commit: e0e93bcf1a9d0018635e78ab740968b79a9f7658
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb 21 06:50:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 21 06:50:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0e93bcf

app-emulation/qemu: fix build w/ linux-headers-6.2

Closes: https://bugs.gentoo.org/895662
Signed-off-by: Sam James  gentoo.org>

 .../qemu-7.2.0-linux-headers-6.2-glibc-2.36.patch  | 66 ++
 app-emulation/qemu/qemu-7.2.0-r2.ebuild|  1 +
 2 files changed, 67 insertions(+)

diff --git 
a/app-emulation/qemu/files/qemu-7.2.0-linux-headers-6.2-glibc-2.36.patch 
b/app-emulation/qemu/files/qemu-7.2.0-linux-headers-6.2-glibc-2.36.patch
new file mode 100644
index ..856997886cc9
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-7.2.0-linux-headers-6.2-glibc-2.36.patch
@@ -0,0 +1,66 @@
+https://bugs.gentoo.org/895662
+https://gitlab.com/qemu-project/qemu/-/commit/9f0246539ae84a5e21efd1cc4516fc343f08115a
+
+From 9f0246539ae84a5e21efd1cc4516fc343f08115a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= 
+Date: Tue, 10 Jan 2023 12:49:00 -0500
+Subject: [PATCH] Revert "linux-user: add more compat ioctl definitions"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This reverts commit c5495f4ecb0cdaaf2e9dddeb48f1689cdb520ca0.
+
+glibc has fixed (in 2.36.9000-40-g774058d729) the problem
+that caused a clash when both sys/mount.h annd linux/mount.h
+are included, and backported this to the 2.36 stable release
+too:
+
+  
https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
+
+It is saner for QEMU to remove the workaround it applied for
+glibc 2.36 and expect distros to ship the 2.36 maint release
+with the fix. This avoids needing to add a further workaround
+to QEMU to deal with the fact that linux/brtfs.h now also pulls
+in linux/mount.h via linux/fs.h since Linux 6.1
+
+Signed-off-by: Daniel P. BerrangÃ© 
+Reviewed-by: Marc-AndrÃ© Lureau 
+Message-Id: <20230110174901.2580297-2-berra...@redhat.com>
+Signed-off-by: Laurent Vivier 
+--- a/linux-user/syscall.c
 b/linux-user/syscall.c
+@@ -111,31 +111,6 @@
+ #define FS_IOC32_SETFLAGS  _IOW('f', 2, int)
+ #define FS_IOC32_GETVERSION_IOR('v', 1, int)
+ #define FS_IOC32_SETVERSION_IOW('v', 2, int)
+-
+-#define BLKGETSIZE64 _IOR(0x12,114,size_t)
+-#define BLKDISCARD _IO(0x12,119)
+-#define BLKIOMIN _IO(0x12,120)
+-#define BLKIOOPT _IO(0x12,121)
+-#define BLKALIGNOFF _IO(0x12,122)
+-#define BLKPBSZGET _IO(0x12,123)
+-#define BLKDISCARDZEROES _IO(0x12,124)
+-#define BLKSECDISCARD _IO(0x12,125)
+-#define BLKROTATIONAL _IO(0x12,126)
+-#define BLKZEROOUT _IO(0x12,127)
+-
+-#define FIBMAP _IO(0x00,1)
+-#define FIGETBSZ   _IO(0x00,2)
+-
+-struct file_clone_range {
+-__s64 src_fd;
+-__u64 src_offset;
+-__u64 src_length;
+-__u64 dest_offset;
+-};
+-
+-#define FICLONE _IOW(0x94, 9, int)
+-#define FICLONERANGE_IOW(0x94, 13, struct file_clone_range)
+-
+ #else
+ #include 
+ #endif
+-- 
+GitLab

diff --git a/app-emulation/qemu/qemu-7.2.0-r2.ebuild 
b/app-emulation/qemu/qemu-7.2.0-r2.ebuild
index 7632e13429ee..c13da1572122 100644
--- a/app-emulation/qemu/qemu-7.2.0-r2.ebuild
+++ b/app-emulation/qemu/qemu-7.2.0-r2.ebuild
@@ -315,6 +315,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.1.0-also-build-virtfs-proxy-helper.patch
"${FILESDIR}"/${PN}-7.1.0-capstone-include-path.patch
"${FILESDIR}"/${PN}-7.2.0-disable-gmp.patch
+   "${FILESDIR}"/${PN}-7.2.0-linux-headers-6.2-glibc-2.36.patch
 )
 
 QA_PREBUILT="

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-02-17 Thread Viorel Munteanu

commit: ad7d8354ea97e03f4ca58e0311faac9e52ca1488
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Fri Feb 17 10:49:36 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Fri Feb 17 17:26:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad7d8354

app-emulation/qemu: add static dependency on dev-libs/capstone

Closes: https://github.com/gentoo/gentoo/pull/29629
Signed-off-by: Viorel Munteanu  gentoo.org>

 app-emulation/qemu/{qemu-7.2.0-r1.ebuild => qemu-7.2.0-r2.ebuild} | 2 +-
 app-emulation/qemu/qemu-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/qemu/qemu-7.2.0-r1.ebuild 
b/app-emulation/qemu/qemu-7.2.0-r2.ebuild
similarity index 99%
rename from app-emulation/qemu/qemu-7.2.0-r1.ebuild
rename to app-emulation/qemu/qemu-7.2.0-r2.ebuild
index a6af546ccf99..7632e13429ee 100644
--- a/app-emulation/qemu/qemu-7.2.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-7.2.0-r2.ebuild
@@ -170,7 +170,7 @@ SOFTMMU_TOOLS_DEPEND="
alsa? ( >=media-libs/alsa-lib-1.0.13 )
bpf? ( dev-libs/libbpf:= )
bzip2? ( app-arch/bzip2[static-libs(+)] )
-   capstone? ( dev-libs/capstone:= )
+   capstone? ( dev-libs/capstone:=[static-libs(+)] )
curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
fdt? ( >=sys-apps/dtc-1.5.1[static-libs(+)] )
fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] )

diff --git a/app-emulation/qemu/qemu-.ebuild 
b/app-emulation/qemu/qemu-.ebuild
index 83f6ec10ef3e..61f5fdffb2eb 100644
--- a/app-emulation/qemu/qemu-.ebuild
+++ b/app-emulation/qemu/qemu-.ebuild
@@ -171,7 +171,7 @@ SOFTMMU_TOOLS_DEPEND="
alsa? ( >=media-libs/alsa-lib-1.0.13 )
bpf? ( dev-libs/libbpf:= )
bzip2? ( app-arch/bzip2[static-libs(+)] )
-   capstone? ( dev-libs/capstone:= )
+   capstone? ( dev-libs/capstone:=[static-libs(+)] )
curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
fdt? ( >=sys-apps/dtc-1.5.1[static-libs(+)] )
fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] )

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-02-10 Thread Andreas K. Hüttel

commit: bd62b3aca68ce447b43ab5733f2b8e83615347b1
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat Feb 11 02:26:31 2023 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sat Feb 11 02:26:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd62b3ac

app-emulation/qemu: fix more configure options

Signed-off-by: Andreas K. Hüttel  gentoo.org>

 app-emulation/qemu/qemu-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/qemu/qemu-.ebuild 
b/app-emulation/qemu/qemu-.ebuild
index d6f958f31220..59cdcadc04bc 100644
--- a/app-emulation/qemu/qemu-.ebuild
+++ b/app-emulation/qemu/qemu-.ebuild
@@ -646,7 +646,7 @@ qemu_src_configure() {
conf_opts+=(
--disable-linux-user
--disable-system
-   --disable-blobs
+   --disable-install-blobs
--enable-tools
--enable-cap-ng
)

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-02-10 Thread Andreas K. Hüttel

commit: 0dcadefec47d4eb7e3e894ac0a1e95a8a420d7eb
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat Feb 11 02:22:58 2023 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sat Feb 11 02:23:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dcadefe

app-emulation/qemu: fix configure options

Signed-off-by: Andreas K. Hüttel  gentoo.org>

 app-emulation/qemu/qemu-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/qemu/qemu-.ebuild 
b/app-emulation/qemu/qemu-.ebuild
index ce7fda66806b..d6f958f31220 100644
--- a/app-emulation/qemu/qemu-.ebuild
+++ b/app-emulation/qemu/qemu-.ebuild
@@ -625,7 +625,7 @@ qemu_src_configure() {
conf_opts+=(
--enable-linux-user
--disable-system
-   --disable-blobs
+   --disable-install-blobs
--disable-tools
--disable-cap-ng
--disable-seccomp
@@ -658,7 +658,7 @@ qemu_src_configure() {
[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
 
# Add support for SystemTAP
-   use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
+   use systemtap && conf_opts+=( --enable-trace-backends=dtrace )
 
# We always want to attempt to build with PIE support as it results
# in a more secure binary. But it doesn't work with static or if

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2023-02-04 Thread Andreas K. Hüttel

commit: a13c9106cd8f1ffc67859c2d670b9370f098fe02
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat Feb  4 17:12:28 2023 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sat Feb  4 17:12:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a13c9106

app-emulation/qemu: drop unused use description

Signed-off-by: Andreas K. Hüttel  gentoo.org>

 app-emulation/qemu/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml
index bdb00757ca3e..55860ffa1847 100644
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@@ -53,7 +53,6 @@
Use sys-apps/usbredir to 
redirect USB devices to another machine over TCP
Enable VDE-based networking
Enable accelerated networking using 
vhost-net, see https://www.linux-kvm.org/page/VhostNet
-   Enable shared file system access 
using the FUSE protocol carried over virtio.
Enable experimental Virgil 3d (virtual 
software GPU)
Enable VirtFS via virtio-9p-pci / fsdev. 
See https://wiki.qemu.org/Documentation/9psetup
Enable terminal support 
(x11-libs/vte) in the GTK+ interface

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/files/, app-emulation/qemu/

2023-02-04 Thread Andreas K. Hüttel

commit: 230e67a4b5a7fbb65587eabc556163f21c98f2dd
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat Feb  4 16:45:33 2023 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sat Feb  4 16:45:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=230e67a4

app-emulation/qemu: drop 7.1.0, 7.1.0-r2

Bug: https://bugs.gentoo.org/883693
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 app-emulation/qemu/Manifest|   2 -
 .../qemu/files/qemu-7.1.0-faccessat2.patch |  78 --
 .../qemu/files/qemu-7.1.0-loong-stat.patch |  98 --
 .../qemu/files/qemu-7.1.0-mips-n32-syscalls.patch  |  94 --
 app-emulation/qemu/files/qemu-7.1.0-strings.patch  |  26 -
 app-emulation/qemu/qemu-7.1.0-r2.ebuild| 967 
 app-emulation/qemu/qemu-7.1.0.ebuild   | 985 -
 7 files changed, 2250 deletions(-)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 12a458ea48a1..0754b3215fa0 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1,4 +1,2 @@
-DIST qemu-7.1.0-docs.tar.xz 2016780 BLAKE2B 
1b84361fe58d504ab740a0b805a25d02f497ca776e7251a99f0e98e3720d1a2029b7a171f9d79dd128ba17a82c72d497e09baa1a4b2f192ba390f0f3b1950792
 SHA512 
7a328303b8af0ab63aa1f0fe07a121d3ca459d00fca817412e645416af795930dbea0a3e60f4ca006a74d1672e84fa4e626e4d83918e0b685b601043d0d8159e
-DIST qemu-7.1.0.tar.xz 121833004 BLAKE2B 
e05f91ce4993c7591a2df08b5fb017f8b8ec2141ab7bfd55d14730ea6b793ac1091de539992058392a5522d4e58beee92a87752707be58e3619b8213ef9f35bf
 SHA512 
c60c5ff8ec99b7552e485768908920658fdd8035ff7a6fa370fb6881957dc8b7e5f18ff1a8f49bd6aa22909ede2a7c084986d8244f12074ccd33ebe40a0c411f
 DIST qemu-7.2.0-docs.tar.xz 1984184 BLAKE2B 
103900fb7903ed8d75f7f012bf61fa2d6fce345b657c851d0437c3384f5735bd1cfd3129320683ea7846ea0b0940e5af5b2663c9320f12fee74b058523a8ea06
 SHA512 
a7edd448982865e07533c300d3e44a8b50cefbdde1982b73c24d0b2aa74315439252c59b634c75de312860874c7b06c75aa72629da681b5105f28ee936794585
 DIST qemu-7.2.0.tar.xz 122408576 BLAKE2B 
415ff621356c59f88b29cfe3ef5db1e282b26bbafbee3d535477c6125ccb060ec9762d9e3ab9f70ce5478804dca0a46a59bcf12c112a2462029a93e578e61530
 SHA512 
f3cfa00da739ba819a218d7e6e95c77fb79a8e0f487b024ddd281602e785249b81144595e3f8c746c32a4f5c4d1a88c6aebae3c162603edfbb50ae3722d7ed13

diff --git a/app-emulation/qemu/files/qemu-7.1.0-faccessat2.patch 
b/app-emulation/qemu/files/qemu-7.1.0-faccessat2.patch
deleted file mode 100644
index ea168f609fc8..
--- a/app-emulation/qemu/files/qemu-7.1.0-faccessat2.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 35a2c85f7d691db7aa2c47181902ac87478eef7a Mon Sep 17 00:00:00 2001
-From: WANG Xuerui 
-Date: Sun, 9 Oct 2022 14:08:13 +0800
-Subject: [PATCH] linux-user: Implement faccessat2
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-User space has been preferring this syscall for a while, due to its
-closer match with C semantics, and newer platforms such as LoongArch
-apparently have libc implementations that don't fallback to faccessat
-so normal access checks are failing without the emulation in place.
-
-Tested by successfully emerging several packages within a Gentoo loong
-stage3 chroot, emulated on amd64 with help of static qemu-loongarch64.
-
-Reported-by: Andreas K. Hüttel 
-Signed-off-by: WANG Xuerui 
-Message-Id: <20221009060813.2289077-1-xe...@gentoo.org>
-[lv: removing defined(__NR_faccessat2) in syscall.c,
- adding defined(TARGET_NR_faccessat2) on print_faccessat()]
-Signed-off-by: Laurent Vivier 

- linux-user/strace.c| 2 +-
- linux-user/strace.list | 3 +++
- linux-user/syscall.c   | 9 +
- 3 files changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/linux-user/strace.c b/linux-user/strace.c
-index 86c081c83f..9ae5a812cd 100644
 a/linux-user/strace.c
-+++ b/linux-user/strace.c
-@@ -1969,7 +1969,7 @@ print_execv(CPUArchState *cpu_env, const struct 
syscallname *name,
- }
- #endif
- 
--#ifdef TARGET_NR_faccessat
-+#if defined(TARGET_NR_faccessat) || defined(TARGET_NR_faccessat2)
- static void
- print_faccessat(CPUArchState *cpu_env, const struct syscallname *name,
- abi_long arg0, abi_long arg1, abi_long arg2,
-diff --git a/linux-user/strace.list b/linux-user/strace.list
-index a87415bf3d..3df2184580 100644
 a/linux-user/strace.list
-+++ b/linux-user/strace.list
-@@ -178,6 +178,9 @@
- #ifdef TARGET_NR_faccessat
- { TARGET_NR_faccessat, "faccessat" , NULL, print_faccessat, NULL },
- #endif
-+#ifdef TARGET_NR_faccessat2
-+{ TARGET_NR_faccessat2, "faccessat2" , NULL, print_faccessat, NULL },
-+#endif
- #ifdef TARGET_NR_fadvise64
- { TARGET_NR_fadvise64, "fadvise64" , NULL, NULL, NULL },
- #endif
-diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index d499cac1d5..e985ad167f 100644
 a/linux-user/syscall.c
-+++ b/linux-user/syscall.c
-@@ -9143,6 +9143,15 @@ static abi_long do_syscall1(CPUArchState *cpu_env,

1 2 3 4 5 6 7 8 >

1 - 100 of 761 matches

Mail list logo