diff --git a/net-im/mautrix-telegram/Manifest b/net-im/mautrix-telegram/Manifest
index 44020567d3..0b7931a42e 100644
--- a/net-im/mautrix-telegram/Manifest
+++ b/net-im/mautrix-telegram/Manifest
@@ -1,3 +1,2 @@
-DIST mautrix-telegram-0.14.1.gh.tar.gz 811724 BLAKE2B 92cc600c5838c9bf65e9aa76a499b63d9474087d998d764f4e0f146cbcc7f9e7d10e7c0f3a7a6d31c3c9d9ff5e75070ea0fe35526455a66a342d96d2fb47cb4b SHA512 7615dc811558119f0e54184af057fba399824b5d753b9dd45ea25c943d710fa66b0dd5bbcbf9162840ee53f771cbf07f3017d563ecbf34b911ff3e28398e54b3
-DIST mautrix-telegram-0.14.2.gh.tar.gz 813171 BLAKE2B 286015b2854b5c2649f27e32e9d87faf852b42227864415692b78a306c85691786e6992d6137ccc30b3c947294b3c417c455c1b433384ddcbeab6aaf10586898 SHA512 0745beb448afaefcd7bafa6425e5fe8469729d208cb8eb6c248c35bc83ce75c6c916434b7d1e6671a37215cab041eaa61c5a6b0b5ee367f9ac5f83b1cfc651a9
DIST mautrix-telegram-0.15.1.tar.gz 253573 BLAKE2B f27e5d97e9f225d8464e2002c02895072c0ddff7cad388bde08716a9337c3fd72291d0e087677fc69f9b298f297418f931e12e536695c30300b1526f1960a579 SHA512 f9a8898e8bfcc79b4e6ddc0cc9473e195f9c772ccc621275c688927e35a7f0801edea3a053b462c155757e4231465670ab5dc305d7fb39438590d953eb6b163b
+DIST mautrix-telegram-0.15.2.tar.gz 255865 BLAKE2B 841f1f0872505f12f45b2a0862314eb057952b8b4a2ba55d314ccf71bbe4957a602bfeb061a1137c4af320f9900b6862b4ee9c754c367818e369e6044a8e776e SHA512 a2df56d58905044e8eb2303e5d6377248ca8911bdfc982e8bd290cc897dbfcde8798e3f1b1c1ad84243febdfb387aae312d83c93443320efc1fa56f95903a486
diff --git a/net-im/mautrix-telegram/files/mautrix-telegram.confd b/net-im/mautrix-telegram/files/mautrix-telegram.confd
new file mode 100644
index 0000000000..ce6afe2195
--- /dev/null
+++ b/net-im/mautrix-telegram/files/mautrix-telegram.confd
@@ -0,0 +1,8 @@
+# Configuration file
+#MAUTRIX_TELEGRAM_CONFIG="/etc/mautrix/mautrix_telegram.yaml"
+
+# Log file
+#MAUTRIX_TELEGRAM_LOG="/var/log/mautrix/mautrix-telegram_daemon.log"
+
+# Extra command-line options
+#MAUTRIX_TELEGRAM_OPTS=""
diff --git a/net-im/mautrix-telegram/files/mautrix-telegram.initd-r1 b/net-im/mautrix-telegram/files/mautrix-telegram.initd-r1
new file mode 100644
index 0000000000..c33d4a0d98
--- /dev/null
+++ b/net-im/mautrix-telegram/files/mautrix-telegram.initd-r1
@@ -0,0 +1,29 @@
+#!/sbin/openrc-run
+# shellcheck shell=sh
+#
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+: ${MAUTRIX_TELEGRAM_CONFIG:=/etc/mautrix/mautrix_telegram.yaml}
+: ${MAUTRIX_TELEGRAM_LOG:=/var/log/mautrix/mautrix-telegram_daemon.log}
+
+description="A Matrix-Telegram Messenger puppeting bridge"
+
+command="/usr/bin/python"
+command_args="-m mautrix_telegram -c ${MAUTRIX_TELEGRAM_CONFIG} ${MAUTRIX_TELEGRAM_OPTS}"
+command_background=true
+command_user="mautrix-telegram:mautrix"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+output_log="${MAUTRIX_TELEGRAM_LOG}"
+error_log="${output_log}"
+
+depend() {
+ need net
+ use dns postgresql
+}
+
+start_pre() {
+ checkpath -d -m 0755 -o "${command_user}" /var/lib/mautrix/telegram
+ checkpath -f -m 0644 -o "${command_user}" "${output_log}"
+}
diff --git a/net-im/mautrix-telegram/mautrix-telegram-0.14.1.ebuild b/net-im/mautrix-telegram/mautrix-telegram-0.14.1.ebuild
deleted file mode 100644
index 557389d489..0000000000
--- a/net-im/mautrix-telegram/mautrix-telegram-0.14.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 optfeature systemd
-
-DESCRIPTION="A Matrix-Telegram Messenger puppeting bridge "
-HOMEPAGE="https://github.com/mautrix/telegram/"
-SRC_URI="https://github.com/mautrix/telegram/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/telegram-${PV}"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
- acct-user/${PN}
- app-arch/brotli[python]
- dev-python/aiohttp[${PYTHON_USEDEP}]
- dev-python/aiodns[${PYTHON_USEDEP}]
- dev-python/asyncpg[${PYTHON_USEDEP}]
- dev-python/commonmark[${PYTHON_USEDEP}]
- dev-python/cryptg[${PYTHON_USEDEP}]
- dev-python/mako[${PYTHON_USEDEP}]
- dev-python/mautrix[${PYTHON_USEDEP}]
- dev-python/python-olm[${PYTHON_USEDEP}]
- dev-python/phonenumbers[${PYTHON_USEDEP}]
- dev-python/pycryptodome[${PYTHON_USEDEP}]
- dev-python/python-magic[${PYTHON_USEDEP}]
- dev-python/qrcode[${PYTHON_USEDEP}]
- dev-python/ruamel-yaml[${PYTHON_USEDEP}]
- >=dev-python/tulir-telethon-1.28.0_alpha9[${PYTHON_USEDEP}]
- dev-python/unpaddedbase64[${PYTHON_USEDEP}]
- dev-python/yarl[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
- distutils-r1_src_install
-
- keepdir /var/log/mautrix
- fowners root:mautrix /var/log/mautrix
- fperms 770 /var/log/mautrix
- sed -i -e "s/\.\/${PN}.log/\/var\/log\/mautrix\/${PN}.log/" "${ED}/usr/example-config.yaml" || die
-
- insinto "/etc/mautrix"
- newins "${ED}/usr/example-config.yaml" "${PN/-/_}.yaml"
- rm "${ED}/usr/example-config.yaml" || die
-
- newinitd "${FILESDIR}/${PN}.initd" "${PN}"
- systemd_dounit "${FILESDIR}/${PN}.service"
-
- fowners -R root:mautrix /etc/mautrix
- fperms -R 770 /etc/mautrix
-}
-
-pkg_postinst() {
- optfeature "Prometheus statistics" dev-python/prometheus_client
- optfeature "Sqlite backend" dev-python/aiosqlite
-
- einfo
- elog ""
- elog "Before you can use ${PN}, you must configure it correctly"
- elog "The configuration file is located at \"/etc/mautrix/${PN/-/_}.yaml\""
- elog "When done, run the following command: emerge --config ${CATEGORY}/${PN}"
- elog "Then, you must register the bridge with your homeserver"
- elog "Refer your homeserver's documentation for instructions"
- elog "The registration file is located at /var/lib/${PN/-/\/}/registration.yaml"
- elog "Finally, you may start the ${PN} daemon"
- einfo
-}
-
-pkg_config() {
- su - "${PN}" -s /bin/sh -c \
- "/usr/bin/python -m ${PN/-/_} -c /etc/mautrix/${PN/-/_}.yaml -g -r /var/lib/${PN/-/\/}/registration.yaml"
-}
diff --git a/net-im/mautrix-telegram/mautrix-telegram-0.14.2.ebuild b/net-im/mautrix-telegram/mautrix-telegram-0.14.2.ebuild
deleted file mode 100644
index 557389d489..0000000000
--- a/net-im/mautrix-telegram/mautrix-telegram-0.14.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 optfeature systemd
-
-DESCRIPTION="A Matrix-Telegram Messenger puppeting bridge "
-HOMEPAGE="https://github.com/mautrix/telegram/"
-SRC_URI="https://github.com/mautrix/telegram/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/telegram-${PV}"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
- acct-user/${PN}
- app-arch/brotli[python]
- dev-python/aiohttp[${PYTHON_USEDEP}]
- dev-python/aiodns[${PYTHON_USEDEP}]
- dev-python/asyncpg[${PYTHON_USEDEP}]
- dev-python/commonmark[${PYTHON_USEDEP}]
- dev-python/cryptg[${PYTHON_USEDEP}]
- dev-python/mako[${PYTHON_USEDEP}]
- dev-python/mautrix[${PYTHON_USEDEP}]
- dev-python/python-olm[${PYTHON_USEDEP}]
- dev-python/phonenumbers[${PYTHON_USEDEP}]
- dev-python/pycryptodome[${PYTHON_USEDEP}]
- dev-python/python-magic[${PYTHON_USEDEP}]
- dev-python/qrcode[${PYTHON_USEDEP}]
- dev-python/ruamel-yaml[${PYTHON_USEDEP}]
- >=dev-python/tulir-telethon-1.28.0_alpha9[${PYTHON_USEDEP}]
- dev-python/unpaddedbase64[${PYTHON_USEDEP}]
- dev-python/yarl[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
- distutils-r1_src_install
-
- keepdir /var/log/mautrix
- fowners root:mautrix /var/log/mautrix
- fperms 770 /var/log/mautrix
- sed -i -e "s/\.\/${PN}.log/\/var\/log\/mautrix\/${PN}.log/" "${ED}/usr/example-config.yaml" || die
-
- insinto "/etc/mautrix"
- newins "${ED}/usr/example-config.yaml" "${PN/-/_}.yaml"
- rm "${ED}/usr/example-config.yaml" || die
-
- newinitd "${FILESDIR}/${PN}.initd" "${PN}"
- systemd_dounit "${FILESDIR}/${PN}.service"
-
- fowners -R root:mautrix /etc/mautrix
- fperms -R 770 /etc/mautrix
-}
-
-pkg_postinst() {
- optfeature "Prometheus statistics" dev-python/prometheus_client
- optfeature "Sqlite backend" dev-python/aiosqlite
-
- einfo
- elog ""
- elog "Before you can use ${PN}, you must configure it correctly"
- elog "The configuration file is located at \"/etc/mautrix/${PN/-/_}.yaml\""
- elog "When done, run the following command: emerge --config ${CATEGORY}/${PN}"
- elog "Then, you must register the bridge with your homeserver"
- elog "Refer your homeserver's documentation for instructions"
- elog "The registration file is located at /var/lib/${PN/-/\/}/registration.yaml"
- elog "Finally, you may start the ${PN} daemon"
- einfo
-}
-
-pkg_config() {
- su - "${PN}" -s /bin/sh -c \
- "/usr/bin/python -m ${PN/-/_} -c /etc/mautrix/${PN/-/_}.yaml -g -r /var/lib/${PN/-/\/}/registration.yaml"
-}
diff --git a/net-im/mautrix-telegram/mautrix-telegram-0.15.2.ebuild b/net-im/mautrix-telegram/mautrix-telegram-0.15.2.ebuild
new file mode 100644
index 0000000000..12d765dccc
--- /dev/null
+++ b/net-im/mautrix-telegram/mautrix-telegram-0.15.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYPI_NO_NORMALIZE=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 optfeature pypi systemd
+
+DESCRIPTION="A Matrix-Telegram Messenger puppeting bridge "
+HOMEPAGE="https://github.com/mautrix/telegram/"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="crypt minimal +qrcode socks5 sqlite"
+
+RDEPEND="
+ acct-user/mautrix-telegram
+ dev-python/aiohttp[${PYTHON_USEDEP}]
+ dev-python/asyncpg[${PYTHON_USEDEP}]
+ dev-python/commonmark[${PYTHON_USEDEP}]
+ dev-python/mako[${PYTHON_USEDEP}]
+ dev-python/mautrix[crypt?,${PYTHON_USEDEP}]
+ dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/tulir-telethon-1.37.0_alpha1[${PYTHON_USEDEP}]
+ dev-python/yarl[${PYTHON_USEDEP}]
+ || (
+ dev-python/python-magic[${PYTHON_USEDEP}]
+ sys-apps/file[python,${PYTHON_USEDEP}]
+ )
+ !minimal? (
+ app-arch/brotli[python,${PYTHON_USEDEP}]
+ dev-python/aiodns[${PYTHON_USEDEP}]
+ dev-python/cryptg[${PYTHON_USEDEP}]
+ dev-python/phonenumbers[${PYTHON_USEDEP}]
+ )
+ qrcode? (
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/qrcode[${PYTHON_USEDEP}]
+ )
+ socks5? ( dev-python/python-socks[${PYTHON_USEDEP}] )
+ sqlite? ( dev-python/aiosqlite[${PYTHON_USEDEP}] )
+"
+
+src_install() {
+ distutils-r1_src_install
+
+ keepdir /var/log/mautrix
+ fowners root:mautrix /var/log/mautrix
+ fperms 770 /var/log/mautrix
+
+ mkdir -p "${ED}"/etc/mautrix || die
+ sed -i "${ED}/usr/example-config.yaml" \
+ -e "s:\./mautrix-telegram.log:/var/log/mautrix/${PN}.log:" || die
+ mv "${ED}"/usr/example-config.yaml "${ED}"/etc/mautrix/mautrix_telegram.yaml || die
+
+ newinitd "${FILESDIR}"/mautrix-telegram.initd-r1 mautrix-telegram
+ newconfd "${FILESDIR}"/mautrix-telegram.confd mautrix-telegram
+ systemd_dounit "${FILESDIR}"/mautrix-telegram.service
+
+ fowners -R root:mautrix /etc/mautrix
+ fperms -R 770 /etc/mautrix
+}
+
+pkg_postinst() {
+ optfeature "Prometheus statistics support" dev-python/prometheus_client
+
+ einfo
+ elog "Before you can use mautrix-telegram, you need to configure it correctly."
+ elog "The configuration file is located at \"/etc/mautrix/mautrix_telegram.yaml\""
+ elog
+ elog "When done, run the following command:"
+ elog " # emerge --config ${CATEGORY}/${PN}"
+ elog
+ elog "Then, you need to register the bridge with your homeserver."
+ elog "Refer your homeserver's documentation for instructions."
+ elog "The registration file is located at /var/lib/mautrix_telegram/registration.yaml"
+ elog
+ elog "Finally, you may start the mautrix-telegram daemon."
+ einfo
+}
+
+pkg_config() {
+ su - mautrix-telegram -s /bin/sh -c \
+ "/usr/bin/python -m mautrix_telegram -c /etc/mautrix/mautrix_telegram.yaml -g -r /var/lib/mautrix_telegram/registration.yaml"
+}
diff --git a/net-im/mautrix-telegram/metadata.xml b/net-im/mautrix-telegram/metadata.xml
index e42fddd1d5..aa64233b2a 100644
--- a/net-im/mautrix-telegram/metadata.xml
+++ b/net-im/mautrix-telegram/metadata.xml
@@ -16,4 +16,7 @@
mautrix/telegram
mautrix-telegram
+