Merge branch 'vbraun' for 10.4.beta2

cschwan · Apr 9, 2024 · 1f4579c · 1f4579c
2 parents 7539eea + 71d8a2f
commit 1f4579c
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/dev-python/jupyter-sphinx/Manifest b/dev-python/jupyter-sphinx/Manifest
@@ -1 +1,2 @@
 DIST jupyter_sphinx-0.4.0.tar.gz 18010 BLAKE2B bcb4a49244c5b83d405f335a50e4f863797532b20b085be1b3c5434d3477a4649d3e002c6bbf8b67f9e21b26f8350e604b42d0b87c8542a25a879e3d4b850725 SHA512 2f05f289f3d9e0a2a1e348eb14f7ea924c839e44df9ab0dc53c00aa71b33886cc0aba959917d553077f4a0468dd804b7678bb2f80117af0cec937266ac0d17ea
+DIST jupyter_sphinx-0.5.3.tar.gz 17532 BLAKE2B 82588c92d4e414f882036bd5fec7a82d35e71696c207dc837d391f4405d49b37bb8f39066d81e115d1951ae952d2bdf577a2fe0384cc66a39f01044becccef03 SHA512 b07b51118931a4b025ceeff6fbcc513336f69da618d0ed114b88f181d2e0913de2282dbb379a3e772affbf8ce021394be885cc03e7a043ed0321e1a7af05d17a
diff --git a/dev-python/jupyter-sphinx/jupyter-sphinx-0.5.3.ebuild b/dev-python/jupyter-sphinx/jupyter-sphinx-0.5.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=hatchling
+inherit distutils-r1 pypi
+
+DESCRIPTION="Jupyter sphinx extensions"
+HOMEPAGE="https://jupyter.org"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# pypi tarball do not include tests
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/ipywidgets[${PYTHON_USEDEP}]
+	dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/nbconvert[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+"
diff --git a/sci-mathematics/sagemath-standard/sagemath-standard-9999.ebuild b/sci-mathematics/sagemath-standard/sagemath-standard-9999.ebuild
@@ -141,11 +141,10 @@ REQUIRED_USE="doc? ( jmol )
 	test? ( jmol )"
 
 PATCHES=(
-	"${FILESDIR}"/singular-4.3.2_p15.patch
+	"${FILESDIR}"/singular-4.3.2_p15_noexpect.patch
 	"${FILESDIR}"/${PN}-9.2-env.patch
 	"${FILESDIR}"/sage_exec-9.3.patch
 	"${FILESDIR}"/${PN}-10.3-neutering.patch
-	"${FILESDIR}"/${PN}-9.8-build_ext.patch
 )
 
 pkg_setup() {