commit:     b2479f841344464fd3668ad7b110ebd6b35855f8
Author:     Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Fri Nov 24 00:27:39 2023 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Fri Nov 24 00:27:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b2479f84

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

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

 dev-python/mautrix/mautrix-0.20.2.ebuild           |  2 +-
 dev-python/mautrix/mautrix-0.20.3.ebuild           |  2 +-
 dev-python/olm/olm-3.2.14-r5.ebuild                | 47 ----------------------
 dev-python/{olm => python-olm}/Manifest            |  1 -
 dev-python/{olm => python-olm}/metadata.xml        |  0
 .../python-olm-3.2.15.ebuild}                      |  4 +-
 .../python-olm-3.2.16.ebuild}                      |  5 +--
 .../mautrix-facebook/mautrix-facebook-0.4.1.ebuild |  2 +-
 .../mautrix-facebook/mautrix-facebook-0.5.0.ebuild |  2 +-
 net-im/mautrix-signal/mautrix-signal-0.4.2.ebuild  |  2 +-
 net-im/mautrix-signal/mautrix-signal-0.4.3.ebuild  |  2 +-
 .../mautrix-telegram-0.14.1.ebuild                 |  2 +-
 .../mautrix-telegram-0.14.2.ebuild                 |  2 +-
 profiles/updates/4Q-2023                           |  1 +
 14 files changed, 13 insertions(+), 61 deletions(-)

diff --git a/dev-python/mautrix/mautrix-0.20.2.ebuild 
b/dev-python/mautrix/mautrix-0.20.2.ebuild
index 5367bd8433..2499e5f9f7 100644
--- a/dev-python/mautrix/mautrix-0.20.2.ebuild
+++ b/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}]

diff --git a/dev-python/mautrix/mautrix-0.20.3.ebuild 
b/dev-python/mautrix/mautrix-0.20.3.ebuild
index 5367bd8433..2499e5f9f7 100644
--- a/dev-python/mautrix/mautrix-0.20.3.ebuild
+++ b/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}]

diff --git a/dev-python/olm/olm-3.2.14-r5.ebuild 
b/dev-python/olm/olm-3.2.14-r5.ebuild
deleted file mode 100644
index 771ef756bb..0000000000
--- a/dev-python/olm/olm-3.2.14-r5.ebuild
+++ /dev/null
@@ -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
-}

diff --git a/dev-python/olm/Manifest b/dev-python/python-olm/Manifest
similarity index 66%
rename from dev-python/olm/Manifest
rename to dev-python/python-olm/Manifest
index 8f51912b6f..f5e4eb8691 100644
--- a/dev-python/olm/Manifest
+++ b/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

diff --git a/dev-python/olm/metadata.xml b/dev-python/python-olm/metadata.xml
similarity index 100%
rename from dev-python/olm/metadata.xml
rename to dev-python/python-olm/metadata.xml

diff --git a/dev-python/olm/olm-3.2.16.ebuild 
b/dev-python/python-olm/python-olm-3.2.15.ebuild
similarity index 87%
rename from dev-python/olm/olm-3.2.16.ebuild
rename to dev-python/python-olm/python-olm-3.2.15.ebuild
index 8536ba163e..d02994cb8d 100644
--- a/dev-python/olm/olm-3.2.16.ebuild
+++ b/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"

diff --git a/dev-python/olm/olm-3.2.15.ebuild 
b/dev-python/python-olm/python-olm-3.2.16.ebuild
similarity index 84%
rename from dev-python/olm/olm-3.2.15.ebuild
rename to dev-python/python-olm/python-olm-3.2.16.ebuild
index 8536ba163e..2e7bf8d996 100644
--- a/dev-python/olm/olm-3.2.15.ebuild
+++ b/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="

diff --git a/net-im/mautrix-facebook/mautrix-facebook-0.4.1.ebuild 
b/net-im/mautrix-facebook/mautrix-facebook-0.4.1.ebuild
index 4a74a0d685..b421ce99b1 100644
--- a/net-im/mautrix-facebook/mautrix-facebook-0.4.1.ebuild
+++ b/net-im/mautrix-facebook/mautrix-facebook-0.4.1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
        dev-python/asyncpg[${PYTHON_USEDEP}]
        dev-python/commonmark[${PYTHON_USEDEP}]
        dev-python/mautrix[${PYTHON_USEDEP}]
-       dev-python/olm[${PYTHON_USEDEP}]
+       dev-python/python-olm[${PYTHON_USEDEP}]
        dev-python/paho-mqtt[${PYTHON_USEDEP}]
        dev-python/pillow[${PYTHON_USEDEP}]
        dev-python/pycryptodome[${PYTHON_USEDEP}]

