3 files changed, 36 insertions, 9 deletions
diff --git a/net-mail/automx2/Manifest b/net-mail/automx2/Manifest
index e5f8e9ff6508..77e048ea4315 100644
--- a/net-mail/automx2/Manifest
+++ b/net-mail/automx2/Manifest
@@ -2,8 +2,9 @@ AUX automx2-2024.2-setupcfg.patch 305 BLAKE2B f0dbe1ca3159f28ea457941a6a6bf3c47b
 AUX conf 721 BLAKE2B 976a2936da5e9eef71d9d08f7f12c51151549c23c27918de28da355e87e4927f84cc63904ab0feb0d10a11326ce6e44cc11531d65f6abe3d1ce213ea2e632e24 SHA512 f931acb2e5060872219709b525d64cae630062eb842e55614d57324ff5e801b4b9a99faf47c706ffe67822b29a7fb680ed59db550470afa9ded80621d4bbe3b8
 AUX confd 213 BLAKE2B 2573f19bdc9022357f2f92ff17d84a1e77078c6c05a46a09b6e57ab7132d1f1078fb5003640f83213f746f94e3ab5b482b01d92feb94684665eb4e796a642841 SHA512 6c04de3ef26fd132269532c7bdca3263e95cebf5078ddd57e8ebff62229fabfb64b8ad4d988dfe99c9611c5d1081b4d3862f09d11c08aa1aabc1d5bc7c987439
 AUX init-r1 608 BLAKE2B 7d2b93482c62fe0219c7194279ee495274e4b0b8319ccf2d24e7816abe7eb23452bc21c01305283deeb8224c3668641b1bd5a7f3fbf8fe783a28e58268511ace SHA512 4a1ed2c45e1414734b8e5cbb731377da2087bd4f1a1075b4acb81b5057a65c0557e9e1a05cdf6856da35067a589d9c56fcf13156e8872facfc8f161bb3cade0f
-DIST automx2-2022.1.tar.gz 182519 BLAKE2B baf2ecc801f6f024eb6a6fe2610d6cb7c3dd0726cfa877fdea76d94ebf16b9393addc5be8844f3017fd664b73adc74f2cd898736bbcad1fa0b2b3c1022cb638a SHA512 3d6fb9cf01cff641c78851560d72e3d80f9011cca4cd438cd49e999feef3f290bbd9495655f41319eb5456beac09bb8862dc327b521254266e0d53aa17b0bbd3
+AUX init-r2 592 BLAKE2B e167b36efe0501cff73abbcac1208659d4365fdd27e09e12bd32cbeb1c297d010d64366b121cc4003fd2d0f07454edec2a110cfbc7c1a1d8609eba3aa0d07833 SHA512 77dcef6b8186cfb9b09db2644794ab902d697ee04bd26543ce7ba9bd7af49d727776e7a30d372686ab46a4e573972b7a4d52175c07ce79b8731be8f00baab7ac
 DIST automx2-2024.2.tar.gz 169710 BLAKE2B 1977e07291d27168424e536273af4069d0cbe4c44e2c37fc10b4d0a2fa53272c404aae6dbb8b0a33dd9926e9fc94aae7cd3c6e5669454dad802e6a6ad85bfaf6 SHA512 de518e7eb5184d5dcd7945ab860250c6338e3343a9c4bba26bcdd68b4cb1d22de9624c329ff63af1420746a17ea220ad6d4bbda627af64f7ddcc5ae73275e5dd
-EBUILD automx2-2022.1-r1.ebuild 1140 BLAKE2B ff219c5046337c4f5e2243fc12cf697d345f88a74ec15776645ac1b7dc0df144bf517afaa9c048cd09f3fcf0063823c80c8fc4d6cab23bb5bfafb0926813d966 SHA512 ba1f7eae07c8653586463c916e825a0a4b87698934b836d3b62c2c8e255047a27269cc4983f79a3c37b1841c64dfa634731b5d63415495117712ef170f0f4452
+DIST automx2-2025.1.tar.gz 175571 BLAKE2B c3c7bbeb6f438a24a476ca6d14b4529ea51869786b3d53f8ef1202a4955259274674683614e0ddadc456d1f7d3e1b9ca20b18d266e4ff8aa54c683456834f92f SHA512 cbaaee4863e7bb265a4c2b991395b8ef3b6405be28beded53287328fb766d1ddb12fde0fdf4ea8992ed0b8abba0e83a018b60054e778a97c734a9a68c391d776
 EBUILD automx2-2024.2.ebuild 1086 BLAKE2B b537b14f97208b604592a4caa8330db270498b10c68bc5f09ba50f7f119c388ddc02f5627f93081fe856c8cfd6fa5aae6d014f5ae5a5859f34e3232fd3a08395 SHA512 d7a86a407b11ffed24dc9dd108761facc19a3e46cb6fd356b52fb2576172f3ac000142aa95a44446d400f7e8db17d4d4500eac7ce0d0492f193ecb529303d480
