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

2024-04-18 Thread Marek Szuba 
commit: 602de0514c8410336ec63f4f0e82e8c451b07086
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Apr 18 22:36:33 2024 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Apr 18 22:38:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=602de051

mail-mta/proton-mail-bridge: install icon and desktop file for the GUI

Co-Authored-By: Robert Greener  greener.sh>
Closes: https://bugs.gentoo.org/929909
Closes: https://github.com/gentoo/gentoo/pull/36315
Signed-off-by: Marek Szuba  gentoo.org>

 ...ail-bridge-3.10.0.ebuild => proton-mail-bridge-3.10.0-r1.ebuild} | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.10.0.ebuild 
b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.10.0-r1.ebuild
similarity index 92%
rename from mail-mta/proton-mail-bridge/proton-mail-bridge-3.10.0.ebuild
rename to mail-mta/proton-mail-bridge/proton-mail-bridge-3.10.0-r1.ebuild
index 9df510d07186..8dbc9cbd2c92 100644
--- a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.10.0.ebuild
+++ b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.10.0-r1.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=8
 
-inherit cmake go-module systemd xdg-utils
+inherit cmake desktop go-module systemd xdg-utils
 
 MY_PN="${PN/-mail/}"
 MY_P="${MY_PN}-${PV}"
 
-DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients"
+DESCRIPTION="Serves Proton Mail to IMAP/SMTP clients"
 HOMEPAGE="https://proton.me/mail/bridge 
https://github.com/ProtonMail/proton-bridge/;
 
SRC_URI="https://github.com/ProtonMail/${MY_PN}/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz

https://dev.gentoo.org/~marecki/dists/${CATEGORY}/${PN}/${P}-deps.tar.xz;
@@ -91,6 +91,8 @@ src_install() {

CMAKE_USE_DIR="${S}"/internal/frontend/bridge-gui/bridge-gui \
cmake_src_install
mv "${ED}"/usr/bin/bridge-gui "${ED}"/usr/bin/${PN}-gui || die
+   newicon "${S}"/dist/bridge.svg ${PN}.svg
+   make_desktop_entry ${PN}-gui "Proton Mail Bridge" ${PN}.svg 
"Email;Network"
fi
 
systemd_newuserunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service

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

2024-04-18 Thread Marek Szuba 
commit: bf4e722ce9706eb0a96dfad69ff0d82230524e2d
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Apr 18 22:38:35 2024 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Apr 18 22:38:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf4e722c

mail-mta/proton-mail-bridge: drop 3.6.1

Signed-off-by: Marek Szuba  gentoo.org>

 mail-mta/proton-mail-bridge/Manifest   |   2 -
 .../proton-mail-bridge-3.6.1.ebuild| 120 -
 2 files changed, 122 deletions(-)

diff --git a/mail-mta/proton-mail-bridge/Manifest 
b/mail-mta/proton-mail-bridge/Manifest
index d6ba310663c7..d1b00586c041 100644
--- a/mail-mta/proton-mail-bridge/Manifest
+++ b/mail-mta/proton-mail-bridge/Manifest
@@ -1,4 +1,2 @@
 DIST proton-mail-bridge-3.10.0-deps.tar.xz 246860004 BLAKE2B 
56000b5aeb30a1dbd4f35b2b3b309bd4ab80c1ace7a7261b303231c196b698afe38754a6e779ca4313acc1fec0e7136a1783c16625f26c041f0aa4c7baa77c19
 SHA512 
8f314727eb1796f7c69e777ce708f45a534e352becd89a51c90cb2c9cf5367f28d6f4b34d42dce85443aca66ed3bb89404e6add19486596044fd00810f8cb65f
 DIST proton-mail-bridge-3.10.0.tar.gz 5176242 BLAKE2B 
a319dab8a9b6b74afe1792ee61cd2c6d3e7e93a7459477cde0b5d796e19a67be2f45766decfdc9e1ba0827a969fbb1c95557d3a6b52d9340eeec5ecbc1b4b6c5
 SHA512 
65d07b15053fc9b67f4792a506b5e8c07896c166bcfe34751625c98f79ab01f00da29cdb029e5276c4624af7f787392347c7555c15edb4d05be1b0415f50bbd6
-DIST proton-mail-bridge-3.6.1-deps.tar.xz 245805016 BLAKE2B 
7aeab4896c9dfcba8c2c3164f441fb57f0febbdc0c49f7555cda3d930443efec85d8748a43ed2ed23982594c6f5e4b8e319cd2524bfa21797a8259252397f5a9
 SHA512 
46a5601606fe99af0ffcc8ba1e325d17b527d15225f6f4c339de0f828e0a17e71304886a58ccf2dde83638e83bc87abb7ef9817db44014cc38132dc65d752fdf
-DIST proton-mail-bridge-3.6.1.tar.gz 5015293 BLAKE2B 
7a6bb687fd1130612a49d4336404229daece91a24a37952b3128462b81cfe83636b935d584b479d294037d0303406f2c79a6798725d7b62f55eefa9294047ba9
 SHA512 
39e11815cdfdcd741ba04ee6776ce4bd959715d8d5bb8345b7f7b1a66b5fa5b66890ebc0353b1f5566a822e0ad1c4757fd022b67f4c66e91113b5e700db04abd

diff --git a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.6.1.ebuild 
b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.6.1.ebuild
deleted file mode 100644
index ea41b272ebaf..
--- a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.6.1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake go-module systemd xdg-utils
-
-MY_PN="${PN/-mail/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients"
-HOMEPAGE="https://proton.me/mail/bridge 
https://github.com/ProtonMail/proton-bridge/;
-SRC_URI="https://github.com/ProtonMail/${MY_PN}/archive/refs/tags/v${PV}.tar.gz
 -> ${P}.tar.gz
-   
https://dev.gentoo.org/~marecki/dists/${CATEGORY}/${PN}/${P}-deps.tar.xz;
-
-LICENSE="Apache-2.0 BSD BSD-2 GPL-3+ ISC LGPL-3+ MIT MPL-2.0 Unlicense"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="gui"
-
-# Quite a few tests require Internet access
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="app-crypt/libsecret
-   gui? (
-   >=dev-libs/protobuf-21.12:=
-   >=dev-libs/sentry-native-0.6.5-r1
-   dev-qt/qtbase:6=[gui,icu,widgets]
-   dev-qt/qtdeclarative:6=[widgets]
-   dev-qt/qtsvg:6=
-   media-libs/mesa
-   net-libs/grpc:=
-   )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-3.3.2-gui_gentoo.patch
-)
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-   xdg_environment_reset
-   default
-   if use gui; then
-   local PATCHES=()
-   BUILD_DIR="${WORKDIR}"/gui_build \
-   
CMAKE_USE_DIR="${S}"/internal/frontend/bridge-gui/bridge-gui \
-   cmake_src_prepare
-   fi
-}
-
-src_configure() {
-   if use gui; then
-   # TODO:
-   #  - auto-sync version number between the two executables
-   #  - can we leave BRIDGE_TAG unset? Seems it gets displayed in 
some info box
-   local mycmakeargs=(
-   -DBRIDGE_APP_FULL_NAME="Proton Mail Bridge"
-   -DBRIDGE_APP_VERSION="${PV}+git"
-   -DBRIDGE_REPO_ROOT="${S}"
-   -DBRIDGE_TAG="NOTAG"
-   -DBRIDGE_VENDOR="Gentoo Linux"
-   -DCMAKE_DISABLE_PRECOMPILE_HEADERS=OFF
-   )
-   BUILD_DIR="${WORKDIR}"/gui_build \
-   
CMAKE_USE_DIR="${S}"/internal/frontend/bridge-gui/bridge-gui \
-   cmake_src_configure
-   fi
-}
-
-src_compile() {
-   emake build-nogui
-
-   if use gui; then
-   BUILD_DIR="${WORKDIR}"/gui_build \
-   
CMAKE_USE_DIR="${S}"/internal/frontend/bridge-gui/bridge-gui \
-   cmake_src_compile
-   fi
-}
-

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

