gentoo auto-resync : 23:07:2022 - 02:48:51

3 files changed, 113 insertions, 0 deletions

diff --git a/www-apps/nikola/Manifest b/www-apps/nikola/Manifest
index 2fa5688b28aa..e1aac1eae52e 100644
--- a/www-apps/nikola/Manifest
+++ b/www-apps/nikola/Manifest
@@ -1,3 +1,5 @@
+AUX nikola-8.2.2-markdown-3.4.patch 1716 BLAKE2B a1fbf6f2eb5adf49a064f09d4b521aa49d0323da2c96ad4d5e0a2671d2ae41c1f9a9fb5cac57f6260bbfacb97c04627e04ba6619dbeee83badcd51dca8b774bd SHA512 7372b620354f6e082087f7a60e81f7e3690bea4f8fbe2af0a83f38150a975ab6e24c115418c0212a6e8d7968de421af99ee1d1754ca35452cdd47fe6d6212e0a
 DIST Nikola-8.2.2.tar.gz 5483145 BLAKE2B 78950e97016b7a87d41739684de102c548a5dfecfe9c1239a94c757a4d7d00f5d77bf679b6ed1a853aa46e1fcb78c27e7c2276e7aafeb874c0e21c1ae9f1cbb2 SHA512 f2bf38c81c2e01f6d6cb6a24d9b9ea95f047e9bd9987437df61cf1cb10c39c5f9259e8baa4c64dc24e4f69dc3b3e35e3553dced7d42c840645e024d6c21eb9ae
 EBUILD nikola-8.2.2-r1.ebuild 2130 BLAKE2B 7e544dedfc0ac7744a32d4e2f41e548f1f127c8da791becaff23f240d72be38c83179d234a957e7f90b0e54824ac031c106c549e4371db42c52743f6ee1ae9e3 SHA512 ec0acdd155bc269cebbd82d0e97d7e7a583f2aedef902c9527484d902aed7b8636437e5f54a6ef94291267bf5eaf3475ca87895827835de11d7f850b5b305fd6
+EBUILD nikola-8.2.2-r2.ebuild 2138 BLAKE2B 6f6e05a61cf4b31700a6a9e41c0b57c46291fa41917626775289aa57e3fe85c4c30e4340f18dc10c10cc1368445ecb7334742cd3667754f534b9fc5b5cbd5ef9 SHA512 e9951fbda8c3d941ea82bc7b30b503a1e1e1e6d7b682d2ef6b2a64bc99cb82c6890d0e14dd24fc42cb55885d03b99356c894d12088fa46214ba8137d5742fccb
 MISC metadata.xml 292 BLAKE2B 0042bf60cec1af73f2d8e977e53c42adf5c7e4500f02ee08e3673b25962a86905d1d07783fb519a3bf40a12ab64229879e5fb217d1bde97195573fc6faa69f66 SHA512 a8e6a37da4e290629b38ccb4f9087682de58a0e4e4a377b85c3f3bb06eba426e3689cab575f528511fde9ed308e12a2e79a318e4dc55c6f85c3d8e16e22b3d01
diff --git a/www-apps/nikola/files/nikola-8.2.2-markdown-3.4.patch b/www-apps/nikola/files/nikola-8.2.2-markdown-3.4.patch
new file mode 100644
index 000000000000..a1f54773f65c
--- /dev/null
+++ b/www-apps/nikola/files/nikola-8.2.2-markdown-3.4.patch
@@ -0,0 +1,49 @@
+https://bugs.gentoo.org/860087
+
+Patch backported from upstream:
+
+commit 1be6e8b387bbebcc891b0afc53802cf69607cfcf
+Author: Chris Warrick <kwpolska@gmail.com>
+Date:   Sun Jul 17 00:08:24 2022 +0200
+
+    Fix #3635 — fix compatibility of Markdown extensions with Markdown 3.4+
+
+--- Nikola-8.2.2/nikola/plugins/compile/markdown/mdx_gist.py
++++ Nikola-8.2.2/nikola/plugins/compile/markdown/mdx_gist.py
+@@ -76,6 +76,7 @@
+ """
+ 
+ import requests
++import xml.etree.ElementTree as etree
+ 
+ from nikola.plugin_categories import MarkdownExtension
+ from nikola.utils import get_logger
+@@ -84,11 +85,10 @@
+     from markdown.extensions import Extension
+     from markdown.inlinepatterns import Pattern
+     from markdown.util import AtomicString
+-    from markdown.util import etree
+ except ImportError:
+     # No need to catch this, if you try to use this without Markdown,
+     # the markdown compiler will fail first
+-    Extension = Pattern = object
++    Extension = Pattern = AtomicString = object
+ 
+ 
+ LOGGER = get_logger('compile_markdown.mdx_gist')
+--- Nikola-8.2.2/nikola/plugins/compile/markdown/mdx_podcast.py
++++ Nikola-8.2.2/nikola/plugins/compile/markdown/mdx_podcast.py
+@@ -36,11 +36,12 @@
+ <p><audio controls=""><source src="https://archive.org/download/Rebeldes_Stereotipos/rs20120609_1.mp3" type="audio/mpeg"></source></audio></p>
+ """
+ 
++import xml.etree.ElementTree as etree
++
+ from nikola.plugin_categories import MarkdownExtension
+ try:
+     from markdown.extensions import Extension
+     from markdown.inlinepatterns import Pattern
+-    from markdown.util import etree
+ except ImportError:
+     # No need to catch this, if you try to use this without Markdown,
+     # the markdown compiler will fail first
diff --git a/www-apps/nikola/nikola-8.2.2-r2.ebuild b/www-apps/nikola/nikola-8.2.2-r2.ebuild
new file mode 100644
index 000000000000..25ba230bd915
--- /dev/null
+++ b/www-apps/nikola/nikola-8.2.2-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 optfeature
+
+MY_PN="Nikola"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A static website and blog generator"
+HOMEPAGE="https://getnikola.com/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT Apache-2.0 CC0-1.0 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+RESTRICT="test" # needs coveralls
+
+DEPEND=">=dev-python/docutils-0.13[${PYTHON_USEDEP}]" # needs rst2man to build manpage
+RDEPEND="${DEPEND}
+	>=dev-python/Babel-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
+	>=dev-python/doit-0.32[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
+	>=dev-python/mako-1.0[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/natsort-3.5.2[${PYTHON_USEDEP}]
+	>=dev-python/piexif-1.0.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
+	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
+	>=dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
+	dev-python/pillow[jpeg,${PYTHON_USEDEP}]
+	dev-python/cloudpickle[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}"/${P}-markdown-3.4.patch )
+
+src_install() {
+	distutils-r1_src_install
+
+	# hackish way to remove docs that ended up in the wrong place
+	rm -r "${ED}/usr/share/doc/${PN}" || die
+
+	dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.rst
+	gunzip "${ED}/usr/share/man/man1/${PN}.1.gz" || die
+}
+
+pkg_postinst() {
+	optfeature "chart generation" dev-python/pygal
+	optfeature "hyphenation support" dev-python/pyphen
+	optfeature "notebook compilation and LESS support" dev-python/ipython
+	optfeature "alternative templating engine to Mako" dev-python/jinja
+	optfeature "built-in web server support" dev-python/aiohttp
+	optfeature "monitoring file system events" dev-python/watchdog
+	optfeature "extracting metadata from web media links" dev-python/micawber
+}