gentoo resync : 17.02.2021

6 files changed, 71 insertions, 8 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 2f6d508cf3fb..8847636ce8c6 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/blohg/Manifest b/www-apps/blohg/Manifest
index ef8e05edadbe..d6fbfe1fc114 100644
--- a/www-apps/blohg/Manifest
+++ b/www-apps/blohg/Manifest
@@ -1,5 +1,5 @@
 DIST blohg-0.13.tar.gz 75003 BLAKE2B 6b9760ffa99ca85a40e35c81341e395fdfc00256f5e80091c6883e54f050d4cf3f345c4752b635b1297d15e0055c182e00e74165451d695bb396c869c285646f SHA512 de8643e85e3f72827408d726bbe2f8674dcc6dcf1efdc47d33a934892071f8365cb54e63a6adb803361c7fd04032b2ac4e786c442676e8a8132b6d3221696865
 DIST blohg-patches-0.13-r4.tar.xz 14960 BLAKE2B 31458f412395000a05b359db25e8af648c54e554a3b3216f6c62355fd7203fc19c4452defe7692d0382653563f7b0565395af4ceb2177cc8e6de1d7e1a3c7b41 SHA512 3f709880bdd1826b74982866931f5002fdda451a205b6c278a9869979314413f37c8bf6400e3064a463f2fd34810e22d0d4cd5dfc89786f9e276dd9bd9fe5ec2
-EBUILD blohg-0.13-r4.ebuild 1780 BLAKE2B d783e57acb35ddc2f1940de5d3540fb07f1ba1d1d34640206e2405cea14c6c7b5ffc998124d4821ad279603ab6336a1f51a3df314728e634c630e19995a589f0 SHA512 ba6044b6cd197a87823f8482794ccdebc57f48aef1876fac120354bb74f070c5e5b22da5bf75f3fb5c849fb1d9efc3fe8e75815c94b1df730a27cff3e8ca4210
-EBUILD blohg-9999.ebuild 1780 BLAKE2B d783e57acb35ddc2f1940de5d3540fb07f1ba1d1d34640206e2405cea14c6c7b5ffc998124d4821ad279603ab6336a1f51a3df314728e634c630e19995a589f0 SHA512 ba6044b6cd197a87823f8482794ccdebc57f48aef1876fac120354bb74f070c5e5b22da5bf75f3fb5c849fb1d9efc3fe8e75815c94b1df730a27cff3e8ca4210
+EBUILD blohg-0.13-r4.ebuild 1773 BLAKE2B fc79e790e5e2569a0a795364a42335b8ec489f8d6d9230705615fb40c5faffbfb9d92b84a44a9700dfa0927e829ef24e7d5a6a51e64fd6433f093c88df7731b6 SHA512 b688da90697a9676d3b83b89db6782dea81becf933a3f9b227d5a3e1915572a8da1899fedb50b3d36ce3b4369e193ee1a90bf13d8099deea6a10b55cab3c9383
+EBUILD blohg-9999.ebuild 1773 BLAKE2B fc79e790e5e2569a0a795364a42335b8ec489f8d6d9230705615fb40c5faffbfb9d92b84a44a9700dfa0927e829ef24e7d5a6a51e64fd6433f093c88df7731b6 SHA512 b688da90697a9676d3b83b89db6782dea81becf933a3f9b227d5a3e1915572a8da1899fedb50b3d36ce3b4369e193ee1a90bf13d8099deea6a10b55cab3c9383
 MISC metadata.xml 976 BLAKE2B e8ab924bbfb9311443780218a3b7b439144fee35052d4e7cc6f3d49fe0fae39b391b106836cc352f56a5a5d340f929af2f76fae7cb20067b7f257450fd54b66d SHA512 7aad60bd5c2102e813a2a7088475427286b2708f98e09be143a1bddd6e336bfc8a92fe6f63e79216f5ea0ab82aec80bda1e100393067a7ce514acfdb2c61c011
diff --git a/www-apps/blohg/blohg-0.13-r4.ebuild b/www-apps/blohg/blohg-0.13-r4.ebuild
index f0260ed804d6..57732d82f2d0 100644
--- a/www-apps/blohg/blohg-0.13-r4.ebuild
+++ b/www-apps/blohg/blohg-0.13-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,10 +18,10 @@ HOMEPAGE="https://github.com/rafaelmartins/blohg"
 
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 	https://dev.gentoo.org/~rafaelmartins/distfiles/${PN}-patches-${PVR}.tar.xz"
-KEYWORDS="~amd64 ~x86"
 if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
