[patch] www-apps/nikola: Fix breakage with dev-python/doit-0.36.0

0001-www-apps-nikola-Fix-breakage-with-dev-python-doit-0..patch (text/plain), 6.41 KB, created by Ulrich Müller on 2022-04-23 13:25:16 UTC

From 784cbd5711455b0cd0029c46b3419621273b59ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <[e-mail]>
Date: Sat, 23 Apr 2022 15:22:55 +0200
Subject: [PATCH] www-apps/nikola: Fix breakage with dev-python/doit-0.36.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes: https://bugs.gentoo.org/840305
Signed-off-by: Ulrich Müller <[e-mail]>
---
 .../nikola/files/nikola-8.1.3-doit-auto.patch | 91 +++++++++++++++++++
 www-apps/nikola/nikola-8.1.3-r1.ebuild        | 62 +++++++++++++
 2 files changed, 153 insertions(+)
 create mode 100644 www-apps/nikola/files/nikola-8.1.3-doit-auto.patch
 create mode 100644 www-apps/nikola/nikola-8.1.3-r1.ebuild

diff --git a/www-apps/nikola/files/nikola-8.1.3-doit-auto.patch b/www-apps/nikola/files/nikola-8.1.3-doit-auto.patch
new file mode 100644
index 000000000000..c6b7305c9042
--- /dev/null
+++ b/www-apps/nikola/files/nikola-8.1.3-doit-auto.patch
@@ -0,0 +1,91 @@
+https://bugs.gentoo.org/840305
+Patch from upstream:
+
+commit a4c67b38c0faef6e04a3f2dcd1a26e592ae8f27c
+Author: Chris Warrick <[e-mail]>
+Date:   Fri Apr 22 20:36:26 2022 +0200
+
+    Fix #3612 — doit 0.36.0 compatibility
+
+--- a/nikola/__main__.py
++++ b/nikola/__main__.py
+@@ -36,8 +36,7 @@
+ from collections import defaultdict
+ 
+ from blinker import signal
+-from doit.cmd_auto import Auto as DoitAuto
+-from doit.cmd_base import TaskLoader, _wrap
++from doit.cmd_base import TaskLoader2, _wrap
+ from doit.cmd_clean import Clean as DoitClean
+ from doit.cmd_completion import TabCompletion
+ from doit.cmd_help import Help as DoitHelp
+@@ -247,31 +246,41 @@ def clean_tasks(self, tasks, dryrun, *a):
+ 
+ # Nikola has its own "auto" commands that uses livereload.
+ # Expose original doit "auto" command as "doit_auto".
+-DoitAuto.name = 'doit_auto'
++# doit_auto is not available with doit>=0.36.0.
++try:
++    from doit.cmd_auto import Auto as DoitAuto
++    DoitAuto.name = 'doit_auto'
++except ImportError:
++    DoitAuto = None
+ 
+ 
+-class NikolaTaskLoader(TaskLoader):
++class NikolaTaskLoader(TaskLoader2):
+     """Nikola-specific task loader."""
+ 
+     def __init__(self, nikola, quiet=False):
+         """Initialize the loader."""
++        super().__init__()
+         self.nikola = nikola
+         self.quiet = quiet
+ 
+-    def load_tasks(self, cmd, opt_values, pos_args):
+-        """Load Nikola tasks."""
++    def load_doit_config(self):
++        """Load doit configuration."""
+         if self.quiet:
+-            DOIT_CONFIG = {
++            doit_config = {
+                 'verbosity': 0,
+                 'reporter': 'zero',
+             }
+         else:
+-            DOIT_CONFIG = {
++            doit_config = {
+                 'reporter': ExecutedOnlyReporter,
+                 'outfile': sys.stderr,
+             }
+-        DOIT_CONFIG['default_tasks'] = ['render_site', 'post_render']
+-        DOIT_CONFIG.update(self.nikola._doit_config)
++        doit_config['default_tasks'] = ['render_site', 'post_render']
++        doit_config.update(self.nikola._doit_config)
++        return doit_config
++
++    def load_tasks(self, cmd, pos_args):
++        """Load Nikola tasks."""
+         try:
+             tasks = generate_tasks(
+                 'render_site',
+@@ -286,15 +295,17 @@ def load_tasks(self, cmd, opt_values, pos_args):
+                 raise
+             _print_exception()
+             sys.exit(3)
+-        return tasks + latetasks, DOIT_CONFIG
++        return tasks + latetasks
+ 
+ 
+ class DoitNikola(DoitMain):
+     """Nikola-specific implementation of DoitMain."""
+ 
+     # overwite help command
+-    DOIT_CMDS = list(DoitMain.DOIT_CMDS) + [Help, Build, Clean, DoitAuto]
++    DOIT_CMDS = list(DoitMain.DOIT_CMDS) + [Help, Build, Clean]
+     TASK_LOADER = NikolaTaskLoader
++    if DoitAuto is not None:
++        DOIT_CMDS.append(DoitAuto)
+ 
+     def __init__(self, nikola, quiet=False):
+         """Initialzie DoitNikola."""
diff --git a/www-apps/nikola/nikola-8.1.3-r1.ebuild b/www-apps/nikola/nikola-8.1.3-r1.ebuild
new file mode 100644
index 000000000000..62ae07196bd6
--- /dev/null
+++ b/www-apps/nikola/nikola-8.1.3-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+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"
+
+LICENSE="MIT Apache-2.0 CC0-1.0 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+IUSE="assets charts hyphenation ipython jinja server watchdog webmedia"
+REQUIRED_USE="server? ( watchdog )"
+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}]
+	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
+	charts? ( >=dev-python/pygal-2.0.1[${PYTHON_USEDEP}] )
+	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
+	ipython? ( >=dev-python/ipython-2.0.0[notebook,${PYTHON_USEDEP}] )
+	jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )
+	server? ( dev-python/aiohttp[${PYTHON_USEDEP}] )
+	watchdog? ( >=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] )
+	webmedia? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+PATCHES=( "${FILESDIR}/${P}-doit-auto.patch" )
+
+src_install() {
+	distutils-r1_src_install
+
+	# hackish way to remove docs that ended up in the wrong place
+	rm -rv "${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
+}
-- 
2.35.1