gentoo resync : 25.08.2020

6 files changed, 136 insertions, 8 deletions

diff --git a/www-apps/nikola/Manifest b/www-apps/nikola/Manifest
index d79eb678e52c..66b785fb3944 100644
--- a/www-apps/nikola/Manifest
+++ b/www-apps/nikola/Manifest
@@ -2,8 +2,11 @@ AUX nikola-8.0.4-setup-py.patch 1340 BLAKE2B 7eb27b287eaf588dfc50b21b4be27ec7239
 DIST Nikola-7.8.15.tar.gz 4131518 BLAKE2B ea3dca9340852a68b668de82e5deeaa0ecf7bb8597f311721b27409fe0cf820919c79f6e631b030bd3ea4571dd8480c862c607d0b9e6015a8b03023de5a9b93e SHA512 b441ae014539b948d007183ceb574243b89a498be265da7245095f67510d4d7c109c4935e0f9765b4144e82f788a1b66a0eacfba1477a89ce6c2645cb77102d7
 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
 EBUILD nikola-7.8.15-r1.ebuild 2308 BLAKE2B 8255869559c71596870d46e963fd9e62f11dd01d4bc4078b82de8603b6a139e44de8eb3684cb3c1e02c1fa92911bbf5f968b080ae994ddd73709b6d3ad53b4a7 SHA512 6ade40546b0eb338b59fad069070761a09ca8e98217727a7561cc7e78d7e1368c1f1845316267fe1834c755384ca0cdf372069cdbd8defe52b37a5804753d5a5
 EBUILD nikola-7.8.15.ebuild 2396 BLAKE2B e7990b3c204afc29ba7d6f2cc2dc5818dde75c2fe27bbc26bd9b8a56f8660f6203cfb1de37f3e13856795ef4fee277ee60c9bf8828fd3f75e8a6b405f447b1b2 SHA512 202047d568d8549c313d9584ada3a59cddcae3a80fdb663e91101b21d159b1ec997233ef7d869f69254cb999022ea0fc8a231d31991b854eab7ffb3cdb153076
