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 D8851158086 for ; Tue, 14 Dec 2021 15:12:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D41FE2BC04E; Tue, 14 Dec 2021 15:12:17 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A5A832BC008 for ; Tue, 14 Dec 2021 15:12:17 +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 497543436E7 for ; Tue, 14 Dec 2021 15:12:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 41015132 for ; Tue, 14 Dec 2021 15:12:14 +0000 (UTC) From: "Guilherme Amadio" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Guilherme Amadio" Message-ID: <1639493903.983589995012215b627aa48f0025a1d8a86dad9a.amadio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/ipykernel/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/ipykernel/ipykernel-6.4.2-r1.ebuild dev-python/ipykernel/ipykernel-6.4.2.ebuild dev-python/ipykernel/ipykernel-6.5.0-r1.ebuild dev-python/ipykernel/ipykernel-6.5.0.ebuild X-VCS-Directories: dev-python/ipykernel/ X-VCS-Committer: amadio X-VCS-Committer-Name: Guilherme Amadio X-VCS-Revision: 983589995012215b627aa48f0025a1d8a86dad9a X-VCS-Branch: master Date: Tue, 14 Dec 2021 15:12:14 +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: b57a4f1c-9d13-4ae2-aa79-90e7055110f2 X-Archives-Hash: 052ed4a6c1054e08ea738bb3dded7933 commit: 983589995012215b627aa48f0025a1d8a86dad9a Author: Guilherme Amadio gentoo org> AuthorDate: Tue Dec 14 12:36:55 2021 +0000 Commit: Guilherme Amadio gentoo org> CommitDate: Tue Dec 14 14:58:23 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98358999 dev-python/ipykernel: fix bug #784764 Closes: https://bugs.gentoo.org/784764 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Guilherme Amadio gentoo.org> .../{ipykernel-6.4.2.ebuild => ipykernel-6.4.2-r1.ebuild} | 7 +++++++ .../{ipykernel-6.5.0.ebuild => ipykernel-6.5.0-r1.ebuild} | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/dev-python/ipykernel/ipykernel-6.4.2.ebuild b/dev-python/ipykernel/ipykernel-6.4.2-r1.ebuild similarity index 87% rename from dev-python/ipykernel/ipykernel-6.4.2.ebuild rename to dev-python/ipykernel/ipykernel-6.4.2-r1.ebuild index 5f91fc4ba8ff..2e632c2d5273 100644 --- a/dev-python/ipykernel/ipykernel-6.4.2.ebuild +++ b/dev-python/ipykernel/ipykernel-6.4.2-r1.ebuild @@ -46,3 +46,10 @@ src_prepare() { sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die distutils-r1_src_prepare } + +src_install() { + distutils-r1_src_install + # Use python3 in kernel.json configuration, bug #784764 + sed -i -e '/python3.[0-9]\+/s//python3/' \ + "${ED}"/usr/share/jupyter/kernels/python3/kernel.json || die +} diff --git a/dev-python/ipykernel/ipykernel-6.5.0.ebuild b/dev-python/ipykernel/ipykernel-6.5.0-r1.ebuild similarity index 88% rename from dev-python/ipykernel/ipykernel-6.5.0.ebuild rename to dev-python/ipykernel/ipykernel-6.5.0-r1.ebuild index a8227c00e8fe..524e5e76b01c 100644 --- a/dev-python/ipykernel/ipykernel-6.5.0.ebuild +++ b/dev-python/ipykernel/ipykernel-6.5.0-r1.ebuild @@ -53,3 +53,10 @@ src_prepare() { sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die distutils-r1_src_prepare } + +src_install() { + distutils-r1_src_install + # Use python3 in kernel.json configuration, bug #784764 + sed -i -e '/python3.[0-9]\+/s//python3/' \ + "${ED}"/usr/share/jupyter/kernels/python3/kernel.json || die +}