gentoo resync : 13.10.2017

4 files changed, 1 insertions, 140 deletions

diff --git a/www-apps/nikola/Manifest b/www-apps/nikola/Manifest
index 34faf4cd63b5..db9aa232407e 100644
--- a/www-apps/nikola/Manifest
+++ b/www-apps/nikola/Manifest
@@ -1,10 +1,5 @@
 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
-EBUILD nikola-7.2.0.ebuild 2226 SHA256 ee5c852a1dd4cf281d1defc184c02adf8741c8a34d5f7d6469dcdd0be6ac336b SHA512 5ffb3d68a602c333e710f2b7f193646b383bb1b3cdb0e7be3c81da39b6ff08b4531d1208e39e6ad15e1d446a9efb132854b0cdb01b13b560b8f9f74aff9735ca WHIRLPOOL 180b051a0a58ced63112c18f305c374ec37e3b080fff4dd096bdb4b14fa3677095222666333700215a3cbcda777ade975e1ab71ac9a35993a746d548f1b8179d
-EBUILD nikola-7.6.3-r1.ebuild 2663 SHA256 62b2aac5558fe9f0a02d05ec3ec97110e34efea36fef0dd2e8d38f61f54f92a0 SHA512 8218192c2c672084b7f5d63ebb9847cd230a9d2f8283b7a47742c20cf5809b70892d9a198ee7d22312b90e37d70dd4c39d9754c1e4a3ba3b48a5a3ecf0dea115 WHIRLPOOL 45f1ecfb666657ba451b2adaeb8db19ed3eb164899fb8a102911ee60280c491437714dc1938292eb92c802084e2255296ad98b82ef7a7e3cd68b9168734e690e
 EBUILD nikola-7.8.8.ebuild 2337 SHA256 10d1e354a80c367c0cf810d061187e2fd239f5ac1e5b1eae1b75b2c4d2e9c4ab SHA512 da6b8ea3e723f0c5d4434d0a3e4bc3997ca85705cf360f0bf9aa7a76e1e2f2f61e72cd41cdd345cce9099c6fb89a59d6f97b0c951bdfd84f93803310f29cbe4b WHIRLPOOL 1d1abe91bec57c6bb9d3cbe1265d8e73aabb88d410506103dc13a3e28743efc0e6085bc64b9164336bc8fe5fdb309299104341c2df6631a8de86eba8dffe338d
 MISC ChangeLog 3617 SHA256 b17401e1c10f66d20053b8140102e3b3ba8a1f737816635a8ffb978ebf3ebecd SHA512 2dfd650782403c01831506b248b8a84866a30ba60d9208e40b618c86ef6edaf0f24ba4835288dedd85f31c34226793d3bf76dde514df937b80450d672f151796 WHIRLPOOL 168e0baaa01fddeef23d4b64decfb60261675b30963e876cdd7b4cac3ca4f2a489d30069c0ba4a5c593666a6d8c39a3de1b22895d2b15375fb8a07122d0082bb
 MISC ChangeLog-2015 4782 SHA256 fd71c1643a569ed8239fa9e165655a970ace9cda0d058aae8dafdbb7a9e6aa4e SHA512 c2627c61d34f62c581d54cff54415ccf6486ecc4a7142c8cb99f2e3d951030af26f8fb72b2e04df2db55bc3b040addba628f348f91eef141bbd3f0bfaa30ea16 WHIRLPOOL 795f7d113b9d32694ccd8aa1b3eef9832d3c764e728d5767732d6d47feb9a65c7edf015f6f8279d3d00d7c9efe7945d9208ce8b37401ac9d8cc8fa20bcfd8e25
-MISC metadata.xml 1487 SHA256 faf9d7a2c3cabeab2e7df29e0a026aeb1596929d506dd95bc7a82f67f623d0b4 SHA512 50837443dc23de0be887dd89fec5eced1163cacbb2f6c798d37a9eb6db1abcc46fd79d0fa8f8e5911a608bb278e95d6254b069cc2aebec1755ace70730b989bc WHIRLPOOL ca0ac3e8cf897dfb721964eb69d62296a3a5979ca22ca5c410f1ef44d96966faaddd242fbac4c266e2123082d57468b1efe7e7dbc4468708087c7c72b8ac7ba4
+MISC metadata.xml 1360 SHA256 4eabc9b24b4c5eaa8e1d8fb0657b5143b07cc3edf4fca15e52a699afa86bb1da SHA512 ea8f610d5c5d7d568e29340e12701d652136a344f8aeb32c1df9a6909dc48180c5e9a7a91935c73e4d7df4f13cff82794e301d6a659262c52d8c88773e3b9697 WHIRLPOOL e218385aaee9219e3c23582b0daccabdf58067ebca3655a7a9c5d62ec01ffac48be85217cc7dde7ff78b7f79db4d0ae87a34c307bd4b5119c9099ff485b7fc17
diff --git a/www-apps/nikola/metadata.xml b/www-apps/nikola/metadata.xml
index 86aba0b41f06..ebc3277c3d9f 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 782d8c1d45d3..000000000000
--- 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 9025b60e6d74..000000000000
--- 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
-}