gentoo auto-resync : 07:01:2025 - 06:41:06

6 files changed, 128 insertions, 7 deletions

diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index a99e9f09c699..7a063bf86b40 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index f55c00476f0c..f3d7db5c6c53 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -3,10 +3,10 @@ AUX postfix.rc6.2.7 2107 BLAKE2B 4ea7006a381b76d5926a7d1794ab45e30d4829a17acfa0f
 AUX postfix.service 709 BLAKE2B 83fec03e622e3eb1e4b66021b94972b63ace3e368dbf6148aa4fc7832652ba3d452c074e51d19e99b78286c8f84e48557940dcef4656c766f5ff9c4b8078049c SHA512 cb6d04e28d19ccb3c0b33058bae033baaa2976d4d75adc1b28f9aaff928dd1da77292dd16c7f0ca2d68af0a3aa6d74c74db0d550eb95516ae041ebdb9493e32a
 AUX smtp.pass 29 BLAKE2B 589915bd2856fa64e22caa12fca54ef342eb07606de38d3879c13ac395413c84de6c3b733c83cc0625a4433167efcc7d504b2f87fa26c05b2facde9c3d103021 SHA512 a8a940099a77ea0547004daf5392a6efc0cd643f10072803d65e37763012464ad25b1b925ae9e32bffb3c3e8a5d4b2d3bb5619a174d58fdc4ea5d4090db0d365
 AUX smtp.sasl 42 BLAKE2B 67e9108101779b6027fa1e5cc7c9256a606d440e15bb037a0da186e6b4983ab26e88ede2f0604737c78144c03e182f66005062f1d49e10443d1ddb9757461d1f SHA512 a48e2bd173c4443dd2c389f6973a541dbcba4223b52b42b409a68d934a7fc82a98d4027267befcd5db6ec628cce6a9dffdf044e6fbd774b6e748f07f4106db47
-DIST postfix-3.10-20241202.tar.gz 4963497 BLAKE2B 3c9220d667904593f5ad1aff32fa4f8ecba25ffa62a1689110fdb447f509fa3605d8b31c4989bd9e382ba5bde6bc4c4bdfacf08b78737c502df767805221e9c0 SHA512 1fb966031ac5af96afef6a61e186205b96202ba3809282832f8fecec95d3bb955bbdd6ee9c6752cefcd8e7f9ea2b00f7bd428e0300fa5d243769a6af946d0c04
+DIST postfix-3.10-20250105.tar.gz 5001528 BLAKE2B a434f0b7d53d9d1c96945008567f9dfd7515b9d1c7372bb1cbbf8e46161a132385c1edbf3d0b9cbd9e0f488dc298583e889970c6b6e4715b3bc7053daf8c8360 SHA512 240b92410b7e1c1546569fdfa2c2d14fc18fe0113434548c49700dd7995e728c806bf1359bd5287628518d226957e92bd7b83e197d00cc5eceb3953f1647cff4
 DIST postfix-3.9.0.tar.gz 4953133 BLAKE2B e07a525d9cbea43d3ed11f3d672452cf94f88ca7bbaf3c3254bf5be4ef675a1797a5fff2444c0db60c6eb53e43734a388a91faed72bb2fb4e3e5a353535602b0 SHA512 46faaf529a6d2edc5ea747ee0d73a028f7061a923da0ea4b1e1828d935b15f5782d83f7a8472e7c74b45ea0e96666c871efd352934bead28a88ddd3561ade324
 DIST postfix-3.9.1.tar.gz 4953855 BLAKE2B 78be7bf0f0d9e46429b40f98ddc98cac442cfdb404d77073346c973f3d0d4c52f299fc7f5d64bddaaf2db60dd234c52790f1efe4995faee8e2cd10c6f8e2096f SHA512 79109d9f19e51d9089a0f2b5c6134972148a6e1a7e385aabc79c0a32e09c78715ad94a93ae3eca1171b770c62d6bf3b8e079b94183ae851001db1a0cf21fff15
-EBUILD postfix-3.10_pre20241202.ebuild 8537 BLAKE2B 5575901888570f707c9e56a525c07e6f6e277860693ea25de75892c9a39f410c2619064d3c9d00292c36e16c7695025923a6c92c4bcac640bad0c1c8da113699 SHA512 6d2c3c793fe764c32ba37328116f799f1fbb398c07d78730fbb987588d6a13f75e1a4ab7543ed8d5d4629cb3988e2c4b835aee44db920360485402a6c28339ae
+EBUILD postfix-3.10_pre20250105.ebuild 8537 BLAKE2B fa7ec3667952d43171e8348f97bdbfa523704acbbeb4a5243f1e00dcd9ee2d684826fd4b6f74584cb48db3810dfe44d7e6f8c256d118fd8c925606992431e49c SHA512 3c391209ac91ec1d76b5567732d1eb2c097b95090d11bc5affa3e49ac012adb971a7fac514dd718a91fa0b85b73c89cfbf51f7cca0f27d7c1402a59be04f2bd7
 EBUILD postfix-3.9.0-r2.ebuild 8591 BLAKE2B 145bcb0062062415f6bcb26fefeede1e84f83a954d98c5fe90120ac7c9bd1104fed3112f15962fadf8408001f4d46b7106712735b8d840d4ae62d6eb9e807a2b SHA512 4b4dd69940a0dae19382773e91149daddc4139c9eb174af8340f00edd10a218f4315a3c3406b70c88fcc80a28b42bcd5ae5332f7ed05794f9df5aeac2ecd6ac8
 EBUILD postfix-3.9.1.ebuild 8597 BLAKE2B a3b6699ccb1b0ee5e1d00d6ef35f80b61da124f7947a7b3744c1d1c714adb35c068445bc5df6b1b49bd15a51cffbc94d3d0d68d441447f6f4a04854f1630ffaa SHA512 5de10189229a8e561df7fd14dee26dbea1f5000badacb67d1b3ed5355760281723caa16b11fd66236c90b21f9168d1cfcc98bcf0d9b98d2043a720d5f94804a6
 MISC metadata.xml 952 BLAKE2B 53d30be39de0878119f60168ad40d4eb1328b7887ef87f34f7d641a6201fb1567c50558e4f87fc160928461461e5850022863ea21217c57184f782d82a5e3340 SHA512 60feaf7daa0360bc5a76b166a0b32afd74bb6922370cb8f200d1eb2e791ff3837f64d0211b622924b4425fe05ac2133806aa86dd8f0c9976b385362b1a8cb730
