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

[Ulrich Müller]

commit:     bcb9d02f1093c3bc00ff90dfbc3c46e8a6126549
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 23 09:44:35 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 23 09:45:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcb9d02f

www-apps/nikola: Replace optional runtime dependencies by optfeature

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

 www-apps/nikola/metadata.xml                       | 25 ----------------------
 ...{nikola-8.2.2.ebuild => nikola-8.2.2-r1.ebuild} | 23 ++++++++++----------
 2 files changed, 12 insertions(+), 36 deletions(-)

diff --git a/www-apps/nikola/metadata.xml b/www-apps/nikola/metadata.xml
index f3793128d66f..d03a91b8243b 100644
--- a/www-apps/nikola/metadata.xml
+++ b/www-apps/nikola/metadata.xml
@@ -4,31 +4,6 @@
   <maintainer type="person">
     <email>ulm@g.o</email>
   </maintainer>
-  <use>
-    <flag name="charts">
-      Support chart generation through <pkg>dev-python/pygal</pkg>
-    </flag>
-    <flag name="hyphenation">
-      Add hyphenation support through <pkg>dev-python/pyphen</pkg>
-    </flag>
-    <flag name="ipython">
-      Add IPython notebook compilation and LESS support
-    </flag>
-    <flag name="jinja">
-      Add support for <pkg>dev-python/jinja</pkg> as alternative templating
-      engine to Mako
-    </flag>
-    <flag name="server">
-      Enable support for built-in web server using <pkg>dev-python/aiohttp</pkg>
-    </flag>
-    <flag name="watchdog">
-      Use <pkg>dev-python/watchdog</pkg> to monitor file system events
-    </flag>
-    <flag name="webmedia">
-      Use <pkg>dev-python/micawber</pkg> to extract metadata from web media
-      links
-    </flag>
-  </use>
   <upstream>
     <remote-id type="pypi">Nikola</remote-id>
   </upstream>

diff --git a/www-apps/nikola/nikola-8.2.2.ebuild b/www-apps/nikola/nikola-8.2.2-r1.ebuild
similarity index 72%
rename from www-apps/nikola/nikola-8.2.2.ebuild
rename to www-apps/nikola/nikola-8.2.2-r1.ebuild
index 75f7358c791b..efa4bce006ed 100644
--- a/www-apps/nikola/nikola-8.2.2.ebuild
+++ b/www-apps/nikola/nikola-8.2.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{8,9,10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit distutils-r1
+inherit distutils-r1 optfeature
 
 MY_PN="Nikola"
 MY_P="${MY_PN}-${PV}"
@@ -18,8 +18,6 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="MIT Apache-2.0 CC0-1.0 public-domain"
 SLOT="0"
 KEYWORDS="amd64 ~riscv"
-IUSE="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
@@ -39,14 +37,7 @@ RDEPEND="${DEPEND}
 	>=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}]
-	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}] )"
+	dev-python/cloudpickle[${PYTHON_USEDEP}]"
 
 src_install() {
 	distutils-r1_src_install
@@ -57,3 +48,13 @@ src_install() {
 	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
+}