gentoo resync : 29.12.2022

7 files changed, 19 insertions, 153 deletions

diff --git a/dev-python/ubelt/Manifest b/dev-python/ubelt/Manifest
index 857f7755aa91..ee3164d49fa2 100644
--- a/dev-python/ubelt/Manifest
+++ b/dev-python/ubelt/Manifest
@@ -1,13 +1,3 @@
-DIST ubelt-0.10.1.tar.gz 216033 BLAKE2B e481b2cf61788b50038ad69f0e2b637dfa0259d24ecca1a5587fe283d2270de205cb085112b9285cf57f664ce8a9d107f08b9b6735c8bea6fb97f6f48935dba9 SHA512 c15af249e6b94f69050703a4004307d91854e2ac7e25c5ac8d467b5b5f3363989f93bf2917eaf3c0f2485258b3530d7317f39449d5ac7ad5ed9b4615d916decb
-DIST ubelt-0.10.2.tar.gz 240069 BLAKE2B 34a24781264dd910e7a3afd87287f8ec9d1e4d1b4dd205f249fdc878861cd9c511121c61a5ca208b3f8ced785a0cec26c715b6a9ef3fee4a8f903e8557d3790f SHA512 8666a05f53d29d39ddd0fca213a9465948fd108bef9e95fc6160cb8331ae6876b9e7297d380cac37383c602d7ad4c248a4d7e03b4306dad5c6b26e0423720afb
-DIST ubelt-0.11.0.tar.gz 251931 BLAKE2B 628c62395b38da5fe70cf5c4eaef74f411cb431ca3837aadc0bfafd28d9ba15a75850d22b317d207e79d81c7e015a7adad28fb14804c25b3e9ef1a473d5af8c2 SHA512 ae95f719238e89ece2bd8ef525d7acc72058a770ff8c0be58e27d9fd0f50b1ae978d71589474133ce1065130562cae63282c4c97f69756ce1c64ce4330a5da1e
-DIST ubelt-0.11.1.tar.gz 255709 BLAKE2B 4d79981c4040685bc532aba0a9d85482169672ea05b010f34ed8eaae124c3e36f68d643f1f351cb05ef1ed3434c959f864cf0f6f56b32ba48a6dbe5c195581b5 SHA512 bb5b8f9ad63a7700c3489e20efde255b03c34cc954f12ec2d889d20c5c5e771fe39e9a9ee868ad0ac5a51eddb60565c283f31a9cc1467e956a578a7d454fe61b
-DIST ubelt-1.0.0.tar.gz 242813 BLAKE2B 31376e56000c73db1173b930027b62c7dd465f9fc329b6016ae8678c70aaa376faa7eb1894060a663574651d517563cdbc67daf4171f3777bea368bc02d06b0a SHA512 718e52ac453cffa9192cf5aa70eb36d6aa09b75abaa0ae6e8ef861025cf92a4d0392c48e64d453f4d42a69aefc59da371e4b8cbab16410f34dee9700cae4b97c
-DIST ubelt-1.0.1.tar.gz 242552 BLAKE2B da4ceb039b926f942c593563e77b42ebfb39a75bfc2953a6eadf2430bda8ebe25faeb4a00714fc110486715da15515fa316d3705d9853a7eb93320ee694d1127 SHA512 150f1c76b5814441fe0bfd50017f37ede4d463cc4e23f152ac634e7531d83f28560415ad26527cd40a7ebdab546d7edd711a1ba0c728ef63791219bf4866099c
-EBUILD ubelt-0.10.1.ebuild 775 BLAKE2B 5e7006b75c8b72ca38c30dc33a724ff3c2fcb542082751d2ad2d3afe4fbf6c5b8bc8792789cfa5bf5cc1baab341e4473eafa74bcc5914b3da7d686525190943f SHA512 8bcbecaa55aa653608069d2274307338aa9765cdb5030598b9cd6553bcdabcba3cb09eba97c93ef54aae483e2b122f3d6c742ffe0a0b9b775b1a1847936e7bff
-EBUILD ubelt-0.10.2.ebuild 716 BLAKE2B ba7181bebb9772cca1d187331805221712160dc9be4157bf84204abc114b26355fb8150f41f584a3ee91af1f2fae933d1f31cf9b852fe48bf3c652f91287a2cc SHA512 57aaaef033c0b0b3c5cc707f3198bd214d02eda7372ac5794decbb24edbe6be8cea25a03d05b62f4ca6ba6fcbe36333feeb0ceaa9970bcf6b69d5382cd28e6a6
-EBUILD ubelt-0.11.0.ebuild 716 BLAKE2B d2ed8e7ac49d20c17634e968bf4de595029006fead40b612516c5ee1302ad75a5a1a2da2288669678b8ed50edd9f80281349c82489fbefc6c9dfdd112ea57597 SHA512 1c9903d7ce314b9727fb3ad0d42fd1d05b1b25a2d2948afc944eefa7398996984f17d7b549fce2f5d81e69a0a64908664629b83ed8d20d5b2701e9fe69db82f6
-EBUILD ubelt-0.11.1.ebuild 716 BLAKE2B d2ed8e7ac49d20c17634e968bf4de595029006fead40b612516c5ee1302ad75a5a1a2da2288669678b8ed50edd9f80281349c82489fbefc6c9dfdd112ea57597 SHA512 1c9903d7ce314b9727fb3ad0d42fd1d05b1b25a2d2948afc944eefa7398996984f17d7b549fce2f5d81e69a0a64908664629b83ed8d20d5b2701e9fe69db82f6
-EBUILD ubelt-1.0.0.ebuild 663 BLAKE2B 179ce7bff10f356c1c1e3c1906756388b70fc1aa61386ad10905102198bda4e3e4815f2202285c99f44ea93b2325fe4326600f8e59d8a393dacd4c0f730741cf SHA512 3d3e9511114beb1011b5ee2206a385e2bb9b3be9c800186d8f54f48bcfb583068e16b45cfe314c4996cafc33e0460c282f1413344674f08053fb9b24fee3dab1
-EBUILD ubelt-1.0.1.ebuild 663 BLAKE2B 179ce7bff10f356c1c1e3c1906756388b70fc1aa61386ad10905102198bda4e3e4815f2202285c99f44ea93b2325fe4326600f8e59d8a393dacd4c0f730741cf SHA512 3d3e9511114beb1011b5ee2206a385e2bb9b3be9c800186d8f54f48bcfb583068e16b45cfe314c4996cafc33e0460c282f1413344674f08053fb9b24fee3dab1
+DIST ubelt-1.1.1.gh.tar.gz 263082 BLAKE2B c146cfa7084b1d04d5a16443e5f8bdd4858992c2de1ff68a28c0febc74728da6320f45661cea69f88530a2fb88ca421cfc103f7f9f6ff420cf65152cbd61576d SHA512 d4d77013920563f3b2e5f47365624a4a794d84047eeb2eccaf2888f8d574c38b047393e550399e0d7ea7df373dabd40acce05ac56db4f0099da8f2a39113fc5c
+EBUILD ubelt-1.1.1.ebuild 910 BLAKE2B e54c0a82b1b0b881cb42008ec7ed95fe931ec28bf910562fbf8c98f980ada79a2c61f9735e1bc50cbd8d4bbffe5ad2a91a2207c3463e7c8740a271ce3392b668 SHA512 bae44559a7367a187d032c306920c41382ad7f912a8319ae922de94caa5fdac9319a016c8da0f034214d13b61f2b698485d238ed5e7e3c9b050d1a765f976e39
 MISC metadata.xml 423 BLAKE2B 3327e3ecc16b8971759b84617779a2b4d5072a34547815c8314809a911e6d557fdea620c90a255ef7f89cb2c941a46a7e1dcbc62e5e6b46f19255758f42890fc SHA512 967c14f809f73fc1bb48d730406512d3f87531486701ad4be8dfb4e5cd0c1265c082596768d36c4950734c653cec56484fb3e5b79ce13dddde38977f88889124
