From 49d36e9793573ab563c841fc0aebeb7d62c58859 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 24 Aug 2023 03:50:36 +0100 Subject: gentoo auto-resync : 24:08:2023 - 03:50:35 --- mail-mta/proton-mail-bridge/Manifest | 4 +- .../proton-mail-bridge-3.1.3.ebuild | 16 +-- .../proton-mail-bridge-3.3.2-r1.ebuild | 119 +++++++++++++++++++++ .../proton-mail-bridge-3.3.2.ebuild | 119 --------------------- 4 files changed, 122 insertions(+), 136 deletions(-) create mode 100644 mail-mta/proton-mail-bridge/proton-mail-bridge-3.3.2-r1.ebuild delete mode 100644 mail-mta/proton-mail-bridge/proton-mail-bridge-3.3.2.ebuild (limited to 'mail-mta/proton-mail-bridge') diff --git a/mail-mta/proton-mail-bridge/Manifest b/mail-mta/proton-mail-bridge/Manifest index 35a279caf02a..6bce07db30b7 100644 --- a/mail-mta/proton-mail-bridge/Manifest +++ b/mail-mta/proton-mail-bridge/Manifest @@ -4,6 +4,6 @@ DIST proton-mail-bridge-3.1.3-deps.tar.xz 206716212 BLAKE2B 4f79e4428ef37452d0ab DIST proton-mail-bridge-3.1.3.tar.gz 4443963 BLAKE2B 2c8fc571612c11c0e281e8f268774e886ba3742b696bdd1180d7cf45525d21d9c062cd3d33acb57a6ceed8dad6b864490c89c090ebfd4bceb4e8c41b19015ae8 SHA512 4f4ca3a2b95c7eed34a13d7f8f296d95717b9c1f95bd157e08c3f21cc752ea3dac5eaefac27662f57f875d9690a5d77a9e15f71406280dcaad6f9054b2ef54b9 DIST proton-mail-bridge-3.3.2-deps.tar.xz 252980292 BLAKE2B 2d7c8961c1ed8a6fb15a26f6b3ee650932b89626c0eea1d3acaf24b5ef6b44a90cb021a051a5f018cf94db5ccb029c4b79390275bca9a39ceeb6b5ef62aa1386 SHA512 52ff54e80635e795462e0bdbd5e02b831478a49225d296ec46ef5591cef173c49bcf63d925d503537d57ccaf65a09424f82d1c8ad8e906d822306ca22bba1121 DIST proton-mail-bridge-3.3.2.tar.gz 4481491 BLAKE2B e00cf4268dcebc7f4eeab5a0738c04e1a809a5633b4d97637ea74aa4ac3eb68dd343b45fef5fca602c4c89faa2d1e05f1c605d9b56ee83d669b07b815f8ae92b SHA512 1b49355f8e816b6a00bf7fad91d0f696efb5ee1f5ea311fd4b92549f715185ea280ac874a759be5d3f8c7ff2309b8f0c3bb37c8502963059b26f4630bc9339f0 -EBUILD proton-mail-bridge-3.1.3.ebuild 1304 BLAKE2B d84f2164bf3ccf91321f9041c331cf4a2eaeee3e54197f013f0014363a1dea0020febf047641f54bd8db0da7ac7cd0f849b0012764d0a1269e5e7c40f2875833 SHA512 e5c315f34abd46ecdb477fb35eda3f57b4bc31a49efba49adc3327318172c80a89de5605fea51c284ed5bca2b2e2218d1d165487f59447af5d4392dc53190676 -EBUILD proton-mail-bridge-3.3.2.ebuild 2837 BLAKE2B 0e7bfc382172dcc6d8bbd3015b80a8921c3a5eff64a94e66ee1654aa24acc4506bce648b63d7098d4973ec99f58aae5bab6a2c3b876bc1af3720fac3a7e14cfc SHA512 602d809f1b75f34257b380898efa4f6045233cc380812e25aea2f1dbd68ba7a5ed2a9d32bd80c7f8467c2c36abd0b5a2a163cc0a501bd1d26b18af563f98a8ee +EBUILD proton-mail-bridge-3.1.3.ebuild 1022 BLAKE2B 79609f56406f27f5bb568437ec7ab6b2aed443ec0d5c259dddcd4a00aaf9159e713f8a68eab6be208c26928b4867b2614c65605e1c8ad1a56fc3aca3e8e899c4 SHA512 e669e1d233633471f159a88ceccfe63f78a0535e4a2e48e285a7d2c9a6fad4a24ca450a399c0efc15379a4340720408079945ac7a1ef77d40f2faa6fddce5286 +EBUILD proton-mail-bridge-3.3.2-r1.ebuild 2848 BLAKE2B 7ee64b8709425797d0de66e9be692742ad0c24a0e38d4b99dde9eb5ab53d43b8a4ce6a6b44f948e1e16816d87a5bb74018e6e0cebea2a978304e9dab8f3b1595 SHA512 099b3e65f5a81c6ba4b306e6756c156f70d063f03d268ea3d96d0266e2cee6108f1843747211b3629eea118b8a85010bc129c30a528721fa27fd7f65a625245c MISC metadata.xml 594 BLAKE2B 4a52e340f984c6a6b3175e06221d277e59b1bfa0929ac019ca56d1b0eaf8801122a3ebd596784494c85a9fa78ce99f880288785a9a0465bb6b2b44397ab5a43a SHA512 b8627546fa733b97d5aa78ed51feaafb3623b770b2e434704055c0e5e23731c18adf3a9a25c73dd77d916060d8f112959772bf4102ccda78e2188e91b9e03348 diff --git a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.1.3.ebuild b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.1.3.ebuild index 3b00a1442737..cc717399d90f 100644 --- a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.1.3.ebuild +++ b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.1.3.ebuild @@ -16,7 +16,6 @@ SRC_URI="https://github.com/ProtonMail/${MY_PN}/archive/refs/tags/v${PV}.tar.gz 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" @@ -33,12 +32,7 @@ src_prepare() { } src_compile() { - if use gui; then - eerror "Since version 3.0.0, GUI support in ${PN} requires Qt6 and is therefore currently not available" - die "USE=gui requires Qt6" - else - emake build-nogui - fi + emake build-nogui } src_test() { @@ -53,11 +47,3 @@ src_install() { einstalldocs } - -pkg_postinst() { - use gui && xdg_icon_cache_update -} - -pkg_postrm() { - use gui && xdg_icon_cache_update -} diff --git a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.3.2-r1.ebuild b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.3.2-r1.ebuild new file mode 100644 index 000000000000..d64b250bc9c0 --- /dev/null +++ b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.3.2-r1.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2023 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" + ) + 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.3.2.ebuild b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.3.2.ebuild deleted file mode 100644 index 013049b4d5c9..000000000000 --- a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.3.2.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2023 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 - 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" - ) - 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