From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 15 Dec 2019 18:09:03 +0000
Subject: gentoo resync : 15.12.2019

---
 www-apps/nikola/Manifest                | 13 +------
 www-apps/nikola/nikola-7.8.11.ebuild    | 62 --------------------------------
 www-apps/nikola/nikola-7.8.12.ebuild    | 62 --------------------------------
 www-apps/nikola/nikola-7.8.13.ebuild    | 62 --------------------------------
 www-apps/nikola/nikola-7.8.14-r1.ebuild | 63 ---------------------------------
 www-apps/nikola/nikola-7.8.14.ebuild    | 63 ---------------------------------
 www-apps/nikola/nikola-7.8.15.ebuild    |  7 +++-
 www-apps/nikola/nikola-7.8.8.ebuild     | 62 --------------------------------
 8 files changed, 7 insertions(+), 387 deletions(-)
 delete mode 100644 www-apps/nikola/nikola-7.8.11.ebuild
 delete mode 100644 www-apps/nikola/nikola-7.8.12.ebuild
 delete mode 100644 www-apps/nikola/nikola-7.8.13.ebuild
 delete mode 100644 www-apps/nikola/nikola-7.8.14-r1.ebuild
 delete mode 100644 www-apps/nikola/nikola-7.8.14.ebuild
 delete mode 100644 www-apps/nikola/nikola-7.8.8.ebuild

(limited to 'www-apps/nikola')

diff --git a/www-apps/nikola/Manifest b/www-apps/nikola/Manifest
index e900e74a105e..de3066c362be 100644
--- a/www-apps/nikola/Manifest
+++ b/www-apps/nikola/Manifest
@@ -1,15 +1,4 @@
-DIST Nikola-7.8.11.tar.gz 4104413 BLAKE2B 22da280a7f7416ad88680a573aa103dc38a8e7ed5476f0ce35c7d179131aaf6bc41edfd1f591967bcc6e747a279b5e0b9e2e0c6e959d45e93328dcb14d95658e SHA512 9273f56a6cbb08db9a4b5c562cd4e80e8bbb777c299406bc3d816a63d8b21d1b2a3e4aa3fa376858459a650ded54b0526ac54b4f186757cd2dec7ccf656e145e
-DIST Nikola-7.8.12.tar.gz 4106202 BLAKE2B 95ef2d074145b40be90f8daf7de92dc4091e24b0db8e5f949daeff6e6bd03d2437198a4a1e33728c204c907cd94fc1ad6f6d0a1945119eaaa738cbc172dfaadb SHA512 8be18b4a9b61da7de1c0b3d75cd0d2bebc9c45191b30b8f918b2a6c8af333d1a6545f7336a033c3aef25a6920d905ff10f7d8238aba586b1dcbc6b92e03e376d
-DIST Nikola-7.8.13.tar.gz 4131250 BLAKE2B 6fdb12e59d7e977bc1ab9e2dd458de4a8a61104e1237926d5362ce1420fd3533617d268a4b496a4248932255459a2e3fa43488be62fedc86ab7c62a3c3cefeb3 SHA512 95118f9e2a7d884ab3e7f517749de6cde22439579cf6e05245111ab972f2def0c7ab824978cf750d2bedf788b2a994ec743e9574b70d17424e04c570ef796bef
-DIST Nikola-7.8.14.tar.gz 4130538 BLAKE2B dc8cd3a484bf203291ff8ca2b25233814e68bf916081f692a73c87af953cd57ea732dfdedfb8508187fb27566204f9442eb87847c98018fa0e5ef4ab4eb5295f SHA512 1a930e0cebbc9d54437ce438622eb2a6ad01988aaa9706f58cc0add17e483c3510d3a8ba120b8aa3b475c0e030cca471173f2520fd36e9528144cdee40fb1a9c
 DIST Nikola-7.8.15.tar.gz 4131518 BLAKE2B ea3dca9340852a68b668de82e5deeaa0ecf7bb8597f311721b27409fe0cf820919c79f6e631b030bd3ea4571dd8480c862c607d0b9e6015a8b03023de5a9b93e SHA512 b441ae014539b948d007183ceb574243b89a498be265da7245095f67510d4d7c109c4935e0f9765b4144e82f788a1b66a0eacfba1477a89ce6c2645cb77102d7
