gentoo auto-resync : 05:12:2022 - 21:07:33

3 files changed, 18 insertions, 62 deletions

diff --git a/dev-util/rbtools/Manifest b/dev-util/rbtools/Manifest
index 8c89f151692b..21454be13587 100644
--- a/dev-util/rbtools/Manifest
+++ b/dev-util/rbtools/Manifest
@@ -1,11 +1,8 @@
-DIST RBTools-2.0.1.tar.gz 229394 BLAKE2B a3864c5a39854ffd8744cc562fb888aded06b86945b7b08bab1b172e557b80c0183352068722e6d530a7b0c2fae85f24ae1bbef9116538c5c31735ae5c47f313 SHA512 41ef3f6ad030e3551b76cce5358806442ddc78ad14cb3f2f5978d25858b44647fc80a8a98c84edc112d3e121748fa49aeca0ae24287c392d2f8d1d3b72df12ff
 DIST RBTools-3.1.1.tar.gz 317592 BLAKE2B c50e27cf67e2015904e2330208f0d13ec5a799d0820f6477a6701553140851a5d82de65fbf41d8b64bfcf0028a9baf27b710909d230e1798032a4e28f2b43935 SHA512 1a1aa51f8924b1fcdc100c0337c66870284b8c3c91cb756d231509111e4b9ae233ccae1245251e826dc23c699553f5d3441e4b9ef2b80f32d4ce8876dfa43819
 DIST RBTools-3.1.2.tar.gz 322538 BLAKE2B ab459e60e1c25a8eb3cb8afbe9ad1c5c63d1d5bb73626225057e42a9afb61d1bf59b841db6ac61cab2ddb14cdb555f9a789d0ecab7eaf02b1489a6bcf9144149 SHA512 b70c42566559180245afcfa31d3920a7a35817377c60f7c70559625866d54790e9666ba9a366a03bf14feaf1d0e8d2847a526d3976be364d14447a82d148a2eb
-DIST RBTools-3.1.tar.gz 317015 BLAKE2B dccabc93af3a8095f5e166f9e3a31cce52155876cb38675b3dd43b6556024bb9b4ed66291e495ab42b41b09934f136f4eeca7a185fc0fbb2aa2d03e1ef12d656 SHA512 2568aa905dfd119e0b66213e3ae9c8edad5a3337df00228b955006cc85e90c1492e1dc4cccc2695b53f5879103c5d4ee8dba6262112c8781e452dea7633d2c0b
 DIST RBTools-4.0.tar.gz 397113 BLAKE2B 25d743a81e22e00575c6bc2a08d5bab04c35e554f6a1a17090eb55bbcaf0e8e5f4c2ad6a68a0415acb76c093c99b7bb223aeccd68392877bae97eac354578002 SHA512 d2dbe94dbd63fbd11ef0fc8c08eecbd7000df23388afe21d30151854ff4ef2b3a6c780c60ee52408832a146570a1f7b3f0269fc0c831953e871d2dda1ed8cb3f
-EBUILD rbtools-2.0.1.ebuild 1250 BLAKE2B 8c939c64d8bcb5ec0d15a27aecbba090f40a1b4d2dd35e2f38863b36b7f95db3ae558f7cff3cb0d74aa5d04eda9c7e93aa000994e4ca60c3d2eb355e1a0059f8 SHA512 447cb645f0715067e6e22817bcb2ffede46ed87f9ed10dca60c6b9375e1738ffcd26295aa404707ecde6eea99a326d2f8ff1379c0d087c06a8f893f19ee40521
 EBUILD rbtools-3.1.1.ebuild 1346 BLAKE2B 4d5aee256901d80aa1511e9e66def578ebd1c5b76bf82bd302b3739f0e38fe3de1e550f7e0bb3ec52e8a6db8a5facd945f0ff634cac08c69ba9e6e6b5cf8040c SHA512 3056584ca24081f687eb4e75782d7981ed9f14de3cd5829dd6f14a5d6ed7c6cddeb14661a4cbcfa865f15c0ee2fd95531ab83862469330eec2ded2d80f3086d3
 EBUILD rbtools-3.1.2.ebuild 1348 BLAKE2B 13538dd2b7cf09854daa8ea13148d75476c834ec799d358735144893ce00ebdadc9da9fc4772bec64b7dcbb5930f850b8b9db606a024e7baf45f3938be84efe9 SHA512 077649c23fbc94cfbf294541d064400d0f2e5af453f3d7c17b8710a8c83904e4e15f8a44e6b1dcdeb4979df79898afbac133c8d91358b90367b16e372461f8e9