diff --git a/net-im/mautrix-facebook/mautrix-facebook-0.5.0.ebuild 
b/net-im/mautrix-facebook/mautrix-facebook-0.5.0.ebuild
index 4a74a0d685..b421ce99b1 100644
--- a/net-im/mautrix-facebook/mautrix-facebook-0.5.0.ebuild
+++ b/net-im/mautrix-facebook/mautrix-facebook-0.5.0.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
        dev-python/asyncpg[${PYTHON_USEDEP}]
        dev-python/commonmark[${PYTHON_USEDEP}]
        dev-python/mautrix[${PYTHON_USEDEP}]
-       dev-python/olm[${PYTHON_USEDEP}]
+       dev-python/python-olm[${PYTHON_USEDEP}]
        dev-python/paho-mqtt[${PYTHON_USEDEP}]
        dev-python/pillow[${PYTHON_USEDEP}]
        dev-python/pycryptodome[${PYTHON_USEDEP}]

diff --git a/net-im/mautrix-signal/mautrix-signal-0.4.2.ebuild 
b/net-im/mautrix-signal/mautrix-signal-0.4.2.ebuild
index 8dc7290700..aa170cafeb 100644
--- a/net-im/mautrix-signal/mautrix-signal-0.4.2.ebuild
+++ b/net-im/mautrix-signal/mautrix-signal-0.4.2.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
        dev-python/attrs[${PYTHON_USEDEP}]
        dev-python/commonmark[${PYTHON_USEDEP}]
        dev-python/mautrix[${PYTHON_USEDEP}]
-       dev-python/olm[${PYTHON_USEDEP}]
+       dev-python/python-olm[${PYTHON_USEDEP}]
        dev-python/phonenumbers[${PYTHON_USEDEP}]
        dev-python/pillow[${PYTHON_USEDEP}]
        dev-python/pycryptodome[${PYTHON_USEDEP}]

diff --git a/net-im/mautrix-signal/mautrix-signal-0.4.3.ebuild 
b/net-im/mautrix-signal/mautrix-signal-0.4.3.ebuild
index 8dc7290700..aa170cafeb 100644
--- a/net-im/mautrix-signal/mautrix-signal-0.4.3.ebuild
+++ b/net-im/mautrix-signal/mautrix-signal-0.4.3.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
        dev-python/attrs[${PYTHON_USEDEP}]
        dev-python/commonmark[${PYTHON_USEDEP}]
        dev-python/mautrix[${PYTHON_USEDEP}]
-       dev-python/olm[${PYTHON_USEDEP}]
+       dev-python/python-olm[${PYTHON_USEDEP}]
        dev-python/phonenumbers[${PYTHON_USEDEP}]
        dev-python/pillow[${PYTHON_USEDEP}]
        dev-python/pycryptodome[${PYTHON_USEDEP}]

diff --git a/net-im/mautrix-telegram/mautrix-telegram-0.14.1.ebuild 
b/net-im/mautrix-telegram/mautrix-telegram-0.14.1.ebuild
index 7b4c1025b7..557389d489 100644
--- a/net-im/mautrix-telegram/mautrix-telegram-0.14.1.ebuild
+++ b/net-im/mautrix-telegram/mautrix-telegram-0.14.1.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
        dev-python/cryptg[${PYTHON_USEDEP}]
        dev-python/mako[${PYTHON_USEDEP}]
        dev-python/mautrix[${PYTHON_USEDEP}]
-       dev-python/olm[${PYTHON_USEDEP}]
+       dev-python/python-olm[${PYTHON_USEDEP}]
        dev-python/phonenumbers[${PYTHON_USEDEP}]
        dev-python/pycryptodome[${PYTHON_USEDEP}]
        dev-python/python-magic[${PYTHON_USEDEP}]

diff --git a/net-im/mautrix-telegram/mautrix-telegram-0.14.2.ebuild 
b/net-im/mautrix-telegram/mautrix-telegram-0.14.2.ebuild
index 7b4c1025b7..557389d489 100644
--- a/net-im/mautrix-telegram/mautrix-telegram-0.14.2.ebuild
+++ b/net-im/mautrix-telegram/mautrix-telegram-0.14.2.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
        dev-python/cryptg[${PYTHON_USEDEP}]
        dev-python/mako[${PYTHON_USEDEP}]
        dev-python/mautrix[${PYTHON_USEDEP}]
-       dev-python/olm[${PYTHON_USEDEP}]
+       dev-python/python-olm[${PYTHON_USEDEP}]
        dev-python/phonenumbers[${PYTHON_USEDEP}]
        dev-python/pycryptodome[${PYTHON_USEDEP}]
        dev-python/python-magic[${PYTHON_USEDEP}]

diff --git a/profiles/updates/4Q-2023 b/profiles/updates/4Q-2023
new file mode 100644
index 0000000000..9eb5e5db79
--- /dev/null
+++ b/profiles/updates/4Q-2023
@@ -0,0 +1 @@
+move dev-python/olm dev-python/python-olm
\ No newline at end of file

Reply via email to