gentoo resync : 25.08.2020

6 files changed, 4 insertions, 68 deletions

diff --git a/dev-python/sphinxcontrib-github-alt/Manifest b/dev-python/sphinxcontrib-github-alt/Manifest
index de4fe678f158..9077a86e71c3 100644
--- a/dev-python/sphinxcontrib-github-alt/Manifest
+++ b/dev-python/sphinxcontrib-github-alt/Manifest
@@ -1,6 +1,3 @@
-AUX sphinxcontrib-github-alt-1.0-init.py.patch 255 BLAKE2B 7451f0920d802bdb06217323719ba0b4cfb5d64a2309c7a051df58a2e83ce22ac1515176fe3b1a3af060da11e4a5031250f13c5530119e3dd63c32b16c0ba9a7 SHA512 2f84e82bfa6fd24fe0707af174773348b23aa7591e5c6ac9a7335e2b87721586e4f84157b33a4421c15632ae6a890c5c0c55090fb403bba6927a4d36bc1377e5
-AUX sphinxcontrib-github-alt-1.1-setup.py.patch 598 BLAKE2B e740a7a90e6e158a7c88943f60c81160d4c6616280a961d6afdc2d9dca59cd04b32b9e62b6b243a16cf4c133d5c5dfcebfc4bc79a915d4699385b1af2d270690 SHA512 763d38a7c01f916382f558635b68c2eacc7013b2e6a5f22aa5299bcd6303223994b9166ba8a4b8c51a6f57c8f592924d9f389b0547dbd5baa45d5e26e0229b4d
 DIST sphinxcontrib-github-alt-1.1.tar.gz 3312 BLAKE2B 4665c873bff44a65b0aaac4ea853ac4edc3447850f6c18a8c7b717a84e158c6cf0c16116bbfdff8f3419b8448272a180c57283c324ab5052359da4522937abbf SHA512 b7af74e3762d51663bcc8a33d10bb63ae5fd24e220919719de5ff9421ec2ae854b84bb9f17f379fa174996edc2160580fb49b0030bab4cadbdfbcbf0a0cd509d
-EBUILD sphinxcontrib-github-alt-1.1-r2.ebuild 640 BLAKE2B 7da032195c19cda1ea14dc0b97a61ff4b1be5a9163d5f383f55ac677983e19b79b66a01588c685151f149f095867da857fb1b4668f1413895021203079d51305 SHA512 195f73a7df7c81e115a39f320d98382442498e3a11c1cb58c0916970e4db6803b1cf535d554d6f95653e594211fbf75a9c8936f34ee60c9443f0bfb6f77e8bc0
-EBUILD sphinxcontrib-github-alt-1.1.ebuild 873 BLAKE2B aec3c67977947b4ac0aeb7ad3c5306bd10a294bc28dd9c822b4efa2cc411c51d6d7fc5a2ede3feffb7dbe6d4a02bdfcdf0dc965e2540c02d048009d033518f08 SHA512 80656dd0b99a89e07eeed24c3ea0d67e215c174d69d741f71e1b45799ea74cdb1e1a2bc8e898c54bbd866326c8d06f71ef17613faa2e1515ed3596162489df8f
-MISC metadata.xml 412 BLAKE2B 2cd07799a32942d97bbc9aaca814d37fa7a02eb748ba60da3740f6d9b37ede1abcdda4b7d36f68c5df26e9af0befa1741b0e55a3b7289e986aedafba98ec703f SHA512 6453593682ebdefbf75a1818ce26347827e3be0819bdaf7d6f407eec24394e45275d3bfec3e1cf254216b17fb6f642b2ddd06b5d92d3488706dab78a03d632a6
+EBUILD sphinxcontrib-github-alt-1.1-r2.ebuild 643 BLAKE2B 8e0eb3932578725387df22b211bd353ad6a39f465f6fc1bbb72fa0752b250b27a9fd165ad112e68fadad0bba30f40ffaa4afa43dadbd34036910019f92fbd77c SHA512 7113e7c0b5909c71d80083446a35655702f36eeb6f957d550d004421ce70953ba01c29575eaf48be0cbd9a222045995bffeeec81e8bc3f46dcd169a5b091ab4b
+MISC metadata.xml 436 BLAKE2B 66cbd7a712c5d961f49809b3cc95dc80f3f10300ab36c0a91c636a514c52d46a4a31fd3d24665fc2d1dd44ed859ae35f8694193bb5fea26fa8f1e02c39546898 SHA512 9c198eba6ed705786f266b89e1313dd2a4427eff716ec0698ed3cc6e25eaa9b168216d8c46e48009d3e67ad820628820566bdd9184ffb1b147d942349bc66d4f
diff --git a/dev-python/sphinxcontrib-github-alt/files/sphinxcontrib-github-alt-1.0-init.py.patch b/dev-python/sphinxcontrib-github-alt/files/sphinxcontrib-github-alt-1.0-init.py.patch
deleted file mode 100644
index e4274fd429ae..000000000000
--- a/dev-python/sphinxcontrib-github-alt/files/sphinxcontrib-github-alt-1.0-init.py.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-__init__.py for sphinxcontrib_github_alt by Marius Brehler.
-
-Patch by Marius Brehler <marbrbre@linux.sungazer.de>.
---- /dev/null
-+++ b/sphinxcontrib_github_alt/__init__.py
-@@ -0,0 +1 @@
-+from .sphinxcontrib_github_alt import *
-\ No newline at end of file
diff --git a/dev-python/sphinxcontrib-github-alt/files/sphinxcontrib-github-alt-1.1-setup.py.patch b/dev-python/sphinxcontrib-github-alt/files/sphinxcontrib-github-alt-1.1-setup.py.patch
deleted file mode 100644
index 37269d0373af..000000000000
--- a/dev-python/sphinxcontrib-github-alt/files/sphinxcontrib-github-alt-1.1-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.1',
-+      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/metadata.xml b/dev-python/sphinxcontrib-github-alt/metadata.xml
index 169949de27c1..9804edaf8c8e 100644
--- a/dev-python/sphinxcontrib-github-alt/metadata.xml
+++ b/dev-python/sphinxcontrib-github-alt/metadata.xml
@@ -5,6 +5,7 @@
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">jupyter/sphinxcontrib_github_alt</remote-id>
 		<remote-id type="pypi">sphinxcontrib_github_alt</remote-id>
diff --git a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1-r2.ebuild b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1-r2.ebuild
index 1d814e6db085..da0d731cb39b 100644
--- a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1-r2.ebuild
+++ b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1-r2.ebuild
@@ -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 ~arm ~arm64 ~hppa ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~s390 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
deleted file mode 100644
index a03a020135f1..000000000000
--- a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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}]"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-1.1-setup.py.patch
-	"${FILESDIR}/${PN}"-1.0-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
-}