-DIST Nikola-7.8.8.tar.gz 3870991 BLAKE2B df6b3784acb339faccbcf1d269a2a9e315861be25e3880fab1c18754df1121b7081e9d1ad08d5a08d6b6913eacfdf184d9a19e5e1218a038913a6c7d2f78dcde SHA512 6222cfaea048a547d8a224828815b8334d2f39abf872d63b9a970ca017cee37e5efeaccc5327b8c21bea9fdfe7beafae7ac9af9f57d459a10fa991879bf74687
-EBUILD nikola-7.8.11.ebuild 2312 BLAKE2B 56afad2e27e9a653b7e70bf5347b89321e21a111d2fbb4e970cd3bd81ffc694284e845cac11da06de1ed2d51727d148c0a60fa71eb68b54714b67c106581ef00 SHA512 06bc0d9bc32618cb29d2ec874c96325df90f0d8ce0cc4e23045f85b11427c696404cfaf17da09d7579426387995fbc7278336ce8beedcb18852847599559dcad
-EBUILD nikola-7.8.12.ebuild 2312 BLAKE2B 56afad2e27e9a653b7e70bf5347b89321e21a111d2fbb4e970cd3bd81ffc694284e845cac11da06de1ed2d51727d148c0a60fa71eb68b54714b67c106581ef00 SHA512 06bc0d9bc32618cb29d2ec874c96325df90f0d8ce0cc4e23045f85b11427c696404cfaf17da09d7579426387995fbc7278336ce8beedcb18852847599559dcad
-EBUILD nikola-7.8.13.ebuild 2312 BLAKE2B 56afad2e27e9a653b7e70bf5347b89321e21a111d2fbb4e970cd3bd81ffc694284e845cac11da06de1ed2d51727d148c0a60fa71eb68b54714b67c106581ef00 SHA512 06bc0d9bc32618cb29d2ec874c96325df90f0d8ce0cc4e23045f85b11427c696404cfaf17da09d7579426387995fbc7278336ce8beedcb18852847599559dcad
-EBUILD nikola-7.8.14-r1.ebuild 2342 BLAKE2B 8559ab8b8597077864cbeb59847cc860474baff86d7aad2a2cdbb55fcc005bbe942d7cd41336a717c0f522cad3a855227e01300ee95aef9cd2b19ebf84e678ec SHA512 e24b1e54e31b41a0af7a3cf55837c02b00f7c0d2f09aa065141b9115472ac7afdd299c7ad5f17ca1a137921e271cbea9e2cd299b39405994fcfe867f89100dcb
-EBUILD nikola-7.8.14.ebuild 2346 BLAKE2B b7103299479bb1be59f26b20781c3af1ca8ddd51865a42ca8435813100523e940cb17f2b4cda6f9d15dc6ebd6269dfa2eb934c209ff6b96c564d6e0fcfa60af0 SHA512 4257c93e3317399c46c436325726908db4d998b9550674b08bcbe3d0b32c9cb57ec44e878e2c7ab1a97f0d858cd3fea10d40e2f5b03b0ab29b472f347072c245
 EBUILD nikola-7.8.15-r1.ebuild 2342 BLAKE2B 1b07256f3a69d002e45cbf720f1540374aa22e4e76bb3621404aa2fa7c9876fb8247b78e2dd52d4ae06a193f3c6837d481f5536d4be4b1ff4d412d0ed97f0a51 SHA512 4bda732817fd23e2bac698aabde65bd3346f1a31b5b1bf174ccfe270099cd8debfe8cca8e4d52ec51d133573d57b441a87d7b2c6327e9044f1238ee20b3fc93f
