From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C872615812D for ; Mon, 06 Jan 2025 04:16:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D6816E07A9; Mon, 06 Jan 2025 04:16:37 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BBF77E078A for ; Mon, 06 Jan 2025 04:16:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F339333BF41 for ; Mon, 06 Jan 2025 04:16:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 89BFF19C8 for ; Mon, 06 Jan 2025 04:16:35 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1736136949.fc1daa830ac42cf3a85709bb4d0c046792d3a0f8.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-mta/proton-mail-bridge/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-mta/proton-mail-bridge/proton-mail-bridge-3.15.1-r1.ebuild X-VCS-Directories: mail-mta/proton-mail-bridge/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: fc1daa830ac42cf3a85709bb4d0c046792d3a0f8 X-VCS-Branch: master Date: Mon, 06 Jan 2025 04:16:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9f04c8af-5933-46f5-b252-ea723fd61858 X-Archives-Hash: c675313c4ae0302218eba297bc6eaa18 commit: fc1daa830ac42cf3a85709bb4d0c046792d3a0f8 Author: Filip Kobierski pm me> AuthorDate: Wed Jan 1 21:55:12 2025 +0000 Commit: Sam James gentoo org> CommitDate: Mon Jan 6 04:15:49 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc1daa83 mail-mta/proton-mail-bridge: improve ebuild changes as they go in the ebuild - add comment regarding dependencies - use upstream desktop file - required patching but the current installed file is named `proton-mail-bridge-gui-proton-mail-bridge.desktop` - remove src_test() -- works without it - remove old postinst warning about telemetry Signed-off-by: Filip Kobierski pm.me> Closes: https://github.com/gentoo/gentoo/pull/39939 Signed-off-by: Sam James gentoo.org> .../proton-mail-bridge-3.15.1-r1.ebuild | 113 +++++++++++++++++++++ 1 file changed, 113 insertions(+) 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..f7c426050794 --- /dev/null +++ b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.15.1-r1.ebuild @@ -0,0 +1,113 @@ +# 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 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_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 +}