-EBUILD nikola-8.0.4.ebuild 2356 BLAKE2B 96e4d7fa29d2306746af735cb0f3ea8a7140f5190d29749fe2f3cee75f20531e97ec22844e191c43d9667ada2d35ca127ff4a8654dd8b997479691532c80fe26 SHA512 8450b7a9d9cf10ff6339e2c33325e70a3d23dc445cdf1d69ef27543bb4a3a305d4121d4fc1696de26819b8063f9a245bbb9e4c4e8dfced054fbf24c6db55c37b
-EBUILD nikola-8.1.0.ebuild 2306 BLAKE2B f8a1a5606e9f2c7ae19926d543e7008b5066b61771d5f12ed0932af880f100406a30304043413bcbe7b40f9e3ca6ef31b3eb9332ec05747213b657b3e92de523 SHA512 b112a676916bb623845520dcf3fa923ab025b29d69c60f2d33fd30768e3731c20e9780096e48e964c8348c521476cb32f4454116d7b7d4e3ef1698d67dce0559
-MISC metadata.xml 1368 BLAKE2B b24365e67cddf550d9f73f2e4ac933ecae46032690ec1427573a1fa664603c1774ba6cc1dd6771672ecedac32ff815fe786b05ba843dd20b05443895a47af79f SHA512 cf68437e746e5f35fd861be6c4d8bb501489a219fe4e98b725721c81a9c5c3304432d0375130fd8d392b492c25c5196ff7bb402ba6ecba15503641694a818c7d
+EBUILD nikola-8.0.4.ebuild 2362 BLAKE2B b2847302f571510ab4d0c90756ef78a6d9dc106f311a58fc1378ad94dfcd5b5ebac5a4b3d79c8c88e10deddbc8e1dc26cd0ae101d815b99dae9366840b435354 SHA512 52ca4d3ab972b0c0e164be7fa5359865aaf6b1ad28ba75e84737434bb1bae8f8630e08478b0c8fee25beeb1edf76578227c2535f5f21e779564dce4be7793f9b
+EBUILD nikola-8.1.0.ebuild 2312 BLAKE2B d9f6492b5e2a0747ddcac3e81d3b948b980ebb7759171f3c35aee4ccdca42a58d37575617f4207755ce5cf090261289622eb89454fc70523d705e01e7909341f SHA512 ecc9db71946d7f3495452d8c2f13e2a9fb3407abc83b1b1c4f8f334c96d74bd8d38083f34de46b056acc13b85601c2117acc60f0f0899806d0331a5aed5386bd
+EBUILD nikola-8.1.1-r1.ebuild 2192 BLAKE2B 61e1c9eb37ae6fb02ac06de77432920335ae05f93ef347bebb20111e0a8b950fe3fe8f9a738730a1286b3d998db203748fb42d00d0df13aea57fa595328303c7 SHA512 218c21e19811b50a63420c2031cadb7c310d833303aaeb2a33558bf9ab763aaa258988a84dfb7d8a3be92b61d60aec464dbe865c0c39c86064d0d54eace92d51
+EBUILD nikola-8.1.1.ebuild 2312 BLAKE2B d9f6492b5e2a0747ddcac3e81d3b948b980ebb7759171f3c35aee4ccdca42a58d37575617f4207755ce5cf090261289622eb89454fc70523d705e01e7909341f SHA512 ecc9db71946d7f3495452d8c2f13e2a9fb3407abc83b1b1c4f8f334c96d74bd8d38083f34de46b056acc13b85601c2117acc60f0f0899806d0331a5aed5386bd
+MISC metadata.xml 1408 BLAKE2B c23be01555581f4fe904d10b24f098a689546d8a84665427f9fbed15a8676be590e16ef4f129c3eacc3db62eb61576bf86815fd80879d6fe64136ee11243ab17 SHA512 0edc102eae251cd7a095373ac293d0baf2f4eff541a85ebceba3ecf539b51fbe68d8fac9154450d16543af618faa55ac9aa39bdcdda64ade35847bbdb0e78fa8
diff --git a/www-apps/nikola/metadata.xml b/www-apps/nikola/metadata.xml
index 929eafbf40bf..56b283c01d83 100644
--- a/www-apps/nikola/metadata.xml
+++ b/www-apps/nikola/metadata.xml
@@ -7,14 +7,13 @@
   </maintainer>
   <use>
     <flag name="assets">
-      Support web asset management through <pkg>dev-python/assets</pkg>
+      Support web asset management
     </flag>
     <flag name="charts">
       Support chart generation through <pkg>dev-python/pygal</pkg>
     </flag>
     <flag name="ghpages">
-      Add support for direct uploading to github pages thru
-      <pkg>dev-vcs/ghp-import</pkg>
+      Add support for direct uploading to github pages
     </flag>
     <flag name="hyphenation">
       Add hyphenation support through <pkg>dev-python/pyphen</pkg>
@@ -26,6 +25,9 @@
       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>
diff --git a/www-apps/nikola/nikola-8.0.4.ebuild b/www-apps/nikola/nikola-8.0.4.ebuild
index 903eb3874a75..33b7daf3e3be 100644
--- a/www-apps/nikola/nikola-8.0.4.ebuild
+++ b/www-apps/nikola/nikola-8.0.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/www-apps/nikola/nikola-8.1.0.ebuild b/www-apps/nikola/nikola-8.1.0.ebuild
index 642cf090d2e6..0d8e0f950fc1 100644
--- a/www-apps/nikola/nikola-8.1.0.ebuild
+++ b/www-apps/nikola/nikola-8.1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/www-apps/nikola/nikola-8.1.1-r1.ebuild b/www-apps/nikola/nikola-8.1.1-r1.ebuild
new file mode 100644
index 000000000000..8abf4ceff6cf
--- /dev/null
+++ b/www-apps/nikola/nikola-8.1.1-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,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
new file mode 100644
index 000000000000..0d8e0f950fc1
--- /dev/null
+++ b/www-apps/nikola/nikola-8.1.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,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
+}