gentoo resync : 02.04.2018

8 files changed, 145 insertions, 16 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 96326544f0e8..505e1c5dbaf7 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/nikola/Manifest b/www-apps/nikola/Manifest
index 14bf1a885f43..ec4469849c52 100644
--- a/www-apps/nikola/Manifest
+++ b/www-apps/nikola/Manifest
@@ -1,9 +1,12 @@
 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.8.tar.gz 3870991 BLAKE2B df6b3784acb339faccbcf1d269a2a9e315861be25e3880fab1c18754df1121b7081e9d1ad08d5a08d6b6913eacfdf184d9a19e5e1218a038913a6c7d2f78dcde SHA512 6222cfaea048a547d8a224828815b8334d2f39abf872d63b9a970ca017cee37e5efeaccc5327b8c21bea9fdfe7beafae7ac9af9f57d459a10fa991879bf74687
 EBUILD nikola-7.8.11.ebuild 2319 BLAKE2B 51f765e8b81757de7727cb3bd014620125f23b1cf91ad9647a9b1c067322b04c99edad91d307f362d49fce29a9aa0e5a0f7f9f3a90cee25d8c4af53cb7c1f44a SHA512 8abd19df5d529d4303f5fc68a6d8e693808e622907bb90a58fb871795de315187bc16c55a16538080148e4b92e1a21c90e3b9b383705d8baee2b639f3ca9dc62
 EBUILD nikola-7.8.12.ebuild 2319 BLAKE2B 51f765e8b81757de7727cb3bd014620125f23b1cf91ad9647a9b1c067322b04c99edad91d307f362d49fce29a9aa0e5a0f7f9f3a90cee25d8c4af53cb7c1f44a SHA512 8abd19df5d529d4303f5fc68a6d8e693808e622907bb90a58fb871795de315187bc16c55a16538080148e4b92e1a21c90e3b9b383705d8baee2b639f3ca9dc62
 EBUILD nikola-7.8.13.ebuild 2319 BLAKE2B 51f765e8b81757de7727cb3bd014620125f23b1cf91ad9647a9b1c067322b04c99edad91d307f362d49fce29a9aa0e5a0f7f9f3a90cee25d8c4af53cb7c1f44a SHA512 8abd19df5d529d4303f5fc68a6d8e693808e622907bb90a58fb871795de315187bc16c55a16538080148e4b92e1a21c90e3b9b383705d8baee2b639f3ca9dc62
+EBUILD nikola-7.8.14-r1.ebuild 2349 BLAKE2B 3294119cb0343de4adfec3cdc0d90e7368d3beff46511f737c841dfb0d956dc9472f303f6b92ae91e162ce10ca6ff9d06d474ce8b4cd911d5493f5bd60e28b9f SHA512 6446b544f4a5369ba92d56f85d81b7422a728e1ff13dfb03971d0ce45ccef07d901c80e45732b0f1761228ac3e0ce5db9ce46ecf8f785bcdda93e2d0be1d390e
+EBUILD nikola-7.8.14.ebuild 2353 BLAKE2B 37b97644d8d6a698482ef6a0886c5e5705aa98273d822a44550e655936593754aed4417866d19a615d06ab9b377dfb3d3dbe79f345f2e1397d403756e7b6bfdd SHA512 1d8475c52977358e626a9aa44242174908908df283796a0d0d87ca8a249d061deac1e3cd164603c5c31ea4aef5667a061226e52008338f7485359e96380b3e4d
 EBUILD nikola-7.8.8.ebuild 2337 BLAKE2B df493ca81b4c03608e1aa10647c2edb436b9e2a7ec42bd7cbf85c523cc19fead482637456957a0dc5c59c36e94a30eeb70c9ed5485b0d9ba79f5aa2ad405a03a SHA512 da6b8ea3e723f0c5d4434d0a3e4bc3997ca85705cf360f0bf9aa7a76e1e2f2f61e72cd41cdd345cce9099c6fb89a59d6f97b0c951bdfd84f93803310f29cbe4b
 MISC metadata.xml 1360 BLAKE2B 694323edda02eec1a835c4c8a68a74c960a290ee44d1c95a59b5814fc6a8f6b248aec961ce69519da1a33970fba2868df81ed87155cd3c60193f79e8165c99d2 SHA512 ea8f610d5c5d7d568e29340e12701d652136a344f8aeb32c1df9a6909dc48180c5e9a7a91935c73e4d7df4f13cff82794e301d6a659262c52d8c88773e3b9697
