dev-python/olm: rename to dev-python/python-olm

Signed-off-by: Julien Roy <julien@jroy.ca>

dev-python/mautrix/mautrix-0.20.2.ebuild

@@ -20,7 +20,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	dev-python/aiohttp[${PYTHON_USEDEP}]
 	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/olm[${PYTHON_USEDEP}]
+	dev-python/python-olm[${PYTHON_USEDEP}]
 	dev-python/pycryptodome[${PYTHON_USEDEP}]
 	dev-python/unpaddedbase64[${PYTHON_USEDEP}]
 	dev-python/yarl[${PYTHON_USEDEP}]

dev-python/mautrix/mautrix-0.20.3.ebuild

@@ -20,7 +20,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	dev-python/aiohttp[${PYTHON_USEDEP}]
 	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/olm[${PYTHON_USEDEP}]
+	dev-python/python-olm[${PYTHON_USEDEP}]
 	dev-python/pycryptodome[${PYTHON_USEDEP}]
 	dev-python/unpaddedbase64[${PYTHON_USEDEP}]
 	dev-python/yarl[${PYTHON_USEDEP}]

dev-python/olm/olm-3.2.14-r5.ebuild

@@ -1,47 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for dev-libs/olm"
-HOMEPAGE="https://gitlab.matrix.org/matrix-org/olm/"
-SRC_URI="https://gitlab.matrix.org/matrix-org/${PN}/-/archive/${PV}/${P}.tar.bz2"
-S="${WORKDIR}/${P}/python"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="dev-libs/olm"
-RDEPEND="
-	${DEPEND}
-	dev-python/future[${PYTHON_USEDEP}]
-	virtual/python-cffi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( dev-python/aspectlib[${PYTHON_USEDEP}] )
-"
-
-DOCS=( README-python.md )
-
-distutils_enable_tests pytest
-
-distutils_enable_sphinx docs \
-	dev-python/alabaster
-
-EPYTEST_DESELECT=(
-	# need pytest-benchmark
-	tests/group_session_test.py::TestClass::test_encrypt
-	tests/group_session_test.py::TestClass::test_decrypt
-)
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# To avoid merge collision with dev-libs/olm
-	mv README.md README-python.md || die
-}

dev-python/python-olm/Manifest

@@ -1,3 +1,2 @@
-DIST olm-3.2.14.tar.bz2 2743089 BLAKE2B 8b8cd2a6b5bd14191ee6604221449ae1472078e3c2a1286e9e3aed433bb77e6a9a88de6ca4c92295cd281e10d76a161905b12207079f457b099f43864317cac7 SHA512 47a19ae2290dbf0ac2b4539806a5e5a22be824ce163233b61680506a8eae341e312e8f169285e342c2277764d4bfa5eaf0417d36e04fbf4e358de01730e302b4
 DIST olm-3.2.15.tar.bz2 2744760 BLAKE2B 44486a63217998010a0bb7e01ff3315c88e139d686b97158e67af29b2f052912412541fb944a17c5d8931df9c641a73e521ef8d0ff352b80fe30bd6fb73b2e7b SHA512 81832766e477fc17908e8d1c49b5403d87b5977fd9102605d95ef2a3907619b7301e32fe0e18ec0f575b1f004ce248633307ff43b0f48bc9bb2313cdfefd6ea7
 DIST olm-3.2.16.tar.bz2 2744360 BLAKE2B 236cd08cb4f014ef4f90377fe30907490dbf6482629ab47a779114c711de1855c44874a45ee92f4f55d7c100abbbde2c427996ce534dd95ce401a7549db351b7 SHA512 504ddc91297e7aef99e9b25f73b33bac29716ca33eb333bf1217b719d8862438e2cdaadd88cef3dc84e9f618bcc9eeeaf7e513f2d6909cc4a3d98a5dd79b0581

dev-python/python-olm/python-olm-3.2.15.ebuild

@@ -9,8 +9,8 @@ inherit distutils-r1
 
 DESCRIPTION="Python bindings for dev-libs/olm"
 HOMEPAGE="https://gitlab.matrix.org/matrix-org/olm/"
-SRC_URI="https://gitlab.matrix.org/matrix-org/${PN}/-/archive/${PV}/${P}.tar.bz2"
-S="${WORKDIR}/${P}/python"
+SRC_URI="https://gitlab.matrix.org/matrix-org/olm/-/archive/${PV}/olm-${PV}.tar.bz2"
+S="${WORKDIR}/olm-${PV}/python"
 
 LICENSE="Apache-2.0"
 SLOT="0"

dev-python/python-olm/python-olm-3.2.16.ebuild

@@ -9,8 +9,8 @@ inherit distutils-r1
 
 DESCRIPTION="Python bindings for dev-libs/olm"
 HOMEPAGE="https://gitlab.matrix.org/matrix-org/olm/"
-SRC_URI="https://gitlab.matrix.org/matrix-org/${PN}/-/archive/${PV}/${P}.tar.bz2"
-S="${WORKDIR}/${P}/python"
+SRC_URI="https://gitlab.matrix.org/matrix-org/olm/-/archive/${PV}/olm-${PV}.tar.bz2"
+S="${WORKDIR}/olm-${PV}/python"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -19,7 +19,6 @@ KEYWORDS="~amd64"
 DEPEND="dev-libs/olm"
 RDEPEND="
 	${DEPEND}
-	dev-python/future[${PYTHON_USEDEP}]
 	virtual/python-cffi[${PYTHON_USEDEP}]
 "
 BDEPEND="