2024-03-29 Thread Marek Szuba 
commit: 1f02d732c7dadd78391816e5ce39ab7e21c2973c
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri Mar 29 13:19:30 2024 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri Mar 29 13:22:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f02d732

mail-mta/proton-mail-bridge: add 3.10.0

Signed-off-by: Marek Szuba  gentoo.org>

 mail-mta/proton-mail-bridge/Manifest   |   2 +
 .../proton-mail-bridge-3.10.0.ebuild   | 117 +
 2 files changed, 119 insertions(+)

diff --git a/mail-mta/proton-mail-bridge/Manifest 
b/mail-mta/proton-mail-bridge/Manifest
index 85ddbdce3b56..d6ba310663c7 100644
--- a/mail-mta/proton-mail-bridge/Manifest
+++ b/mail-mta/proton-mail-bridge/Manifest
@@ -1,2 +1,4 @@
+DIST proton-mail-bridge-3.10.0-deps.tar.xz 246860004 BLAKE2B 
56000b5aeb30a1dbd4f35b2b3b309bd4ab80c1ace7a7261b303231c196b698afe38754a6e779ca4313acc1fec0e7136a1783c16625f26c041f0aa4c7baa77c19
 SHA512 
8f314727eb1796f7c69e777ce708f45a534e352becd89a51c90cb2c9cf5367f28d6f4b34d42dce85443aca66ed3bb89404e6add19486596044fd00810f8cb65f
+DIST proton-mail-bridge-3.10.0.tar.gz 5176242 BLAKE2B 
a319dab8a9b6b74afe1792ee61cd2c6d3e7e93a7459477cde0b5d796e19a67be2f45766decfdc9e1ba0827a969fbb1c95557d3a6b52d9340eeec5ecbc1b4b6c5
 SHA512 
65d07b15053fc9b67f4792a506b5e8c07896c166bcfe34751625c98f79ab01f00da29cdb029e5276c4624af7f787392347c7555c15edb4d05be1b0415f50bbd6
 DIST proton-mail-bridge-3.6.1-deps.tar.xz 245805016 BLAKE2B 
7aeab4896c9dfcba8c2c3164f441fb57f0febbdc0c49f7555cda3d930443efec85d8748a43ed2ed23982594c6f5e4b8e319cd2524bfa21797a8259252397f5a9
 SHA512 
46a5601606fe99af0ffcc8ba1e325d17b527d15225f6f4c339de0f828e0a17e71304886a58ccf2dde83638e83bc87abb7ef9817db44014cc38132dc65d752fdf
 DIST proton-mail-bridge-3.6.1.tar.gz 5015293 BLAKE2B 
7a6bb687fd1130612a49d4336404229daece91a24a37952b3128462b81cfe83636b935d584b479d294037d0303406f2c79a6798725d7b62f55eefa9294047ba9
 SHA512 
39e11815cdfdcd741ba04ee6776ce4bd959715d8d5bb8345b7f7b1a66b5fa5b66890ebc0353b1f5566a822e0ad1c4757fd022b67f4c66e91113b5e700db04abd

diff --git a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.10.0.ebuild 
b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.10.0.ebuild
new file mode 100644
index ..9df510d07186
--- /dev/null
+++ b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.10.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake go-module systemd xdg-utils
+
+MY_PN="${PN/-mail/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients"
+HOMEPAGE="https://proton.me/mail/bridge 
https://github.com/ProtonMail/proton-bridge/;
+SRC_URI="https://github.com/ProtonMail/${MY_PN}/archive/refs/tags/v${PV}.tar.gz
 -> ${P}.tar.gz
+   
https://dev.gentoo.org/~marecki/dists/${CATEGORY}/${PN}/${P}-deps.tar.xz;
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-3+ ISC LGPL-3+ MIT MPL-2.0 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gui"
+
+# Quite a few tests require Internet access
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="app-crypt/libsecret
+   gui? (
+   >=dev-libs/protobuf-21.12:=
+   >=dev-libs/sentry-native-0.6.5-r1
+   dev-qt/qtbase:6=[gui,icu,widgets]
+   dev-qt/qtdeclarative:6=[widgets]
+   dev-qt/qtsvg:6=
+   media-libs/mesa
+   net-libs/grpc:=
+   )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.3.2-gui_gentoo.patch
+)
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+   xdg_environment_reset
+   default
+   if use gui; then
+   local PATCHES=()
+   BUILD_DIR="${WORKDIR}"/gui_build \
+   
CMAKE_USE_DIR="${S}"/internal/frontend/bridge-gui/bridge-gui \
+   cmake_src_prepare
+   fi
+}
+
+src_configure() {
+   if use gui; then
+   local mycmakeargs=(
+   -DBRIDGE_APP_FULL_NAME="Proton Mail Bridge"
+   -DBRIDGE_APP_VERSION="${PV}+git"
+   -DBRIDGE_REPO_ROOT="${S}"
+   -DBRIDGE_TAG="NOTAG"
+   -DBRIDGE_VENDOR="Gentoo Linux"
+   -DCMAKE_DISABLE_PRECOMPILE_HEADERS=OFF
+   )
+   BUILD_DIR="${WORKDIR}"/gui_build \
+   
CMAKE_USE_DIR="${S}"/internal/frontend/bridge-gui/bridge-gui \
+   cmake_src_configure
+   fi
+}
+
+src_compile() {
+   emake build-nogui
+
+   if use gui; then
+   BUILD_DIR="${WORKDIR}"/gui_build \
+   
CMAKE_USE_DIR="${S}"/internal/frontend/bridge-gui/bridge-gui \
+   cmake_src_compile
+   fi
+}
+
+src_test() {
+   emake test
+}
+
+src_install() {
+   exeinto /usr/bin
+   newexe bridge ${PN}
+
+   if use gui; then
+   BUILD_DIR="${WORKDIR}"/gui_build \
+

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

2024-01-24 Thread Marek Szuba 
commit: fbf1eb7688dab5c4afe26d285c668d5eff0c5df5
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Jan 24 16:33:26 2024 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Jan 24 16:33:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbf1eb76

mail-mta/proton-mail-bridge: drop 3.1.3, 3.3.2-r1, 3.5.4

Signed-off-by: Marek Szuba  gentoo.org>

 mail-mta/proton-mail-bridge/Manifest   |   6 --
 .../proton-mail-bridge-3.1.3.ebuild|  49 -
 .../proton-mail-bridge-3.3.2-r1.ebuild | 119 -
 .../proton-mail-bridge-3.5.4.ebuild| 119 -
 4 files changed, 293 deletions(-)

diff --git a/mail-mta/proton-mail-bridge/Manifest 
b/mail-mta/proton-mail-bridge/Manifest
index b71490e18859..85ddbdce3b56 100644
--- a/mail-mta/proton-mail-bridge/Manifest
+++ b/mail-mta/proton-mail-bridge/Manifest
@@ -1,8 +1,2 @@
-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
-DIST proton-mail-bridge-3.3.2-deps.tar.xz 252980292 BLAKE2B 
2d7c8961c1ed8a6fb15a26f6b3ee650932b89626c0eea1d3acaf24b5ef6b44a90cb021a051a5f018cf94db5ccb029c4b79390275bca9a39ceeb6b5ef62aa1386
 SHA512 
52ff54e80635e795462e0bdbd5e02b831478a49225d296ec46ef5591cef173c49bcf63d925d503537d57ccaf65a09424f82d1c8ad8e906d822306ca22bba1121
-DIST proton-mail-bridge-3.3.2.tar.gz 4481491 BLAKE2B 
e00cf4268dcebc7f4eeab5a0738c04e1a809a5633b4d97637ea74aa4ac3eb68dd343b45fef5fca602c4c89faa2d1e05f1c605d9b56ee83d669b07b815f8ae92b
 SHA512 
1b49355f8e816b6a00bf7fad91d0f696efb5ee1f5ea311fd4b92549f715185ea280ac874a759be5d3f8c7ff2309b8f0c3bb37c8502963059b26f4630bc9339f0
-DIST proton-mail-bridge-3.5.4-deps.tar.xz 246550932 BLAKE2B 
6b83a8c331e70abf026d2b74c85e5e52360f4163e23bb25b8cdf25558125e675805a2850eb43d40bf02f1109204f9f5d002e0862fd9b956b88b7078c7fdd1cd0
 SHA512 
a5ba16e77c6d773361223fc661959d38870b47f79ff303d0940305bdbe7a3ad8444ed47e166a13e13ca52010c1153b681728870d2cec7941bdd9185f47a2d4e2
-DIST proton-mail-bridge-3.5.4.tar.gz 4428659 BLAKE2B 
b366ee551279a46c928cba33b8879c12a101caae24a73d8aa6110cc2269dc94a9c7208c0e6a9c25485494a886e226d446aed29b76b8a95e4229d0a0e67bcf814
 SHA512 
7fc82ef135da5c24607cfca14d08aafdf4e7de51b087b279dbfb42c0a363db4bfb8ed029dc598fd30ffdb298798cebc1530338c87be28e495ee7e18c24e7558d
 DIST proton-mail-bridge-3.6.1-deps.tar.xz 245805016 BLAKE2B 
7aeab4896c9dfcba8c2c3164f441fb57f0febbdc0c49f7555cda3d930443efec85d8748a43ed2ed23982594c6f5e4b8e319cd2524bfa21797a8259252397f5a9
 SHA512 
46a5601606fe99af0ffcc8ba1e325d17b527d15225f6f4c339de0f828e0a17e71304886a58ccf2dde83638e83bc87abb7ef9817db44014cc38132dc65d752fdf
 DIST proton-mail-bridge-3.6.1.tar.gz 5015293 BLAKE2B 
7a6bb687fd1130612a49d4336404229daece91a24a37952b3128462b81cfe83636b935d584b479d294037d0303406f2c79a6798725d7b62f55eefa9294047ba9
 SHA512 
39e11815cdfdcd741ba04ee6776ce4bd959715d8d5bb8345b7f7b1a66b5fa5b66890ebc0353b1f5566a822e0ad1c4757fd022b67f4c66e91113b5e700db04abd

diff --git a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.1.3.ebuild 
b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.1.3.ebuild
deleted file mode 100644
index cc717399d90f..
--- a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.1.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd xdg-utils
-
-MY_PN="${PN/-mail/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients"
-HOMEPAGE="https://proton.me/mail/bridge 
https://github.com/ProtonMail/proton-bridge/;
-SRC_URI="https://github.com/ProtonMail/${MY_PN}/archive/refs/tags/v${PV}.tar.gz
 -> ${P}.tar.gz
-   
https://dev.gentoo.org/~marecki/dists/${CATEGORY}/${PN}/${P}-deps.tar.xz;
-
-LICENSE="Apache-2.0 BSD BSD-2 GPL-3+ ISC LGPL-3+ MIT MPL-2.0 Unlicense"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# Quite a few tests require Internet access
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="app-crypt/libsecret"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-   xdg_environment_reset
-   default
-}
-
-src_compile() {
-   emake build-nogui
-}
-
-src_test() {
-   emake test
-}
-
-src_install() {
-   exeinto /usr/bin
-   newexe bridge ${PN}
-
-   systemd_newuserunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
-
-   einstalldocs
-}

diff --git

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

2024-01-24 Thread Marek Szuba 
commit: 849d6b5c1efc0eb6df64c0b8cfb836d38650f136
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Jan 24 16:37:49 2024 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Jan 24 16:37:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=849d6b5c

mail-mta/proton-mail-bridge: disable PCH for the GUI

Enabled on Gentoo by default (in cmake.eclass), appears to cause
problems for some users.

Closes: https://bugs.gentoo.org/921938
Signed-off-by: Marek Szuba  gentoo.org>

 mail-mta/proton-mail-bridge/proton-mail-bridge-3.6.1.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.6.1.ebuild 
b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.6.1.ebuild
index d64b250bc9c0..ea41b272ebaf 100644
--- a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.6.1.ebuild
+++ b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -63,6 +63,7 @@ src_configure() {
-DBRIDGE_REPO_ROOT="${S}"
-DBRIDGE_TAG="NOTAG"
-DBRIDGE_VENDOR="Gentoo Linux"
+   -DCMAKE_DISABLE_PRECOMPILE_HEADERS=OFF
)
BUILD_DIR="${WORKDIR}"/gui_build \

CMAKE_USE_DIR="${S}"/internal/frontend/bridge-gui/bridge-gui \

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

2023-12-16 Thread Marek Szuba 
commit: d6bed80336cae2f09210cb524354acdd8603d3db
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Dec 16 21:35:07 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Dec 16 21:39:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6bed803

mail-mta/proton-mail-bridge: add 3.6.1

Signed-off-by: Marek Szuba  gentoo.org>

 mail-mta/proton-mail-bridge/Manifest   |   2 +
 .../proton-mail-bridge-3.6.1.ebuild| 119 +
 2 files changed, 121 insertions(+)

diff --git a/mail-mta/proton-mail-bridge/Manifest 
b/mail-mta/proton-mail-bridge/Manifest
index 3b3c92a21275..b71490e18859 100644
--- a/mail-mta/proton-mail-bridge/Manifest
+++ b/mail-mta/proton-mail-bridge/Manifest
@@ -4,3 +4,5 @@ DIST proton-mail-bridge-3.3.2-deps.tar.xz 252980292 BLAKE2B 
2d7c8961c1ed8a6fb15a
 DIST proton-mail-bridge-3.3.2.tar.gz 4481491 BLAKE2B 
e00cf4268dcebc7f4eeab5a0738c04e1a809a5633b4d97637ea74aa4ac3eb68dd343b45fef5fca602c4c89faa2d1e05f1c605d9b56ee83d669b07b815f8ae92b
 SHA512 
1b49355f8e816b6a00bf7fad91d0f696efb5ee1f5ea311fd4b92549f715185ea280ac874a759be5d3f8c7ff2309b8f0c3bb37c8502963059b26f4630bc9339f0
 DIST proton-mail-bridge-3.5.4-deps.tar.xz 246550932 BLAKE2B 
6b83a8c331e70abf026d2b74c85e5e52360f4163e23bb25b8cdf25558125e675805a2850eb43d40bf02f1109204f9f5d002e0862fd9b956b88b7078c7fdd1cd0
 SHA512 
a5ba16e77c6d773361223fc661959d38870b47f79ff303d0940305bdbe7a3ad8444ed47e166a13e13ca52010c1153b681728870d2cec7941bdd9185f47a2d4e2
 DIST proton-mail-bridge-3.5.4.tar.gz 4428659 BLAKE2B 
b366ee551279a46c928cba33b8879c12a101caae24a73d8aa6110cc2269dc94a9c7208c0e6a9c25485494a886e226d446aed29b76b8a95e4229d0a0e67bcf814
 SHA512 
7fc82ef135da5c24607cfca14d08aafdf4e7de51b087b279dbfb42c0a363db4bfb8ed029dc598fd30ffdb298798cebc1530338c87be28e495ee7e18c24e7558d
+DIST proton-mail-bridge-3.6.1-deps.tar.xz 245805016 BLAKE2B 
7aeab4896c9dfcba8c2c3164f441fb57f0febbdc0c49f7555cda3d930443efec85d8748a43ed2ed23982594c6f5e4b8e319cd2524bfa21797a8259252397f5a9
 SHA512 
46a5601606fe99af0ffcc8ba1e325d17b527d15225f6f4c339de0f828e0a17e71304886a58ccf2dde83638e83bc87abb7ef9817db44014cc38132dc65d752fdf
+DIST proton-mail-bridge-3.6.1.tar.gz 5015293 BLAKE2B 
7a6bb687fd1130612a49d4336404229daece91a24a37952b3128462b81cfe83636b935d584b479d294037d0303406f2c79a6798725d7b62f55eefa9294047ba9
 SHA512 
39e11815cdfdcd741ba04ee6776ce4bd959715d8d5bb8345b7f7b1a66b5fa5b66890ebc0353b1f5566a822e0ad1c4757fd022b67f4c66e91113b5e700db04abd

diff --git a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.6.1.ebuild 
b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.6.1.ebuild
new file mode 100644
index ..d64b250bc9c0
--- /dev/null
+++ b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.6.1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake go-module systemd xdg-utils
+
+MY_PN="${PN/-mail/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients"
+HOMEPAGE="https://proton.me/mail/bridge 
https://github.com/ProtonMail/proton-bridge/;
+SRC_URI="https://github.com/ProtonMail/${MY_PN}/archive/refs/tags/v${PV}.tar.gz
 -> ${P}.tar.gz