diff --git a/dev-python/ubelt/ubelt-0.10.1.ebuild b/dev-python/ubelt/ubelt-0.10.1.ebuild
deleted file mode 100644
index aad8e9f06c5c..000000000000
--- a/dev-python/ubelt/ubelt-0.10.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A stdlib like feel, and extra batteries. Hashing, Caching, Timing, Progress"
-HOMEPAGE="https://github.com/Erotemic/ubelt"
-SRC_URI="https://github.com/Erotemic/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	dev-python/ordered-set[${PYTHON_USEDEP}]"
-
-DEPEND="test? ( dev-python/xdoctest[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# relies on passwd being equal to ${HOME}
-		ubelt/util_path.py::userhome:0
-	)
-
-	epytest ${deselect[@]/#/--deselect } tests
-}
diff --git a/dev-python/ubelt/ubelt-0.10.2.ebuild b/dev-python/ubelt/ubelt-0.10.2.ebuild
deleted file mode 100644
index 67d4f2466be8..000000000000
--- a/dev-python/ubelt/ubelt-0.10.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A stdlib like feel, and extra batteries. Hashing, Caching, Timing, Progress"
-HOMEPAGE="https://github.com/Erotemic/ubelt"
-SRC_URI="https://github.com/Erotemic/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	dev-python/ordered-set[${PYTHON_USEDEP}]"
-
-DEPEND="test? ( dev-python/xdoctest[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# relies on passwd home being equal to ${HOME}
-	ubelt/util_path.py::userhome:0
-)
diff --git a/dev-python/ubelt/ubelt-0.11.0.ebuild b/dev-python/ubelt/ubelt-0.11.0.ebuild
deleted file mode 100644
index 05531fa0f9eb..000000000000
--- a/dev-python/ubelt/ubelt-0.11.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A stdlib like feel, and extra batteries. Hashing, Caching, Timing, Progress"
-HOMEPAGE="https://github.com/Erotemic/ubelt"
-SRC_URI="https://github.com/Erotemic/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	dev-python/ordered-set[${PYTHON_USEDEP}]"
-
-DEPEND="test? ( dev-python/xdoctest[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# relies on passwd home being equal to ${HOME}
-	ubelt/util_path.py::userhome:0
-)
diff --git a/dev-python/ubelt/ubelt-0.11.1.ebuild b/dev-python/ubelt/ubelt-0.11.1.ebuild
deleted file mode 100644
index 05531fa0f9eb..000000000000
--- a/dev-python/ubelt/ubelt-0.11.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A stdlib like feel, and extra batteries. Hashing, Caching, Timing, Progress"
-HOMEPAGE="https://github.com/Erotemic/ubelt"
-SRC_URI="https://github.com/Erotemic/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	dev-python/ordered-set[${PYTHON_USEDEP}]"
-
-DEPEND="test? ( dev-python/xdoctest[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# relies on passwd home being equal to ${HOME}
-	ubelt/util_path.py::userhome:0
-)
diff --git a/dev-python/ubelt/ubelt-1.0.1.ebuild b/dev-python/ubelt/ubelt-1.0.1.ebuild
deleted file mode 100644
index 0e9c2987b85a..000000000000
--- a/dev-python/ubelt/ubelt-1.0.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A stdlib like feel, and extra batteries. Hashing, Caching, Timing, Progress"
-HOMEPAGE="https://github.com/Erotemic/ubelt"
-SRC_URI="https://github.com/Erotemic/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="test? ( dev-python/xdoctest[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# relies on passwd home being equal to ${HOME}
-	ubelt/util_path.py::userhome:0
-)
diff --git a/dev-python/ubelt/ubelt-1.0.0.ebuild b/dev-python/ubelt/ubelt-1.1.1.ebuild
index 0e9c2987b85a..04c09d5462ff 100644
--- a/dev-python/ubelt/ubelt-1.0.0.ebuild
+++ b/dev-python/ubelt/ubelt-1.1.1.ebuild
@@ -9,14 +9,28 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="A stdlib like feel, and extra batteries. Hashing, Caching, Timing, Progress"
-HOMEPAGE="https://github.com/Erotemic/ubelt"
-SRC_URI="https://github.com/Erotemic/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="
+	https://github.com/Erotemic/ubelt/
+	https://pypi.org/project/ubelt/
+"
+SRC_URI="
+	https://github.com/Erotemic/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 
 SLOT="0"
 LICENSE="Apache-2.0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="test? ( dev-python/xdoctest[${PYTHON_USEDEP}] )"
+BDEPEND="
+	test? (
+		>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+		dev-python/xdoctest[${PYTHON_USEDEP}]
+		>=dev-python/xxhash-1.0.1[${PYTHON_USEDEP}]
+	)
+"
 
 distutils_enable_tests pytest