+EBUILD automx2-2025.1.ebuild 1112 BLAKE2B 36484fdf8c6def93014763f212495bffd37c2442dc346c8eb06cfa9dcfa25b6ef9b6696133fec3a2df7ccc7892973a879e66474b2b7ff38dd56c773220e16e83 SHA512 9a827bf195cd9c27d106b74237c80828a8326f614abf39ac9d8fac90483568078ed5075578a4197a1299c31d063663e5bf19ba31e6f0f3db444f01d23ba083c3
 MISC metadata.xml 662 BLAKE2B 0751c66d39b941b5fe181be51254b0d22192af56bdf016ac72e5b4f8ab0fe579424ee587d23e66d29a5f87726ac0e1fa47c9b0b71de5d9d1bed7b834b16d5bee SHA512 b50f93ec5909b8f12992b79bdf173199bf0aab37df9420111cc487ccd9e3aab92e78aa4742fbb90043648b95e1c29d3aece003fd39f20314ebc7d11c70b1dd0a
diff --git a/net-mail/automx2/automx2-2022.1-r1.ebuild b/net-mail/automx2/automx2-2025.1.ebuild
index ead2c323a51f..0647731a280f 100644
--- a/net-mail/automx2/automx2-2022.1-r1.ebuild
+++ b/net-mail/automx2/automx2-2025.1.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11,12} )
+PYTHON_COMPAT=( python3_{11..13} )
 
 inherit distutils-r1
 
-DESCRIPTION="Email client autoconfiguration service"
+DESCRIPTION="Mail User Agent (email client) configuration made easy"
 HOMEPAGE="https://rseichter.github.io/automx2/"
 SRC_URI="https://github.com/rseichter/automx2/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 
 RDEPEND="acct-user/automx2
 	dev-python/flask[${PYTHON_USEDEP}]
@@ -26,7 +26,7 @@ RDEPEND="acct-user/automx2
 distutils_enable_tests unittest
 
 python_prepare_all() {
-	sed -i -e "/('scripts'/d" setup.py || die
+	rm -r src/alembic || die
 	distutils-r1_python_prepare_all
 }
 
@@ -36,10 +36,10 @@ python_test() {
 }
 
 python_install_all() {
-	local DOCS=( "${S}"/docs/*.adoc "${S}"/contrib/*sample.conf )
+	local DOCS=( "${S}"/docs/*.pdf )
 	local HTML_DOCS=( "${S}"/docs/*.{html,svg} )
 	newconfd "${FILESDIR}/confd" "${PN}"
-	newinitd "${FILESDIR}/init-r1" "${PN}"
+	newinitd "${FILESDIR}/init-r2" "${PN}"
 	insinto /etc
 	newins "${FILESDIR}/conf" "${PN}.conf"
 	distutils-r1_python_install_all
diff --git a/net-mail/automx2/files/init-r2 b/net-mail/automx2/files/init-r2
new file mode 100644
index 000000000000..bf64b5bd74c7
--- /dev/null
+++ b/net-mail/automx2/files/init-r2
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+: ${AUTOMX2_CONF:="/etc/${RC_SVCNAME}.conf"}
+: ${AUTOMX2_USER:="automx2"}
+: ${AUTOMX2_ARGS:="--port 4243"}
+
+command="/usr/bin/flask"
+command_args="run ${AUTOMX2_ARGS}"
+command_background="true"
+command_user="${AUTOMX2_USER}"
+pidfile="/run/${RC_SVCNAME}.pid"
+required_files="${AUTOMX2_CONF}"
+
+depend() {
+	use logger net
+	before nginx
+}
+
+start_pre() {
+	export AUTOMX2_CONF
+	export EPYTHON="python"
+	export FLASK_APP="automx2.server:app"
+	export FLASK_ENV="production"
+}