-EBUILD rbtools-3.1.ebuild 1348 BLAKE2B 13538dd2b7cf09854daa8ea13148d75476c834ec799d358735144893ce00ebdadc9da9fc4772bec64b7dcbb5930f850b8b9db606a024e7baf45f3938be84efe9 SHA512 077649c23fbc94cfbf294541d064400d0f2e5af453f3d7c17b8710a8c83904e4e15f8a44e6b1dcdeb4979df79898afbac133c8d91358b90367b16e372461f8e9
+EBUILD rbtools-4.0-r1.ebuild 1719 BLAKE2B 81851ded38b2e597218ad335a1cbe86d2cb22833820c1930b3ba84853087409782c9514f2668d9a22015f8a9e31f042ad1a85da020fd37936332b382c08db89d SHA512 3d58f96d8a0e0c14917f0fe119af18c0431e873a45743edcdb8de9c72ceeb1b96d52566daa443971965d9d45709413da6ae71ed7490bca2ad590dadac495ae8f
 EBUILD rbtools-4.0.ebuild 1642 BLAKE2B aeb5b00b5bde0f18181867b1639ef965682fda85117dea87c7d73c7fbc8ece1350bb06ce77b79afb46b6c9844dd626563fdb8ebc144ed771307178bd9ac2a55f SHA512 c04424d1b77cd0aa63604b12d3b5383b899c2fe902a7926c395c717ef94b48299371bddb4da0297336fa9f883e2d2464e8d0996fbd7d0491871bd28bacf45a84
 MISC metadata.xml 218 BLAKE2B e25e8013045a9887590c6b042f7b200cff82f721b120d495d01d69fa07fe49cbbbb996b77f4f6af08527d5f89194b3fa650c9ffc7c279328652b21709353bece SHA512 ac49327c1e8833a999126e219e7f7b0008fbaee02eabda53f36d0957a264619e5bd695edf6279a932cc49bd4aa48ca22373177afed7ab427cb454c9de53d01b1
diff --git a/dev-util/rbtools/rbtools-2.0.1.ebuild b/dev-util/rbtools/rbtools-2.0.1.ebuild
deleted file mode 100644
index dce8b43ab697..000000000000
--- a/dev-util/rbtools/rbtools-2.0.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit distutils-r1
-
-MY_PN="RBTools"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Command line tools for use with Review Board"
-HOMEPAGE="https://www.reviewboard.org/"
-SRC_URI="https://downloads.reviewboard.org/releases/${MY_PN}/$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/six-1.8.0[${PYTHON_USEDEP}]
-	dev-python/tqdm[${PYTHON_USEDEP}]
-	dev-python/texttable[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-DOCS=( AUTHORS NEWS README.md )
-
-S=${WORKDIR}/${MY_P}
-
-distutils_enable_tests nose
-
-src_prepare() {
-	default
-
-	# Avoid tests with unpackaged kgb for now
-	rm -f rbtools/clients/tests/test_svn.py rbtools/clients/tests/test_git.py \
-		rbtools/clients/tests/test_mercurial.py rbtools/utils/tests.py \
-		rbtools/commands/tests/test_setup_repo.py rbtools/api/tests/test_http_request.py || die
-
-	# Avoid tests requiring unpackaged test data
-	rm -f rbtools/clients/tests/test_scanning.py || die
-}
-
-python_test() {
-	distutils_install_for_testing
-	distutils-r1_python_test
-}
diff --git a/dev-util/rbtools/rbtools-3.1.ebuild b/dev-util/rbtools/rbtools-4.0-r1.ebuild
index 9fb63ed11ab4..ca0cc849f0c3 100644
--- a/dev-util/rbtools/rbtools-3.1.ebuild
+++ b/dev-util/rbtools/rbtools-4.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10,11} )
 
 inherit distutils-r1
 
@@ -19,22 +19,30 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-	>=dev-python/pydiffx-1.0.1-r1[${PYTHON_USEDEP}]
+	>=dev-python/importlib_metadata-4.12[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	>=dev-python/pydiffx-1.1[${PYTHON_USEDEP}]
+	=dev-python/pydiffx-1.1*[${PYTHON_USEDEP}]
 	>=dev-python/six-1.8.0[${PYTHON_USEDEP}]
-	dev-python/tqdm[${PYTHON_USEDEP}]
 	dev-python/texttable[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4.3.0[${PYTHON_USEDEP}]
+	dev-python/tqdm[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/kgb[${PYTHON_USEDEP}] )
+	test? (
+		>=dev-python/kgb-6.1[${PYTHON_USEDEP}]
+		dev-python/pytest-env[${PYTHON_USEDEP}]
+		dev-vcs/git
+		dev-vcs/mercurial
+	)
 "
 
 DOCS=( AUTHORS NEWS README.md )
 
 S=${WORKDIR}/${MY_P}
 
-distutils_enable_tests nose
+distutils_enable_tests pytest
 
 src_prepare() {
 	default
@@ -47,6 +55,9 @@ src_prepare() {
 
 	# Fix test that appears to expect case-insentive comparison
 	sed -i -e 's/TEST CONTENT/Test content/' rbtools/utils/tests/test_console.py || die
+
+	# Loosen importlib_metadata dependency
+	sed -i -e '/importlib_metadata/ s/~=/>=/' RBTools.egg-info/requires.txt setup.py || die
 }
 
 python_test() {