From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 5A9AF15808B for ; Sun, 17 Apr 2022 22:17:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 46459E09CF; Sun, 17 Apr 2022 22:17:02 +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 27C75E09CF for ; Sun, 17 Apr 2022 22:17:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 19E2334154F for ; Sun, 17 Apr 2022 22:17:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8CE553B5 for ; Sun, 17 Apr 2022 22:16:59 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1650233790.9118f7b507ff604a6d7ef142f9bb9890fd67baf2.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/xen-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/xen-tools/xen-tools-4.16.0-r1.ebuild app-emulation/xen-tools/xen-tools-4.16.0-r2.ebuild X-VCS-Directories: app-emulation/xen-tools/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 9118f7b507ff604a6d7ef142f9bb9890fd67baf2 X-VCS-Branch: master Date: Sun, 17 Apr 2022 22:16:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 474dfbe5-3ff2-441e-991b-2347d3395a06 X-Archives-Hash: 95b6b552dfdca110eec3bc6c4207b2f0 commit: 9118f7b507ff604a6d7ef142f9bb9890fd67baf2 Author: Florian Schmaus gentoo org> AuthorDate: Sun Apr 17 22:13:39 2022 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Sun Apr 17 22:16:30 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9118f7b5 app-emulation/xen-tools: reinstate fix for bash completion This sed was dropped with 4.16, probably because it could not be used verbatim from the 4.15 ebuilds. This reinstates the fix with a slightly modified sed expression and while adjusting the path to config/Paths.mk.in (was Config.mk). Signed-off-by: Florian Schmaus gentoo.org> .../{xen-tools-4.16.0-r1.ebuild => xen-tools-4.16.0-r2.ebuild} | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app-emulation/xen-tools/xen-tools-4.16.0-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.16.0-r2.ebuild similarity index 99% rename from app-emulation/xen-tools/xen-tools-4.16.0-r1.ebuild rename to app-emulation/xen-tools/xen-tools-4.16.0-r2.ebuild index 43eb6b355c52..280ccd68b1e4 100644 --- a/app-emulation/xen-tools/xen-tools-4.16.0-r1.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.16.0-r2.ebuild @@ -359,6 +359,10 @@ src_prepare() { sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die fi + # Reset bash completion dir; Bug 472438 + sed -e "s;^BASH_COMPLETION_DIR :=.*;BASH_COMPLETION_DIR := $(get_bashcompdir);" \ + -i config/Paths.mk.in || die + # xencommons, Bug #492332, sed lighter weight than patching sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \ -i tools/hotplug/Linux/init.d/xencommons.in || die