gentoo resync : 14.12.2020

3 files changed, 63 insertions, 18 deletions

diff --git a/app-text/pelican/Manifest b/app-text/pelican/Manifest
index e59550541928..cb6cf8b647ef 100644
--- a/app-text/pelican/Manifest
+++ b/app-text/pelican/Manifest
@@ -1,6 +1,8 @@
 DIST pelican-4.2.0.tar.gz 1332348 BLAKE2B 879a9d51f2b2956e895302dd613c877ff65bf8d420cd70144618ada07723037bca680f6983bdf3860d144ebae4eca8198219dad9caf0d6ecc06745a3881447fa SHA512 9c9f41306739acc4c6c6a7ddf50d955d958af7be1da197b42859b95405b18ab5b597fee4f9aabdf98cd508204558bff9c4f0c11bf4e5367b16e32568682a21e6
 DIST pelican-4.5.1.tar.gz 1397023 BLAKE2B f12b16045feaf001c8f6e57116fb8e807ce1d51f16bf7a373203edec3d1edb91a2386dbf8fb008efbc11654ae1cbe678b4a3cbf99349340db1d784962e81ab5b SHA512 cb27399d3c280981d1e8cd01dbfd54b1a8bd11d9b87c4717226a2a467d73c3ad4e038a8e544534289a73e9e3cc64b4414e2b3bbf2cdd05b917d02df79ab40b5a
+DIST pelican-4.5.3.tar.gz 1397896 BLAKE2B 86651f627af67c571ea65a7ddfe7b62747fd2798575d6c4f29455da9b2371ce22ff42d715f148925724764e0a9fbb8aeba1dea401226856d3681b520dbb0a7af SHA512 b1ef5f145b448f6af2e25a1adb399521d4c5f7eef3ee2aa5ab9e50c223623b5c9961622e5cd835a3cb72dbbe905da6ac9217128f2459a35892bbac9b9cb6d26a
 EBUILD pelican-4.2.0.ebuild 1484 BLAKE2B 61feaa13e44ac0efbd0e07f94ab7d1bd53245a0ecfc1b2a6e6d2f4674dc38f78b92753261c598165ca4005790dd8d2475e2c2c561cf2ff5711f0e92739111f8d SHA512 dc6f0ce017071f66f2e24cc4f6fdea986bf31d3980e08f7cd0c4b073eed2a6456e87af2a1cda8fd08cb8095c695a8598db49035d72f84dbd21161e4a7ba7e33c
 EBUILD pelican-4.5.1.ebuild 1519 BLAKE2B c8d21aed61f0d488d3515e587705bb467398bb3d462b659d84e5ed1f002d1d13e18f7ffee223ee3ccf77a5cf4ad50b7844d1144f84c8874d01a8202437c4ca00 SHA512 ab1f4db1cfc194f81f91c376401b8ba04400ebc2d4091be004e450405e8a952dd5f3186c58a3bf51a6b83c8a63ee82802b38d03345adaa658752447e4fd4ee90
-EBUILD pelican-9999.ebuild 1541 BLAKE2B 2b961dc8dc31d683360f063c90d727a0f8553796b4017774c6f97ab1e3386ca6aea5ba600aafd5eaaeae6c09bb480290b5407e2807d3b1ac5a4dd2cca31b2363 SHA512 6470c2a01b936cd22e8405346deac26330b627d6a05147055697775aa40f2dc87194f521c871da98c90800262930161084c1d1b441d754af51767f1fc8c1dcb9
+EBUILD pelican-4.5.3.ebuild 1429 BLAKE2B a63fd57d12351b26e93e894a77b80031257975b96468461f6e4dba90e7c416e077fc03a03ba4d3ab012261c590e9b9c353e4e3edfba0058c79977369df46ebe4 SHA512 932a5000ad63ad05902e29cd0ae686189d82486b037be5dadb2c3849c0ea35108198337925c2de8931d163a376457c562a1d249304cfa8d0d035602522792c07
+EBUILD pelican-9999.ebuild 1424 BLAKE2B f77d1ac743e751da8150e7da7514c5785f93f8c2e0f60370362a9728b1f32ab424ae4c2a971e007a899558939d46887e3d9efaab03cdef012b8b822bfaf7fc10 SHA512 672cfca62aa728ae9682850a5979393be163aaad50186cc729340916e150cc41c203d9bb49c8c834f5c77845475abd085ea2328fa138c8a5c17cd62677647ab6
 MISC metadata.xml 520 BLAKE2B bcf1bbb92ce3d045a3dde410f9566322f5605796b3fdc1947b1ae08967f2af21319922001d1942ccbb46dda2a911c3ea4efacf95ae67af32f8a3183c734ab2e1 SHA512 1a10d48a737dd95edb40e5190e45bddd30fdbe50db08394d21834d1ebd4f7e5b267477a52f90934b9ba92252b5a2b1d60e208399ab96559d169f550055c3e65c
diff --git a/app-text/pelican/pelican-4.5.3.ebuild b/app-text/pelican/pelican-4.5.3.ebuild
new file mode 100644
index 000000000000..6741e738f9b0
--- /dev/null
+++ b/app-text/pelican/pelican-4.5.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
+HOMEPAGE="https://blog.getpelican.com/ https://pypi.org/project/pelican/"
+SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc examples markdown"
+
+RESTRICT="test"
+RDEPEND=">=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )"
+DEPEND="test? ( dev-python/markdown[${PYTHON_USEDEP}] )"
+
+DOCS=( README.rst )
+
+distutils_enable_tests nose
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	if use examples; then
+		insinto "/usr/share/doc/${PF}"
+		docompress -x "/usr/share/doc/${PF}/samples"
+		doins -r samples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/app-text/pelican/pelican-9999.ebuild b/app-text/pelican/pelican-9999.ebuild
index cda70ce55f5a..5ef3211ca690 100644
--- a/app-text/pelican/pelican-9999.ebuild
+++ b/app-text/pelican/pelican-9999.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 git-r3
 
@@ -13,12 +15,10 @@ EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS=""
-IUSE="doc examples markdown test"
-# Tests fail for this release but are fixed upstream
-RESTRICT="test"
+IUSE="doc examples markdown"
 
-DEPEND=">=dev-python/feedgenerator-1.6[${PYTHON_USEDEP}]
+RESTRICT="test"
+RDEPEND=">=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
 	dev-python/docutils[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
@@ -28,15 +28,12 @@ DEPEND=">=dev-python/feedgenerator-1.6[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/markdown[${PYTHON_USEDEP}]
-	)"
-RDEPEND=""
-
+	markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )"
+DEPEND="test? ( dev-python/markdown[${PYTHON_USEDEP}] )"
 DOCS=( README.rst )
 
+distutils_enable_tests nose
+
 python_compile_all() {
 	use doc && emake -C docs html
 }
@@ -50,7 +47,3 @@ python_install_all() {
 	fi
 	distutils-r1_python_install_all
 }
-
-python_test() {
-	nosetests || die "Testing failed with ${EPYTHON}"
-}