-EBUILD nikola-7.8.15.ebuild 2341 BLAKE2B 4101e2cbf26dffc69dd5b8a9afce8b1c1462b0b2d75ca533528ee8d56db0dba8f3f40daa490c8a7d003f46ae0506bef1d70032d6ade4768e0be071a453c04298 SHA512 90a06d57f562af135aabb68785bcc9c4dfd939d98ee48e5e7542ebcb0bb150d5f2530f63c788437947d25e1b31dc6f8dd8dd9b3972ba107f26967c29327d745a
-EBUILD nikola-7.8.8.ebuild 2330 BLAKE2B 3010ed5a670c93978bf2f09fc816a0a36f46788bde965422fe5a73711b6f0185d628ceed1f1c3b1840adf89817084e4abee336f088b40d11e493fb8d20102d3c SHA512 be5d0bbc720ef8f05e0f6fae30c997093a9d42231640345e57d0d32bb21fb0ba2d11a7fef0f096255b7b85aa59f3bb161f563c000d3bfdbd0e2f1eb22c753d00
+EBUILD nikola-7.8.15.ebuild 2440 BLAKE2B e585b8867a7c7ef3adf4428899b0c10b38d5b21a938c3cfdad81635efdeb20f4758c8cd77954b3b305238d7a78d98fc82b1e922d96a10d624add3513f169bd8e SHA512 7432c7ea3a80244801f1308845a9b6576da4b89a9800b6440c12ea0abfb48407c4177eff35e9155d7d5f640e9bb2fc8bb577e19f866b849785630dac0f3a93d4
 MISC metadata.xml 1360 BLAKE2B 694323edda02eec1a835c4c8a68a74c960a290ee44d1c95a59b5814fc6a8f6b248aec961ce69519da1a33970fba2868df81ed87155cd3c60193f79e8165c99d2 SHA512 ea8f610d5c5d7d568e29340e12701d652136a344f8aeb32c1df9a6909dc48180c5e9a7a91935c73e4d7df4f13cff82794e301d6a659262c52d8c88773e3b9697
