gentoo Easter resync : 12.04.2020

5 files changed, 5 insertions, 63 deletions

diff --git a/dev-python/sphinxcontrib-github-alt/Manifest b/dev-python/sphinxcontrib-github-alt/Manifest
index 401eebdc0098..3c3e2c23742e 100644
--- a/dev-python/sphinxcontrib-github-alt/Manifest
+++ b/dev-python/sphinxcontrib-github-alt/Manifest
@@ -1,9 +1,6 @@
 AUX sphinxcontrib-github-alt-1.0-init.py.patch 255 BLAKE2B 7451f0920d802bdb06217323719ba0b4cfb5d64a2309c7a051df58a2e83ce22ac1515176fe3b1a3af060da11e4a5031250f13c5530119e3dd63c32b16c0ba9a7 SHA512 2f84e82bfa6fd24fe0707af174773348b23aa7591e5c6ac9a7335e2b87721586e4f84157b33a4421c15632ae6a890c5c0c55090fb403bba6927a4d36bc1377e5
-AUX sphinxcontrib-github-alt-1.0-setup.py.patch 598 BLAKE2B 7a4e2a1692368334ce0d1d3e13b98a5e21f6e1b1775c2bf99abbbdc2b6a68a1ca301e2d3a237a8ff45a53f1ee54c5788367a69844381c043c635f3106d3fc663 SHA512 0159cfa1a416e6d9b150eb0245dcec65e8e69cf2c1d4e69808128f4046d3ea13952feb60ef8b3b628e6e678ef03bcf04789c30a45c829e9d6ebe2014833376b7
 AUX sphinxcontrib-github-alt-1.1-setup.py.patch 598 BLAKE2B e740a7a90e6e158a7c88943f60c81160d4c6616280a961d6afdc2d9dca59cd04b32b9e62b6b243a16cf4c133d5c5dfcebfc4bc79a915d4699385b1af2d270690 SHA512 763d38a7c01f916382f558635b68c2eacc7013b2e6a5f22aa5299bcd6303223994b9166ba8a4b8c51a6f57c8f592924d9f389b0547dbd5baa45d5e26e0229b4d
-DIST sphinxcontrib-github-alt-1.0.tar.gz 3213 BLAKE2B b2449c0b635769735a23187f422f05c21c52098bd25057f4dfec5412040992417451ba21bd85dcdd71c75fe2d0ac935f745b6595bf5c77bb3facf91d48a39cef SHA512 57f5ab3a5d679634ce0c2ea8c78069f37ed5a5d3c32fe6cf61851ed4a9e8b6b9b6c882f486eb84914153b4121dacc25fd4b11edee111630001ae9bc324f2250e
 DIST sphinxcontrib-github-alt-1.1.tar.gz 3312 BLAKE2B 4665c873bff44a65b0aaac4ea853ac4edc3447850f6c18a8c7b717a84e158c6cf0c16116bbfdff8f3419b8448272a180c57283c324ab5052359da4522937abbf SHA512 b7af74e3762d51663bcc8a33d10bb63ae5fd24e220919719de5ff9421ec2ae854b84bb9f17f379fa174996edc2160580fb49b0030bab4cadbdfbcbf0a0cd509d
-EBUILD sphinxcontrib-github-alt-1.0.ebuild 904 BLAKE2B 2d7a4552fd0428367ac575851b5e6539641cf8d9c1f5f78b296018b962357dbb4a6c4d22337ab988f3b3f5f090e34059bbb7bc826633051d5c0987d9ec6295cc SHA512 fc9cf996014d2bc6367b84eccc7d2fbeb9cf3644e3efd1232186ddad961d53d52e9181b9992c99ba802e0a9d16a21c9f5b9249eab9be17e58a4ae6eaa826152c
-EBUILD sphinxcontrib-github-alt-1.1-r1.ebuild 622 BLAKE2B e82ddec60ca7172e7e0f9758dede9f87755be7e3e0a950928f1e7e7926dc6628a0a55ba2b363c61c25393a3d864a6eaaaa76616b18cfbd1dff76448530b6cea1 SHA512 f8756251e80b5bf3aa59d01428ae1fecad4d06fe872d71bd2d986aeb6f4b3468dee96244f384f0187fbdee53f5287f06ce3e16e64536f241c72e9b86a5e15581
-EBUILD sphinxcontrib-github-alt-1.1.ebuild 874 BLAKE2B 2cf478b03ceaaa5e01f65566d4501f0d838aa6d76c8ce457bfbb1869e86c7bbf066a39472cbef3873b08edd4bb3034f7925c711ea6127a42c16fed126654da7c SHA512 fdbe1db6ddaeb565be9c216ca12d9be5dc7a5cfe34c72959e015687cc4de88db9ef21191227a718ed280daa7fcf2ec113f996c8e42e0a3518eb42a3216ca58c7
+EBUILD sphinxcontrib-github-alt-1.1-r2.ebuild 629 BLAKE2B ae91fb877e0d288eb982422f0b08a8433383b65850629c93667c9e90b9d10ef28bf6d483afaed4bacf5f728da129e8d509b644bcb9dcbb17358b5f6cdf499031 SHA512 85283880edbc874a7fce6c5990edf964a7ff0ae0a859871b4390147a9d86e439f098747cf325958d1c4671ca4ee93aceea65d1a0b57e55b9222f8b12b552f316
+EBUILD sphinxcontrib-github-alt-1.1.ebuild 873 BLAKE2B aec3c67977947b4ac0aeb7ad3c5306bd10a294bc28dd9c822b4efa2cc411c51d6d7fc5a2ede3feffb7dbe6d4a02bdfcdf0dc965e2540c02d048009d033518f08 SHA512 80656dd0b99a89e07eeed24c3ea0d67e215c174d69d741f71e1b45799ea74cdb1e1a2bc8e898c54bbd866326c8d06f71ef17613faa2e1515ed3596162489df8f
 MISC metadata.xml 412 BLAKE2B 2cd07799a32942d97bbc9aaca814d37fa7a02eb748ba60da3740f6d9b37ede1abcdda4b7d36f68c5df26e9af0befa1741b0e55a3b7289e986aedafba98ec703f SHA512 6453593682ebdefbf75a1818ce26347827e3be0819bdaf7d6f407eec24394e45275d3bfec3e1cf254216b17fb6f642b2ddd06b5d92d3488706dab78a03d632a6
diff --git a/dev-python/sphinxcontrib-github-alt/files/sphinxcontrib-github-alt-1.0-setup.py.patch b/dev-python/sphinxcontrib-github-alt/files/sphinxcontrib-github-alt-1.0-setup.py.patch
deleted file mode 100644
index 2bc518c2cafb..000000000000
--- a/dev-python/sphinxcontrib-github-alt/files/sphinxcontrib-github-alt-1.0-setup.py.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-setup.py for sphinxcontrib_github_alt by Marius Brehler <marbre@linux.sungazer.de>.
-
-Patch by Marius Brehler <marbrbre@linux.sungazer.de>.
---- /dev/null
-+++ b/setup.py
-@@ -0,0 +1,12 @@
-+from distutils.core import setup
-+
-+setup(name='sphinxcontrib_github_alt',
-+      version='1.0',
-+      author='Jupyter Development Team',
-+      author_email='jupyter@googlegroups.com',
-+      url='https://github.com/jupyter/sphinxcontrib_github_alt',
-+      packages=['sphinxcontrib_github_alt'],
-+      classifiers=[
-+          'License :: OSI Approved :: BSD License'
-+      ]
-+)
-\ No newline at end of file
diff --git a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.0.ebuild b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.0.ebuild
deleted file mode 100644
index b1a9271990b0..000000000000
--- a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7}  )
-
-inherit distutils-r1
-
-MY_PN="sphinxcontrib_github_alt"
-
-DESCRIPTION="Link to GitHub issues, pull requests, commits and users from Sphinx docs"
-HOMEPAGE="https://github.com/jupyter/sphinxcontrib_github_alt"
-SRC_URI="https://github.com/jupyter/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/${P}"-setup.py.patch
-	"${FILESDIR}/${P}"-init.py.patch
-)
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	mv "${WORKDIR}/${MY_PN}-${PV}"/sphinxcontrib_github_alt.py "${WORKDIR}/${MY_PN}-${PV}/${MY_PN}/" || die
-}
diff --git a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1-r1.ebuild b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1-r2.ebuild
index e2c50ac186d1..ff13f834f04e 100644
--- a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1-r1.ebuild
+++ b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/jupyter/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
 BDEPEND=${RDEPEND}
diff --git a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1.ebuild b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1.ebuild
index 05794e64fda8..a03a020135f1 100644
--- a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1.ebuild
+++ b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/jupyter/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="