From 2018f76571ec6c736e0133a9cb0e4e681ca72273 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Sun, 30 Oct 2022 07:45:45 +0100
Subject: [PATCH] =?UTF-8?q?Move=20dev-python/{zstandard=20=E2=86=92=20pyth?=
 =?UTF-8?q?on-zstandard}?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 app-admin/eclean-kernel/eclean-kernel-2.99.3.ebuild         | 2 +-
 app-admin/eclean-kernel/eclean-kernel-9999.ebuild           | 2 +-
 dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild                   | 4 ++--
 dev-libs/rocksdb/rocksdb-6.15.5.ebuild                      | 4 ++--
 dev-libs/rocksdb/rocksdb-6.17.3.ebuild                      | 2 +-
 dev-python/kafka-python/kafka-python-2.0.2.ebuild           | 6 +++---
 dev-python/kombu/kombu-5.2.4.ebuild                         | 4 ++--
 dev-python/kombu/kombu-5.3.0_beta2.ebuild                   | 4 ++--
 dev-python/{zstandard => python-zstandard}/Manifest         | 0
 dev-python/{zstandard => python-zstandard}/metadata.xml     | 0
 .../python-zstandard-0.18.0.ebuild}                         | 0
 .../python-zstandard-0.19.0.ebuild}                         | 0
 dev-python/zstd/zstd-1.5.2.6.ebuild                         | 2 +-
 dev-vcs/mercurial/mercurial-5.8.ebuild                      | 2 +-
 media-gfx/blender/blender-3.1.2.ebuild                      | 2 +-
 media-gfx/blender/blender-3.2.0.ebuild                      | 2 +-
 media-gfx/blender/blender-3.2.1.ebuild                      | 2 +-
 media-gfx/blender/blender-3.2.2.ebuild                      | 2 +-
 media-gfx/blender/blender-3.3.0.ebuild                      | 2 +-
 media-gfx/blender/blender-9999.ebuild                       | 2 +-
 net-proxy/mitmproxy/mitmproxy-8.1.1.ebuild                  | 2 +-
 profiles/updates/4Q-2022                                    | 1 +
 22 files changed, 24 insertions(+), 23 deletions(-)
 rename dev-python/{zstandard => python-zstandard}/Manifest (100%)
 rename dev-python/{zstandard => python-zstandard}/metadata.xml (100%)
 rename dev-python/{zstandard/zstandard-0.18.0.ebuild => python-zstandard/python-zstandard-0.18.0.ebuild} (100%)
 rename dev-python/{zstandard/zstandard-0.19.0.ebuild => python-zstandard/python-zstandard-0.19.0.ebuild} (100%)

diff --git a/app-admin/eclean-kernel/eclean-kernel-2.99.3.ebuild b/app-admin/eclean-kernel/eclean-kernel-2.99.3.ebuild
index 27c2c00785a0b..587cb0ebb129e 100644
--- a/app-admin/eclean-kernel/eclean-kernel-2.99.3.ebuild
+++ b/app-admin/eclean-kernel/eclean-kernel-2.99.3.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	kernel_linux? ( dev-python/pymountboot[${PYTHON_USEDEP}] )
 	lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
 	lzo? ( dev-python/python-lzo[${PYTHON_USEDEP}] )
-	zstd? ( dev-python/zstandard[${PYTHON_USEDEP}] )
+	zstd? ( dev-python/python-zstandard[${PYTHON_USEDEP}] )
 "
 
 distutils_enable_tests pytest
diff --git a/app-admin/eclean-kernel/eclean-kernel-9999.ebuild b/app-admin/eclean-kernel/eclean-kernel-9999.ebuild
index c4682a7d19180..ef5717a47b1ae 100644
--- a/app-admin/eclean-kernel/eclean-kernel-9999.ebuild
+++ b/app-admin/eclean-kernel/eclean-kernel-9999.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	kernel_linux? ( dev-python/pymountboot[${PYTHON_USEDEP}] )
 	lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
 	lzo? ( dev-python/python-lzo[${PYTHON_USEDEP}] )
-	zstd? ( dev-python/zstandard[${PYTHON_USEDEP}] )
+	zstd? ( dev-python/python-zstandard[${PYTHON_USEDEP}] )
 "
 
 distutils_enable_tests pytest
