gentoo resync : 10.02.2020

4 files changed, 120 insertions, 5 deletions

diff --git a/www-apps/nikola/Manifest b/www-apps/nikola/Manifest
index 28072ac626a9..fd475a752da4 100644
--- a/www-apps/nikola/Manifest
+++ b/www-apps/nikola/Manifest
@@ -1,4 +1,7 @@
+AUX nikola-8.0.4-setup-py.patch 1340 BLAKE2B 7eb27b287eaf588dfc50b21b4be27ec7239a745c2d61ee665d0c4578de4bdbcd5050ae38a2376d2fe7caae0fd41ed62e3e3e0e0bd67ac71a3b66c71c00dd6a6d SHA512 b3d16bd453192bc14208c55d0502192a24577b422fc9ca865512a5693544e238bf15d0bf79ca67bf279a4259e2f70894579f81e3b8ea1914f09bccdcd467b366
 DIST Nikola-7.8.15.tar.gz 4131518 BLAKE2B ea3dca9340852a68b668de82e5deeaa0ecf7bb8597f311721b27409fe0cf820919c79f6e631b030bd3ea4571dd8480c862c607d0b9e6015a8b03023de5a9b93e SHA512 b441ae014539b948d007183ceb574243b89a498be265da7245095f67510d4d7c109c4935e0f9765b4144e82f788a1b66a0eacfba1477a89ce6c2645cb77102d7
-EBUILD nikola-7.8.15-r1.ebuild 2336 BLAKE2B 06a8f34a515ae6399a6e0877aea8f12f099da43241c569e923595c18e876468f7c5e5aa939173ad870cb56dd2d73d4a579164fc46942ee47e4284f98d8b5c048 SHA512 4a6d2ea1f357080fc2faf18a2ebe33e058864771caabfc6d603adb8c7240a58e3ec204a4977f5a975dbfb751e732580fc3854deab78d5b0cef7e49427236cc44
+DIST Nikola-8.0.4.tar.gz 4137494 BLAKE2B 04db8b83f34ca9b3cee785c5eed9d0421d27acf750c4f17dc3bec0df6fd4f462af52a65c0c97a07777922da3bf3fa855d58d546479b19bfb152e8190d2f74524 SHA512 eb6774d11be4eab81fbe41115d80e5d0d38694b734431d5d6355fcd3e3d8ae5ff4a02114c5dd0dbbc9e1ea5a625e9ac2b6b91e82f6e017b4376e4ca8d56cfec7
+EBUILD nikola-7.8.15-r1.ebuild 2310 BLAKE2B e06c418bb41204e0fef07348829e762472f51e572c6bf93800a8fe090dc0f1f50bedd011f1dd3059dc9238458546dead07ce62f84a476dc4d87363a4c798e58c SHA512 59b3cb56629185eb7ab9d3713318d54b443622c0a5c6a9cf93892c752a9cd3e53428989c018869476b5180b148d049ea4d7778ae8fa9f30b8d867f0b00233f10
 EBUILD nikola-7.8.15.ebuild 2434 BLAKE2B 66d90061f9679ee9738861c1a7e0b5cb95aac9954aba8cbdd39ad27468f539391d567f86332ad869e2e2635b10e444a254a37ce473fd13f84f54fceeeff4aa8b SHA512 3cbef0fab73ef77fcd4dfc331e251c86c88d5146d094ce516f019e5efe9bdf34f82c8f6ddf9bd3f9f26c426b85f4bed465d070454f3b49de9005b6a191a59e29
+EBUILD nikola-8.0.4.ebuild 2358 BLAKE2B 9e7285413dd8ac344ffcd670edf947bf53294ebbd57991ba155fbb5792a7fcd9fc844db088797d09d420b275b09711a504aaddc061e1c2078a3607a7a5e846df SHA512 36a184844520c54b1e74c42c0c19d574af5070e5516af8c644f51ecd45261c4aa79eabb44d682a47324893ce0ffa57bd0b07d678ed20e6c732f18151a72efb06
 MISC metadata.xml 1360 BLAKE2B 694323edda02eec1a835c4c8a68a74c960a290ee44d1c95a59b5814fc6a8f6b248aec961ce69519da1a33970fba2868df81ed87155cd3c60193f79e8165c99d2 SHA512 ea8f610d5c5d7d568e29340e12701d652136a344f8aeb32c1df9a6909dc48180c5e9a7a91935c73e4d7df4f13cff82794e301d6a659262c52d8c88773e3b9697
diff --git a/www-apps/nikola/files/nikola-8.0.4-setup-py.patch b/www-apps/nikola/files/nikola-8.0.4-setup-py.patch
new file mode 100644
index 000000000000..8089b4ee8b24
--- /dev/null
+++ b/www-apps/nikola/files/nikola-8.0.4-setup-py.patch
@@ -0,0 +1,47 @@
+From 89bfbfb5bb0ffc823664557ff59f90db03f7b10f Mon Sep 17 00:00:00 2001
+From: Chris Warrick <kwpolska@gmail.com>
+Date: Fri, 7 Feb 2020 13:06:06 +0100
+Subject: [PATCH] =?UTF-8?q?Fix=20#3348=20=E2=80=94=20don=E2=80=99t=20ship?=
+ =?UTF-8?q?=20tests=20to=20site-packages?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ CHANGES.txt | 12 ++++++++++++
+ setup.py    |  2 +-
+ 2 files changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/CHANGES.txt b/CHANGES.txt
+index e76f24bee..815b37849 100644
+--- a/CHANGES.txt
++++ b/CHANGES.txt
+@@ -1,3 +1,15 @@
++New in master
++============
++
++Features
++--------
++
++Bugfixes
++--------
++
++* Avoid installing ``tests`` package to site-packages, remove it from
++  your environment if it was inadvertently added (Issue #3348)
++
+ New in v8.0.4
+ =============
+ 
+diff --git a/setup.py b/setup.py
+index f6ca027b7..e4f2c7fc7 100755
+--- a/setup.py
++++ b/setup.py
+@@ -105,7 +105,7 @@ def run(self):
+       author='Roberto Alsina and others',
+       author_email='ralsina@netmanagers.com.ar',
+       url='https://getnikola.com/',
+-      packages=find_packages(exclude=('tests',)),
++      packages=find_packages(exclude=('tests', 'tests.*')),
+       license='MIT',
+       keywords='website, blog, static',
+       classifiers=['Development Status :: 5 - Production/Stable',
diff --git a/www-apps/nikola/nikola-7.8.15-r1.ebuild b/www-apps/nikola/nikola-7.8.15-r1.ebuild
index c989d8059c4f..f7d523787787 100644
--- a/www-apps/nikola/nikola-7.8.15-r1.ebuild
+++ b/www-apps/nikola/nikola-7.8.15-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python3_6 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -32,7 +33,6 @@ RDEPEND="${DEPEND}
 	>=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}]
@@ -58,6 +58,5 @@ src_install() {
 	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"
+	gunzip "${D}/usr/share/man/man1/${PN}.1.gz" || die
 }
diff --git a/www-apps/nikola/nikola-8.0.4.ebuild b/www-apps/nikola/nikola-8.0.4.ebuild
new file mode 100644
index 000000000000..abec5ee581f6
--- /dev/null
+++ b/www-apps/nikola/nikola-8.0.4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 )
+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 ghpages hyphenation ipython jinja watchdog webmedia websocket"
+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.30.1[${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[${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}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-setup-py.patch
+)
+
+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/*.rst
+	gunzip "${D}/usr/share/man/man1/${PN}.1.gz" || die
+}