diff --git a/www-apps/nikola/nikola-7.8.11.ebuild b/www-apps/nikola/nikola-7.8.11.ebuild
deleted file mode 100644
index d57d5fb59b08..000000000000
--- a/www-apps/nikola/nikola-7.8.11.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-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.12[${PYTHON_USEDEP}]" # needs rst2man to build manpage
-RDEPEND="${DEPEND}
-	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
-	>=dev-python/doit-0.29.0[${PYTHON_USEDEP}]
-	>=dev-python/logbook-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
-	>=dev-python/mako-1.0[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.4.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.4[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-20.3[${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-python/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/*.txt
-	doman "docs/man/${PN}.1.gz"
-}
diff --git a/www-apps/nikola/nikola-7.8.12.ebuild b/www-apps/nikola/nikola-7.8.12.ebuild
deleted file mode 100644
index d57d5fb59b08..000000000000
--- a/www-apps/nikola/nikola-7.8.12.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-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.12[${PYTHON_USEDEP}]" # needs rst2man to build manpage
-RDEPEND="${DEPEND}
-	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
-	>=dev-python/doit-0.29.0[${PYTHON_USEDEP}]
-	>=dev-python/logbook-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
-	>=dev-python/mako-1.0[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.4.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.4[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-20.3[${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-python/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/*.txt
-	doman "docs/man/${PN}.1.gz"
-}
diff --git a/www-apps/nikola/nikola-7.8.13.ebuild b/www-apps/nikola/nikola-7.8.13.ebuild
deleted file mode 100644
index d57d5fb59b08..000000000000
--- a/www-apps/nikola/nikola-7.8.13.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-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.12[${PYTHON_USEDEP}]" # needs rst2man to build manpage
-RDEPEND="${DEPEND}
-	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
-	>=dev-python/doit-0.29.0[${PYTHON_USEDEP}]
-	>=dev-python/logbook-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
-	>=dev-python/mako-1.0[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.4.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.4[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-20.3[${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-python/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/*.txt
-	doman "docs/man/${PN}.1.gz"
-}
diff --git a/www-apps/nikola/nikola-7.8.14-r1.ebuild b/www-apps/nikola/nikola-7.8.14-r1.ebuild
deleted file mode 100644
index 9706ef6e630d..000000000000
--- a/www-apps/nikola/nikola-7.8.14-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6} )
-
-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.12[${PYTHON_USEDEP}]" # needs rst2man to build manpage
-RDEPEND="${DEPEND}
-	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
-	>=dev-python/doit-0.29.0[${PYTHON_USEDEP}]
-	>=dev-python/logbook-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
-	>=dev-python/mako-1.0[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.4.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.4[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-20.3[${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-python/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/*.txt
-	gunzip "docs/man/${PN}.1.gz" || die
-	doman "docs/man/${PN}.1"
-}
diff --git a/www-apps/nikola/nikola-7.8.14.ebuild b/www-apps/nikola/nikola-7.8.14.ebuild
deleted file mode 100644
index 34d9a48daf5a..000000000000
--- a/www-apps/nikola/nikola-7.8.14.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-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.12[${PYTHON_USEDEP}]" # needs rst2man to build manpage
-RDEPEND="${DEPEND}
-	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
-	>=dev-python/doit-0.29.0[${PYTHON_USEDEP}]
-	>=dev-python/logbook-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
-	>=dev-python/mako-1.0[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.4.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.4[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-20.3[${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-python/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/*.txt
-	gunzip "docs/man/${PN}.1.gz" || die
-	doman "docs/man/${PN}.1"
-}
diff --git a/www-apps/nikola/nikola-7.8.15.ebuild b/www-apps/nikola/nikola-7.8.15.ebuild
index 0b6076257213..4ae53a855542 100644
--- a/www-apps/nikola/nikola-7.8.15.ebuild
+++ b/www-apps/nikola/nikola-7.8.15.ebuild
@@ -17,6 +17,7 @@ LICENSE="MIT Apache-2.0 CC0-1.0 public-domain"
 SLOT="0"
 KEYWORDS="amd64"
 IUSE="assets charts ghpages hyphenation ipython jinja watchdog webmedia websocket"
+REQUIRED_USE="ipython? ( || ( $(python_gen_useflags -3) ) )"
 RESTRICT="test" # needs coveralls
 
 DEPEND=">=dev-python/docutils-0.12[${PYTHON_USEDEP}]" # needs rst2man to build manpage
@@ -42,7 +43,11 @@ RDEPEND="${DEPEND}
 	charts? ( >=dev-python/pygal-2.0.1[${PYTHON_USEDEP}] )
 	ghpages? ( >=dev-python/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}] )
+	ipython? (
+		$(python_gen_cond_dep '
+			>=dev-python/ipython-2.0.0[notebook,${PYTHON_USEDEP}]
+		' -3)
+	)
 	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}] )
diff --git a/www-apps/nikola/nikola-7.8.8.ebuild b/www-apps/nikola/nikola-7.8.8.ebuild
deleted file mode 100644
index 2d6dccca94be..000000000000
--- a/www-apps/nikola/nikola-7.8.8.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5} ) # 3.6 waiting for deps
-
-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.12[${PYTHON_USEDEP}]" # needs rst2man to build manpage
-RDEPEND="${DEPEND}
-	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
-	>=dev-python/doit-0.29.0[${PYTHON_USEDEP}]
-	>=dev-python/logbook-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
-	>=dev-python/mako-1.0[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.4.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.4[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-20.3[${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-python/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/*.txt
-	doman "docs/man/${PN}.1.gz"
-}
-- 
cgit v1.2.3