diff --git a/dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild b/dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild
index 337b328a43cf8..e35631d5477cd 100644
--- a/dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild
+++ b/dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ DEPEND="
 	app-arch/lz4:=
 	app-arch/snappy:=
 	dev-cpp/gflags:=
-	dev-python/zstandard:=
+	dev-python/python-zstandard:=
 	sys-libs/zlib:=
 	jemalloc? ( dev-libs/jemalloc:= )
 "
diff --git a/dev-libs/rocksdb/rocksdb-6.15.5.ebuild b/dev-libs/rocksdb/rocksdb-6.15.5.ebuild
index c8bb53cec4463..f583da0da7733 100644
--- a/dev-libs/rocksdb/rocksdb-6.15.5.ebuild
+++ b/dev-libs/rocksdb/rocksdb-6.15.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ DEPEND="
 	app-arch/lz4:=
 	app-arch/snappy:=
 	dev-cpp/gflags
-	dev-python/zstandard:=
+	dev-python/python-zstandard:=
 	sys-libs/zlib:=
 	jemalloc? ( dev-libs/jemalloc:= )
 "
diff --git a/dev-libs/rocksdb/rocksdb-6.17.3.ebuild b/dev-libs/rocksdb/rocksdb-6.17.3.ebuild
index 948eba50fa13c..ce510723b0dd8 100644
--- a/dev-libs/rocksdb/rocksdb-6.17.3.ebuild
+++ b/dev-libs/rocksdb/rocksdb-6.17.3.ebuild
@@ -19,7 +19,7 @@ DEPEND="
 	app-arch/lz4:=
 	app-arch/snappy:=
 	dev-cpp/gflags
-	dev-python/zstandard:=
+	dev-python/python-zstandard:=
 	sys-libs/zlib:=
 	jemalloc? ( dev-libs/jemalloc:= )
 "
diff --git a/dev-python/kafka-python/kafka-python-2.0.2.ebuild b/dev-python/kafka-python/kafka-python-2.0.2.ebuild
index d492752a2026e..a3dcd721f51de 100644
--- a/dev-python/kafka-python/kafka-python-2.0.2.ebuild
+++ b/dev-python/kafka-python/kafka-python-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,8 +21,8 @@ BDEPEND="
 		dev-python/lz4[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/python-zstandard[${PYTHON_USEDEP}]
 		dev-python/snappy[${PYTHON_USEDEP}]
-		dev-python/zstandard[${PYTHON_USEDEP}]
 	)"
 
 distutils_enable_tests pytest
@@ -40,5 +40,5 @@ python_test() {
 pkg_postinst() {
 	optfeature "LZ4 compression/decompression support" dev-python/lz4
 	optfeature "Snappy compression support" dev-python/snappy
-	optfeature "ZSTD compression/decompression support" dev-python/zstandard
+	optfeature "ZSTD compression/decompression support" dev-python/python-zstandard
 }
diff --git a/dev-python/kombu/kombu-5.2.4.ebuild b/dev-python/kombu/kombu-5.2.4.ebuild
index ee3abf177c8af..566a2f02ed3fa 100644
--- a/dev-python/kombu/kombu-5.2.4.ebuild
+++ b/dev-python/kombu/kombu-5.2.4.ebuild
@@ -33,11 +33,11 @@ BDEPEND="
 		dev-python/pycurl[${PYTHON_USEDEP}]
 		>=dev-python/pymongo-3.3.0[${PYTHON_USEDEP}]
 		dev-python/Pyro4[${PYTHON_USEDEP}]
+		dev-python/python-zstandard[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
 		>=dev-python/redis-py-3.3.11[${PYTHON_USEDEP}]
 		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		dev-python/zstandard[${PYTHON_USEDEP}]
 	)
 "
 
@@ -76,5 +76,5 @@ pkg_postinst() {
 	optfeature "Zookeeper backend" dev-python/kazoo
 	optfeature "MessagePack (de)serializer for Python" dev-python/msgpack
 	optfeature "brotli compression" "app-arch/brotli[python]"
-	optfeature "zstd compression" dev-python/zstandard
+	optfeature "zstd compression" dev-python/python-zstandard
 }
diff --git a/dev-python/kombu/kombu-5.3.0_beta2.ebuild b/dev-python/kombu/kombu-5.3.0_beta2.ebuild
index 2da90fe549853..9f7f2d69998c9 100644
--- a/dev-python/kombu/kombu-5.3.0_beta2.ebuild
+++ b/dev-python/kombu/kombu-5.3.0_beta2.ebuild
@@ -38,11 +38,11 @@ BDEPEND="
 		>=dev-python/pymongo-4.1.1[${PYTHON_USEDEP}]
 		dev-python/Pyro4[${PYTHON_USEDEP}]
 		dev-python/pytest-freezegun[${PYTHON_USEDEP}]
+		dev-python/python-zstandard[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
 		>=dev-python/redis-py-4.2.2[${PYTHON_USEDEP}]
 		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		dev-python/zstandard[${PYTHON_USEDEP}]
 	)
 "
 
@@ -90,5 +90,5 @@ pkg_postinst() {
 	optfeature "yaml backend" dev-python/pyyaml
 	optfeature "MessagePack (de)serializer for Python" dev-python/msgpack
 	optfeature "brotli compression" "app-arch/brotli[python]"
-	optfeature "zstd compression" dev-python/zstandard
+	optfeature "zstd compression" dev-python/python-zstandard
 }
diff --git a/dev-python/zstandard/Manifest b/dev-python/python-zstandard/Manifest
similarity index 100%
rename from dev-python/zstandard/Manifest
rename to dev-python/python-zstandard/Manifest
diff --git a/dev-python/zstandard/metadata.xml b/dev-python/python-zstandard/metadata.xml
similarity index 100%
rename from dev-python/zstandard/metadata.xml
rename to dev-python/python-zstandard/metadata.xml
diff --git a/dev-python/zstandard/zstandard-0.18.0.ebuild b/dev-python/python-zstandard/python-zstandard-0.18.0.ebuild
similarity index 100%
rename from dev-python/zstandard/zstandard-0.18.0.ebuild
rename to dev-python/python-zstandard/python-zstandard-0.18.0.ebuild
diff --git a/dev-python/zstandard/zstandard-0.19.0.ebuild b/dev-python/python-zstandard/python-zstandard-0.19.0.ebuild
similarity index 100%
rename from dev-python/zstandard/zstandard-0.19.0.ebuild
rename to dev-python/python-zstandard/python-zstandard-0.19.0.ebuild
diff --git a/dev-python/zstd/zstd-1.5.2.6.ebuild b/dev-python/zstd/zstd-1.5.2.6.ebuild
index 78b4bf5b67f74..58f7a87a118fb 100644
--- a/dev-python/zstd/zstd-1.5.2.6.ebuild
+++ b/dev-python/zstd/zstd-1.5.2.6.ebuild
@@ -24,7 +24,7 @@ DEPEND="
 "
 RDEPEND="
 	${DEPEND}
-	!<dev-python/zstandard-0.15.2-r1[${PYTHON_USEDEP}]
+	!<dev-python/python-zstandard-0.15.2-r1[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests unittest
diff --git a/dev-vcs/mercurial/mercurial-5.8.ebuild b/dev-vcs/mercurial/mercurial-5.8.ebuild
index 0da9a6dd131a0..9d990f49bf80c 100644
--- a/dev-vcs/mercurial/mercurial-5.8.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.8.ebuild
@@ -143,7 +143,7 @@ IUSE="+chg emacs gpg test tk rust"
 BDEPEND="rust? ( ${RUST_DEPEND} )"
 RDEPEND="
 	app-misc/ca-certificates
-	dev-python/zstandard[${PYTHON_USEDEP}]
+	dev-python/python-zstandard[${PYTHON_USEDEP}]
 	gpg? ( app-crypt/gnupg )
 	tk? ( dev-lang/tk )"
 
diff --git a/media-gfx/blender/blender-3.1.2.ebuild b/media-gfx/blender/blender-3.1.2.ebuild
index beeb79e057b3a..46aa14cdad0d3 100644
--- a/media-gfx/blender/blender-3.1.2.ebuild
+++ b/media-gfx/blender/blender-3.1.2.ebuild
@@ -48,8 +48,8 @@ RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/cython[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-zstandard[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/zstandard[${PYTHON_USEDEP}]
 	')
 	media-libs/freetype:=
 	media-libs/glew:*
diff --git a/media-gfx/blender/blender-3.2.0.ebuild b/media-gfx/blender/blender-3.2.0.ebuild
index b231e2cdd986e..57cdab40f12c3 100644
--- a/media-gfx/blender/blender-3.2.0.ebuild
+++ b/media-gfx/blender/blender-3.2.0.ebuild
@@ -48,8 +48,8 @@ RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/cython[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-zstandard[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/zstandard[${PYTHON_USEDEP}]
 	')
 	media-libs/freetype:=
 	media-libs/glew:*
diff --git a/media-gfx/blender/blender-3.2.1.ebuild b/media-gfx/blender/blender-3.2.1.ebuild
index ee2c69b295148..f8bbd1e9fbea3 100644
--- a/media-gfx/blender/blender-3.2.1.ebuild
+++ b/media-gfx/blender/blender-3.2.1.ebuild
@@ -48,8 +48,8 @@ RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/cython[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-zstandard[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/zstandard[${PYTHON_USEDEP}]
 	')
 	media-libs/freetype:=
 	media-libs/glew:*
diff --git a/media-gfx/blender/blender-3.2.2.ebuild b/media-gfx/blender/blender-3.2.2.ebuild
index 4442e89a027e8..655e0a7145f8d 100644
--- a/media-gfx/blender/blender-3.2.2.ebuild
+++ b/media-gfx/blender/blender-3.2.2.ebuild
@@ -50,8 +50,8 @@ RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/cython[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-zstandard[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/zstandard[${PYTHON_USEDEP}]
 	')
 	media-libs/freetype:=
 	media-libs/glew:*
diff --git a/media-gfx/blender/blender-3.3.0.ebuild b/media-gfx/blender/blender-3.3.0.ebuild
index a27d961ccf8a7..57dfbf4e736a9 100644
--- a/media-gfx/blender/blender-3.3.0.ebuild
+++ b/media-gfx/blender/blender-3.3.0.ebuild
@@ -50,8 +50,8 @@ RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/cython[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-zstandard[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/zstandard[${PYTHON_USEDEP}]
 	')
 	media-libs/freetype:=[brotli]
 	media-libs/glew:*
diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild
index f89499ab68c28..25a5c6b80b509 100644
--- a/media-gfx/blender/blender-9999.ebuild
+++ b/media-gfx/blender/blender-9999.ebuild
@@ -50,8 +50,8 @@ RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/cython[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-zstandard[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/zstandard[${PYTHON_USEDEP}]
 	')
 	media-libs/freetype:=[brotli]
 	media-libs/libepoxy:=
diff --git a/net-proxy/mitmproxy/mitmproxy-8.1.1.ebuild b/net-proxy/mitmproxy/mitmproxy-8.1.1.ebuild
index 7eddc9ee73823..d24f8c4c2a135 100644
--- a/net-proxy/mitmproxy/mitmproxy-8.1.1.ebuild
+++ b/net-proxy/mitmproxy/mitmproxy-8.1.1.ebuild
@@ -35,12 +35,12 @@ RDEPEND="
 	>=dev-python/pyopenssl-22.0[${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-2.4.2[${PYTHON_USEDEP}]
 	>=dev-python/pyperclip-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/python-zstandard-0.11.0[${PYTHON_USEDEP}]
 	>=dev-python/ruamel-yaml-0.16[${PYTHON_USEDEP}]
 	>=dev-python/sortedcontainers-2.3.0[${PYTHON_USEDEP}]
 	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
 	>=dev-python/urwid-2.1.1[${PYTHON_USEDEP}]
 	>=dev-python/wsproto-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/zstandard-0.11.0[${PYTHON_USEDEP}]
 	dev-libs/openssl:0
 "
 
diff --git a/profiles/updates/4Q-2022 b/profiles/updates/4Q-2022
index 03a22ffdd16ca..358a603f62b25 100644
--- a/profiles/updates/4Q-2022
+++ b/profiles/updates/4Q-2022
@@ -5,3 +5,4 @@ move x11-libs/libva-intel-media-driver media-libs/libva-intel-media-driver
 move x11-libs/intel-hybrid-codec-driver media-libs/intel-hybrid-codec-driver
 move dev-python/swagger-spec-validator dev-python/swagger_spec_validator
 move dev-python/zeroconf dev-python/python-zeroconf
+move dev-python/zstandard dev-python/python-zstandard