[gentoo-commits] repo/gentoo:master commit in: www-apps/nikola/files/, www-apps/nikola/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: www-apps/nikola/files/, www-apps/nikola/
@ 2021-02-21 23:43 Thomas Deutschmann
  0 siblings, 0 replies; 4+ messages in thread
From: Thomas Deutschmann @ 2021-02-21 23:43 UTC (permalink / raw
  To: gentoo-commits

commit:     1741984b7972c5bbfc9cf5af88e9209722de837c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 21 23:42:20 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Feb 21 23:43:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1741984b

www-apps/nikola: drop old

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 www-apps/nikola/Manifest                          |  4 --
 www-apps/nikola/files/nikola-8.0.4-setup-py.patch | 47 ----------------
 www-apps/nikola/metadata.xml                      |  6 ---
 www-apps/nikola/nikola-8.0.4.ebuild               | 66 -----------------------
 www-apps/nikola/nikola-8.1.0.ebuild               | 62 ---------------------
 www-apps/nikola/nikola-8.1.1-r1.ebuild            | 61 ---------------------
 www-apps/nikola/nikola-8.1.1.ebuild               | 62 ---------------------
 www-apps/nikola/nikola-8.1.2.ebuild               | 61 ---------------------
 8 files changed, 369 deletions(-)

diff --git a/www-apps/nikola/Manifest b/www-apps/nikola/Manifest
index af76c59f328..d5a48bc3ba3 100644
--- a/www-apps/nikola/Manifest
+++ b/www-apps/nikola/Manifest
@@ -1,5 +1 @@
-DIST Nikola-8.0.4.tar.gz 4137494 BLAKE2B 04db8b83f34ca9b3cee785c5eed9d0421d27acf750c4f17dc3bec0df6fd4f462af52a65c0c97a07777922da3bf3fa855d58d546479b19bfb152e8190d2f74524 SHA512 eb6774d11be4eab81fbe41115d80e5d0d38694b734431d5d6355fcd3e3d8ae5ff4a02114c5dd0dbbc9e1ea5a625e9ac2b6b91e82f6e017b4376e4ca8d56cfec7
-DIST Nikola-8.1.0.tar.gz 4298799 BLAKE2B 568b6b39506ab78c84bdb5fc1bf66829a714d41e1c88afe40236e915a801ce8214e7913ecfda7816d11af17beb9bdb54a0c60a88ef72ce53f7bdac91d057489d SHA512 b88fdf4848314e6428b7f3c4a891aefe682f1ae6a2cdc8da25de1d6af839f5d6f3410e23d90b76094f082aebe15d7e51b2c9cd079d017960bb979503d62a4b68
-DIST Nikola-8.1.1.tar.gz 4299903 BLAKE2B 75997604e21484bcaab26afa056c3c82f5d19c810e8a388af07aa3c10f8bd341e912c089af5d3aeda51748b6ec17ee07a7c577d5df1a801b032b0bd100188a9a SHA512 a833cb7687077266a20f7043f99b03391f350b48ceea71250158e760b0e44b603de1d6e398a03ec848483775501ad248b6ac45a23ceb250d120a63f110d482b5
-DIST Nikola-8.1.2.tar.gz 4351283 BLAKE2B 28b4a9905a92ba2714e05aec5854ffbd9bf136e9d31218e032d6697f54b3b2711256b83e74ef6ebd0411fdeb0ac17d6454c52473cb396c029af5086cc085728e SHA512 5f53f4939dddececfaf75922147b18fd08434242373d3f4a54e300475adf274b716cdc6e485e6703bdb17fe038656a8c4ac9b260b4ddd47c252a645c3d26a30a
 DIST Nikola-8.1.3.tar.gz 4340545 BLAKE2B 535870b7cd147169b511166186ac200ab9d31d976c58363e42235e07ea8ba68e01738d378190663864e6a8605986771500569004e7a73ea043ae8982be09afe1 SHA512 7b6a8391d023a339125392082cc3d2ea2a2fe25b8938bd82b8c9efe0cbb3e8b83537f1bd00d97a648e3fc2b096e673702026fa3942ab9c97e76bf21b5afefe16

diff --git a/www-apps/nikola/files/nikola-8.0.4-setup-py.patch b/www-apps/nikola/files/nikola-8.0.4-setup-py.patch
deleted file mode 100644
index 8089b4ee8b2..00000000000
--- a/www-apps/nikola/files/nikola-8.0.4-setup-py.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 89bfbfb5bb0ffc823664557ff59f90db03f7b10f Mon Sep 17 00:00:00 2001
-From: Chris Warrick <kwpolska@gmail.com>
-Date: Fri, 7 Feb 2020 13:06:06 +0100
-Subject: [PATCH] =?UTF-8?q?Fix=20#3348=20=E2=80=94=20don=E2=80=99t=20ship?=
- =?UTF-8?q?=20tests=20to=20site-packages?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- CHANGES.txt | 12 ++++++++++++
- setup.py    |  2 +-
- 2 files changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/CHANGES.txt b/CHANGES.txt
-index e76f24bee..815b37849 100644
---- a/CHANGES.txt
-+++ b/CHANGES.txt
-@@ -1,3 +1,15 @@
-+New in master
-+============
-+
-+Features
-+--------
-+
-+Bugfixes
-+--------
-+
-+* Avoid installing ``tests`` package to site-packages, remove it from
-+  your environment if it was inadvertently added (Issue #3348)
-+
- New in v8.0.4
- =============
- 
-diff --git a/setup.py b/setup.py
-index f6ca027b7..e4f2c7fc7 100755
---- a/setup.py
-+++ b/setup.py
-@@ -105,7 +105,7 @@ def run(self):
-       author='Roberto Alsina and others',
-       author_email='ralsina@netmanagers.com.ar',
-       url='https://getnikola.com/',
--      packages=find_packages(exclude=('tests',)),
-+      packages=find_packages(exclude=('tests', 'tests.*')),
-       license='MIT',
-       keywords='website, blog, static',
-       classifiers=['Development Status :: 5 - Production/Stable',

diff --git a/www-apps/nikola/metadata.xml b/www-apps/nikola/metadata.xml
index 56b283c01d8..4c68f03e7ce 100644
--- a/www-apps/nikola/metadata.xml
+++ b/www-apps/nikola/metadata.xml
@@ -12,9 +12,6 @@
     <flag name="charts">
       Support chart generation through <pkg>dev-python/pygal</pkg>
     </flag>
-    <flag name="ghpages">
-      Add support for direct uploading to github pages
-    </flag>
     <flag name="hyphenation">
       Add hyphenation support through <pkg>dev-python/pyphen</pkg>
     </flag>
@@ -35,9 +32,6 @@
       Use <pkg>dev-python/micawber</pkg> to extract metadata from web media
       links
     </flag>
-    <flag name="websocket">
-      Add websocket support thru <pkg>dev-python/ws4py</pkg>
-    </flag>
   </use>
   <upstream>
     <remote-id type="pypi">Nikola</remote-id>

diff --git a/www-apps/nikola/nikola-8.0.4.ebuild b/www-apps/nikola/nikola-8.0.4.ebuild
deleted file mode 100644
index 1bc96ad266f..00000000000
--- a/www-apps/nikola/nikola-8.0.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-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"
-IUSE="assets charts ghpages hyphenation ipython jinja watchdog webmedia websocket"
-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.30.1[${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[${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}] )
-	ghpages? ( >=dev-vcs/ghp-import-0.4.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}] )
-	watchdog? ( >=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] )
-	webmedia? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )
-	websocket? ( ~dev-python/ws4py-0.3.4[${PYTHON_USEDEP}] )"
-#	typography? ( >=dev-python/typogrify-2.0.4[${PYTHON_USEDEP}] ) # needs smartypants
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-setup-py.patch
-)
-
-src_install() {
-	distutils-r1_src_install
-
-	# hackish way to remove docs that ended up in the wrong place
-	rm -rv "${D}/usr/share/doc/${PN}" || die
-
-	dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.rst
-	gunzip "${D}/usr/share/man/man1/${PN}.1.gz" || die
-}

diff --git a/www-apps/nikola/nikola-8.1.0.ebuild b/www-apps/nikola/nikola-8.1.0.ebuild
deleted file mode 100644
index 02cf2f92674..00000000000
--- a/www-apps/nikola/nikola-8.1.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-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"
-IUSE="assets charts ghpages hyphenation ipython jinja watchdog webmedia websocket"
-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[${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}] )
-	ghpages? ( >=dev-vcs/ghp-import-0.4.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}] )
-	watchdog? ( >=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] )
-	webmedia? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )
-	websocket? ( ~dev-python/ws4py-0.3.4[${PYTHON_USEDEP}] )"
-#	typography? ( >=dev-python/typogrify-2.0.4[${PYTHON_USEDEP}] ) # needs smartypants
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	distutils-r1_src_install
-
-	# hackish way to remove docs that ended up in the wrong place
-	rm -rv "${D}/usr/share/doc/${PN}" || die
-
-	dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.rst
-	gunzip "${D}/usr/share/man/man1/${PN}.1.gz" || die
-}

diff --git a/www-apps/nikola/nikola-8.1.1-r1.ebuild b/www-apps/nikola/nikola-8.1.1-r1.ebuild
deleted file mode 100644
index f5e1a159852..00000000000
--- a/www-apps/nikola/nikola-8.1.1-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-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"
-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}"
-
-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
-}

