Adding metadata

3 files changed, 5 insertions, 120 deletions

diff --git a/mail-mta/proton-mail-bridge/Manifest b/mail-mta/proton-mail-bridge/Manifest
index db63cd7299f1..7d11765c0857 100644
--- a/mail-mta/proton-mail-bridge/Manifest
+++ b/mail-mta/proton-mail-bridge/Manifest
@@ -1,4 +1,2 @@
-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
 DIST proton-mail-bridge-3.20.0-vendor.tar.xz 7565448 BLAKE2B df6c04fe9f51a41e8e5e39a05f6524a54e15ef35f26bd4f14b7a8c1141f4680a89c6432cba4d4263401d9db26ad9da47755542a4105342cf81a5e2f2b12a5061 SHA512 32e6345bdd2fedad950249f09b6cad983d20730a5c56440ac9f6415101c890423ac83e0be9da44a879b239290d29b6ad640e0d95a505bc42d797cdd7ce4eba4a
 DIST proton-mail-bridge-3.20.0.tar.gz 5440605 BLAKE2B d7969b56d69e1ccc0ad4efe26dd5f25424c14cc23e847999f16976164d370ae4d670c3a91f6c5bd3a89bc10cf040665c8b05e8d003cb496f9e848ed4ed16ad33 SHA512 51c31d752438cacdf0a4a8fc6176b8392b2a0e6dcf0f8ef23bcb41c9950b0ba96d0791072f34d319c37baecd798dc7473a78492706918188651844ab9c5cdda4
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
deleted file mode 100644
index 09ece2bf26ab..000000000000
--- a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.15.1-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# 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
-}
diff --git a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.20.0.ebuild b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.20.0-r1.ebuild
index 93e153e9e392..2fea42f10e67 100644
--- a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.20.0.ebuild
+++ b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.20.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ProtonMail/${MY_PN}/archive/refs/tags/v${PV}.tar.gz
 SRC_URI+=" https://dev.gentoo.org/~expeditioneer/distfiles/${CATEGORY}/${PN}/${P}-vendor.tar.xz"
 S="${WORKDIR}"/${MY_P}
 
-LICENSE="Apache-2.0 BSD BSD-2 GPL-3+ ISC LGPL-3+ MIT MPL-2.0 Unlicense"
+LICENSE="GPL-3+ Apache-2.0 BSD BSD-2 ISC LGPL-3+ MIT MPL-2.0 Unlicense"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="gui"
@@ -27,6 +27,7 @@ RDEPEND="
 	app-crypt/libsecret
 	gui? (
 		>=dev-libs/protobuf-21.12:=
+		dev-libs/re2:=
 		>=dev-libs/sentry-native-0.6.5-r1
 		dev-qt/qtbase:6=[gui,icu,widgets]
 		dev-qt/qtdeclarative:6=[widgets]
@@ -41,6 +42,9 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.15.1-gui_gentoo.patch
 )
 
+# $S is there for bug 957684
+DOCS=( "${S}"/{README,Changelog}.md )
+
 src_unpack() {
 	default