gentoo Easter resync : 12.04.2020

4 files changed, 45 insertions, 72 deletions

diff --git a/www-apps/blohg/Manifest b/www-apps/blohg/Manifest
index 1e4898c683fb..a659ac3c19e0 100644
--- a/www-apps/blohg/Manifest
+++ b/www-apps/blohg/Manifest
@@ -1,5 +1,5 @@
-AUX use-recent-libgit2.patch 724 BLAKE2B 393c488bf71af9a7ae89c53a64739a729043ba1408722e8b64636ca6e099d859c63c4421eb821b26a89423e8dfdfaca9c95fccffee1b76d50b25b0d772169580 SHA512 fab12807128e60d6c9105947ca313233ea00e8b81329d9eb92e5307d24f0ec7b1173de6d1b6b6571bf2e8ce4820dc8d7c1e5dac0a3dfed14157357532b99d1e9
 DIST blohg-0.13.tar.gz 75003 BLAKE2B 6b9760ffa99ca85a40e35c81341e395fdfc00256f5e80091c6883e54f050d4cf3f345c4752b635b1297d15e0055c182e00e74165451d695bb396c869c285646f SHA512 de8643e85e3f72827408d726bbe2f8674dcc6dcf1efdc47d33a934892071f8365cb54e63a6adb803361c7fd04032b2ac4e786c442676e8a8132b6d3221696865
-EBUILD blohg-0.13-r3.ebuild 1737 BLAKE2B 04f1e8bc211894e6c1e8a02650f434150729c413164401a61fba903c430b0c97a1fa4f296c6f1f8fad7f1c0b15475b8731b4fd56e9feb3532aa45f6e5d512511 SHA512 2182b11e686e521a398531d713d36ad6524983c7e632b3e212b096c30ef8b8aa56c822c0da4809c10683507ee8f274bc7d8f1bc6ba3a869e3c534ada50d6a77c
-EBUILD blohg-9999.ebuild 1672 BLAKE2B 3fd775eb873d59fe296a26346778eaae5c9f03bad92bd0cee1f4f5c6eca4eff444c60fc7ef34d9f8302eacc539bc2add10d2561a20e14eb510b4922745808208 SHA512 b6a72c8a9043f3dd5fc8efb1557b45647b0938508ea123d5885d369fee29a4b3adfa05fd6ec1a4ef4a1ce782a248010e7ad386b3c9ff06871ceafef2889f5dff
+DIST blohg-patches-0.13-r4.tar.xz 14960 BLAKE2B 31458f412395000a05b359db25e8af648c54e554a3b3216f6c62355fd7203fc19c4452defe7692d0382653563f7b0565395af4ceb2177cc8e6de1d7e1a3c7b41 SHA512 3f709880bdd1826b74982866931f5002fdda451a205b6c278a9869979314413f37c8bf6400e3064a463f2fd34810e22d0d4cd5dfc89786f9e276dd9bd9fe5ec2
+EBUILD blohg-0.13-r4.ebuild 1776 BLAKE2B a78101332ab32b5147743a0ff566d5d164f6004016298ea9c956e93bfba9723990f12eac5b64eafb7ce0a0bc92a9d98cf42193bf8b5186dcc13ee9be9827390d SHA512 ccc2fd369f31e7da5603b5c22f2e3a86d2ec158653c1aeb671eee38cb9915f9ba9c2bec89068065f2df4282e4ba5293821929673d6c6608ea713cdb4b621bbbf
+EBUILD blohg-9999.ebuild 1776 BLAKE2B a78101332ab32b5147743a0ff566d5d164f6004016298ea9c956e93bfba9723990f12eac5b64eafb7ce0a0bc92a9d98cf42193bf8b5186dcc13ee9be9827390d SHA512 ccc2fd369f31e7da5603b5c22f2e3a86d2ec158653c1aeb671eee38cb9915f9ba9c2bec89068065f2df4282e4ba5293821929673d6c6608ea713cdb4b621bbbf
 MISC metadata.xml 983 BLAKE2B b57921e5e260e283cc261200cefcba516918e21ab44ff009a5fb08c58036cd39263de239e65e20714bac823bd7d0c6889dbd0737904109af635809cd16ce2f55 SHA512 39e0799c5a6e685ea188c12b8e2ddd34178fce3630a0cb84308a66c710730e8aeaeaf23444e4f8091ec2adf6eb1da3ea7bf74e1df1adb3d5caa2205da99cc6f8
diff --git a/www-apps/blohg/blohg-0.13-r3.ebuild b/www-apps/blohg/blohg-0.13-r4.ebuild
index f30c7c0ad0b4..6a4abc9a54f5 100644
--- a/www-apps/blohg/blohg-0.13-r3.ebuild
+++ b/www-apps/blohg/blohg-0.13-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_6 )
 
 GIT_ECLASS=""
 if [[ ${PV} = *9999* ]]; then
@@ -16,7 +16,8 @@ inherit distutils-r1 ${GIT_ECLASS}
 DESCRIPTION="A Mercurial (or Git) based blogging engine"
 HOMEPAGE="https://github.com/rafaelmartins/blohg"
 
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~rafaelmartins/distfiles/${PN}-patches-${PVR}.tar.xz"
 KEYWORDS="~amd64 ~x86"
 if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
@@ -32,27 +33,28 @@ REQUIRED_USE="|| ( git mercurial )
 	test? ( git mercurial )"
 
 RDEPEND="
-	>=dev-python/click-2.0
-	>=dev-python/docutils-0.11
-	>=dev-python/flask-0.10.1
-	>=dev-python/flask-babel-0.7
-	>=dev-python/frozen-flask-0.7
-	>=dev-python/jinja-2.5.2
-	dev-python/pyyaml
-	dev-python/setuptools
-	dev-python/pygments
-	git? ( >=dev-python/pygit2-0.21.3 )
-	mercurial? ( >=dev-vcs/mercurial-1.6 )"
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/feedgenerator[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-babel[${PYTHON_USEDEP}]
+	dev-python/frozen-flask[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	git? ( dev-python/pygit2[${PYTHON_USEDEP}] )
+	mercurial? ( >=dev-vcs/mercurial-5.2[${PYTHON_USEDEP}] )"
 
 DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-	test? ( dev-python/mock )"
+	doc? ( dev-python/sphinx )"
 
 python_prepare_all() {
+	if [[ ${PV} != *9999* ]]; then
+		eapply "${WORKDIR}/${PN}-patches-${PVR}"
+	fi
+
 	if ! use git; then
 		rm -rf blohg/vcs_backends/git || die 'rm failed'
-	else
-		local PATCHES=( "${FILESDIR}/use-recent-libgit2.patch" )
 	fi
 
 	if ! use mercurial; then
@@ -74,11 +76,3 @@ python_install_all() {
 python_test() {
 	esetup.py test
 }
-
-pkg_postinst() {
-	local ver="${PV}"
-	[[ ${PV} = *9999* ]] && ver="latest"
-
-	elog "You may want to check the upgrade notes:"
-	elog "http://docs.blohg.org/en/${ver}/upgrade/"
-}
diff --git a/www-apps/blohg/blohg-9999.ebuild b/www-apps/blohg/blohg-9999.ebuild
index 03b42c18276f..6a4abc9a54f5 100644
--- a/www-apps/blohg/blohg-9999.ebuild
+++ b/www-apps/blohg/blohg-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_6 )
 
 GIT_ECLASS=""
 if [[ ${PV} = *9999* ]]; then
@@ -16,7 +16,8 @@ inherit distutils-r1 ${GIT_ECLASS}
 DESCRIPTION="A Mercurial (or Git) based blogging engine"
 HOMEPAGE="https://github.com/rafaelmartins/blohg"
 
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~rafaelmartins/distfiles/${PN}-patches-${PVR}.tar.xz"
 KEYWORDS="~amd64 ~x86"
 if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
@@ -32,23 +33,26 @@ REQUIRED_USE="|| ( git mercurial )
 	test? ( git mercurial )"
 
 RDEPEND="
-	>=dev-python/click-2.0
-	>=dev-python/docutils-0.11
-	>=dev-python/flask-0.10.1
-	>=dev-python/flask-babel-0.7
-	>=dev-python/frozen-flask-0.7
-	>=dev-python/jinja-2.5.2
-	dev-python/pyyaml
-	dev-python/setuptools
-	dev-python/pygments
-	git? ( >=dev-python/pygit2-0.21.3 )
-	mercurial? ( >=dev-vcs/mercurial-1.6 )"
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/feedgenerator[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-babel[${PYTHON_USEDEP}]
+	dev-python/frozen-flask[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	git? ( dev-python/pygit2[${PYTHON_USEDEP}] )
+	mercurial? ( >=dev-vcs/mercurial-5.2[${PYTHON_USEDEP}] )"
 
 DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-	test? ( dev-python/mock )"
+	doc? ( dev-python/sphinx )"
 
 python_prepare_all() {
+	if [[ ${PV} != *9999* ]]; then
+		eapply "${WORKDIR}/${PN}-patches-${PVR}"
+	fi
+
 	if ! use git; then
 		rm -rf blohg/vcs_backends/git || die 'rm failed'
 	fi
@@ -72,11 +76,3 @@ python_install_all() {
 python_test() {
 	esetup.py test
 }
-
-pkg_postinst() {
-	local ver="${PV}"
-	[[ ${PV} = *9999* ]] && ver="latest"
-
-	elog "You may want to check the upgrade notes:"
-	elog "http://docs.blohg.org/en/${ver}/upgrade/"
-}
diff --git a/www-apps/blohg/files/use-recent-libgit2.patch b/www-apps/blohg/files/use-recent-libgit2.patch
deleted file mode 100644
index decd01b78fb5..000000000000
--- a/www-apps/blohg/files/use-recent-libgit2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/blohg/vcs_backends/git/filectx.py b/blohg/vcs_backends/git/filectx.py
-index 84f7aa3..5e20762 100644
---- a/blohg/vcs_backends/git/filectx.py
-+++ b/blohg/vcs_backends/git/filectx.py
-@@ -73,7 +73,11 @@ def _last_changeset(self):
-                                       GIT_SORT_TIME):
-             diff = self._repo.diff(head, commit)
-             for patch in diff:
--                if patch.new_file_path == self._path:
-+                try:
-+                    new_file_path = patch.delta.new_file.path
-+                except AttributeError:
-+                    new_file_path = patch.new_file_path
-+                if new_file_path == self._path:
-                     return head
-             head = commit
-