diff --git a/www-apps/nikola/nikola-8.1.1.ebuild b/www-apps/nikola/nikola-8.1.1.ebuild
deleted file mode 100644
index 02cf2f92674..00000000000
--- a/www-apps/nikola/nikola-8.1.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-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"
-IUSE="assets charts ghpages hyphenation ipython jinja watchdog webmedia websocket"
-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[${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}] )
-	ghpages? ( >=dev-vcs/ghp-import-0.4.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}] )
-	watchdog? ( >=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] )
-	webmedia? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )
-	websocket? ( ~dev-python/ws4py-0.3.4[${PYTHON_USEDEP}] )"
-#	typography? ( >=dev-python/typogrify-2.0.4[${PYTHON_USEDEP}] ) # needs smartypants
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	distutils-r1_src_install
-
-	# hackish way to remove docs that ended up in the wrong place
-	rm -rv "${D}/usr/share/doc/${PN}" || die
-
-	dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.rst
-	gunzip "${D}/usr/share/man/man1/${PN}.1.gz" || die
-}

diff --git a/www-apps/nikola/nikola-8.1.2.ebuild b/www-apps/nikola/nikola-8.1.2.ebuild
deleted file mode 100644
index 347b90da687..00000000000
--- a/www-apps/nikola/nikola-8.1.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-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"
-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}"
-
-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
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-apps/nikola/files/, www-apps/nikola/
@ 2022-07-22 19:00 Ulrich Müller
  0 siblings, 0 replies; 4+ messages in thread
