gentoo resync : 29.12.2022

4 files changed, 6 insertions, 51 deletions

diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index d612ff31f2f0..945bbf755482 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,7 +1,6 @@
-AUX notebook-5.7.0-no-mathjax.patch 1438 BLAKE2B 66719f5342c08fce7576a70780b38a97ac3e768f3385218da15e7e2b7073ec0e1bbe943f320e4ebd0618401760de96295fc1b0ea0f2e919487b41f90acabfef0 SHA512 ef2754a0e7f552de34411532e7cbddffeab66364075a5514290b09f956b3486791f757b9a159a6c3f975507b8a5626612efeee754933927e2b505aea5f5df2db
 AUX notebook-6.4.11-no-mathjax.patch 1527 BLAKE2B ccd6d1af303eccdd0eacb760d1b741b11354fa19c46b4d96c04da150793ea9e825cbf0922e152c7eac010ac4ef95d4fd16057092967a12873744fe45e6fbc4b6 SHA512 eb72afff71ab2589afafc735dff50651f9bd55aa8bda520d6d9ed8769373db8b557f79d69e4f2a0d95863e3c9f4d83e09a3a915390e6ad89d6d3bc558101a44e
-DIST notebook-6.4.10.tar.gz 14357395 BLAKE2B 32415b7d303b18c380ea6bab398246307a2b218ad52cdeb9a08db6f2f5f100515f36407358de094144f8da558762f7acf62505edbd9cf9e757fad1ac299f2431 SHA512 78a186c9907006d1fec1cea99e4c0f4181f673bf4dd383ed934cd2eb491cfd247db240fcec6a35a2967fe12b121863bbfaad0c4a8270618d03cd746f4688743b
 DIST notebook-6.4.11.tar.gz 14373938 BLAKE2B 3f6aa2f86c205dec6b66a8eb3a6d3509f8ba0f80d17f7123bfbede41b7ff6d986271a8eeb32916fdf71c56105b0571192c71740836d34baf88b52a35ea0c4a59 SHA512 beabc84e3d528b0786363c705062717378e73aa824ffe6ce8706f6ed765744f40f651bd4e0910d6a0302990f9efcabea1af51c6894106c49869761bcf217084a
-EBUILD notebook-6.4.10.ebuild 3160 BLAKE2B b9a53dbeff695777c29dc4ff1927989a1724b8bb82707061242246788bf91f2274d715a249c8117805873325dc91c084bdd58de020c9f70651506010a292deb1 SHA512 42f2c39114745f9e9ebf85fa8fa17e7c99436a3d8ff4c3afd8bf726ac55782e87c0b503e99f0aa72c84b52b1184cb930f4710e4aecb148ac7d352ae694d4f749
-EBUILD notebook-6.4.11.ebuild 3172 BLAKE2B 2abc220d8e2af5516a8846b772a4860591ba73598eaee539582170164725c3ff9b4fe4083cbe611ecd92477b231f74148fc2302fe0edfa0a4028aad865254a77 SHA512 63b6f10241b11a84506d798f1765a987e2e0fbd3396612f66da8b89ff158aa01171c28ecceabc7fb1f93c45f76dbe21ae4c26aa3653f2a3584658176abce05e2
+DIST notebook-6.4.12.tar.gz 14389641 BLAKE2B 1cda6a1eb1f4e7ccce964153bdce8de243588ffd4abcc5ab6687ba0ea347d68c5dd239c2af5bf93809409d850747db28df72be5c2ec03bfd06b725976ae1c599 SHA512 1314cfebe97ddada61e1013fdfd606bed08908c06b58e59f2fda6e63c43a1158eeed6a93a5cddbb609ecad0347bf80ee3a74747104fd29942629734c1ea749f0
+EBUILD notebook-6.4.11.ebuild 3164 BLAKE2B 132f4a78997645e2ce6cf10cb15e7cb8940e60d7cd11bb4e9f815c18327d499d0e59f62f568600be4a0a2d6fe5c986f2915a12e6ada7123053b2933606977f9d SHA512 86958592f6ecaf9fce14ae8f808b27369955364cd7c1e6f6db07390b397744caaa1e832ddf807cf64cec072d9399275c42fdb3417a1d1509d927125d08ac8037
+EBUILD notebook-6.4.12.ebuild 3172 BLAKE2B 2abc220d8e2af5516a8846b772a4860591ba73598eaee539582170164725c3ff9b4fe4083cbe611ecd92477b231f74148fc2302fe0edfa0a4028aad865254a77 SHA512 63b6f10241b11a84506d798f1765a987e2e0fbd3396612f66da8b89ff158aa01171c28ecceabc7fb1f93c45f76dbe21ae4c26aa3653f2a3584658176abce05e2
 MISC metadata.xml 525 BLAKE2B 03602bbd7c6b55aaa4c4d6011a91127090359079ed2d7e6b9e3cefe63b2b249b36cd172a40d1ce69234de2440d9248e933dd94a636b95c07f06a658ecb929227 SHA512 18f6bd5cb4b1c90cc228a5ee506cea17c4aa9d60174e00c7cb4df654d5d7158aa20ea6346bf9a0734877402a0e0916aa7f9e82f0bdce0cca78c877c5e87550e3