diff --git a/www-apps/nikola/nikola-7.8.14-r1.ebuild b/www-apps/nikola/nikola-7.8.14-r1.ebuild
new file mode 100644
index 000000000000..05f442bd330a
--- /dev/null
+++ b/www-apps/nikola/nikola-7.8.14-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_4,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
new file mode 100644
index 000000000000..c0a87b751c1e
--- /dev/null
+++ b/www-apps/nikola/nikola-7.8.14.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,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/wiliki/Manifest b/www-apps/wiliki/Manifest
index dc766ad8ef32..cfd3bfcda9f2 100644
--- a/www-apps/wiliki/Manifest
+++ b/www-apps/wiliki/Manifest
@@ -1,5 +1,5 @@
-AUX wiliki-0.6.1-cgi-gentoo.patch 812 BLAKE2B ae57532f0a53b54400168fc07c2cc3d2f25fa34c7c8a83b8ffc61e1f1587c9182d401628d578dbc2826e4f9e60d3f98819290a57a13bad6c86b24954236dd638 SHA512 46f1972f046d07a4bc0f5ce17d57bf6211588128f3b8e0387d13fa3c6d75ea72f8b514955960332de6d4befbd00174965f113ab50fc3cb38202b3c356b052673
-AUX wiliki-po-gentoo.patch 426 BLAKE2B 3461917a93d304fa849a73ef88c7a6f596554a7ef9bf8392d11e23b40e20943818229a460be368143ab09fc5f5e64628408ac730007a3dcbbdb0dbf894b10857 SHA512 0d4eaedff0debe4e964bb4a0a8cdf348b8a4996e4ef403f4e66c8ea57e4b3080c8c33bfb293fe117e86ab3057039da365fdd44349bca26b0319f65a50e6d7cd5
+AUX wiliki-0.6.1-cgi-gentoo.patch 816 BLAKE2B e0a4448467d42cb91d20421e14d260c4482eac2687bcd728bac5c041ab605f824679c6936641258e5b9fd1f6287f3aa6fe938b5213bb45b0004d864d10db1f4c SHA512 d875ec0efde29348a230bb0bcd08a5eb4813cb5daace4b6cbdc25b5103b5f11f21fec28167b0fd618d4f6a1b53baa4024e9bbedb7b20d065f7502964579cf7b1
+AUX wiliki-po-gentoo.patch 455 BLAKE2B be37736cc1b4b5c6de065bb3bfe3d7011310710b87d45738d81eda9398342541e6b42512228e3ab1bb38e483bef8824d1b22f60e5493f64a6e9cc7984e3faca4 SHA512 e5c3ba62b29be3c9910e06ee20897f66696a859d1c427de5c8d7d57ccaba4d18325700b6d6a01fb6e869391373f6ac1894dd267720957d2f594dd8c37d5db162
 DIST WiLiKi-0.6.1.tgz 123954 BLAKE2B 80f1f39a0099e481a7b21c61bdb2d0a1b89052b23fa3312564b32d8bfb19441d08f23bc8369d085204179041dad18da72f65636ff80b63533d6c290a99e4f31a SHA512 de781f028d38edd37db43384dbdc8a57e9fbfd8b71f12c24840a90a6f000b0a2a85425f5cf3b49c5837bc3d104e2080dbb9c8e763cea54121dac779e3c5d7021
