gentoo auto-resync : 17:12:2023 - 02:56:05

2 files changed, 122 insertions, 0 deletions

diff --git a/mail-mta/proton-mail-bridge/Manifest b/mail-mta/proton-mail-bridge/Manifest
index 60ad96d73958..9371540794d7 100644
--- a/mail-mta/proton-mail-bridge/Manifest
+++ b/mail-mta/proton-mail-bridge/Manifest
@@ -6,7 +6,10 @@ 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
 EBUILD proton-mail-bridge-3.1.3.ebuild 1022 BLAKE2B 79609f56406f27f5bb568437ec7ab6b2aed443ec0d5c259dddcd4a00aaf9159e713f8a68eab6be208c26928b4867b2614c65605e1c8ad1a56fc3aca3e8e899c4 SHA512 e669e1d233633471f159a88ceccfe63f78a0535e4a2e48e285a7d2c9a6fad4a24ca450a399c0efc15379a4340720408079945ac7a1ef77d40f2faa6fddce5286
 EBUILD proton-mail-bridge-3.3.2-r1.ebuild 2848 BLAKE2B 7ee64b8709425797d0de66e9be692742ad0c24a0e38d4b99dde9eb5ab53d43b8a4ce6a6b44f948e1e16816d87a5bb74018e6e0cebea2a978304e9dab8f3b1595 SHA512 099b3e65f5a81c6ba4b306e6756c156f70d063f03d268ea3d96d0266e2cee6108f1843747211b3629eea118b8a85010bc129c30a528721fa27fd7f65a625245c
 EBUILD proton-mail-bridge-3.5.4.ebuild 2848 BLAKE2B 7ee64b8709425797d0de66e9be692742ad0c24a0e38d4b99dde9eb5ab53d43b8a4ce6a6b44f948e1e16816d87a5bb74018e6e0cebea2a978304e9dab8f3b1595 SHA512 099b3e65f5a81c6ba4b306e6756c156f70d063f03d268ea3d96d0266e2cee6108f1843747211b3629eea118b8a85010bc129c30a528721fa27fd7f65a625245c
+EBUILD proton-mail-bridge-3.6.1.ebuild 2848 BLAKE2B 7ee64b8709425797d0de66e9be692742ad0c24a0e38d4b99dde9eb5ab53d43b8a4ce6a6b44f948e1e16816d87a5bb74018e6e0cebea2a978304e9dab8f3b1595 SHA512 099b3e65f5a81c6ba4b306e6756c156f70d063f03d268ea3d96d0266e2cee6108f1843747211b3629eea118b8a85010bc129c30a528721fa27fd7f65a625245c
 MISC metadata.xml 594 BLAKE2B 4a52e340f984c6a6b3175e06221d277e59b1bfa0929ac019ca56d1b0eaf8801122a3ebd596784494c85a9fa78ce99f880288785a9a0465bb6b2b44397ab5a43a SHA512 b8627546fa733b97d5aa78ed51feaafb3623b770b2e434704055c0e5e23731c18adf3a9a25c73dd77d916060d8f112959772bf4102ccda78e2188e91b9e03348
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 000000000000..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 \
+			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 \
+			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
+	fi
+
+	systemd_newuserunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		local oldver
+		for oldver in ${REPLACING_VERSIONS}; do
+			if ver_test "${oldver}" -lt 3.2.0; then
+				ewarn "Please note that since version 3.2.0, ${PN} by default shares usage statistics with upstream."
+				ewarn "For details, please see"
+				ewarn
+				ewarn "	https://proton.me/support/share-usage-statistics"
+				ewarn
+				ewarn "This behaviour can be disabled through ${PN}-gui, under Advanced Settings."
+				ewarn
+				break
+			fi
+		done
+	fi
+}