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

["Tim Harder" <radhermit@gentoo.org>]

commit:     392ffa23bee87246fccc9d13fb9d675607d027dd
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 12 17:06:09 2017 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Thu Oct 12 17:15:49 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=392ffa23

www-apps/nikola: remove old

 www-apps/nikola/Manifest               |  3 --
 www-apps/nikola/metadata.xml           |  4 --
 www-apps/nikola/nikola-7.2.0.ebuild    | 61 ------------------------------
 www-apps/nikola/nikola-7.6.3-r1.ebuild | 69 ----------------------------------
 4 files changed, 137 deletions(-)

diff --git a/www-apps/nikola/Manifest b/www-apps/nikola/Manifest
index a1af90418b7..0df43a16ba9 100644
--- a/www-apps/nikola/Manifest
+++ b/www-apps/nikola/Manifest
@@ -1,4 +1 @@
 DIST Nikola-7.8.8.tar.gz 3870991 SHA256 a45272e96ea8311e79ab6ea5523d792207d549cba418d623f03bf80d5e5e3e5a SHA512 6222cfaea048a547d8a224828815b8334d2f39abf872d63b9a970ca017cee37e5efeaccc5327b8c21bea9fdfe7beafae7ac9af9f57d459a10fa991879bf74687 WHIRLPOOL 3f9d8e234db07910dd82a9319aefdef8e9d08d717e457506de1ba5f51281ad56335d7745d659f7245744924cd18fe54ba6b47953b598857750702e72fb06136e
-DIST a-study-in-scarlet.txt 122496 SHA256 633115482b8b6cca24332133f22ed3caa1b4b58361b604dbe26aaa943b7cb4ad SHA512 7958079a745ce6474b9006454ee99d9c848bc36372fc149265b4f2b82e562c961823b7716ec0e3285fce1e9363cf8e109190d6f0dc998801c568764ac82f8d19 WHIRLPOOL 0b03b0c6c89f9e23745e8cd1fb8f9faba3b382fc06d3481cfc72e50d386937d97452889a49ef9d298915431ecb5920b1374f1e7585aefd8fe893f13a69f66a9d
-DIST nikola-7.2.0.tar.gz 1843614 SHA256 05bf72f9894eaf83a61ebc1386ab61ffa1be1e4934265261e58487b371f8a926 SHA512 87a6f543793bc21453dc01b4662703edbfd887b775ea067a79bfcf0ac74e22e3034657ce24bdbaca5a05585a6e556295b6d5670ae085f8b31a057cf77d72d3eb WHIRLPOOL ad9794f705307393050727467ae8f4908e0e08134d78aebf9ff3aa0c12f35d2a6bffa7d8453a7c0ce1ba21b6591b3dcc493a0a52b5dd27971d67174ef24dbef6
-DIST nikola-7.6.3.tar.gz 2365230 SHA256 f07a0eb00cb1653bf778dea0d7fe6983dce01f845e6b53ba1ce1678ff2c87c3d SHA512 eef8b8cc4d3af03e009ae31247ba19eb37b9a3ed9691d942b44291562df80d0f12b8306a2d7c0a2a1fb0555f700da09db06a1b002ed58c0338234d2ca2336b5b WHIRLPOOL 5584f1254503c89044822bf6aa51a487ffcd0863f351fee41195217b596a549d2160470f63b0ce60f4131533577adf88d199a818a32caf351dd1edcf350545a7

diff --git a/www-apps/nikola/metadata.xml b/www-apps/nikola/metadata.xml
index 86aba0b41f0..ebc3277c3d9 100644
--- a/www-apps/nikola/metadata.xml
+++ b/www-apps/nikola/metadata.xml
@@ -26,10 +26,6 @@
       Add support for <pkg>dev-python/jinja</pkg> as alternative templating
       engine to Mako
     </flag>
-    <flag name="markdown">
-      Add support for Markdown as alternative markup language to
-      reStructuredText
-    </flag>
     <flag name="watchdog">
       Use <pkg>dev-python/watchdog</pkg> to monitor file system events
     </flag>

diff --git a/www-apps/nikola/nikola-7.2.0.ebuild b/www-apps/nikola/nikola-7.2.0.ebuild
deleted file mode 100644
index 782d8c1d45d..00000000000
--- a/www-apps/nikola/nikola-7.2.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
-inherit distutils-r1
-
-DESCRIPTION="A static website and blog generator"
-HOMEPAGE="https://getnikola.com/"
-MY_PN="Nikola"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="https://github.com/ralsina/${PN}.git"
-else
-	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
-	KEYWORDS="amd64"
-fi
-
-LICENSE="MIT-with-advertising Apache-2.0" # Gutenberg
-SLOT="0"
-IUSE="assets charts hyphenation ipython jinja markdown"
-RESTRICT="test" # needs freezegun, coveralls, and phpserialize
-
-DEPEND=">=dev-python/docutils-0.12[${PYTHON_USEDEP}]" # needs rst2man to build manpage
-RDEPEND="${DEPEND}
-	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	>=dev-python/doit-0.23.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/natsort-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
-	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.2[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-5.4.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
-	>=dev-python/yapsy-1.10.423[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
-	charts? ( >=dev-python/pygal-1.5.1[${PYTHON_USEDEP}] )
-	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
-	ipython? ( >=dev-python/ipython-1.2.1[${PYTHON_USEDEP}] )
-	jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )
-	markdown? ( >=dev-python/markdown-2.4.0[${PYTHON_USEDEP}] )"
-# more options as packages will be added:
-#	livereload? ( =dev-python/livereload-2.3.1[${PYTHON_USEDEP}] )
-#	micawber? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )
-#	typogrify? ( >=dev-python/typogrify-2.0.4[${PYTHON_USEDEP}] )
-
-src_install() {
-	distutils-r1_src_install
-
-	# hackish way to remove docs that ended up in the wrong place
-	rm -rf "${D}"/usr/share/doc/${PN}
-
-	dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.txt
-	doman docs/man/*
-}

diff --git a/www-apps/nikola/nikola-7.6.3-r1.ebuild b/www-apps/nikola/nikola-7.6.3-r1.ebuild
deleted file mode 100644
index 9025b60e6d7..00000000000
--- a/www-apps/nikola/nikola-7.6.3-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
-inherit distutils-r1
-
-DESCRIPTION="A static website and blog generator"
-HOMEPAGE="https://getnikola.com/"
-SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/a-study-in-scarlet.txt"
-MY_PN="Nikola"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="https://github.com/ralsina/${PN}.git"
-else
-	SRC_URI+=" mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT Apache-2.0 CC0-1.0 public-domain"
-SLOT="0"
-IUSE="assets charts ghpages hyphenation ipython jinja markdown 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.28.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/natsort-3.5.2[${PYTHON_USEDEP}]
-	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
-	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
-	~dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-5.4.1[${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}] )
-	markdown? ( >=dev-python/markdown-2.4.0[${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
-
-src_prepare() {
-	# replace Gutenberg licensed version with our public domain version (bug #552372)
-	rm nikola/data/samplesite/stories/a-study-in-scarlet.txt || die
-	cp "${DISTDIR}"/a-study-in-scarlet.txt nikola/data/samplesite/stories/ || die
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# hackish way to remove docs that ended up in the wrong place
-	rm -rf "${D}"/usr/share/doc/${PN}
-
-	dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.txt
-	doman docs/man/${PN}.1.gz
-}