gentoo auto-resync : 31:12:2024 - 06:31:02

3 files changed, 209 insertions, 0 deletions

diff --git a/mail-mta/proton-mail-bridge/Manifest b/mail-mta/proton-mail-bridge/Manifest
index 54738ba8d514..42581b8833b7 100644
--- a/mail-mta/proton-mail-bridge/Manifest
+++ b/mail-mta/proton-mail-bridge/Manifest
@@ -1,6 +1,10 @@
+AUX proton-mail-bridge-3.15.1-gui_gentoo.patch 3698 BLAKE2B 94883df55d4fea30a6ab7aaab1515444bd4944d405eeb5d9071dd3f8920a89bff90b764045e3d557d56a70352372be73d46c8c46664fb087e0d2ed8a9dc05279 SHA512 8ed246f2039b5011cea517c70cc800ac0812b36eaf96433508b7c07b58e6f0c18c1ff63fff9c652cd1a19f2154900c412c0c1c462f0b7df420b132681abf073d
 AUX proton-mail-bridge-3.3.2-gui_gentoo.patch 2760 BLAKE2B fc31a27afd24f8f02f0e1864cbc0b863a480dc94991c30e6498dbfb7ab06243dff14f45db31ff665851feccf523310d0b396f3c8ea46e8416b34330f9080b3cc SHA512 d1955987ea62c4148792372cb34f84e828a9b56c29ae04480b66de1f97435ed54d6bc038ca4bb89b0683fbc0d3befd8f4b1355512805e3bbde635f1a3e3ec3f4
 AUX proton-mail-bridge.service-r1 341 BLAKE2B 056e68d9d2f009b60708c5bea58e851b3955e3292e44af114976815f597ca813917b2b74082fae5d0146288aefa9a38993d791272073b23bcff51cbed4f4bbdf SHA512 bafea6004077cb2b5d77ebb9fd48ca925be20987b1a1698b68c9853e9c1d95ac2d0d8d77f78fb2b3e7c1e56d4ea4e7d2dcfeef857df189f1ae51a57ce5d0ac93
 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.15.1-deps.tar.xz 7043648 BLAKE2B fcd6e87989f4571c3c3743af4cee6db752ef1a9a441503e777913deb50825e7544353090f0225568051fd0c9fd6732ce644d7b6aa01cddf664f93060a1232882 SHA512 d3d2449f8bc8fa6bae4699a27e6b4d089259a67e44c3694c25a869f433418196354d539e600416549404ba441002189e9e62d50f52b43d919a3f9fece33eb677
+DIST proton-mail-bridge-3.15.1.tar.gz 5422838 BLAKE2B 8e6ac15b482a5d169d2dee3ab0fec2c99f291ca63db833e6650c92c3e9fab2cf0f68c8c23fc2f8d4d69040a22f3bfbd7854bb1ea6cd0a266e72e5e8b0049efb5 SHA512 96890c5ddf554da612d41275dd661611cb3e28f987d1fba984181c86b57bb15014fa6815f2925c17251842873993865a052173c1f7363d29c502e5676d2c32b4
 EBUILD proton-mail-bridge-3.10.0-r1.ebuild 2871 BLAKE2B 5083ff765fff21831ae44a854c596abad6520416bb6589077a5bdba3569712461ff533b1691b776f4e5261811761fd81c07a04731c0fc516ee8b942a2ad0dce5 SHA512 11572a58cc5dcabfffd840d2c51525b24db6903a1be13d1a3b689960109810558b7f1ed1c7a062aff3f4721c482b1904b754e25d00de7944de12ebd9c25fd0a9
+EBUILD proton-mail-bridge-3.15.1.ebuild 3041 BLAKE2B 3173522a192342b82bffd8adb698d8a8d58d8a5224bd8c8605a60fb6e01288db7f52b370f50c4f8b0125849ed1f5b8595646cc933b1a2bad725fd70523545569 SHA512 3e5036690f4a323203988cfdbbc0f7a31163245302fae191b7d1d659cb0ba099bbbaa103efa887547904b9bf18eaee097ad8cf1a731f3e8c8d6a2ae2536330ab
 MISC metadata.xml 516 BLAKE2B 0553b183a1ea4114cb866037b40660c1cc23d308e1ed6b4c7f6fddb6b5059877cd101d1707f1274a629d0d1464374e90c67d46cf605e7727bd044c1e2222f93d SHA512 a576e67b731a259bd8c1882b08c8b1cf8c14f0a4287facf68990df3b3b1b468e1ea0c35486d2f281d793bd46a1db7d3857976a400dcadba7de144b9c01a6d26c
diff --git a/mail-mta/proton-mail-bridge/files/proton-mail-bridge-3.15.1-gui_gentoo.patch b/mail-mta/proton-mail-bridge/files/proton-mail-bridge-3.15.1-gui_gentoo.patch
new file mode 100644
index 000000000000..8c2b4d1d8c4d
--- /dev/null
+++ b/mail-mta/proton-mail-bridge/files/proton-mail-bridge-3.15.1-gui_gentoo.patch
@@ -0,0 +1,77 @@
+diff --git a/internal/frontend/bridge-gui/BridgeSetup.cmake b/internal/frontend/bridge-gui/BridgeSetup.cmake
+index 7c6c634..6959892 100644
+--- a/internal/frontend/bridge-gui/BridgeSetup.cmake
++++ b/internal/frontend/bridge-gui/BridgeSetup.cmake
+@@ -44,7 +44,7 @@ if (NOT DEFINED BRIDGE_APP_VERSION)
+     endif()
+ endif()
+ 
+-
++if(0)
+ #****************************************************************************************************************************************************
+ # vcpkg, toolchain, and architecture
+ #****************************************************************************************************************************************************
+@@ -87,4 +87,5 @@ if  (WIN32)
+     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/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt b/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt
+index 93a9f49..ffe3a52 100644
+--- a/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt
++++ b/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt
+@@ -167,12 +167,9 @@ set_target_properties(bridge-gui PROPERTIES
+         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
+@@ -187,3 +184,4 @@ else()
+ endif()
+ 
+ include(Deploy${DEPLOY_OS}.cmake)
++endif()
+diff --git a/internal/frontend/bridge-gui/bridge-gui/main.cpp b/internal/frontend/bridge-gui/bridge-gui/main.cpp
+index 8c21436..c804410 100644
+--- a/internal/frontend/bridge-gui/bridge-gui/main.cpp
++++ b/internal/frontend/bridge-gui/bridge-gui/main.cpp
+@@ -51,7 +51,7 @@ QString const exeSuffix;
+ 
+ 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 constexpr grpcServiceConfigWaitDelayMs = 180000; ///< The wait delay for the gRPC config file in milliseconds.
+ QString const waitFlag = "--wait"; ///< The wait command-line flag.
+ QString const orphanInstanceException =  "An orphan instance of bridge is already running. Please terminate it and relaunch the application.";
+diff --git a/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt b/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt
+index f4a0a55..17cab0e 100644
+--- a/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt
++++ b/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt
+@@ -164,6 +164,9 @@ target_link_libraries(bridgepp
+ 
+ target_precompile_headers(bridgepp PRIVATE Pch.h)
+ 
++install(TARGETS bridgepp)
++
++if(0)
+ #*****************************************************************************************************************************************************
+ # GoogleTest
+ #*****************************************************************************************************************************************************
+@@ -205,3 +208,4 @@ target_link_libraries(bridgepp-test
+ 
+ include(GoogleTest)
+ gtest_discover_tests(bridgepp-test)
++endif()
diff --git a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.15.1.ebuild b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.15.1.ebuild
new file mode 100644
index 000000000000..3dba7b1a0afe
--- /dev/null
+++ b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.15.1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop go-env go-module systemd xdg-utils
+
+MY_PN="${PN/-mail/}"
+MY_P="${MY_PN}-${PV}"
+
+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"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+S="${WORKDIR}"/${MY_P}
+
+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.15.1-gui_gentoo.patch
+)
+
+src_unpack() {
+	default
+
+	if [[ -d "${WORKDIR}"/vendor ]] ; then
+		mv "${WORKDIR}"/vendor "${S}"/vendor || die
+	fi
+	go-env_set_compile_environment
+}
+
+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 \
+			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
+
+	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
+}