commit: 849068830764c9092de79d51a9751009f7abb2b9 Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> AuthorDate: Fri Jun 8 20:56:27 2018 +0000 Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> CommitDate: Fri Jun 8 20:57:06 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84906883
dev-python/ipykernel: handle the multiple python3 case. Bonus of verion bump. Credit: Colin MacLean Closes: https://bugs.gentoo.org/628222 Package-Manager: Portage-2.3.28, Repoman-2.3.9 dev-python/ipykernel/Manifest | 1 + dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild | 2 +- .../ipykernel/{ipykernel-4.6.1-r2.ebuild => ipykernel-4.8.2.ebuild} | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest index 19978affb11..5011acb82ed 100644 --- a/dev-python/ipykernel/Manifest +++ b/dev-python/ipykernel/Manifest @@ -1 +1,2 @@ DIST ipykernel-4.6.1.tar.gz 90591 BLAKE2B 9d66e569e416e30fa0af93e9442326a081638e55e004c751d38b3e995e2e1c6baeba5b61e125ae8484a31344ca541070035154e4453f9eda30f7a2ac436e7f1c SHA512 3124534a8a059056211ac573784c491ba18d6e936292523382a9604af10bc2c911b14f49f7625242e29189b46c673da25244f3c9dfa3148d460ba4e466eef001 +DIST ipykernel-4.8.2.tar.gz 94441 BLAKE2B cdcf08c114c6c53ce4ed9829f3c2e0d2184f5b89b54556f92df25ecefadcc38955f992572a6dfb9ee49477e9a2111304c9b4f636edc47c0c0a26209c5f616579 SHA512 6542b086ef14abe70f51393e585c1e02eac0967b863c2e3de2dfdcbcdc2f4c01597bd035990f09f07d76005628a3345be97d1b5e5ce7a772ce7074bb31b4d4df diff --git a/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild b/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild index 0beee570792..0b67f85acfe 100644 --- a/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild +++ b/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild @@ -36,7 +36,7 @@ python_install() { distutils-r1_python_install # bug 628222, specify python 2 or 3. - sed -e "s:python:${EPYTHON}:" \ + sed -e "s:python:${EPYTHON%.*}:" \ -i "${ED}"usr/share/jupyter/kernels/${EPYTHON%.*}/kernel.json || die } diff --git a/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild b/dev-python/ipykernel/ipykernel-4.8.2.ebuild similarity index 92% copy from dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild copy to dev-python/ipykernel/ipykernel-4.8.2.ebuild index 0beee570792..98f9a7f4602 100644 --- a/dev-python/ipykernel/ipykernel-4.6.1-r2.ebuild +++ b/dev-python/ipykernel/ipykernel-4.8.2.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" IUSE="test" RDEPEND=" @@ -36,7 +36,7 @@ python_install() { distutils-r1_python_install # bug 628222, specify python 2 or 3. - sed -e "s:python:${EPYTHON}:" \ + sed -e "s:python:${EPYTHON%.*}:" \ -i "${ED}"usr/share/jupyter/kernels/${EPYTHON%.*}/kernel.json || die }