From: Ulrich Müller @ 2022-07-22 19:00 UTC (permalink / raw
  To: gentoo-commits

commit:     6637557f1b4ae76e05299a6f4cead4aed80179ba
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 22 18:59:17 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Jul 22 19:00:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6637557f

www-apps/nikola: Fix runtime error with >=dev-python/markdown-3.4

Closes: https://bugs.gentoo.org/860087
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 .../nikola/files/nikola-8.2.2-markdown-3.4.patch   | 49 +++++++++++++++++
 www-apps/nikola/nikola-8.2.2-r2.ebuild             | 62 ++++++++++++++++++++++
 2 files changed, 111 insertions(+)

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
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-apps/nikola/files/, www-apps/nikola/
@ 2023-03-30  2:44 Ulrich Müller
  0 siblings, 0 replies; 4+ messages in thread
From: Ulrich Müller @ 2023-03-30  2:44 UTC (permalink / raw
  To: gentoo-commits

commit:     c26459f3b5eaf6f7b47c125fc22ec5a202a68961
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 30 02:44:17 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 30 02:44:17 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c26459f3

www-apps/nikola: drop 8.2.2-r2

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 www-apps/nikola/Manifest                           |  1 -
 .../nikola/files/nikola-8.2.2-markdown-3.4.patch   | 49 -----------------
 www-apps/nikola/nikola-8.2.2-r2.ebuild             | 62 ----------------------
 3 files changed, 112 deletions(-)

diff --git a/www-apps/nikola/Manifest b/www-apps/nikola/Manifest
index fc41693c7fdb..3438a0e6cd11 100644
--- a/www-apps/nikola/Manifest
+++ b/www-apps/nikola/Manifest
@@ -1,2 +1 @@
-DIST Nikola-8.2.2.tar.gz 5483145 BLAKE2B 78950e97016b7a87d41739684de102c548a5dfecfe9c1239a94c757a4d7d00f5d77bf679b6ed1a853aa46e1fcb78c27e7c2276e7aafeb874c0e21c1ae9f1cbb2 SHA512 f2bf38c81c2e01f6d6cb6a24d9b9ea95f047e9bd9987437df61cf1cb10c39c5f9259e8baa4c64dc24e4f69dc3b3e35e3553dced7d42c840645e024d6c21eb9ae
 DIST Nikola-8.2.3.tar.gz 5486641 BLAKE2B 690ea8584b9b11b1f26b768dc6daaded2f976b54a7be3b75f83d50cda3721f3f0051fd7ff7be3c38ed871ac905f604f891936e4ea72381b8f88a461f4d227587 SHA512 fbb107f975a4eeb369469eaa7a83e6fd342202530f91a0428c854f2eca28315268d6623983a078496943878a9f0548a5939184a2349d468cc0ac7152116b48b4

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
deleted file mode 100644
index a1f54773f65c..000000000000
--- a/www-apps/nikola/files/nikola-8.2.2-markdown-3.4.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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
deleted file mode 100644
index 4285f876880a..000000000000
--- a/www-apps/nikola/nikola-8.2.2-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{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
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-apps/nikola/files/, www-apps/nikola/
@ 2023-11-05 13:46 Ulrich Müller
  0 siblings, 0 replies; 4+ messages in thread
From: Ulrich Müller @ 2023-11-05 13:46 UTC (permalink / raw
  To: gentoo-commits

commit:     876398edc86a7c72569a36b3f972219a9c34a11d
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  5 13:43:10 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Nov  5 13:45:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=876398ed

www-apps/nikola: Fix loading of plugins

Bug: https://bugs.gentoo.org/916872
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 www-apps/nikola/files/nikola-8.2.4-yapsy.patch | 45 ++++++++++++++++++++++++++
 www-apps/nikola/nikola-8.2.4.ebuild            |  2 ++
 2 files changed, 47 insertions(+)

diff --git a/www-apps/nikola/files/nikola-8.2.4-yapsy.patch b/www-apps/nikola/files/nikola-8.2.4-yapsy.patch
new file mode 100644
index 000000000000..563b92609879
--- /dev/null
+++ b/www-apps/nikola/files/nikola-8.2.4-yapsy.patch
@@ -0,0 +1,45 @@
+https://bugs.gentoo.org/916872
+https://github.com/getnikola/nikola/issues/3700
+Patch from upstream.
+
+commit 4f51e2e0a0b1c0de375d15d06cfacd703ab03040
+Author: Adam Williamson <awilliam@redhat.com>
+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.ebuild b/www-apps/nikola/nikola-8.2.4.ebuild
index 93ffb6d32eea..76917982b3b4 100644
--- a/www-apps/nikola/nikola-8.2.4.ebuild
+++ b/www-apps/nikola/nikola-8.2.4.ebuild
@@ -37,6 +37,8 @@ RDEPEND="${BDEPEND}
 	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


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2023-11-05 13:46 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-02-21 23:43 [gentoo-commits] repo/gentoo:master commit in: www-apps/nikola/files/, www-apps/nikola/ Thomas Deutschmann
  -- strict thread matches above, loose matches on Subject: below --
2022-07-22 19:00 Ulrich Müller
2023-03-30  2:44 Ulrich Müller
2023-11-05 13:46 Ulrich Müller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox