gentoo auto-resync : 24:05:2023 - 03:01:18

3 files changed, 8 insertions, 30 deletions

diff --git a/mail-mta/proton-mail-bridge/Manifest b/mail-mta/proton-mail-bridge/Manifest
index 1790fb3e856a..f7440f9cffa9 100644
--- a/mail-mta/proton-mail-bridge/Manifest
+++ b/mail-mta/proton-mail-bridge/Manifest
@@ -1,9 +1,8 @@
-AUX proton-mail-bridge.service 336 BLAKE2B 663919b03685d99f17f49bf0da4f6f10b09fce1e1e05966c3cfce3d19692b0d3744a0289a2908bdb40d57cfa7e089709417184e6c86c2afa618c71ad33cabf99 SHA512 af81c8cfd2399356715f3b52031d6b0be2fd8b436b6c55b1acf165846c7f3b240b8ea8ca6488cea487f22dc1bb9f3f6cef08844ab74f88aedb71149263a3ef7a
 AUX proton-mail-bridge.service-r1 341 BLAKE2B 056e68d9d2f009b60708c5bea58e851b3955e3292e44af114976815f597ca813917b2b74082fae5d0146288aefa9a38993d791272073b23bcff51cbed4f4bbdf SHA512 bafea6004077cb2b5d77ebb9fd48ca925be20987b1a1698b68c9853e9c1d95ac2d0d8d77f78fb2b3e7c1e56d4ea4e7d2dcfeef857df189f1ae51a57ce5d0ac93
-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
-EBUILD proton-mail-bridge-2.3.0.ebuild 1281 BLAKE2B 862313bc9b4d65d1c39c9f8a3f9532fe85e4dd55bf9939bd1dc60e433da83c8d6bcde581223df9a55695a1a9690260a569cf1844b3fad6238a3f89fba602ea68 SHA512 5a1cab17ac4a029dbfc3e7cff7af479626decb1f049babbe430016f54d7cb8c8fab4f7ffde78d1f61889fde0525e2d2f0a83eb737522f652e7456493d52cd34b
+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
 EBUILD proton-mail-bridge-3.0.21-r1.ebuild 1307 BLAKE2B ff88747c497f759321320d1d09e506d0ab0a667bf28d1c57296015ee810e6ba27c0537668999d4b85cb43aa4b2ed12516d868d173b66f11b2c54c8ab004534d0 SHA512 ce71071e55e5da9008fcee2ecd627d8e42f418653c69a6e4ef3e39f5f7adb53704662a5f67804e61da640bc41fe23e27c225ac37320f791982ea567469acfc52
+EBUILD proton-mail-bridge-3.1.3.ebuild 1304 BLAKE2B d84f2164bf3ccf91321f9041c331cf4a2eaeee3e54197f013f0014363a1dea0020febf047641f54bd8db0da7ac7cd0f849b0012764d0a1269e5e7c40f2875833 SHA512 e5c315f34abd46ecdb477fb35eda3f57b4bc31a49efba49adc3327318172c80a89de5605fea51c284ed5bca2b2e2218d1d165487f59447af5d4392dc53190676
 MISC metadata.xml 707 BLAKE2B beafd2d519859dd89569526a7b0e7c5d45803bb110b537173566212e9e851d20e5bac4a7f6d83ea39bb797515dbfaca0309bfff12f186eca5e5cd71ba0f76f07 SHA512 b489c6aad17f194bbaaf9160472e7f26efba2250ff0e31cc3537230a16f2682c4480f85eb9f5d618df61f9d830cc9ebcd76ebadcf0aad537ff6acb5361d9a5ea
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
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
 }