From b6cfc0c19effe2d9f7b8ab303cd00636f16da253 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 19 Apr 2024 12:05:02 +0100 Subject: gentoo auto-resync : 19:04:2024 - 12:05:02 --- mail-mta/Manifest.gz | Bin 2385 -> 2386 bytes mail-mta/proton-mail-bridge/Manifest | 5 +- .../proton-mail-bridge-3.10.0-r1.ebuild | 119 ++++++++++++++++++++ .../proton-mail-bridge-3.10.0.ebuild | 117 -------------------- .../proton-mail-bridge-3.6.1.ebuild | 120 --------------------- 5 files changed, 120 insertions(+), 241 deletions(-) create mode 100644 mail-mta/proton-mail-bridge/proton-mail-bridge-3.10.0-r1.ebuild delete mode 100644 mail-mta/proton-mail-bridge/proton-mail-bridge-3.10.0.ebuild delete mode 100644 mail-mta/proton-mail-bridge/proton-mail-bridge-3.6.1.ebuild (limited to 'mail-mta') diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz index aa8056343408..b43b673ff2fe 100644 Binary files a/mail-mta/Manifest.gz and b/mail-mta/Manifest.gz differ diff --git a/mail-mta/proton-mail-bridge/Manifest b/mail-mta/proton-mail-bridge/Manifest index d01d764ab7ae..c2158aa3dfa8 100644 --- a/mail-mta/proton-mail-bridge/Manifest +++ b/mail-mta/proton-mail-bridge/Manifest @@ -2,8 +2,5 @@ AUX proton-mail-bridge-3.3.2-gui_gentoo.patch 2760 BLAKE2B fc31a27afd24f8f02f0e1 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.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.10.0.ebuild 2741 BLAKE2B 517eb168d4d968daf2afbc0a0d0ec25a22b330c5988e32f464e74bac00db51c7f1a090338ab4ece8ef58e25e4a516ec82fbf2f239bf8e344fc5e12cd823d37b0 SHA512 99243641e1964529714e465beafb4b106cfa2f9525ce695d9e3f23fd94b580e013ab0e8458dff4fa6f110be8a6829732d2a1bef9a9888bc8eb4cc5377bb794cf -EBUILD proton-mail-bridge-3.6.1.ebuild 2890 BLAKE2B 0bd7b33367b2c381099ff6a81821f444888e1da29497dd290a7bba6c14bab7ad72b671af981ac2947dc17290bc54a449ce4b3cb66afdf8eb62c2a4ba2e108b39 SHA512 dcb320ecb43d1c918c45277f23933c2abf9e4ff5b02dd8b3514336ebd5bd5263f8789d3aca90ecce85513c779e0966dba2b510895ae7d112de61cab86d6d7c36 +EBUILD proton-mail-bridge-3.10.0-r1.ebuild 2871 BLAKE2B 5083ff765fff21831ae44a854c596abad6520416bb6589077a5bdba3569712461ff533b1691b776f4e5261811761fd81c07a04731c0fc516ee8b942a2ad0dce5 SHA512 11572a58cc5dcabfffd840d2c51525b24db6903a1be13d1a3b689960109810558b7f1ed1c7a062aff3f4721c482b1904b754e25d00de7944de12ebd9c25fd0a9 MISC metadata.xml 594 BLAKE2B 4a52e340f984c6a6b3175e06221d277e59b1bfa0929ac019ca56d1b0eaf8801122a3ebd596784494c85a9fa78ce99f880288785a9a0465bb6b2b44397ab5a43a SHA512 b8627546fa733b97d5aa78ed51feaafb3623b770b2e434704055c0e5e23731c18adf3a9a25c73dd77d916060d8f112959772bf4102ccda78e2188e91b9e03348 diff --git a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.10.0-r1.ebuild b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.10.0-r1.ebuild new file mode 100644 index 000000000000..8dbc9cbd2c92 --- /dev/null +++ b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.10.0-r1.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake desktop 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 + 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 + 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 +} diff --git a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.10.0.ebuild b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.10.0.ebuild deleted file mode 100644 index 9df510d07186..000000000000 --- a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.10.0.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2024 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 - 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 - 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 -} 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 deleted file mode 100644 index ea41b272ebaf..000000000000 --- a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.6.1.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2024 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" - -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 - 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 -} -- cgit v1.2.3