diff --git a/mail-mta/postfix/postfix-3.10_pre20241202.ebuild b/mail-mta/postfix/postfix-3.10_pre20250105.ebuild
index dd2d17dc5128..e9d3655ef4b6 100644
--- a/mail-mta/postfix/postfix-3.10_pre20241202.ebuild
+++ b/mail-mta/postfix/postfix-3.10_pre20250105.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/mail-mta/proton-mail-bridge/Manifest b/mail-mta/proton-mail-bridge/Manifest
index 42581b8833b7..d6e290fac11c 100644
--- a/mail-mta/proton-mail-bridge/Manifest
+++ b/mail-mta/proton-mail-bridge/Manifest
@@ -6,5 +6,6 @@ DIST proton-mail-bridge-3.10.0.tar.gz 5176242 BLAKE2B a319dab8a9b6b74afe1792ee61
 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-r1.ebuild 2810 BLAKE2B ae7730e5ca6b9e3d5032d4d201e5c5c8ad9c19dc7b64ec20802580c09a2665e7708433d8d0e4a6844def5c59be2a0aac900b9f46d92b0d36caf1c7e26c6f26c9 SHA512 1741ad1c29c4a809ebd79904af8f083e18c1e8d22a62a2c37ff4591a3a2fb5ce4a65270b34ccdf9e7bbc03769229c76d51ffd996cad811a8991e9c285876ce96
 EBUILD proton-mail-bridge-3.15.1.ebuild 3041 BLAKE2B 3173522a192342b82bffd8adb698d8a8d58d8a5224bd8c8605a60fb6e01288db7f52b370f50c4f8b0125849ed1f5b8595646cc933b1a2bad725fd70523545569 SHA512 3e5036690f4a323203988cfdbbc0f7a31163245302fae191b7d1d659cb0ba099bbbaa103efa887547904b9bf18eaee097ad8cf1a731f3e8c8d6a2ae2536330ab
-MISC metadata.xml 516 BLAKE2B 0553b183a1ea4114cb866037b40660c1cc23d308e1ed6b4c7f6fddb6b5059877cd101d1707f1274a629d0d1464374e90c67d46cf605e7727bd044c1e2222f93d SHA512 a576e67b731a259bd8c1882b08c8b1cf8c14f0a4287facf68990df3b3b1b468e1ea0c35486d2f281d793bd46a1db7d3857976a400dcadba7de144b9c01a6d26c
+MISC metadata.xml 700 BLAKE2B 87b570f46139ef7c6ab4c2335b46c1b8e11ec92749855b23f5b19de78676e4c816f165d34b8b52992daebbe2d6815a55a96d41a971c5ba811a86768de273cca0 SHA512 acbca8f8a8d8c6c83ce6b556202a61f0a7c908e5048fb724e3c2c629d8f9fced3454e461b8248f9e9bd59b27cfdbd9dd79966f0c93ddb41dfeb09e4e183e72bb
diff --git a/mail-mta/proton-mail-bridge/metadata.xml b/mail-mta/proton-mail-bridge/metadata.xml
index 7b0d7b60fb94..aaec162377ff 100644
--- a/mail-mta/proton-mail-bridge/metadata.xml
+++ b/mail-mta/proton-mail-bridge/metadata.xml
@@ -3,11 +3,14 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<longdescription>
-		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 Qt vendoring
-		(see https://github.com/ProtonMail/proton-bridge/issues/16).
+		ProtonMail bridge has been Open Source since April 2020.
+		It is a daemon that essentialy is an interface to Proton's servers.
+		It can be built with or without it's QT GUI.
 	</longdescription>
 	<upstream>
+		<bugs-to>https://github.com/ProtonMail/proton-bridge/issues</bugs-to>
+		<changelog>https://github.com/ProtonMail/proton-bridge/blob/master/Changelog.md</changelog>
+		<doc>https://github.com/ProtonMail/proton-bridge/wiki</doc>
 		<remote-id type="github">ProtonMail/proton-bridge</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.15.1-r1.ebuild b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.15.1-r1.ebuild
new file mode 100644
index 000000000000..09ece2bf26ab
--- /dev/null
+++ b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.15.1-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2025 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 # if we ship the dependencies
+		mv "${WORKDIR}"/vendor "${S}"/vendor || die # move them into the tree
+	fi
+
+	go-env_set_compile_environment
+}
+
+src_prepare() {
+	xdg_environment_reset
+	default
+	if use gui; then
+		# prepare desktop file
+		local desktopFilePath="${S}"/dist/${MY_PN}.desktop
+		sed -i 's/protonmail/proton-mail/g' ${desktopFilePath} || die
+		sed -i 's/Exec=proton-mail-bridge/Exec=proton-mail-bridge-gui/g' ${desktopFilePath} || die
+
+		# build GUI
+		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 -Onone 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 -Onone 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,${PN}}.svg
+		newmenu {dist/${MY_PN},${PN}}.desktop
+	fi
+
+	systemd_newuserunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
+
+	einstalldocs
+}