gentoo resync : 22.12.2021

4 files changed, 49 insertions, 7 deletions

diff --git a/dev-python/terminaltables/Manifest b/dev-python/terminaltables/Manifest
index 55fc85b635a3..df487176667d 100644
--- a/dev-python/terminaltables/Manifest
+++ b/dev-python/terminaltables/Manifest
@@ -1,5 +1,7 @@
 AUX terminaltables-3.1.0-stdout.patch 789 BLAKE2B 2c9f166d4e303cc55bf2d6b9b0e1f9d947cd10a1a173abc5657b9dedfd637da05e374fdc9e997f9e758be9caa90f3a984032eade15e816de594d65268bb013ad SHA512 f6eb3ea11a7027886457dd720b0736fc11611d233b7971456141476a6b1d83fb0be33e14c5789a626da1ca0f0f2ca75983f496bc68660aa66d7f285a3c2be684
 DIST terminaltables-3.1.0.tar.gz 278484 BLAKE2B 733bcfcdc51c5e78e85e8f7fc9db00fa96c1ad48f76a9ec48ed546dc0acd62af90f437de346fe05d4cb09151b33ddea2f62beb21b418d7f76d8a719423a5f694 SHA512 dc49458652fff8bc6094d316d84c9b8e9fca1a26e3230c0b668bc03ec8528793f4ef024e8032d4a56fbfabfdfd4a1142870f550f0b373ba6a42dd2e3ead3f501
+DIST terminaltables-3.1.10.tar.gz 282122 BLAKE2B 53d5ecde38370f5b05d3eaae4b618ada6991214feadc7e826467dafede5baaf8292e47e6b2be903eb8ae6d46e3066314fe7950d7330056cd3053e0d643ad1a9e SHA512 84fa403cee4206b6b19de0206d89535bd2965a0796e1890dd9b0a9c6593c5f41d0d24b88ee9db426067c777712a4e810d67d4d0246496239a7a96b53a24e8174
 EBUILD terminaltables-3.1.0.ebuild 682 BLAKE2B 276e25b200a4423954205a63272d886ad61b1929cccd64a0925403697ece767189e5d186ed1f2aeca44255edfd41ca2b601f76ee27bd86c9899cfa54d53f7d1c SHA512 5d550588536a736497a25e15650a37dfe7baffaaffdaded4b4c1045acce3281e67a45f3c836af709db9c7381a6b0adc5341af8f228d8d183ee00d9476fedcc61
-EBUILD terminaltables-9999.ebuild 589 BLAKE2B c13bc07bad5ae721a777e41303fdccbc48916faa1d344830a1d4a5b84e253dc73038f92a6a5204aa1de04b463d8d5d629518541a9c21a09689090dc3546471ef SHA512 cf912682938c5e25cbc30843d05b69af33fa05d3a7137d089a30c7a7d703c4c9dc97d37f8d4658ee095b047ab3161b2bb12023f300f6b317dcecb64776503a06
-MISC metadata.xml 490 BLAKE2B eff13d3dec4aa1a31ec6edbc57b5d7e9f7a5245ee1f34c574ec6ef0a4825a31e896438132626572e7c6a82515f0e491550c5434cbe604b253570390dfc848115 SHA512 0bef787dd0e53db6fef581de5513e31ed40fa1882731ae44a5c2faebd06484777bb22b6a2d1b2161c2ab51ad920782d363f32c438ff2a44a934836799d9a07fa
+EBUILD terminaltables-3.1.10.ebuild 954 BLAKE2B 26e32579fed298d1df1958798bbd3b46076a7bccb635ffca1c1fbdf49238edd701869115e2a181e0b18b8ca283541f849e196acf4917abf4f00030732fe429c5 SHA512 a35555f1ab3cf61d0398898aa954c6bd41b7b7ce9e7566e59ba49e6f5f431a4b79b7aa5f95b8c00456b36a3ba63dcc852d4bee7d8146cd5d02a9e8537c9a2f32
+EBUILD terminaltables-9999.ebuild 628 BLAKE2B 798fefdd5c8353834b47b3f389dde52eeb8ae334c9efc676faab22c63a8f85be0ab4f34827580d2269ff06ac167a28e46f524264e068644e4fe190c8e874a5c9 SHA512 848c7ef097cc0bd15c9d0535fce2baebf315002b95eefb3c69b753a361059e4e1fdb660150d07c32a40a1756bf0185668bb49f25ab9f50e2d8b09135b7085b34
+MISC metadata.xml 499 BLAKE2B c69faec6e90ce8d085d4ab222b09bbf69ff55415e8a596ec9a940191a5df96cfbc7ac0c2ce087c4d1c8199941c844a4e28ad4783bd9a8c106edb75537f781db9 SHA512 71bf75a76067bed905cd34d1f0eeae629a2362b8cfa33b54f06b228314274467795f8e1a34a7adb02d54d7976635a420dcd40ea6e1b6dc6f256b4179af7eb76d
diff --git a/dev-python/terminaltables/metadata.xml b/dev-python/terminaltables/metadata.xml
index f8a843fcbfdf..38af7ae0ae2b 100644
--- a/dev-python/terminaltables/metadata.xml
+++ b/dev-python/terminaltables/metadata.xml
@@ -10,7 +10,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="github">Robpol86/terminaltables</remote-id>
+		<remote-id type="github">matthewdeanmartin/terminaltables</remote-id>
 		<remote-id type="pypi">terminaltables</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/terminaltables/terminaltables-3.1.10.ebuild b/dev-python/terminaltables/terminaltables-3.1.10.ebuild
new file mode 100644
index 000000000000..a1a015395675
--- /dev/null
+++ b/dev-python/terminaltables/terminaltables-3.1.10.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Generate simple tables in terminals from a nested list of strings"
+HOMEPAGE="https://robpol86.github.io/terminaltables/"
+SRC_URI="
+	https://github.com/matthewdeanmartin/terminaltables/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/colorama[${PYTHON_USEDEP}]
+		dev-python/colorclass[${PYTHON_USEDEP}]
+		dev-python/termcolor[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/terminaltables-3.1.0-stdout.patch
+)
+
+src_prepare() {
+	# workaround pp2sp complaining about unsupported exclude,
+	# even though it's empty (fix will be included in pp2sp-22)
+	sed -i -e 's:^exclude:empty-&:' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/terminaltables/terminaltables-9999.ebuild b/dev-python/terminaltables/terminaltables-9999.ebuild
index f20c73f288fc..ed12c5a82704 100644
--- a/dev-python/terminaltables/terminaltables-9999.ebuild
+++ b/dev-python/terminaltables/terminaltables-9999.ebuild
@@ -1,15 +1,16 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} )
 
-PYTHON_COMPAT=( python3_{7..10} )
-EGIT_REPO_URI="https://github.com/Robpol86/${PN}.git"
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Generate simple tables in terminals from a nested list of strings"
 HOMEPAGE="https://robpol86.github.io/terminaltables/"
-SRC_URI=""
+EGIT_REPO_URI="https://github.com/matthewdeanmartin/${PN}.git"
 
 LICENSE="MIT"
 SLOT="0"