From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1558196-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8D8A315814C for <garchives@archives.gentoo.org>; Thu, 28 Sep 2023 01:22:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C92542BC04D; Thu, 28 Sep 2023 01:22:45 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ADD542BC04D for <gentoo-commits@lists.gentoo.org>; Thu, 28 Sep 2023 01:22:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C21A9335CDF for <gentoo-commits@lists.gentoo.org>; Thu, 28 Sep 2023 01:22:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 30EB31124 for <gentoo-commits@lists.gentoo.org>; Thu, 28 Sep 2023 01:22:43 +0000 (UTC) From: "Sam James" <sam@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org> Message-ID: <1695864091.5c12b485d94a4e670e3874ef15bc277384bfc6e7.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/qemu/qemu-9999.ebuild X-VCS-Directories: app-emulation/qemu/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5c12b485d94a4e670e3874ef15bc277384bfc6e7 X-VCS-Branch: master Date: Thu, 28 Sep 2023 01:22:43 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e047d9f4-e355-4e86-ab11-91b6d0b2590e X-Archives-Hash: 623d681fc70495eeecbd55791725d383 commit: 5c12b485d94a4e670e3874ef15bc277384bfc6e7 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Sep 28 01:21:31 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Sep 28 01:21:31 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c12b485 app-emulation/qemu: don't conditionally define phase Signed-off-by: Sam James <sam <AT> gentoo.org> app-emulation/qemu/qemu-9999.ebuild | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index de4d90b78216..1f63912672aa 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -446,20 +446,22 @@ check_targets() { popd >/dev/null } -if [[ ${PV} == 9999 ]]; 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} == 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