[gentoo-commits] repo/gentoo:master commit in: mail-mta/proton-mail-bridge/, mail-mta/proton-mail-bridge/files/

["Marek Szuba" <marecki@gentoo.org>]

commit:     4123a3e1260de40ab33fc9038c0e036b9fd90942
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue May 23 19:30:01 2023 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue May 23 19:39:36 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4123a3e1

mail-mta/proton-mail-bridge: add 3.1.3, drop 2.3.0

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 mail-mta/proton-mail-bridge/Manifest                    |  4 ++--
 .../proton-mail-bridge/files/proton-mail-bridge.service | 17 -----------------
 ...dge-2.3.0.ebuild => proton-mail-bridge-3.1.3.ebuild} | 14 +++++---------
 3 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/mail-mta/proton-mail-bridge/Manifest b/mail-mta/proton-mail-bridge/Manifest
index 02d0b96025d3..3becaa8e0a54 100644
--- a/mail-mta/proton-mail-bridge/Manifest
+++ b/mail-mta/proton-mail-bridge/Manifest
@@ -1,4 +1,4 @@
-DIST proton-mail-bridge-2.3.0-deps.tar.xz 237367120 BLAKE2B 819ffc216017db8a02a189fdb1b4c78e26d38f1cde94bbc556e8603047e396ce0de3caa2b3cf18392a30fbaab525c305f6f0193fb1210baeb48f6a346ae2ba94 SHA512 63076459bf1e8c17775439a5ef1e22482684e0f37a45a4b6f9469c851e66b984f1bce5c19c1d4bfa8cbf5f9ae4fe21a5a20d8304254cdc4f215120dfe5b254e7
-DIST proton-mail-bridge-2.3.0.tar.gz 5059969 BLAKE2B 3871ec75e69ce2976a3b588c9cb32dc61d5c6eaf28a8a7941fb91babbe74cf73f101a3fa9d87c999c659847a42b0a3d93298d6c692a06cfe2716a31fcbb0d469 SHA512 3e3a64d945577a4efc1cb1e9a3b029465f64fab37e80fa7d58e7ea94ba316281596e91a6b49fc37168a0275921f3f79567f58eb926a1d77fcc0b8b39a3cf8f5c
 DIST proton-mail-bridge-3.0.21-deps.tar.xz 169294240 BLAKE2B ee463d96d01e702180f86765a36bc59c72454f13caed22183e68a6875c1dad4b7614966dabdd43915b2762d3de69b8fb3cac1011a48bf50d8f3cc1dbf3a96420 SHA512 6bce4cfcdf1704a6599f925ff59fd367c6750f92f75bee886f656f609a5368eb75f865f642ae63e87bafe3609e7620b0c27dfbec40e281cc8a92221af24f9661
 DIST proton-mail-bridge-3.0.21.tar.gz 4416496 BLAKE2B 6199338b6265c8d3e7108cd7b149fa4e32e56e3ecb7f299e66f4d072d78d8b21a919e52c510c509613958adbacf32d8a4dccb2891a77efa4dec83d483e560266 SHA512 30adc2e4947309fb274a5f86ff450a41685d30b27854b9a00f033adc65d33bcbff19ee830c50ae5bea0c2ac178bc5a4960912486edd4954f928ff075b7441d82
+DIST proton-mail-bridge-3.1.3-deps.tar.xz 206716212 BLAKE2B 4f79e4428ef37452d0abd288e074ecdce8886393582352117b6df5275e1b2f0f8018145c20b8fa889f6473899fd0fde6b621e52cf2faaa218fdac8238134a19b SHA512 fd948e39afaab15d7318c8b46cffd97823857cd8e1c5ba2b2ed3673fcbf186627b190bd876973fbb71854355f4dfba62663e902651716301685dca5f14f26e81
+DIST proton-mail-bridge-3.1.3.tar.gz 4443963 BLAKE2B 2c8fc571612c11c0e281e8f268774e886ba3742b696bdd1180d7cf45525d21d9c062cd3d33acb57a6ceed8dad6b864490c89c090ebfd4bceb4e8c41b19015ae8 SHA512 4f4ca3a2b95c7eed34a13d7f8f296d95717b9c1f95bd157e08c3f21cc752ea3dac5eaefac27662f57f875d9690a5d77a9e15f71406280dcaad6f9054b2ef54b9

diff --git a/mail-mta/proton-mail-bridge/files/proton-mail-bridge.service b/mail-mta/proton-mail-bridge/files/proton-mail-bridge.service
deleted file mode 100644
index 21f0ad1650dd..000000000000
--- a/mail-mta/proton-mail-bridge/files/proton-mail-bridge.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=Proton Mail IMAP/SMTP bridge
-Documentation=https://proton.me/mail/bridge/
-
-[Service]
-ExecStart=/usr/bin/proton-mail-bridge --no-window
-Restart=on-failure
-
-# Hardening
-ProtectSystem=full
-PrivateTmp=true
-SystemCallArchitectures=native
-MemoryDenyWriteExecute=true
-NoNewPrivileges=true
-
-[Install]
-WantedBy=default.target

diff --git a/mail-mta/proton-mail-bridge/proton-mail-bridge-2.3.0.ebuild b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.1.3.ebuild
similarity index 80%
rename from mail-mta/proton-mail-bridge/proton-mail-bridge-2.3.0.ebuild
rename to mail-mta/proton-mail-bridge/proton-mail-bridge-3.1.3.ebuild
index 79f180fa1513..3b00a1442737 100644
--- a/mail-mta/proton-mail-bridge/proton-mail-bridge-2.3.0.ebuild
+++ b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -34,10 +34,8 @@ src_prepare() {
 
 src_compile() {
 	if use gui; then
-		emake \
-			QT_DOC_DIR="/usr/share/qt5-doc" \
-			QT_PKG_CONFIG=true \
-			build
+		eerror "Since version 3.0.0, GUI support in ${PN} requires Qt6 and is therefore currently not available"
+		die "USE=gui requires Qt6"
 	else
 		emake build-nogui
 	fi
@@ -49,11 +47,9 @@ src_test() {
 
 src_install() {
 	exeinto /usr/bin
-	newexe ${MY_PN} ${PN}
+	newexe bridge ${PN}
 
-	systemd_douserunit "${FILESDIR}"/${PN}.service
-
-	# FIXME: USE=gui will probably need more files
+	systemd_newuserunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
 
 	einstalldocs
 }