-EBUILD wiliki-0.6.1.ebuild 1434 BLAKE2B 959405053190c1bf0f43bb2cbdf29b04423738a43d9b1d182855984083e2e31d56962b1e0c07274d332433fcfad8aa6b7fee54e77b727ffa56206ca90b9c86aa SHA512 64b3c6a1dea7a8961dc2b44c0989525adb2a601083bf42f719250d5edee4625ffa9b9f548d23b27a23e2f747a9b9a05678ff027bbf473afac994287bc54ac897
+EBUILD wiliki-0.6.1-r1.ebuild 1406 BLAKE2B be894ce099d405ee357150d3507e163218edd08eeca584d6baa4d77a79e43711487eb63084856156204a23f2eeb4f7891d106ae422f2b456db6b2e8e4254cbee SHA512 5aaeca1f7c7ff58f17d4f64082ac2da0e9b1faefca70adf7d9ebec3cfba84be2f8e6905a99434d89d0dff47380081a516a8dba846a91860437e0a1720e251c77
 MISC metadata.xml 692 BLAKE2B a7d08bea3e962a0fd42bc5e90fc114a26b293141bcb251c039b1558a6a4950fd0efec1219241bfa2ed0985924ceffdbfadf3b28809bebb7dc4ae0a9211e1bfeb SHA512 ed8c01a0526eeb75e36d011af5a619a9882ca2e511e48a8b2dd914545d097968958c000c3898a97b2f60b6f42c81efc25e64ab2442a1bcedec952c764ee5b7e1
diff --git a/www-apps/wiliki/files/wiliki-0.6.1-cgi-gentoo.patch b/www-apps/wiliki/files/wiliki-0.6.1-cgi-gentoo.patch
index 55def56d0510..173f25fc4cad 100644
--- a/www-apps/wiliki/files/wiliki-0.6.1-cgi-gentoo.patch
+++ b/www-apps/wiliki/files/wiliki-0.6.1-cgi-gentoo.patch
@@ -1,5 +1,5 @@
---- src/wiliki.cgi.orig	2008-01-11 08:52:19.000000000 -0500
-+++ src/wiliki.cgi	2009-01-30 11:54:41.000000000 -0500
+--- a/src/wiliki.cgi.orig	2008-01-11 08:52:19.000000000 -0500
++++ b/src/wiliki.cgi	2009-01-30 11:54:41.000000000 -0500
 @@ -52,13 +52,13 @@
  (define (main args)
    (wiliki-main
diff --git a/www-apps/wiliki/files/wiliki-po-gentoo.patch b/www-apps/wiliki/files/wiliki-po-gentoo.patch
index 3e5e93f79436..5ce0cca9736f 100644
--- a/www-apps/wiliki/files/wiliki-po-gentoo.patch
+++ b/www-apps/wiliki/files/wiliki-po-gentoo.patch
@@ -1,6 +1,6 @@
---- po/Makefile.in.orig	2008-01-31 21:38:35.000000000 -0500
-+++ po/Makefile.in	2009-01-09 14:34:08.000000000 -0500
-@@ -28,7 +28,7 @@
+--- a/po/Makefile.orig	2018-04-01 19:58:29.879110970 -0400
++++ b/po/Makefile.in	2018-04-01 19:59:14.929385523 -0400
+@@ -28,7 +28,7 @@ ALL_LINGUAS = @ALL_LINGUAS@
  PO_FILES = $(addsuffix .po,$(ALL_LINGUAS))
  MO_FILES = $(addsuffix .gmo,$(ALL_LINGUAS))
  
diff --git a/www-apps/wiliki/wiliki-0.6.1.ebuild b/www-apps/wiliki/wiliki-0.6.1-r1.ebuild
index b3d0f900c446..4add1c335f63 100644
--- a/www-apps/wiliki/wiliki-0.6.1.ebuild
+++ b/www-apps/wiliki/wiliki-0.6.1-r1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="3"
+EAPI=6
 
-inherit webapp eutils
+inherit webapp
 
 MY_PN="WiLiKi"
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="WiLiKi is a lightweight Wiki engine written in and running on Gauche Scheme"
-HOMEPAGE="http://practical-scheme.net/wiliki/"
+HOMEPAGE="https://practical-scheme.net/wiliki/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
 
 LICENSE="BSD"
@@ -28,10 +28,10 @@ WEBAPP_MANUAL_SLOT="yes"
 
 S="${WORKDIR}"/${MY_P}
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-po-gentoo.patch
-	epatch "${FILESDIR}"/${P}-cgi-gentoo.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-po-gentoo.patch
+	"${FILESDIR}"/${P}-cgi-gentoo.patch
+)
 
 src_install() {
 	webapp_src_preinst