+   
https://dev.gentoo.org/~marecki/dists/${CATEGORY}/${PN}/${P}-deps.tar.xz;
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-3+ ISC LGPL-3+ MIT MPL-2.0 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gui"
+
+# Quite a few tests require Internet access
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="app-crypt/libsecret
+   gui? (
+   >=dev-libs/protobuf-21.12:=
+   >=dev-libs/sentry-native-0.6.5-r1
+   dev-qt/qtbase:6=[gui,icu,widgets]
+   dev-qt/qtdeclarative:6=[widgets]
+   dev-qt/qtsvg:6=
+   media-libs/mesa
+   net-libs/grpc:=
+   )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.3.2-gui_gentoo.patch
+)
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+   xdg_environment_reset
+   default
+   if use gui; then
+   local PATCHES=()
+   BUILD_DIR="${WORKDIR}"/gui_build \
+   
CMAKE_USE_DIR="${S}"/internal/frontend/bridge-gui/bridge-gui \
+   cmake_src_prepare
+   fi
+}
+
+src_configure() {
+   if use gui; then
+   # TODO:
+   #  - auto-sync version number between the two executables
+   #  - can we leave BRIDGE_TAG unset? Seems it gets displayed in 
some info box
+   local mycmakeargs=(
+   -DBRIDGE_APP_FULL_NAME="Proton Mail Bridge"
+   -DBRIDGE_APP_VERSION="${PV}+git"
+   -DBRIDGE_REPO_ROOT="${S}"
+   -DBRIDGE_TAG="NOTAG"
+   -DBRIDGE_VENDOR="Gentoo Linux"
+   )
+   BUILD_DIR="${WORKDIR}"/gui_build \
+   
CMAKE_USE_DIR="${S}"/internal/frontend/bridge-gui/bridge-gui

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

2023-10-24 Thread Marek Szuba 
commit: 9c12c32dc7a50c68424fc55e77078f2ad3b5f655
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Oct 24 22:03:26 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Oct 24 23:16:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c12c32d

mail-mta/proton-mail-bridge: add 3.5.4

Signed-off-by: Marek Szuba  gentoo.org>

 mail-mta/proton-mail-bridge/Manifest   |   2 +
 .../proton-mail-bridge-3.5.4.ebuild| 119 +
 2 files changed, 121 insertions(+)

diff --git a/mail-mta/proton-mail-bridge/Manifest 
b/mail-mta/proton-mail-bridge/Manifest
index b9e6820cb224..3b3c92a21275 100644
--- a/mail-mta/proton-mail-bridge/Manifest
+++ b/mail-mta/proton-mail-bridge/Manifest
@@ -2,3 +2,5 @@ DIST proton-mail-bridge-3.1.3-deps.tar.xz 206716212 BLAKE2B 
4f79e4428ef37452d0ab
 DIST proton-mail-bridge-3.1.3.tar.gz 4443963 BLAKE2B 
2c8fc571612c11c0e281e8f268774e886ba3742b696bdd1180d7cf45525d21d9c062cd3d33acb57a6ceed8dad6b864490c89c090ebfd4bceb4e8c41b19015ae8
 SHA512 
4f4ca3a2b95c7eed34a13d7f8f296d95717b9c1f95bd157e08c3f21cc752ea3dac5eaefac27662f57f875d9690a5d77a9e15f71406280dcaad6f9054b2ef54b9
 DIST proton-mail-bridge-3.3.2-deps.tar.xz 252980292 BLAKE2B 
2d7c8961c1ed8a6fb15a26f6b3ee650932b89626c0eea1d3acaf24b5ef6b44a90cb021a051a5f018cf94db5ccb029c4b79390275bca9a39ceeb6b5ef62aa1386
 SHA512 
52ff54e80635e795462e0bdbd5e02b831478a49225d296ec46ef5591cef173c49bcf63d925d503537d57ccaf65a09424f82d1c8ad8e906d822306ca22bba1121
 DIST proton-mail-bridge-3.3.2.tar.gz 4481491 BLAKE2B 
e00cf4268dcebc7f4eeab5a0738c04e1a809a5633b4d97637ea74aa4ac3eb68dd343b45fef5fca602c4c89faa2d1e05f1c605d9b56ee83d669b07b815f8ae92b
 SHA512 
1b49355f8e816b6a00bf7fad91d0f696efb5ee1f5ea311fd4b92549f715185ea280ac874a759be5d3f8c7ff2309b8f0c3bb37c8502963059b26f4630bc9339f0
+DIST proton-mail-bridge-3.5.4-deps.tar.xz 246550932 BLAKE2B 
6b83a8c331e70abf026d2b74c85e5e52360f4163e23bb25b8cdf25558125e675805a2850eb43d40bf02f1109204f9f5d002e0862fd9b956b88b7078c7fdd1cd0
 SHA512 
a5ba16e77c6d773361223fc661959d38870b47f79ff303d0940305bdbe7a3ad8444ed47e166a13e13ca52010c1153b681728870d2cec7941bdd9185f47a2d4e2
+DIST proton-mail-bridge-3.5.4.tar.gz 4428659 BLAKE2B 
b366ee551279a46c928cba33b8879c12a101caae24a73d8aa6110cc2269dc94a9c7208c0e6a9c25485494a886e226d446aed29b76b8a95e4229d0a0e67bcf814
 SHA512 
7fc82ef135da5c24607cfca14d08aafdf4e7de51b087b279dbfb42c0a363db4bfb8ed029dc598fd30ffdb298798cebc1530338c87be28e495ee7e18c24e7558d

diff --git a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.5.4.ebuild 
b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.5.4.ebuild
new file mode 100644
index ..d64b250bc9c0
--- /dev/null
+++ b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.5.4.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake go-module systemd xdg-utils
+
+MY_PN="${PN/-mail/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients"
+HOMEPAGE="https://proton.me/mail/bridge 
https://github.com/ProtonMail/proton-bridge/;
+SRC_URI="https://github.com/ProtonMail/${MY_PN}/archive/refs/tags/v${PV}.tar.gz
 -> ${P}.tar.gz
+   
https://dev.gentoo.org/~marecki/dists/${CATEGORY}/${PN}/${P}-deps.tar.xz;
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-3+ ISC LGPL-3+ MIT MPL-2.0 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gui"
+
+# Quite a few tests require Internet access
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="app-crypt/libsecret
+   gui? (
+   >=dev-libs/protobuf-21.12:=
+   >=dev-libs/sentry-native-0.6.5-r1
+   dev-qt/qtbase:6=[gui,icu,widgets]
+   dev-qt/qtdeclarative:6=[widgets]
+   dev-qt/qtsvg:6=
+   media-libs/mesa
+   net-libs/grpc:=
+   )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.3.2-gui_gentoo.patch
+)
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+   xdg_environment_reset
+   default
+   if use gui; then
+   local PATCHES=()
+   BUILD_DIR="${WORKDIR}"/gui_build \
+   
CMAKE_USE_DIR="${S}"/internal/frontend/bridge-gui/bridge-gui \
+   cmake_src_prepare
+   fi
+}
+
+src_configure() {
+   if use gui; then
+   # TODO:
+   #  - auto-sync version number between the two executables
+   #  - can we leave BRIDGE_TAG unset? Seems it gets displayed in 
some info box
+   local mycmakeargs=(
+   -DBRIDGE_APP_FULL_NAME="Proton Mail Bridge"
+   -DBRIDGE_APP_VERSION="${PV}+git"
+   -DBRIDGE_REPO_ROOT="${S}"
+   -DBRIDGE_TAG="NOTAG"
+   -DBRIDGE_VENDOR="Gentoo Linux"
+   )
+   BUILD_DIR="${WORKDIR}"/gui_build \
+   
CMAKE_USE_DIR="${S}"/internal/frontend/bridge-gui/bridge-gui

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

2023-08-23 Thread Marek Szuba 
commit: 50617250fed88df8c69f17193bc4b3731a814ad9
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Aug 23 21:01:14 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Aug 23 21:05:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50617250

mail-mta/proton-mail-bridge: require a sentry-native version which produces 
complete CMake modules

Bug: https://bugs.gentoo.org/912886
Signed-off-by: Marek Szuba  gentoo.org>

 ...oton-mail-bridge-3.3.2.ebuild => proton-mail-bridge-3.3.2-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.3.2.ebuild 
b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.3.2-r1.ebuild
similarity index 98%
rename from mail-mta/proton-mail-bridge/proton-mail-bridge-3.3.2.ebuild
rename to mail-mta/proton-mail-bridge/proton-mail-bridge-3.3.2-r1.ebuild
index 013049b4d5c9..d64b250bc9c0 100644
--- a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.3.2.ebuild
+++ b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.3.2-r1.ebuild
@@ -25,7 +25,7 @@ RESTRICT="test"
 RDEPEND="app-crypt/libsecret
gui? (
>=dev-libs/protobuf-21.12:=
-   dev-libs/sentry-native
+   >=dev-libs/sentry-native-0.6.5-r1
dev-qt/qtbase:6=[gui,icu,widgets]
dev-qt/qtdeclarative:6=[widgets]
dev-qt/qtsvg:6=

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

2023-08-23 Thread Marek Szuba 
commit: 05df5805b608a906b01e871ca45114dec89fda68
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Aug 23 20:11:49 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Aug 23 21:05:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05df5805

mail-mta/proton-mail-bridge: remove IUSE=gui from 3.1.3

It never did anything anyway. We could of course simply drop this
version, however this is the last one without built-in telemetry support
so I'd rather keep it around for a while.

Closes: https://bugs.gentoo.org/912887
Signed-off-by: Marek Szuba  gentoo.org>

 .../proton-mail-bridge/proton-mail-bridge-3.1.3.ebuild   | 16 +---
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.1.3.ebuild 
b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.1.3.ebuild
index 3b00a1442737..cc717399d90f 100644
--- a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.1.3.ebuild
+++ b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.1.3.ebuild
@@ -16,7 +16,6 @@ 
SRC_URI="https://github.com/ProtonMail/${MY_PN}/archive/refs/tags/v${PV}.tar.gz
 LICENSE="Apache-2.0 BSD BSD-2 GPL-3+ ISC LGPL-3+ MIT MPL-2.0 Unlicense"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gui"
 
 # Quite a few tests require Internet access
 PROPERTIES="test_network"
@@ -33,12 +32,7 @@ src_prepare() {
 }
 
 src_compile() {
-   if use gui; then
-   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
+   emake build-nogui
 }
 
 src_test() {
@@ -53,11 +47,3 @@ src_install() {
 
einstalldocs
 }
-
-pkg_postinst() {
-   use gui && xdg_icon_cache_update
-}
-
-pkg_postrm() {
-   use gui && xdg_icon_cache_update
-}

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

2023-08-22 Thread Marek Szuba 
commit: 81cd2d1eea86b73703fda5bd4b19dde5e7d250aa
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Aug 22 18:10:00 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Aug 22 18:12:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81cd2d1e

mail-mta/proton-mail-bridge: implement GUI building

Fun fact, while the bridge proper is still written in Go the current
version of the bridge GUI has been rewritten to C++. I am sure there is
a lesson in here somewhere.

Signed-off-by: Marek Szuba  gentoo.org>

 .../proton-mail-bridge-3.3.2-gui_gentoo.patch  | 68 ++
 ...roton-mail-bridge-3.3.2-telemetry_default.patch | 14 -
 .../proton-mail-bridge-3.3.2.ebuild| 66 -
 3 files changed, 119 insertions(+), 29 deletions(-)

diff --git 
a/mail-mta/proton-mail-bridge/files/proton-mail-bridge-3.3.2-gui_gentoo.patch 
b/mail-mta/proton-mail-bridge/files/proton-mail-bridge-3.3.2-gui_gentoo.patch
new file mode 100644
index ..6bf34627039f
--- /dev/null
+++ 
b/mail-mta/proton-mail-bridge/files/proton-mail-bridge-3.3.2-gui_gentoo.patch
@@ -0,0 +1,68 @@
+--- a/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt
 b/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt
+@@ -165,12 +165,9 @@
+ WIN32_EXECUTABLE TRUE
+ MACOSX_BUNDLE TRUE)
+ 
+-install(TARGETS bridge-gui
+-RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}"
+-BUNDLE DESTINATION  "${CMAKE_INSTALL_PREFIX}"
+-LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}"
+-)
++install(TARGETS bridge-gui)
+ 
++if(0)
+ qt_generate_deploy_app_script(
+ TARGET bridge-gui
+ FILENAME_VARIABLE deploy_script
+@@ -185,3 +182,4 @@
+ endif()
+ 
+ include(Deploy${DEPLOY_OS}.cmake)
++endif()
+--- a/internal/frontend/bridge-gui/bridge-gui/main.cpp
 b/internal/frontend/bridge-gui/bridge-gui/main.cpp
+@@ -53,7 +53,7 @@
+ 
+ QString const bridgeLock = "bridge-v3.lock"; ///< The file name used for the 
bridge-gui lock file.
+ QString const bridgeGUILock = "bridge-v3-gui.lock"; ///< The file name used 
for the bridge-gui lock file.
+-QString const exeName = "bridge" + exeSuffix; ///< The bridge executable file 
name.*
++QString const exeName = "proton-mail-bridge" + exeSuffix; ///< The bridge 
executable file name.*
+ qint64 const grpcServiceConfigWaitDelayMs = 18; ///< The wait delay for 
the gRPC config file in milliseconds.
+ QString const waitFlag = "--wait"; ///< The wait command-line flag.
+ 
+--- a/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt
 b/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt
+@@ -161,6 +161,9 @@
+ 
+ target_precompile_headers(bridgepp PRIVATE Pch.h)
+ 
++install(TARGETS bridgepp)
++
++if(0)
+ 
#*
+ # GoogleTest
+ 
#*
+@@ -198,3 +201,4 @@
+ 
+ include(GoogleTest)
+ gtest_discover_tests(bridgepp-test)
++endif()
+--- a/internal/frontend/bridge-gui/BridgeSetup.cmake
 b/internal/frontend/bridge-gui/BridgeSetup.cmake
+@@ -45,6 +45,7 @@
+ endif()
+ 
+ 
++if(0)
+ 
#
+ # vcpkg, toolchain, and architecture
+ 
#
+@@ -87,4 +88,5 @@
+ set(VCPKG_TARGET_TRIPLET x64-windows)
+ endif()
+ 
+-set(CMAKE_TOOLCHAIN_FILE "${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" 
CACHE STRING "toolchain")
+\ No newline at end of file
++set(CMAKE_TOOLCHAIN_FILE "${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" 
CACHE STRING "toolchain")
++endif()

diff --git 
a/mail-mta/proton-mail-bridge/files/proton-mail-bridge-3.3.2-telemetry_default.patch
 
b/mail-mta/proton-mail-bridge/files/proton-mail-bridge-3.3.2-telemetry_default.patch
deleted file mode 100644
index 3c8df6c2ef9d..
--- 
a/mail-mta/proton-mail-bridge/files/proton-mail-bridge-3.3.2-telemetry_default.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Such things really should be opt-in rather than opt-out, and doubly so given
-Gentoo does not package the bridge GUI yet.
-
 a/internal/vault/types_settings.go
-+++ b/internal/vault/types_settings.go
-@@ -96,7 +96,7 @@
-   ShowAllMail:   true,
-   Autostart: true,
-   AutoUpdate:true,
--  TelemetryDisabled: false,
-+  TelemetryDisabled: true,
- 
-   LastVersion: "0.0.0",
-   FirstStart:  true,

diff --git a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.3.2.ebuild

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

2023-08-21 Thread Marek Szuba 
commit: ad7af30650ee04e12a5b6ca8203e1b98c28e1f55
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Aug 21 22:19:10 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Aug 21 22:19:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad7af306

mail-mta/proton-mail-bridge: remove outdated comment

Signed-off-by: Marek Szuba  gentoo.org>

 mail-mta/proton-mail-bridge/proton-mail-bridge-3.3.2.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.3.2.ebuild 
b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.3.2.ebuild
index a73779dc7b74..7d85059d6295 100644
--- a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.3.2.ebuild
+++ b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.3.2.ebuild
@@ -12,7 +12,6 @@ DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients"
 HOMEPAGE="https://proton.me/mail/bridge 
https://github.com/ProtonMail/proton-bridge/;
 
SRC_URI="https://github.com/ProtonMail/${MY_PN}/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz

https://dev.gentoo.org/~marecki/dists/${CATEGORY}/${PN}/${P}-deps.tar.xz;
-# FIXME: default telemetry to off!
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-3+ ISC LGPL-3+ MIT MPL-2.0 Unlicense"
 SLOT="0"

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

2023-08-21 Thread Marek Szuba 
commit: ebf9fb9ff79e45b67cd66054bd3d509cb387d8b0
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Aug 21 21:58:51 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Aug 21 22:02:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebf9fb9f

mail-mta/proton-mail-bridge: add 3.3.2

Signed-off-by: Marek Szuba  gentoo.org>

 mail-mta/proton-mail-bridge/Manifest   |  2 +
 ...roton-mail-bridge-3.3.2-telemetry_default.patch | 14 
 .../proton-mail-bridge-3.3.2.ebuild| 84 ++
 3 files changed, 100 insertions(+)

diff --git a/mail-mta/proton-mail-bridge/Manifest 
b/mail-mta/proton-mail-bridge/Manifest
index cda1f48f641e..b9e6820cb224 100644
--- a/mail-mta/proton-mail-bridge/Manifest
+++ b/mail-mta/proton-mail-bridge/Manifest
@@ -1,2 +1,4 @@
 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
+DIST proton-mail-bridge-3.3.2-deps.tar.xz 252980292 BLAKE2B 
2d7c8961c1ed8a6fb15a26f6b3ee650932b89626c0eea1d3acaf24b5ef6b44a90cb021a051a5f018cf94db5ccb029c4b79390275bca9a39ceeb6b5ef62aa1386
 SHA512 
52ff54e80635e795462e0bdbd5e02b831478a49225d296ec46ef5591cef173c49bcf63d925d503537d57ccaf65a09424f82d1c8ad8e906d822306ca22bba1121
+DIST proton-mail-bridge-3.3.2.tar.gz 4481491 BLAKE2B 
e00cf4268dcebc7f4eeab5a0738c04e1a809a5633b4d97637ea74aa4ac3eb68dd343b45fef5fca602c4c89faa2d1e05f1c605d9b56ee83d669b07b815f8ae92b
 SHA512 
1b49355f8e816b6a00bf7fad91d0f696efb5ee1f5ea311fd4b92549f715185ea280ac874a759be5d3f8c7ff2309b8f0c3bb37c8502963059b26f4630bc9339f0

diff --git 
a/mail-mta/proton-mail-bridge/files/proton-mail-bridge-3.3.2-telemetry_default.patch
 
b/mail-mta/proton-mail-bridge/files/proton-mail-bridge-3.3.2-telemetry_default.patch
new file mode 100644
index ..3c8df6c2ef9d
--- /dev/null
+++ 
b/mail-mta/proton-mail-bridge/files/proton-mail-bridge-3.3.2-telemetry_default.patch
@@ -0,0 +1,14 @@
+Such things really should be opt-in rather than opt-out, and doubly so given
+Gentoo does not package the bridge GUI yet.
+
+--- a/internal/vault/types_settings.go
 b/internal/vault/types_settings.go
+@@ -96,7 +96,7 @@
+   ShowAllMail:   true,
+   Autostart: true,
+   AutoUpdate:true,
+-  TelemetryDisabled: false,
++  TelemetryDisabled: true,
+ 
+   LastVersion: "0.0.0",
+   FirstStart:  true,

diff --git a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.3.2.ebuild 
b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.3.2.ebuild
new file mode 100644
index ..a73779dc7b74
--- /dev/null
+++ b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.3.2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd xdg-utils
+
+MY_PN="${PN/-mail/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients"
+HOMEPAGE="https://proton.me/mail/bridge 
https://github.com/ProtonMail/proton-bridge/;
+SRC_URI="https://github.com/ProtonMail/${MY_PN}/archive/refs/tags/v${PV}.tar.gz
 -> ${P}.tar.gz
+   
https://dev.gentoo.org/~marecki/dists/${CATEGORY}/${PN}/${P}-deps.tar.xz;
+# FIXME: default telemetry to off!
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-3+ ISC LGPL-3+ MIT MPL-2.0 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gui"
+
+# Quite a few tests require Internet access
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="app-crypt/libsecret"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.3.2-telemetry_default.patch
+)
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+   xdg_environment_reset
+   default
+}
+
+src_compile() {
+   if use gui; then
+   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
+}
+
+src_test() {
+   emake test
+}
+
+src_install() {
+   exeinto /usr/bin
+   newexe bridge ${PN}
+
+   systemd_newuserunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
+
+   einstalldocs
+}
+
+pkg_postinst() {
+   use gui && xdg_icon_cache_update
+
+   if [[ -n "${REPLACING_VERSIONS}" ]]; then
+   local oldver
+   for oldver in ${REPLACING_VERSIONS}; do
+   if

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

2023-08-21 Thread Marek Szuba 
commit: 71eb092943c5a7778230fe87c744998f97d99723
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Aug 21 18:15:49 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Aug 21 18:16:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71eb0929

mail-mta/proton-mail-bridge: drop 3.0.21-r1

Signed-off-by: Marek Szuba  gentoo.org>

 mail-mta/proton-mail-bridge/Manifest   |  2 -
 .../proton-mail-bridge-3.0.21-r1.ebuild| 63 --
 2 files changed, 65 deletions(-)

diff --git a/mail-mta/proton-mail-bridge/Manifest 
b/mail-mta/proton-mail-bridge/Manifest
index 3becaa8e0a54..cda1f48f641e 100644
--- a/mail-mta/proton-mail-bridge/Manifest
+++ b/mail-mta/proton-mail-bridge/Manifest
@@ -1,4 +1,2 @@
-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/proton-mail-bridge-3.0.21-r1.ebuild 
b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.0.21-r1.ebuild
deleted file mode 100644
index f05292d8f63e..
--- a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.0.21-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd xdg-utils
-
-MY_PN="${PN/-mail/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients"
-HOMEPAGE="https://proton.me/mail/bridge 
https://github.com/ProtonMail/proton-bridge/;
-SRC_URI="https://github.com/ProtonMail/${MY_PN}/archive/refs/tags/v${PV}.tar.gz
 -> ${P}.tar.gz
-   
https://dev.gentoo.org/~marecki/dists/${CATEGORY}/${PN}/${P}-deps.tar.xz;
-
-LICENSE="Apache-2.0 BSD BSD-2 GPL-3+ ISC LGPL-3+ MIT MPL-2.0 Unlicense"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="gui"
-
-# Quite a few tests require Internet access
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="app-crypt/libsecret"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-   xdg_environment_reset
-   default
-}
-
-src_compile() {
-   if use gui; then
-   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
-}
-
-src_test() {
-   emake test
-}
-
-src_install() {
-   exeinto /usr/bin
-   newexe bridge ${PN}
-
-   systemd_newuserunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
-
-   einstalldocs
-}
-
-pkg_postinst() {
-   use gui && xdg_icon_cache_update
-}
-
-pkg_postrm() {
-   use gui && xdg_icon_cache_update
-}

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

2023-08-09 Thread Piotr Karbowski 
commit: ef835affb7c521e4db13d05f963b39df276d7fa2
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Wed Aug  9 18:02:54 2023 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Wed Aug  9 18:14:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef835aff

mail-mta/proton-mail-bridge: drop myself as maintainer.

Signed-off-by: Piotr Karbowski  gentoo.org>

 mail-mta/proton-mail-bridge/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/mail-mta/proton-mail-bridge/metadata.xml 
b/mail-mta/proton-mail-bridge/metadata.xml
index 4341308d7149..6891e5bab160 100644
--- a/mail-mta/proton-mail-bridge/metadata.xml
+++ b/mail-mta/proton-mail-bridge/metadata.xml
@@ -1,10 +1,6 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   slashbe...@gentoo.org
-   Piotr Karbowski
-   

mare...@gentoo.org
Marek Szuba

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

2023-05-23 Thread Marek Szuba 
commit: 4123a3e1260de40ab33fc9038c0e036b9fd90942
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue May 23 19:30:01 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue May 23 19:39:36 2023 +
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  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..
--- 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
 }

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

2023-04-10 Thread Marek Szuba 
commit: 3cb992df77ba586bdb4f545610bf0c21827d46fc
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Apr 10 16:31:58 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Apr 10 16:32:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cb992df

mail-mta/proton-mail-bridge: update systemd unit for 3.0.0+

Signed-off-by: Marek Szuba  gentoo.org>

 .../files/proton-mail-bridge.service-r1 | 17 +
 0.21.ebuild => proton-mail-bridge-3.0.21-r1.ebuild} |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/mail-mta/proton-mail-bridge/files/proton-mail-bridge.service-r1 
b/mail-mta/proton-mail-bridge/files/proton-mail-bridge.service-r1
new file mode 100644
index ..8dd8980214af
--- /dev/null
+++ b/mail-mta/proton-mail-bridge/files/proton-mail-bridge.service-r1
@@ -0,0 +1,17 @@
+[Unit]
+Description=Proton Mail IMAP/SMTP bridge
+Documentation=https://proton.me/mail/bridge/
+
+[Service]
+ExecStart=/usr/bin/proton-mail-bridge --noninteractive
+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-3.0.21.ebuild 
b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.0.21-r1.ebuild
similarity index 94%
rename from mail-mta/proton-mail-bridge/proton-mail-bridge-3.0.21.ebuild
rename to mail-mta/proton-mail-bridge/proton-mail-bridge-3.0.21-r1.ebuild
index a9020b672022..f05292d8f63e 100644
--- a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.0.21.ebuild
+++ b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.0.21-r1.ebuild
@@ -49,7 +49,7 @@ src_install() {
exeinto /usr/bin
newexe bridge ${PN}
 
-   systemd_douserunit "${FILESDIR}"/${PN}.service
+   systemd_newuserunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
 
einstalldocs
 }

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

2023-04-10 Thread Marek Szuba 
commit: 0055cf1ef65fd49ffb3d2a83139e2c1f8dbfd883
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Apr 10 13:47:18 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Apr 10 13:47:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0055cf1e

mail-mta/proton-mail-bridge: add github upstream metadata

Signed-off-by: Marek Szuba  gentoo.org>

 mail-mta/proton-mail-bridge/metadata.xml | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mail-mta/proton-mail-bridge/metadata.xml 
b/mail-mta/proton-mail-bridge/metadata.xml
index 8795413ea236..4341308d7149 100644
--- a/mail-mta/proton-mail-bridge/metadata.xml
+++ b/mail-mta/proton-mail-bridge/metadata.xml
@@ -11,7 +11,10 @@


ProtonMail bridge has been Open Source since April 2020. Note 
that this package
-   is CLI-only for now, as we have run into some problems with Qt5 
vendoring
+   is CLI-only for now, as we have run into some problems with Qt 
vendoring
(see https://github.com/ProtonMail/proton-bridge/issues/16).

+   
+   ProtonMail/proton-bridge
+

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

2022-09-21 Thread Marek Szuba 
commit: c4c4dc43197b95397eb9c312726a020c7e7ba5c3
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Sep 21 23:50:52 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Sep 21 23:54:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4c4dc43

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

Signed-off-by: Marek Szuba  gentoo.org>

 mail-mta/proton-mail-bridge/Manifest| 4 ++--
 .../files/{protonmail-bridge.service => proton-mail-bridge.service} | 6 +++---
 ...ton-mail-bridge-2.2.2.ebuild => proton-mail-bridge-2.3.0.ebuild} | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mail-mta/proton-mail-bridge/Manifest 
b/mail-mta/proton-mail-bridge/Manifest
index da2998d1cc62..dbdfa8254ea8 100644
--- a/mail-mta/proton-mail-bridge/Manifest
+++ b/mail-mta/proton-mail-bridge/Manifest
@@ -1,2 +1,2 @@
-DIST protonmail-bridge-2.2.2-deps.tar.xz 237555984 BLAKE2B 
b069b1b9015e0a96cc0f5558216058c23c1488a67abc29363f4111f9175eac9f204f5f14b54a090040e6d340d4aeb69d1e3b1e59685c3dcef9499ae93526f411
 SHA512 
8ae9bd6bdbc8a16d7cb0e5a3405ef3dca1737f7b3b5e53b9f954618eadfccd94c5ca1a3994a20745f234e81dbace28bc2df0489e28dbf6dc322b508a11acf813
-DIST protonmail-bridge-2.2.2.tar.gz 5057358 BLAKE2B 
f2b585ec16c1b6864e4a23436f30c36253beed0453a1068f52f19af8b47b7b626ec779795486ce3719716b5785b2a3c60fbe62ed192b724c6d88ceb507abc590
 SHA512 
c17ce614ab1074ddeeb9842ce98e6c9cbcb57f44a0bc75cdf74b9a7085257768824a549a9ae5870dcb45243655a90f0956600912c69fc1e826c58d36e8ee19fe
+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

diff --git a/mail-mta/proton-mail-bridge/files/protonmail-bridge.service 
b/mail-mta/proton-mail-bridge/files/proton-mail-bridge.service
similarity index 59%
rename from mail-mta/proton-mail-bridge/files/protonmail-bridge.service
rename to mail-mta/proton-mail-bridge/files/proton-mail-bridge.service
index 8e4c71adfd0d..21f0ad1650dd 100644
--- a/mail-mta/proton-mail-bridge/files/protonmail-bridge.service
+++ b/mail-mta/proton-mail-bridge/files/proton-mail-bridge.service
@@ -1,9 +1,9 @@
 [Unit]
-Description=ProtonMail IMAP/SMTP bridge
-Documentation=https://protonmail.com/bridge/
+Description=Proton Mail IMAP/SMTP bridge
+Documentation=https://proton.me/mail/bridge/
 
 [Service]
-ExecStart=/usr/bin/protonmail-bridge --no-window
+ExecStart=/usr/bin/proton-mail-bridge --no-window
 Restart=on-failure
 
 # Hardening

diff --git a/mail-mta/proton-mail-bridge/proton-mail-bridge-2.2.2.ebuild 
b/mail-mta/proton-mail-bridge/proton-mail-bridge-2.3.0.ebuild
similarity index 98%
rename from mail-mta/proton-mail-bridge/proton-mail-bridge-2.2.2.ebuild
rename to mail-mta/proton-mail-bridge/proton-mail-bridge-2.3.0.ebuild
index 3eb8df2b3026..79f180fa1513 100644
--- a/mail-mta/proton-mail-bridge/proton-mail-bridge-2.2.2.ebuild
+++ b/mail-mta/proton-mail-bridge/proton-mail-bridge-2.3.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit go-module systemd xdg-utils
 
-MY_PN="proton-bridge"
+MY_PN="${PN/-mail/}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients"