diff options
52 files changed, 58 insertions, 57 deletions
diff --git a/app-misc/anki/anki-24.06.3-r2.ebuild b/app-misc/anki/anki-24.06.3-r2.ebuild index dea830f2ea71..75eac9eb0bd0 100644 --- a/app-misc/anki/anki-24.06.3-r2.ebuild +++ b/app-misc/anki/anki-24.06.3-r2.ebuild @@ -755,7 +755,7 @@ GUI_RDEPEND=" dev-python/flask-cors[${PYTHON_USEDEP}] dev-python/jsonschema[${PYTHON_USEDEP}] dev-python/markdown[${PYTHON_USEDEP}] - dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-python/protobuf[${PYTHON_USEDEP}] >=dev-python/PyQt6-6.6.1[gui,network,opengl,quick,webchannel,widgets,${PYTHON_USEDEP}] >=dev-python/PyQt6-sip-13.6.0[${PYTHON_USEDEP}] >=dev-python/PyQt6-WebEngine-6.6.0[widgets,${PYTHON_USEDEP}] diff --git a/app-misc/ola/ola-0.10.9-r2.ebuild b/app-misc/ola/ola-0.10.9-r2.ebuild index e34b79db1983..e3f459c3f733 100644 --- a/app-misc/ola/ola-0.10.9-r2.ebuild +++ b/app-misc/ola/ola-0.10.9-r2.ebuild @@ -30,7 +30,7 @@ RDEPEND="<dev-libs/protobuf-22.5:= python? ( ${PYTHON_DEPS} $(python_gen_cond_dep ' - dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-python/protobuf[${PYTHON_USEDEP}] ') ) rdm-tests? ( @@ -56,7 +56,7 @@ BDEPEND="app-alternatives/yacc ${PYTHON_DEPS} $(python_gen_cond_dep ' dev-python/numpy[${PYTHON_USEDEP}] - dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-python/protobuf[${PYTHON_USEDEP}] ') ) )" diff --git a/dev-python/consonance/consonance-0.1.5-r1.ebuild b/dev-python/consonance/consonance-0.1.5-r1.ebuild index 09de935cd30f..67de308b01df 100644 --- a/dev-python/consonance/consonance-0.1.5-r1.ebuild +++ b/dev-python/consonance/consonance-0.1.5-r1.ebuild @@ -23,7 +23,7 @@ PROPERTIES="test_network" RDEPEND=" dev-python/cryptography[${PYTHON_USEDEP}] dev-python/dissononce[${PYTHON_USEDEP}] - dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-python/protobuf[${PYTHON_USEDEP}] dev-python/python-axolotl-curve25519[${PYTHON_USEDEP}] dev-python/transitions[${PYTHON_USEDEP}] " diff --git a/dev-python/google-api-core/google-api-core-2.22.0.ebuild b/dev-python/google-api-core/google-api-core-2.22.0.ebuild index 625fa6542e3f..a7d170e85890 100644 --- a/dev-python/google-api-core/google-api-core-2.22.0.ebuild +++ b/dev-python/google-api-core/google-api-core-2.22.0.ebuild @@ -30,7 +30,7 @@ RDEPEND=" >=dev-python/googleapis-common-protos-1.56.2[${PYTHON_USEDEP}] >=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}] >=dev-python/proto-plus-1.25.0[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-3.19.5[${PYTHON_USEDEP}] + >=dev-python/protobuf-3.19.5[${PYTHON_USEDEP}] >=dev-python/requests-2.18.0[${PYTHON_USEDEP}] <dev-python/requests-3[${PYTHON_USEDEP}] grpc? ( diff --git a/dev-python/google-api-core/google-api-core-2.23.0.ebuild b/dev-python/google-api-core/google-api-core-2.23.0.ebuild index a7d49218760d..0d4b57aeaa3c 100644 --- a/dev-python/google-api-core/google-api-core-2.23.0.ebuild +++ b/dev-python/google-api-core/google-api-core-2.23.0.ebuild @@ -30,7 +30,7 @@ RDEPEND=" >=dev-python/googleapis-common-protos-1.56.2[${PYTHON_USEDEP}] >=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}] >=dev-python/proto-plus-1.25.0[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-3.19.5[${PYTHON_USEDEP}] + >=dev-python/protobuf-3.19.5[${PYTHON_USEDEP}] >=dev-python/requests-2.18.0[${PYTHON_USEDEP}] <dev-python/requests-3[${PYTHON_USEDEP}] grpc? ( diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.65.0.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.65.0.ebuild index 6a256da12cd4..07ef057f4354 100644 --- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.65.0.ebuild +++ b/dev-python/googleapis-common-protos/googleapis-common-protos-1.65.0.ebuild @@ -19,8 +19,8 @@ SLOT="0" KEYWORDS="amd64 ~arm arm64 x86" RDEPEND=" - <dev-python/protobuf-python-6[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-3.15.0[${PYTHON_USEDEP}] + <dev-python/protobuf-6[${PYTHON_USEDEP}] + >=dev-python/protobuf-3.15.0[${PYTHON_USEDEP}] " distutils_enable_tests pytest diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.66.0.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.66.0.ebuild index 08022aeae1e8..4d1f5561d5e7 100644 --- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.66.0.ebuild +++ b/dev-python/googleapis-common-protos/googleapis-common-protos-1.66.0.ebuild @@ -19,8 +19,8 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~x86" RDEPEND=" - <dev-python/protobuf-python-6[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-3.15.0[${PYTHON_USEDEP}] + <dev-python/protobuf-6[${PYTHON_USEDEP}] + >=dev-python/protobuf-3.15.0[${PYTHON_USEDEP}] " distutils_enable_tests pytest diff --git a/dev-python/grpcio-status/grpcio-status-1.67.0.ebuild b/dev-python/grpcio-status/grpcio-status-1.67.0.ebuild index 183bc3666551..16526c3f3458 100644 --- a/dev-python/grpcio-status/grpcio-status-1.67.0.ebuild +++ b/dev-python/grpcio-status/grpcio-status-1.67.0.ebuild @@ -28,8 +28,8 @@ KEYWORDS="amd64 arm64 x86" RDEPEND=" >=dev-python/grpcio-${PV}[${PYTHON_USEDEP}] >=dev-python/googleapis-common-protos-1.5.5[${PYTHON_USEDEP}] - <dev-python/protobuf-python-6[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-5.26.1[${PYTHON_USEDEP}] + <dev-python/protobuf-6[${PYTHON_USEDEP}] + >=dev-python/protobuf-5.26.1[${PYTHON_USEDEP}] " BDEPEND=" test? ( diff --git a/dev-python/grpcio/grpcio-1.67.0-r2.ebuild b/dev-python/grpcio/grpcio-1.67.0-r2.ebuild index e0e831bc9844..e583f7d910c2 100644 --- a/dev-python/grpcio/grpcio-1.67.0-r2.ebuild +++ b/dev-python/grpcio/grpcio-1.67.0-r2.ebuild @@ -43,7 +43,7 @@ BDEPEND=" dev-python/cython[${PYTHON_USEDEP}] test? ( dev-python/coverage[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-5.26.1[${PYTHON_USEDEP}] + >=dev-python/protobuf-5.26.1[${PYTHON_USEDEP}] ) " diff --git a/dev-python/grpclib/grpclib-0.4.7-r1.ebuild b/dev-python/grpclib/grpclib-0.4.7-r1.ebuild index 998ced6e9f68..a441df07fcac 100644 --- a/dev-python/grpclib/grpclib-0.4.7-r1.ebuild +++ b/dev-python/grpclib/grpclib-0.4.7-r1.ebuild @@ -29,7 +29,7 @@ RDEPEND=" dev-python/googleapis-common-protos[${PYTHON_USEDEP}] dev-python/h2[${PYTHON_USEDEP}] dev-python/multidict[${PYTHON_USEDEP}] - dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-python/protobuf[${PYTHON_USEDEP}] " BDEPEND=" test? ( diff --git a/dev-python/mapbox-vector-tile/mapbox-vector-tile-2.1.0.ebuild b/dev-python/mapbox-vector-tile/mapbox-vector-tile-2.1.0.ebuild index e5df10ee0026..787d1c7f20b6 100644 --- a/dev-python/mapbox-vector-tile/mapbox-vector-tile-2.1.0.ebuild +++ b/dev-python/mapbox-vector-tile/mapbox-vector-tile-2.1.0.ebuild @@ -20,7 +20,7 @@ SLOT="0" KEYWORDS="amd64 arm64 ~x86" RDEPEND=" - dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-python/protobuf[${PYTHON_USEDEP}] >=dev-python/pyclipper-1.3.0[${PYTHON_USEDEP}] >=dev-python/pyproj-3.4.1[${PYTHON_USEDEP}] >=dev-python/shapely-2.0.0[${PYTHON_USEDEP}] diff --git a/dev-python/omemo-dr/omemo-dr-1.0.1.ebuild b/dev-python/omemo-dr/omemo-dr-1.0.1.ebuild index 8ffe48eeb933..7c8d2abb842d 100644 --- a/dev-python/omemo-dr/omemo-dr-1.0.1.ebuild +++ b/dev-python/omemo-dr/omemo-dr-1.0.1.ebuild @@ -22,7 +22,7 @@ KEYWORDS="amd64 ~arm64 ~loong ~riscv x86" RDEPEND=" dev-python/cryptography[${PYTHON_USEDEP}] - dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-python/protobuf[${PYTHON_USEDEP}] " distutils_enable_tests pytest diff --git a/dev-python/phonenumbers/phonenumbers-8.13.49.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.49.ebuild index ac05eba6ee74..9a8626596b1e 100644 --- a/dev-python/phonenumbers/phonenumbers-8.13.49.ebuild +++ b/dev-python/phonenumbers/phonenumbers-8.13.49.ebuild @@ -28,7 +28,7 @@ RESTRICT="!test? ( test )" BDEPEND=" test? ( - dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-python/protobuf[${PYTHON_USEDEP}] ) " diff --git a/dev-python/proto-plus/proto-plus-1.25.0.ebuild b/dev-python/proto-plus/proto-plus-1.25.0.ebuild index 8a5dedc2161a..ae4724e9a155 100644 --- a/dev-python/proto-plus/proto-plus-1.25.0.ebuild +++ b/dev-python/proto-plus/proto-plus-1.25.0.ebuild @@ -25,8 +25,8 @@ SLOT="0" KEYWORDS="amd64 arm64 x86" RDEPEND=" - <dev-python/protobuf-python-6[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-3.19.0[${PYTHON_USEDEP}] + <dev-python/protobuf-6[${PYTHON_USEDEP}] + >=dev-python/protobuf-3.19.0[${PYTHON_USEDEP}] " BDEPEND=" test? ( diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf/Manifest index fb851d0bf1d3..fb851d0bf1d3 100644 --- a/dev-python/protobuf-python/Manifest +++ b/dev-python/protobuf/Manifest diff --git a/dev-python/protobuf-python/files/protobuf-python-3.20.3-python311.patch b/dev-python/protobuf/files/protobuf-3.20.3-python311.patch index b9aca40776c5..b9aca40776c5 100644 --- a/dev-python/protobuf-python/files/protobuf-python-3.20.3-python311.patch +++ b/dev-python/protobuf/files/protobuf-3.20.3-python311.patch diff --git a/dev-python/protobuf-python/files/protobuf-python-4.22.5-c++-17.patch b/dev-python/protobuf/files/protobuf-4.22.5-c++-17.patch index 3ca6a5776d04..3ca6a5776d04 100644 --- a/dev-python/protobuf-python/files/protobuf-python-4.22.5-c++-17.patch +++ b/dev-python/protobuf/files/protobuf-4.22.5-c++-17.patch diff --git a/dev-python/protobuf-python/files/protobuf-python-4.22.5-python.patch b/dev-python/protobuf/files/protobuf-4.22.5-python.patch index 65cb22d5f653..65cb22d5f653 100644 --- a/dev-python/protobuf-python/files/protobuf-python-4.22.5-python.patch +++ b/dev-python/protobuf/files/protobuf-4.22.5-python.patch diff --git a/dev-python/protobuf-python/metadata.xml b/dev-python/protobuf/metadata.xml index 05a4e2ab92b2..05a4e2ab92b2 100644 --- a/dev-python/protobuf-python/metadata.xml +++ b/dev-python/protobuf/metadata.xml diff --git a/dev-python/protobuf-python/protobuf-python-4.21.12.ebuild b/dev-python/protobuf/protobuf-4.21.12.ebuild index 4c01b69d46e8..4c01b69d46e8 100644 --- a/dev-python/protobuf-python/protobuf-python-4.21.12.ebuild +++ b/dev-python/protobuf/protobuf-4.21.12.ebuild diff --git a/dev-python/protobuf-python/protobuf-python-4.21.9.ebuild b/dev-python/protobuf/protobuf-4.21.9.ebuild index 5e612260a3f2..2a2d21423728 100644 --- a/dev-python/protobuf-python/protobuf-python-4.21.9.ebuild +++ b/dev-python/protobuf/protobuf-4.21.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 2008-2023 Gentoo Authors +# Copyright 2008-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/dev-python/protobuf-python/protobuf-python-4.22.5.ebuild b/dev-python/protobuf/protobuf-4.22.5.ebuild index 59b4f648ed71..59b4f648ed71 100644 --- a/dev-python/protobuf-python/protobuf-python-4.22.5.ebuild +++ b/dev-python/protobuf/protobuf-4.22.5.ebuild diff --git a/dev-python/protobuf-python/protobuf-python-4.23.3.ebuild b/dev-python/protobuf/protobuf-4.23.3.ebuild index a186181fd7f9..a186181fd7f9 100644 --- a/dev-python/protobuf-python/protobuf-python-4.23.3.ebuild +++ b/dev-python/protobuf/protobuf-4.23.3.ebuild diff --git a/dev-python/protobuf-python/protobuf-python-4.25.4.ebuild b/dev-python/protobuf/protobuf-4.25.4.ebuild index defde612e08b..defde612e08b 100644 --- a/dev-python/protobuf-python/protobuf-python-4.25.4.ebuild +++ b/dev-python/protobuf/protobuf-4.25.4.ebuild diff --git a/dev-python/protobuf-python/protobuf-python-5.27.2.ebuild b/dev-python/protobuf/protobuf-5.27.2.ebuild index 3ce286ddf0db..3ce286ddf0db 100644 --- a/dev-python/protobuf-python/protobuf-python-5.27.2.ebuild +++ b/dev-python/protobuf/protobuf-5.27.2.ebuild diff --git a/dev-python/protobuf-python/protobuf-python-5.27.4.ebuild b/dev-python/protobuf/protobuf-5.27.4.ebuild index 3ce286ddf0db..3ce286ddf0db 100644 --- a/dev-python/protobuf-python/protobuf-python-5.27.4.ebuild +++ b/dev-python/protobuf/protobuf-5.27.4.ebuild diff --git a/dev-python/protobuf-python/protobuf-python-5.28.0.ebuild b/dev-python/protobuf/protobuf-5.28.0.ebuild index 3ce286ddf0db..3ce286ddf0db 100644 --- a/dev-python/protobuf-python/protobuf-python-5.28.0.ebuild +++ b/dev-python/protobuf/protobuf-5.28.0.ebuild diff --git a/dev-python/pychromecast/pychromecast-13.0.7.ebuild b/dev-python/pychromecast/pychromecast-13.0.7.ebuild index 3a63ef820c58..82cef1252650 100644 --- a/dev-python/pychromecast/pychromecast-13.0.7.ebuild +++ b/dev-python/pychromecast/pychromecast-13.0.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,7 +6,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools PYPI_NO_NORMALIZE=1 PYPI_PN=PyChromecast -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit distutils-r1 pypi @@ -22,6 +22,6 @@ KEYWORDS="amd64 x86" RDEPEND=" >=dev-python/casttube-0.2.0[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-3.19.1[${PYTHON_USEDEP}] + >=dev-python/protobuf-3.19.1[${PYTHON_USEDEP}] >=dev-python/zeroconf-0.25.1[${PYTHON_USEDEP}] " diff --git a/dev-python/pychromecast/pychromecast-13.1.0.ebuild b/dev-python/pychromecast/pychromecast-13.1.0.ebuild index 923d1d60979d..fdcbf77b8258 100644 --- a/dev-python/pychromecast/pychromecast-13.1.0.ebuild +++ b/dev-python/pychromecast/pychromecast-13.1.0.ebuild @@ -22,6 +22,6 @@ KEYWORDS="~amd64 ~x86" RDEPEND=" >=dev-python/casttube-0.2.0[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-3.19.1[${PYTHON_USEDEP}] + >=dev-python/protobuf-3.19.1[${PYTHON_USEDEP}] >=dev-python/zeroconf-0.25.1[${PYTHON_USEDEP}] " diff --git a/dev-python/pychromecast/pychromecast-14.0.1.ebuild b/dev-python/pychromecast/pychromecast-14.0.1.ebuild index 594ec1fad4db..71a84ede88d3 100644 --- a/dev-python/pychromecast/pychromecast-14.0.1.ebuild +++ b/dev-python/pychromecast/pychromecast-14.0.1.ebuild @@ -22,6 +22,6 @@ KEYWORDS="amd64 x86" RDEPEND=" >=dev-python/casttube-0.2.0[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-3.19.1[${PYTHON_USEDEP}] + >=dev-python/protobuf-3.19.1[${PYTHON_USEDEP}] >=dev-python/zeroconf-0.25.1[${PYTHON_USEDEP}] " diff --git a/dev-python/pyspectrum2/pyspectrum2-0.2.0-r2.ebuild b/dev-python/pyspectrum2/pyspectrum2-0.2.0-r2.ebuild index 1d14e5828659..aa2fd50c3cca 100644 --- a/dev-python/pyspectrum2/pyspectrum2-0.2.0-r2.ebuild +++ b/dev-python/pyspectrum2/pyspectrum2-0.2.0-r2.ebuild @@ -16,7 +16,7 @@ LICENSE="GPL-3+" SLOT="0" KEYWORDS="amd64 x86" -RDEPEND="dev-python/protobuf-python[${PYTHON_USEDEP}]" +RDEPEND="dev-python/protobuf[${PYTHON_USEDEP}]" DEPEND="${RDEPEND}" python_install_all() { diff --git a/dev-python/python-axolotl/python-axolotl-0.2.3-r3.ebuild b/dev-python/python-axolotl/python-axolotl-0.2.3-r3.ebuild index 20434956c9b5..fa00a5679a88 100644 --- a/dev-python/python-axolotl/python-axolotl-0.2.3-r3.ebuild +++ b/dev-python/python-axolotl/python-axolotl-0.2.3-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -24,7 +24,7 @@ KEYWORDS="amd64 ~arm64 ~loong ~riscv x86" RDEPEND=" dev-python/cryptography[${PYTHON_USEDEP}] - dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-python/protobuf[${PYTHON_USEDEP}] dev-python/python-axolotl-curve25519[${PYTHON_USEDEP}] " diff --git a/games-util/lutris/lutris-0.5.17-r1.ebuild b/games-util/lutris/lutris-0.5.17-r1.ebuild index cf67d3d750f3..765674cdc319 100644 --- a/games-util/lutris/lutris-0.5.17-r1.ebuild +++ b/games-util/lutris/lutris-0.5.17-r1.ebuild @@ -42,7 +42,7 @@ RDEPEND=" dev-python/pypresence[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] - dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-python/protobuf[${PYTHON_USEDEP}] dev-python/moddb[${PYTHON_USEDEP}] ') media-sound/fluid-soundfont diff --git a/games-util/lutris/lutris-9999.ebuild b/games-util/lutris/lutris-9999.ebuild index 38738bc2ee2f..a9e06207f6d4 100644 --- a/games-util/lutris/lutris-9999.ebuild +++ b/games-util/lutris/lutris-9999.ebuild @@ -42,7 +42,7 @@ RDEPEND=" dev-python/pypresence[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] - dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-python/protobuf[${PYTHON_USEDEP}] dev-python/moddb[${PYTHON_USEDEP}] ') media-sound/fluid-soundfont diff --git a/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild b/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild index 8f03d4e44e6c..139d3d762797 100644 --- a/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild +++ b/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild @@ -24,7 +24,7 @@ RDEPEND=" dev-python/pygobject:3[${PYTHON_USEDEP}] dev-python/numpy[${PYTHON_USEDEP}] >=dev-python/pycairo-1.4[${PYTHON_USEDEP}] - dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-python/protobuf[${PYTHON_USEDEP}] ') >=dev-libs/json-c-0.11:= gnome-base/librsvg diff --git a/net-im/transwhat/transwhat-0.2.2_p20190426-r3.ebuild b/net-im/transwhat/transwhat-0.2.2_p20190426-r3.ebuild index 3a1f9c589d2b..6d502255b9a2 100644 --- a/net-im/transwhat/transwhat-0.2.2_p20190426-r3.ebuild +++ b/net-im/transwhat/transwhat-0.2.2_p20190426-r3.ebuild @@ -19,7 +19,7 @@ SLOT="0" KEYWORDS="amd64 x86" RDEPEND=" - dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-python/protobuf[${PYTHON_USEDEP}] dev-python/pyspectrum2[${PYTHON_USEDEP}] dev-python/python-dateutil[${PYTHON_USEDEP}] net-im/yowsup[${PYTHON_USEDEP}] diff --git a/net-im/yowsup/yowsup-3.3.0.ebuild b/net-im/yowsup/yowsup-3.3.0.ebuild index b1da807a7464..41baa12f037a 100644 --- a/net-im/yowsup/yowsup-3.3.0.ebuild +++ b/net-im/yowsup/yowsup-3.3.0.ebuild @@ -25,7 +25,7 @@ RDEPEND=" dev-python/ConfigArgParse[${PYTHON_USEDEP}] dev-python/consonance[${PYTHON_USEDEP}] dev-python/pillow[${PYTHON_USEDEP}] - dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-python/protobuf[${PYTHON_USEDEP}] dev-python/python-axolotl[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] " diff --git a/net-misc/electron-cash/electron-cash-4.2.11.ebuild b/net-misc/electron-cash/electron-cash-4.2.11.ebuild index 8ca0f0b82471..a7548ba8264c 100644 --- a/net-misc/electron-cash/electron-cash-4.2.11.ebuild +++ b/net-misc/electron-cash/electron-cash-4.2.11.ebuild @@ -47,7 +47,7 @@ RDEPEND=" dev-python/requests[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] - dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-python/protobuf[${PYTHON_USEDEP}] net-libs/stem[${PYTHON_USEDEP}] amodem? ( dev-python/amodem[${PYTHON_USEDEP}] ) qrcode? ( media-gfx/zbar[v4l] ) diff --git a/net-misc/electrum-ltc/electrum-ltc-4.2.2.1.ebuild b/net-misc/electrum-ltc/electrum-ltc-4.2.2.1.ebuild index bc67b230cfc0..f0fbe6de5776 100644 --- a/net-misc/electrum-ltc/electrum-ltc-4.2.2.1.ebuild +++ b/net-misc/electrum-ltc/electrum-ltc-4.2.2.1.ebuild @@ -35,7 +35,7 @@ RDEPEND=" dev-python/requests[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}] + >=dev-python/protobuf-3.12[${PYTHON_USEDEP}] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] diff --git a/net-misc/electrum/electrum-4.5.8.ebuild b/net-misc/electrum/electrum-4.5.8.ebuild index 5cfd9ed099bd..0a23222fa6e1 100644 --- a/net-misc/electrum/electrum-4.5.8.ebuild +++ b/net-misc/electrum/electrum-4.5.8.ebuild @@ -41,7 +41,7 @@ RDEPEND=" dev-python/requests[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-3.20[${PYTHON_USEDEP}] + >=dev-python/protobuf-3.20[${PYTHON_USEDEP}] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] diff --git a/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.5_p1-r1.ebuild b/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.5_p1-r1.ebuild index 596bd3f68add..0950923af448 100644 --- a/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.5_p1-r1.ebuild +++ b/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.5_p1-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) DISTUTILS_USE_PEP517=setuptools inherit desktop distutils-r1 @@ -26,7 +26,7 @@ fi LICENSE="GPL-3" SLOT="0" -RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}] +RDEPEND=">=dev-python/protobuf-2.5.0[${PYTHON_USEDEP}] >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}] >=dev-python/requests-2.2.1[${PYTHON_USEDEP}] >=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}] diff --git a/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild b/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild index 41b49563f683..56b2c044304e 100644 --- a/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild +++ b/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) DISTUTILS_USE_PEP517=setuptools inherit desktop distutils-r1 @@ -26,7 +26,7 @@ fi LICENSE="GPL-3" SLOT="0" -RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}] +RDEPEND=">=dev-python/protobuf-2.5.0[${PYTHON_USEDEP}] >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}] >=dev-python/requests-2.2.1[${PYTHON_USEDEP}] >=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}] diff --git a/net-proxy/mitmproxy/mitmproxy-9.0.1.ebuild b/net-proxy/mitmproxy/mitmproxy-9.0.1.ebuild index 984f0e123679..48c652f37ae5 100644 --- a/net-proxy/mitmproxy/mitmproxy-9.0.1.ebuild +++ b/net-proxy/mitmproxy/mitmproxy-9.0.1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9,10,11} ) +PYTHON_COMPAT=( python3_{10,11} ) PYTHON_REQ_USE="sqlite" inherit distutils-r1 @@ -30,7 +30,7 @@ RDEPEND=" >=dev-python/mitmproxy_wireguard-0.1.16[${PYTHON_USEDEP}] >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] >=dev-python/passlib-1.6.5[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-3.14.0[${PYTHON_USEDEP}] + >=dev-python/protobuf-3.14.0[${PYTHON_USEDEP}] >=dev-python/publicsuffix-2.20190205[${PYTHON_USEDEP}] >=dev-python/pyopenssl-22.1[${PYTHON_USEDEP}] >=dev-python/pyparsing-2.4.2[${PYTHON_USEDEP}] diff --git a/net-wireless/kismet/kismet-2022.08.1-r2.ebuild b/net-wireless/kismet/kismet-2022.08.1-r2.ebuild index fe81d7a6be92..3cdf4407a7e8 100644 --- a/net-wireless/kismet/kismet-2022.08.1-r2.ebuild +++ b/net-wireless/kismet/kismet-2022.08.1-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit autotools flag-o-matic python-single-r1 udev systemd @@ -54,7 +54,7 @@ CDEPEND=" dev-libs/protobuf-c:= dev-libs/protobuf:= $(python_gen_cond_dep ' - dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-python/protobuf[${PYTHON_USEDEP}] dev-python/websockets[${PYTHON_USEDEP}] ') lm-sensors? ( sys-apps/lm-sensors:= ) diff --git a/net-wireless/kismet/kismet-2023.07.1-r1.ebuild b/net-wireless/kismet/kismet-2023.07.1-r1.ebuild index 1e4b45ab639e..b87166980da6 100644 --- a/net-wireless/kismet/kismet-2023.07.1-r1.ebuild +++ b/net-wireless/kismet/kismet-2023.07.1-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit autotools flag-o-matic python-single-r1 udev systemd @@ -62,7 +62,7 @@ CDEPEND=" dev-libs/protobuf-c:= <dev-libs/protobuf-26:= $(python_gen_cond_dep ' - dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-python/protobuf[${PYTHON_USEDEP}] dev-python/websockets[${PYTHON_USEDEP}] ') lm-sensors? ( sys-apps/lm-sensors:= ) diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild index 5d486e757c5f..eb9aa7d0a0c6 100644 --- a/net-wireless/kismet/kismet-9999.ebuild +++ b/net-wireless/kismet/kismet-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit autotools flag-o-matic python-single-r1 udev systemd @@ -56,7 +56,7 @@ CDEPEND=" dev-libs/protobuf-c:= <dev-libs/protobuf-26:= $(python_gen_cond_dep ' - dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-python/protobuf[${PYTHON_USEDEP}] dev-python/websockets[${PYTHON_USEDEP}] ') lm-sensors? ( sys-apps/lm-sensors:= ) diff --git a/profiles/updates/4Q-2024 b/profiles/updates/4Q-2024 index 00ce7d2a3a4a..8c8044455315 100644 --- a/profiles/updates/4Q-2024 +++ b/profiles/updates/4Q-2024 @@ -14,3 +14,4 @@ move dev-python/python-lhafile dev-python/lhafile move dev-python/pysvg dev-python/pysvg-py3 move dev-python/libpillowfight dev-python/pypillowfight move dev-python/cchardet dev-python/faust-cchardet +move dev-python/protobuf-python dev-python/protobuf diff --git a/sci-libs/onnx/onnx-1.16.1-r1.ebuild b/sci-libs/onnx/onnx-1.16.1-r1.ebuild index 0e8227eb2487..9d71aeffe047 100644 --- a/sci-libs/onnx/onnx-1.16.1-r1.ebuild +++ b/sci-libs/onnx/onnx-1.16.1-r1.ebuild @@ -19,7 +19,7 @@ IUSE="disableStaticReg" RESTRICT="test" RDEPEND=" - dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-python/protobuf[${PYTHON_USEDEP}] dev-python/pybind11[${PYTHON_USEDEP}] dev-libs/protobuf:= dev-cpp/abseil-cpp:= diff --git a/sci-libs/onnx/onnx-1.16.2.ebuild b/sci-libs/onnx/onnx-1.16.2.ebuild index 0e8227eb2487..9d71aeffe047 100644 --- a/sci-libs/onnx/onnx-1.16.2.ebuild +++ b/sci-libs/onnx/onnx-1.16.2.ebuild @@ -19,7 +19,7 @@ IUSE="disableStaticReg" RESTRICT="test" RDEPEND=" - dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-python/protobuf[${PYTHON_USEDEP}] dev-python/pybind11[${PYTHON_USEDEP}] dev-libs/protobuf:= dev-cpp/abseil-cpp:= diff --git a/sys-process/criu/criu-3.17-r1.ebuild b/sys-process/criu/criu-3.17-r1.ebuild index 43c010f69cc1..212e0208a5c2 100644 --- a/sys-process/criu/criu-3.17-r1.ebuild +++ b/sys-process/criu/criu-3.17-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit toolchain-funcs linux-info python-r1 @@ -44,7 +44,7 @@ BDEPEND=" " RDEPEND=" ${COMMON_DEPEND} - dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-python/protobuf[${PYTHON_USEDEP}] " CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER diff --git a/sys-process/criu/criu-3.18-r1.ebuild b/sys-process/criu/criu-3.18-r1.ebuild index 58a469e59416..3892a1b3db9f 100644 --- a/sys-process/criu/criu-3.18-r1.ebuild +++ b/sys-process/criu/criu-3.18-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) DISTUTILS_USE_PEP517=setuptools inherit fcaps toolchain-funcs linux-info distutils-r1 @@ -45,7 +45,7 @@ BDEPEND=" " RDEPEND=" ${COMMON_DEPEND} - dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-python/protobuf[${PYTHON_USEDEP}] " CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER diff --git a/sys-process/criu/criu-3.19.ebuild b/sys-process/criu/criu-3.19.ebuild index 52078c69f2ea..0132a5f7d262 100644 --- a/sys-process/criu/criu-3.19.ebuild +++ b/sys-process/criu/criu-3.19.ebuild @@ -45,7 +45,7 @@ BDEPEND=" " RDEPEND=" ${COMMON_DEPEND} - dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-python/protobuf[${PYTHON_USEDEP}] " CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER |