gentoo auto-resync : 28:09:2023 - 05:33:43

3 files changed, 28 insertions, 6 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 2d8bdaf8e3d0..8b8a2c6c41bc 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 2cfe820611b1..e0eb77ab4740 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -17,6 +17,9 @@ AUX qemu-8.1.0-find-sphinx.patch 427 BLAKE2B 2834abad14361b63b18f05d0e672215b884
 AUX qemu-8.1.0-skip-tests.patch 2767 BLAKE2B b55b4225f7afa6bc3634fe072c10150e21f9ea109f6706da663f9ab5ca3c05ee5a03fad9061c1e35b8945e009b86715d3fa220b7b30f95597ed933f647e64e33 SHA512 db643b31152c9d10817ee2abf298c728adcf3d2dfc808582a352fb924ea9877865d26cd7c8bec7feacca51741a5498984022f8bc77ca9cacbe0d5088c6e37233
 AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a33cca81f990decfafac2907c86c042350c9dd45591d16330846d4e11d2c8a2a409a68ad81656d9c2c51964c0 SHA512 3fec8946a37bfbd2089f5d95089ed5987a198fc0139ee7482d4bb38c2ffa0e165667a7853afcf2b458bc3e2a6540f172c929ca5a334a00db47e2d0f881382c0e
 AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737
+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
@@ -46,5 +49,5 @@ EBUILD qemu-8.0.4.ebuild 27367 BLAKE2B f28951659e63a87285aa31576f3e6b3cfcb86bdf2
 EBUILD qemu-8.0.5.ebuild 27371 BLAKE2B ef4fe77f039a7d5b719c7f39a546b266516a6b8010e36dce9399ade633af68c3e9045040d0bebdb9a78e7f9bb91eaff438aea521eeb06b256664f8175fc0b301 SHA512 c2ae3827dfb00e51916d136d7b6832f95b7930ee19950d0adb58f87e5f1de3d02dee18e110fd8a3a7fad504279007efa046ca80d9a5cef903babf70f24ba0d4b
 EBUILD qemu-8.1.0-r1.ebuild 27148 BLAKE2B 3e43837b088de370e9e61b42e6a0babc4232375e2799066d790a776a352903803e28b370eae98fbf497235b72816db855d5b0d44515b479c3a3de9e645393a55 SHA512 054af163b83225a2d16f9a230124b44be5ee182305f4901662094eabf9ee1e2207abe22eabbf8adb64c64e6e37f09b5b6381e289c8b8af88ed017afa42dd7d45
 EBUILD qemu-8.1.1.ebuild 27173 BLAKE2B 7c2f331829f9a8a8870d375de788fb518faa0b3546f438ecdc3b76af6ab2db49dff4f5fea0fd654843c833ca224608d0819168616cbb25857743a927df7856b4 SHA512 fde2e2945aa01a975a1401f2a0bb2197ed14d056eee31fa0c9ce4dcd0567168cca5c65ff5d1c1b200c880b30463297cadc42184c8a79c01511e85371b91109c5
-EBUILD qemu-9999.ebuild 27216 BLAKE2B a2478b0dfb1dd421e6a4eb898f094416e4437bed8487145467f56499a84f3b5134f8046b9f37f2e27404150819f2c1a72596f3a3e876a177947f7f0b9ae5ca04 SHA512 cc19a6e4bc4114a8c8f7e44fa2c5636760f0952511b835ffff0230a0f716934a1c1651093aeb3653fe4fe83818d303eeb4b0bba59135e65fec97eef81edaa1a1
+EBUILD qemu-9999.ebuild 27778 BLAKE2B b9bec1f50801cc4950db4da4edf84a0d1f1f1e7007dcefe2a6936e55dc0238d202ec97ff2b3982bfed8a978168a78a11d7777fb60c86197dade1a2fdbbf8f596 SHA512 b7e5d80b166f957c043378e1422480f4be88056ef9afa74637338528a899c7bfbb3cac2b9ce542f72fcc758193334e56ce1b4785305317026a65b51ccf5546f5
 MISC metadata.xml 4323 BLAKE2B 6e28c4719b95f6f0f3f9c699c05925d87197e0d3c6882b782e1aab9beda1e9715a2329849a692bb7debdabbf9ccd1e59648611942c72ea89a0dd05e99ae14618 SHA512 beb497dcf2e1d5fcd757c83312425c1fe47d712523940d596c141eacca55ddaf9d30fd3adb481a54a0acacedae5bc69e03349e6f8636f96d919330e12f70f099
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 6bc1056cfd1c..3da439a4b7b4 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -28,6 +28,16 @@ if [[ ${PV} == *9999* ]]; 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.bz2"
+	done
 else
 	MY_P="${PN}-${PV/_rc/-rc}"
 	SRC_URI="https://download.qemu.org/${MY_P}.tar.xz"
@@ -436,13 +446,22 @@ check_targets() {
 	popd >/dev/null
 }
 
-if [[ ${PV} == 9999 ]]; then
 src_unpack() {
-	git-r3_src_unpack
-	cd "${P}" || die
-	meson subprojects download keycodemapdb berkeley-softfloat-3 berkeley-testfloat-3 || die
+	if [[ ${PV} == 9999 ]] ; 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