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 4E87F158094 for ; Wed, 6 Jul 2022 03:18:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7C6CDE0F9A; Wed, 6 Jul 2022 03:18:43 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 54384E0F9A for ; Wed, 6 Jul 2022 03:18:43 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5943D3412AB for ; Wed, 6 Jul 2022 03:18:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7C4BA4FA for ; Wed, 6 Jul 2022 03:18:40 +0000 (UTC) From: "Sam James" 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" Message-ID: <1657077512.7dde6a6bd36cadd1c70d8ec3d3f956750231eeff.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/virtualbox/virtualbox-6.1.34-r3.ebuild X-VCS-Directories: app-emulation/virtualbox/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7dde6a6bd36cadd1c70d8ec3d3f956750231eeff X-VCS-Branch: master Date: Wed, 6 Jul 2022 03:18:40 +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: bdfd5cfe-bd60-4ed7-b709-77941fea188a X-Archives-Hash: e3efae4ac68e01c7a61bd1f2b50ef454 commit: 7dde6a6bd36cadd1c70d8ec3d3f956750231eeff Author: Sam James gentoo org> AuthorDate: Wed Jul 6 03:17:56 2022 +0000 Commit: Sam James gentoo org> CommitDate: Wed Jul 6 03:18:32 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dde6a6b app-emulation/virtualbox: uncomment partial Python logic Went back and forth on this but I think it's worth hinting as much as possible for now, given it's completely guessing otherwise, and we can't easily just rip out / disable Python entirely until we fix this. Bug: https://bugs.gentoo.org/856121 Bug: https://bugs.gentoo.org/785835 Signed-off-by: Sam James gentoo.org> .../virtualbox/virtualbox-6.1.34-r3.ebuild | 24 ++++++++++------------ 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/app-emulation/virtualbox/virtualbox-6.1.34-r3.ebuild b/app-emulation/virtualbox/virtualbox-6.1.34-r3.ebuild index a352a9dd329b..1475e06f6fa0 100644 --- a/app-emulation/virtualbox/virtualbox-6.1.34-r3.ebuild +++ b/app-emulation/virtualbox/virtualbox-6.1.34-r3.ebuild @@ -280,20 +280,18 @@ src_configure() { edo ./configure "${myconf[@]}" # Try to force usage of chosen Python implementation - # Commented out for now as it's insufficient (see comment above - # PYTHON_COMPAT). # bug #856121, bug #785835 - #sed -i \ - # -e '/VBOX_WITH_PYTHON.*=/d' \ - # -e '/VBOX_PATH_PYTHON_INC.*=/d' \ - # -e '/VBOX_LIB_PYTHON.*=/d' \ - # AutoConfig.kmk || die - # - #cat >> AutoConfig.kmk <<-EOF || die - # VBOX_WITH_PYTHON=$(usex python 1 0) - # VBOX_PATH_PYTHON_INC=$(python_get_includedir) - # VBOX_LIB_PYTHON=$(python_get_library_path) - #EOF + sed -i \ + -e '/VBOX_WITH_PYTHON.*=/d' \ + -e '/VBOX_PATH_PYTHON_INC.*=/d' \ + -e '/VBOX_LIB_PYTHON.*=/d' \ + AutoConfig.kmk || die + + cat >> AutoConfig.kmk <<-EOF || die + VBOX_WITH_PYTHON=$(usex python 1 0) + VBOX_PATH_PYTHON_INC=$(python_get_includedir) + VBOX_LIB_PYTHON=$(python_get_library_path) + EOF } src_compile() {