commit: 8366dc288a82d117f69304e3e76a0797c316913d Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Mon Mar 3 00:52:55 2025 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Mon Mar 3 00:52:55 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8366dc28
www-apps/nikola: drop 8.2.4-r1, 8.3.0 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> www-apps/nikola/Manifest | 2 - www-apps/nikola/files/nikola-8.2.4-yapsy.patch | 45 ----------------- www-apps/nikola/nikola-8.2.4-r1.ebuild | 69 -------------------------- www-apps/nikola/nikola-8.3.0.ebuild | 67 ------------------------- 4 files changed, 183 deletions(-) diff --git a/www-apps/nikola/Manifest b/www-apps/nikola/Manifest index 01f0b4ef29f6..0bf1276aa0ec 100644 --- a/www-apps/nikola/Manifest +++ b/www-apps/nikola/Manifest @@ -1,3 +1 @@ -DIST Nikola-8.2.4.tar.gz 5635965 BLAKE2B 94421a278718fd9ae9f8978854954f2120bab005d10a52294b120d619a67455417eed94bb9e99cc9d01eca4e1d3da210980caef1ad7ff4ca5d25299a39d8eb19 SHA512 2bcea53181a5371fc1ce7d6d96e5db1ae0ab7c4bc8fe8947ed0d5427e71a469b0f522f1e6f20a47e51a3325730a9646156a8a57bab127785f220c65eb9f891ea -DIST Nikola-8.3.0.tar.gz 4557992 BLAKE2B 67ab76c670fd00d992e6359bcaa11c59dfc904c78c935d1739e6ed7118e38c8f1c4590782a75e85c722f4fcb2c23efc032cb5d58d0c1587069b80920f3bd20fa SHA512 9b25eb90fa560b45e8cd0b03f24523859548353f2a4d2ac91b23b05bfb614d20456bb71f1aaa5702b6d6ab7980696aeb2f5ccc3c00ebc648cfcad49619481247 DIST Nikola-8.3.1.tar.gz 4559433 BLAKE2B 32bffeaf5f490f6c7bdf48b1c3b1906e4fb9a94fb196ecba8f0c2f074489b05e57c4278ae6ec8a6d91838772d19ddb0444166e05caa4d0d3055bd388b9b8cc63 SHA512 cbf4e099e2e1ee22ab16c8a3d3984617097721cb24cf03cf9673fc89d051fa712a05cbbfb522f85d6808155a0fa8835b1630096691a33c25aee8cf24564df050 diff --git a/www-apps/nikola/files/nikola-8.2.4-yapsy.patch b/www-apps/nikola/files/nikola-8.2.4-yapsy.patch deleted file mode 100644 index 563b92609879..000000000000 --- a/www-apps/nikola/files/nikola-8.2.4-yapsy.patch +++ /dev/null @@ -1,45 +0,0 @@ -https://bugs.gentoo.org/916872 -https://github.com/getnikola/nikola/issues/3700 -Patch from upstream. - -commit 4f51e2e0a0b1c0de375d15d06cfacd703ab03040 -Author: Adam Williamson <[email protected]> -Date: Sat, 15 Jul 2023 09:34:30 -0700 - - Handle change to plugin loading in recent yapsy (#3700) (#3701) - ---- a/nikola/plugin_categories.py -+++ b/nikola/plugin_categories.py -@@ -75,8 +75,31 @@ def set_site(self, site): - def inject_templates(self): - """Inject 'templates/<engine>' (if exists) very early in the theme chain.""" - try: -+ mod_candidate = None -+ # since https://github.com/tibonihoo/yapsy/pull/11 , -+ # yapsy only adds each imported plugin to sys.modules -+ # under its modified, "unique" name (see early in -+ # PluginManager.loadPlugins), so we recreate the -+ # modified name here to find it. we fudge the serial -+ # number here, assuming that if a plugin is loaded -+ # under the same name multiple times, the location -+ # will also be the same, so we can just use 0. -+ possible_names = ( -+ self.__class__.__module__, -+ "yapsy_loaded_plugin_" + self.__class__.__module__ + "_0", -+ "yapsy_loaded_plugin_" + self.name + "_0", -+ ) -+ for possible_name in possible_names: -+ mod_candidate = sys.modules.get(possible_name) -+ if mod_candidate: -+ break -+ if not mod_candidate: -+ # well, we tried. we wind up here for the dummy -+ # plugins; honestly I'm not sure exactly why/how, -+ # but they don't have templates, so it's okay -+ return - # Sorry, found no other way to get this -- mod_path = sys.modules[self.__class__.__module__].__file__ -+ mod_path = mod_candidate.__file__ - mod_dir = os.path.dirname(mod_path) - tmpl_dir = os.path.join( - mod_dir, 'templates', self.site.template_system.name diff --git a/www-apps/nikola/nikola-8.2.4-r1.ebuild b/www-apps/nikola/nikola-8.2.4-r1.ebuild deleted file mode 100644 index af508414a102..000000000000 --- a/www-apps/nikola/nikola-8.2.4-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{10,11} ) -DISTUTILS_USE_PEP517=setuptools - -inherit bash-completion-r1 distutils-r1 optfeature pypi - -DESCRIPTION="A static website and blog generator" -HOMEPAGE="https://getnikola.com/"; -SRC_URI="$(pypi_sdist_url --no-normalize ${PN^} ${PV})" -S="${WORKDIR}/${P^}" - -LICENSE="MIT Apache-2.0 CC0-1.0 public-domain" -SLOT="0" -KEYWORDS="amd64 ~riscv" -RESTRICT="test" # needs coveralls - -BDEPEND=">=dev-python/docutils-0.13[${PYTHON_USEDEP}]" # needs rst2man to build manpage -RDEPEND="${BDEPEND} - >=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/setuptools-67.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}-yapsy.patch ) - -python_compile_all() { - nikola tabcompletion --shell=bash > ${PN}.bashcomp || die - nikola tabcompletion --shell=zsh > ${PN}.zshcomp || die -} - -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 - - newbashcomp ${PN}.bashcomp ${PN} - insinto /usr/share/zsh/site-functions - newins ${PN}.zshcomp _${PN} -} - -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/jinja2 - 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 -} diff --git a/www-apps/nikola/nikola-8.3.0.ebuild b/www-apps/nikola/nikola-8.3.0.ebuild deleted file mode 100644 index 3d28257ecfe2..000000000000 --- a/www-apps/nikola/nikola-8.3.0.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{10,11,12} ) -DISTUTILS_USE_PEP517=setuptools - -inherit bash-completion-r1 distutils-r1 optfeature pypi - -DESCRIPTION="A static website and blog generator" -HOMEPAGE="https://getnikola.com/"; -SRC_URI="$(pypi_sdist_url --no-normalize ${PN^} ${PV})" -S="${WORKDIR}/${P^}" - -LICENSE="MIT Apache-2.0 CC0-1.0 public-domain" -SLOT="0" -KEYWORDS="amd64 ~riscv" -RESTRICT="test" # needs coveralls - -BDEPEND=">=dev-python/docutils-0.13[${PYTHON_USEDEP}]" # needs rst2man to build manpage -RDEPEND="${BDEPEND} - >=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/setuptools-67.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}]" - -python_compile_all() { - nikola tabcompletion --shell=bash > ${PN}.bashcomp || die - nikola tabcompletion --shell=zsh > ${PN}.zshcomp || die -} - -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 - - newbashcomp ${PN}.bashcomp ${PN} - insinto /usr/share/zsh/site-functions - newins ${PN}.zshcomp _${PN} -} - -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/jinja2 - 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 -}