diff --git a/dev-python/notebook/files/notebook-5.7.0-no-mathjax.patch b/dev-python/notebook/files/notebook-5.7.0-no-mathjax.patch
deleted file mode 100644
index f9ce5c3a9e39..000000000000
--- a/dev-python/notebook/files/notebook-5.7.0-no-mathjax.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Disable bundled mathjax.
-
-Patch by Marius Brehler.
---- notebook-5.7.0.orig/setupbase.py
-+++ notebook-5.7.0/setupbase.py
-@@ -169,38 +169,6 @@ def find_package_data():
-             if f.endswith(('.js', '.css')):
-                 static_data.append(pjoin(parent, f))
- 
--    # Trim mathjax
--    mj = lambda *path: pjoin(components, 'MathJax', *path)
--    static_data.extend([
--        mj('MathJax.js'),
--        mj('config', 'TeX-AMS-MML_HTMLorMML-full.js'),
--        mj('config', 'Safe.js'),
--    ])
--    
--    trees = []
--    mj_out = mj('jax', 'output')
--    
--    if os.path.exists(mj_out):
--        for output in os.listdir(mj_out):
--            path = pjoin(mj_out, output)
--            static_data.append(pjoin(path, '*.js'))
--            autoload = pjoin(path, 'autoload')
--            if os.path.isdir(autoload):
--                trees.append(autoload)
--
--    for tree in trees + [
--        mj('localization'), # limit to en?
--        mj('fonts', 'HTML-CSS', 'STIX-Web', 'woff'),
--        mj('extensions'),
--        mj('jax', 'input', 'TeX'),
--        mj('jax', 'output', 'HTML-CSS', 'fonts', 'STIX-Web'),
--        mj('jax', 'output', 'SVG', 'fonts', 'STIX-Web'),
--        mj('jax', 'element', 'mml'),
--    ]:
--        for parent, dirs, files in os.walk(tree):
--            for f in files:
--                static_data.append(pjoin(parent, f))
--
-     os.chdir(os.path.join('tests',))
-     js_tests = glob('*.js') + glob('*/*.js')
- 
diff --git a/dev-python/notebook/notebook-6.4.11.ebuild b/dev-python/notebook/notebook-6.4.11.ebuild
index 05106aece83b..3de25560fa62 100644
--- a/dev-python/notebook/notebook-6.4.11.ebuild
+++ b/dev-python/notebook/notebook-6.4.11.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-libs/mathjax-2.4
diff --git a/dev-python/notebook/notebook-6.4.10.ebuild b/dev-python/notebook/notebook-6.4.12.ebuild
index de98e834153c..05106aece83b 100644
--- a/dev-python/notebook/notebook-6.4.10.ebuild
+++ b/dev-python/notebook/notebook-6.4.12.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-libs/mathjax-2.4
@@ -44,7 +44,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}"-5.7.0-no-mathjax.patch
+	"${FILESDIR}"/notebook-6.4.11-no-mathjax.patch
 )
 
 distutils_enable_tests pytest