gentoo resync : 29.12.2022

3 files changed, 20 insertions, 50 deletions

diff --git a/www-apps/nikola/Manifest b/www-apps/nikola/Manifest
index 01f3c5db4213..d64e863e19ac 100644
--- a/www-apps/nikola/Manifest
+++ b/www-apps/nikola/Manifest
@@ -1,3 +1,3 @@
-DIST Nikola-8.1.3.tar.gz 4340545 BLAKE2B 535870b7cd147169b511166186ac200ab9d31d976c58363e42235e07ea8ba68e01738d378190663864e6a8605986771500569004e7a73ea043ae8982be09afe1 SHA512 7b6a8391d023a339125392082cc3d2ea2a2fe25b8938bd82b8c9efe0cbb3e8b83537f1bd00d97a648e3fc2b096e673702026fa3942ab9c97e76bf21b5afefe16
-EBUILD nikola-8.1.3.ebuild 2198 BLAKE2B 1d64ba030d176676dd0670fca9ccd8de90eb78fd4badb09182ed9418fd8a046ca882d09f0572f2be7f5e763dd24f264e28c1d3362437d376e8110c11371677c3 SHA512 2106be3afce054b5557db657fd87ad9897fb9e99545edaa0caa29fd983eba71a87a1d6ba9455b6154fefe15020224105005e72e66eafceebba1a20d88faa07b2
-MISC metadata.xml 1215 BLAKE2B 2db59843fa03f315486d76c2e49cf35d3c6e8b44faee18058a876352e5d30d5398b533a5bb89f19e975c5d676e683d8ee5eab50952e8212cb1225ad36d2bf2b0 SHA512 262e25578f4d8946400112ff1228b3f39b2a1a533b8449768ebf5083543893dbbdff7f2e28d3a14394e9d2be6deafe066379a771fffc09c62fd50592dd33ed95
+DIST Nikola-8.2.2.tar.gz 5483145 BLAKE2B 78950e97016b7a87d41739684de102c548a5dfecfe9c1239a94c757a4d7d00f5d77bf679b6ed1a853aa46e1fcb78c27e7c2276e7aafeb874c0e21c1ae9f1cbb2 SHA512 f2bf38c81c2e01f6d6cb6a24d9b9ea95f047e9bd9987437df61cf1cb10c39c5f9259e8baa4c64dc24e4f69dc3b3e35e3553dced7d42c840645e024d6c21eb9ae
+EBUILD nikola-8.2.2-r1.ebuild 2086 BLAKE2B adecf09a7e847882349655c3739876917d92dd4d5533ef6a6e20829ef8542f08f8835724d8829bdc36a4a6c759b8275e377992dfc874299944ab5ce52ea88468 SHA512 c05dfc6bdac3969c604684f64932d4218e7213ee612c8183380d8b4befe5fbe9b7e26fc1d13f5d061307af9ddc0061ad4f9372035a8a1361cb00c01d734d6d6f
+MISC metadata.xml 292 BLAKE2B 0042bf60cec1af73f2d8e977e53c42adf5c7e4500f02ee08e3673b25962a86905d1d07783fb519a3bf40a12ab64229879e5fb217d1bde97195573fc6faa69f66 SHA512 a8e6a37da4e290629b38ccb4f9087682de58a0e4e4a377b85c3f3bb06eba426e3689cab575f528511fde9ed308e12a2e79a318e4dc55c6f85c3d8e16e22b3d01
diff --git a/www-apps/nikola/metadata.xml b/www-apps/nikola/metadata.xml
index db71581d0733..d03a91b8243b 100644
--- a/www-apps/nikola/metadata.xml
+++ b/www-apps/nikola/metadata.xml
@@ -2,37 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>whissi@gentoo.org</email>
-    <name>Thomas Deutschmann</name>
+    <email>ulm@gentoo.org</email>
   </maintainer>
-  <use>
-    <flag name="assets">
-      Support web asset management
-    </flag>
-    <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.1.3.ebuild b/www-apps/nikola/nikola-8.2.2-r1.ebuild
index c7955e4d67ec..efa4bce006ed 100644
--- a/www-apps/nikola/nikola-8.1.3.ebuild
+++ b/www-apps/nikola/nikola-8.2.2-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+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}"
@@ -13,12 +13,11 @@ 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"
-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
@@ -38,24 +37,24 @@ 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}]
-	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}"
+	dev-python/cloudpickle[${PYTHON_USEDEP}]"
 
 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
+	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
+}