-	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/www-apps/blohg/blohg-9999.ebuild b/www-apps/blohg/blohg-9999.ebuild
index f0260ed804d6..57732d82f2d0 100644
--- a/www-apps/blohg/blohg-9999.ebuild
+++ b/www-apps/blohg/blohg-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,10 +18,10 @@ HOMEPAGE="https://github.com/rafaelmartins/blohg"
 
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 	https://dev.gentoo.org/~rafaelmartins/distfiles/${PN}-patches-${PVR}.tar.xz"
-KEYWORDS="~amd64 ~x86"
 if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
-	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/www-apps/nikola/Manifest b/www-apps/nikola/Manifest
index 0ee4aa4d403d..3dc26a77feb0 100644
--- a/www-apps/nikola/Manifest
+++ b/www-apps/nikola/Manifest
@@ -3,9 +3,11 @@ DIST Nikola-8.0.4.tar.gz 4137494 BLAKE2B 04db8b83f34ca9b3cee785c5eed9d0421d27acf
 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
 EBUILD nikola-8.0.4.ebuild 2360 BLAKE2B c0c5364d1bf7aee04b70d18086e27242c1f7bb19df63a5005b78985f948bc54eda049de1a55e7c182e8cf7f9dce5d23a7d8a8a7e44edb7a0d5c27d4fd7017611 SHA512 95980033b9831f98d04f6a41cb04946b5280714663ea26a97db5e49289607cb8828a0dffd048ce8b2430e2b97ce2b0544c27da980a7f1be74a00b7577670cff9
 EBUILD nikola-8.1.0.ebuild 2310 BLAKE2B dc5603a8c25bbb783042c5898809697437b5686311a63ae961675584fe89b74c293e0cfe7576bd55c00db2bac158b9bc33a8383219b374456f922513ab47b15f SHA512 dd10ec3de5d3b3bce7a6de672e42afe2c4002c5edc54b8476c991912ee107187a7a5a7196e2114dc89bec782179936c0fe40387b0de7715a1276c463ff263f9a
 EBUILD nikola-8.1.1-r1.ebuild 2189 BLAKE2B 3d4585281d365cd5f05acecc21accf0171a6a606659349a357b793722473b8ec9cdb426d54cf53953bf38d7ed5ae62a0ac167ef110a61dfbe483833f20f0b630 SHA512 c28c0c3ef71a8e0240a6e29274f19e67a035551c4f913b90eb6e76d7ad285a8dfb279bed9cc4210568ff26cfd25ec018dcff311d8996ef249b0a0b6fbf5bd2a6
 EBUILD nikola-8.1.1.ebuild 2310 BLAKE2B dc5603a8c25bbb783042c5898809697437b5686311a63ae961675584fe89b74c293e0cfe7576bd55c00db2bac158b9bc33a8383219b374456f922513ab47b15f SHA512 dd10ec3de5d3b3bce7a6de672e42afe2c4002c5edc54b8476c991912ee107187a7a5a7196e2114dc89bec782179936c0fe40387b0de7715a1276c463ff263f9a
 EBUILD nikola-8.1.2.ebuild 2190 BLAKE2B c1581251064c89cf0c6d3892554a63aa0a64189f03fae433f7424c15f46e4154e6f6da98296c627adc9daa67226e8ee9b5727f38dd367dd78296624d65c5704e SHA512 0060d2872954dea010c9a0a0143378b7fa1479acbfc93d275ed71d9be94c6a4f17bd9a8c92f20b53a5c232f89dd726e3fb313bcd19e87bd40e3572fc4c23d10a
+EBUILD nikola-8.1.3.ebuild 2190 BLAKE2B d601d2a3200840e823dd61f466178d5e37d8a418f02a00a9d4dc089a5334d53d923284ef0ee036bacebbb79b0a0ae09ae78f46576b2ef8e679b6512004d064a2 SHA512 ebf7410883b69219c209a51cb3cb0a26e112a066d78c8680c3bc45334bac4ca7029d5053fa24f31a6330e06445793df1bf5f9f3685b73dbe663437674e14caa2
 MISC metadata.xml 1408 BLAKE2B c23be01555581f4fe904d10b24f098a689546d8a84665427f9fbed15a8676be590e16ef4f129c3eacc3db62eb61576bf86815fd80879d6fe64136ee11243ab17 SHA512 0edc102eae251cd7a095373ac293d0baf2f4eff541a85ebceba3ecf539b51fbe68d8fac9154450d16543af618faa55ac9aa39bdcdda64ade35847bbdb0e78fa8
diff --git a/www-apps/nikola/nikola-8.1.3.ebuild b/www-apps/nikola/nikola-8.1.3.ebuild
new file mode 100644
index 000000000000..470843bb79b3
--- /dev/null
+++ b/www-apps/nikola/nikola-8.1.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 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
+}