gentoo resync : 28.04.2021

2 files changed, 24 insertions, 22 deletions

diff --git a/mail-mta/protonmail-bridge/Manifest b/mail-mta/protonmail-bridge/Manifest
index 2c078d8079ba..7871f0f623d8 100644
--- a/mail-mta/protonmail-bridge/Manifest
+++ b/mail-mta/protonmail-bridge/Manifest
@@ -78,8 +78,6 @@ DIST github.com%2Femersion%2Fgo-imap-idle%2F@v%2Fv0.0.0-20200601154248-f05f54664
 DIST github.com%2Femersion%2Fgo-imap-idle%2F@v%2Fv0.0.0-20200601154248-f05f54664cc4.zip 6392 BLAKE2B 369446455bfec51e81db08238a6a0f3e01b633ca0000f72b8aa2851cb68e845bdacf63270f9cbb137ad5efe8633250b76a35b097593dee0f1af10f96266fc009 SHA512 92cc5009d279a5ed6a04f38badb1bc3adbeb5279d7e1d7844e67bc3fccaf1b23911fa147d382e40e700a819285f117f7518df535eb51deda2bb366b9e69e6f23
 DIST github.com%2Femersion%2Fgo-imap-move%2F@v%2Fv0.0.0-20190710073258-6e5a51a5b342.mod 40 BLAKE2B 6d885135d81932507052375b8070da9a0b25f29792087b90f4542f5b3978aa1f478a8cf3722bb29ded7d4e3b8af65b9d55024fd9b50df151b89584120ba71b4e SHA512 7fc8ba40d0d2255200c49d159bdc1a4b724dc98eb5f26767d2479a6c0d27d81ac9729d3acd15393d83012ef6e81ae848125aee28a19f27b474631f3528d0819c
 DIST github.com%2Femersion%2Fgo-imap-move%2F@v%2Fv0.0.0-20190710073258-6e5a51a5b342.zip 4879 BLAKE2B 8f89d359457e74b1de159c0c25f5f1cbc31375086786e67ba04de77dbddd88d3c409e0260f61d9232b406f99b48a795aaf66c2b47a496e6d4f092036c9b3fa9a SHA512 0e2391c42450c9036b5a66822a32a154726b6735d15f531770223c9230b1122eb416c6953f6da288321e085fdac833aa6525da362ef5024ed92119aa6f839450
-DIST github.com%2Femersion%2Fgo-imap-quota%2F@v%2Fv0.0.0-20200423100218-dcfd1b7d2b41.mod 41 BLAKE2B 6a8ffeb78340cf03ffb87dc3bcd1bbea4d848ce95603e856f3d895681382977e8464766c9b8000a52b757f0a3399c6042eb0e26e2c1a3d0c0cd906562242b47f SHA512 e431cfc3256de1b0d9683cca7422a22ef831cb12a4048d3d3adb45331270a20b2454908087c9535c64dcd8c6f75fd63f20590af259d1052c68016fc87c86aff5
-DIST github.com%2Femersion%2Fgo-imap-quota%2F@v%2Fv0.0.0-20200423100218-dcfd1b7d2b41.zip 6988 BLAKE2B 27b638f15ae22ace24f2ba6ce617a89bcccc6a91755d787fbee0545310fc8139390857e964b07772d86945b5aed3005484eecaeb375bae4e8e0d90e717d53227 SHA512 965bccfdc470ee02d4b6f2f0200eb48b340b34a78cef82e2f93081fecf47997556cd39f8a144f09a49320b198c8a4957dd7687459c3ce41eff058178f7d4d4b3
 DIST github.com%2Femersion%2Fgo-imap-quota%2F@v%2Fv0.0.0-20210203125329-619074823f3c.mod 41 BLAKE2B 6a8ffeb78340cf03ffb87dc3bcd1bbea4d848ce95603e856f3d895681382977e8464766c9b8000a52b757f0a3399c6042eb0e26e2c1a3d0c0cd906562242b47f SHA512 e431cfc3256de1b0d9683cca7422a22ef831cb12a4048d3d3adb45331270a20b2454908087c9535c64dcd8c6f75fd63f20590af259d1052c68016fc87c86aff5
 DIST github.com%2Femersion%2Fgo-imap-quota%2F@v%2Fv0.0.0-20210203125329-619074823f3c.zip 6994 BLAKE2B 991f973e37f864759fbbeb633b4810a83be3a97589363b8ab9b24b39d2647600ce5030d1c7850456a86868dd5a46204cb559ec5927be3d6a4ab31d096279a45e SHA512 2d1fcb21fbed8de34e38930823aecb975e9f23d4984e283c04a010aa29e5bb310a14c5780db209cbeb7a0b898e0ea0375c2497baf264ae9d11aeafb20289b259
 DIST github.com%2Femersion%2Fgo-imap-unselect%2F@v%2Fv0.0.0-20171113212723-b985794e5f26.mod 44 BLAKE2B ad97f48981b24805164ad750f1e0742942dcb40fcc18f4e4ee889232f5afe15e14886c1908174146cdb46148e7b40fb1f978a5afebac81c4c8b790fb62d576a0 SHA512 f2ba8441d9a51e08d25d949691a0544897ec44c7c4a87224b1f4605ffb552a681e3030326b9accf26893c512146e844a270a15ae7ff763b067e8c1a6d5837122
@@ -267,6 +265,12 @@ DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod 216 BLAKE2B c597010cf6690
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip 98541 BLAKE2B 369a625a7b05ee56619698e8067ee7b99a9d0508db655aefd23cf42f5ee1abb150a6b262be089fce6951f84fe9f1cc0fa46b75830b851888fd17f123852558e7 SHA512 073f44125d4bbce27d69b914385e05028c4d275585e275ff1ee2ffe299059646394163dde2b6b5c175ac9379d388fe34c1c874deda4138121541e2a639d7635f
 DIST github.com%2Ftherecipe%2Fqt%2F@v%2Fv0.0.0-20200701200531-7f61353ee73e.mod 981 BLAKE2B 34b7805e7762a3a353118c4fe0902f895a3281baf0aec98de9ccb2572c272012e9087a7068a5a4880d4ec94d688b8a001faed0c1e250bd82e29ad52836102f66 SHA512 f1a73209ccee5122864ac345de9712b95bce2852dfbb45075b7371482f6d26939b87fdb0c5202590f9a22e594f199f085b3427d1472c4301a8e214b8ef600d53
 DIST github.com%2Ftherecipe%2Fqt%2F@v%2Fv0.0.0-20200701200531-7f61353ee73e.zip 5439966 BLAKE2B d82dfabc65708dfa74af5fc2b173d5c5f1bf2fb5307ec15a1830ab3a1e309dce797d6cbd0e68352e7fb4e9218c5c5d912bf135330e4219c884a3f9138242bb03 SHA512 f22c87b7cb50c0b308c42a7aaac7b18ef646e783c1e90a99efc0f701db290ba5da9ee794d98d1104053ee93cea9d4bba0b844a3c9f90b3361f9fd1b84f990c98
+DIST github.com%2Ftherecipe%2Fqt%2F@v%2Fv0.0.0-20200904063919-c0c124a5770d.zip 3082277 BLAKE2B 395d71a1af4752e043cad6e6e9991f939e188741a3b9312574313ef9092b4bf1fb8927a21784bd794feda1c54fd5eef8a789f1d9a23d5258ba2e8f92c7827e6c SHA512 9604cd88161289e8f3e0f42d97de607a3b38fe205aaec564374697cfef19f8f458de7925d427735bc9a7dc278f9b70d7a23cd837fd11020de2b00e457a0553d9
+DIST github.com%2Ftherecipe%2Fqt%2Finternal%2Fbinding%2Ffiles%2Fdocs%2F5.12.0%2F@v%2Fv0.0.0-20200904063919-c0c124a5770d.mod 66 BLAKE2B 143bef9f2ad0de822e8f6ebb8db6c5a50cd0e29b029321e54f51e12459440e8032e1d0ce02f7f5e4ae1e79bbdd9a3c32435c5989b1de3c5691d115451b6d3392 SHA512 7b4bc3cae0c8c436cb2e75696c4928c610e52cd34cd58b66bf217300066ea2ad42948b762d5ee91a9a94049f08e09f7794c263d745ae8e49542b659f90b9ebf8
+DIST github.com%2Ftherecipe%2Fqt%2Finternal%2Fbinding%2Ffiles%2Fdocs%2F5.12.0%2F@v%2Fv0.0.0-20200904063919-c0c124a5770d.zip 7699921 BLAKE2B f318b2a9ae8e4f4065aa66afb2ffaa2fbd4a5364c1d1b095c6dca38881d007399d3a55127498c1a6d47ea2176c5822abffd42d9d4074c05b1004b1b39066e688 SHA512 f6980bb5981696058766d67a6ffbb8d6e600ba468e48b98132a9be9628ae432fbc4bc341283c99e8535efeaa8baf9fe1e6621647e23dcc8c43d0e16711cd0099
+DIST github.com%2Ftherecipe%2Fqt%2Finternal%2Fbinding%2Ffiles%2Fdocs%2F5.13.0%2F@v%2Fv0.0.0-20200904063919-c0c124a5770d.mod 66 BLAKE2B 3c0df58b5c2aa6eb4f2c943cc0033f853f4d4d63e4d405cf05ee52d8f690c4f0e2068ea96e17956be286c956e61e0ae30f3c6262a458f5a4fa8d1c5bb0328430 SHA512 0654069c54acbc55a2c4014548742fd9be1b2846bc98ac7f44c9feef61ea58e80a813b891c2b7ce0ed48b068f4ae24a8370c92fbbeaa187c13717bd78f4c5b97
+DIST github.com%2Ftherecipe%2Fqt%2Finternal%2Fbinding%2Ffiles%2Fdocs%2F5.13.0%2F@v%2Fv0.0.0-20200904063919-c0c124a5770d.zip 8155800 BLAKE2B 7d7b2522bfba1171cb0d99b7720f68a4f645149f80cfcabfaf068ae4071eafe6d03de2a099e6c027ce02e02222649ca8b9b7dbd03227b677aeb80a535af77d8e SHA512 38f0fd555b09d5bab48191432dd6dcbdea5c171870500a89b1f43a2554e9f5c15af4e7a3c20a369d7b1d82fa2b1669f40676b5f04a0ea6878133b863f8f19f8f
+DIST github.com%2Ftherecipe%2Fqt%2Finternal%2Fbinding%2Ffiles%2Fdocs%2F@v%2Fv0.0.0-20191019224306-1097424d656c.zip 3609 BLAKE2B 30643301e6c943df029735c8f4b0103b868750a729c36fa4ba2029a010fcb3e8d408382022139e5f85ecb5a3ba195c660364e7540e243a6f2283ca6e6b8b1359 SHA512 5490f417aa17a94d699d1a90208942b5446c2daca31c29704957c95265e2fd38b53dda5a1e8d62a9d19642b9bf46ead0c22b8d0cd56ec283ebac97a3274a6314
 DIST github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod 29 BLAKE2B 8502924d37d2cb283d252008e9727d55269eace4ec1b9e049294563a1d92b777e7333c946bc69c7f47167a36482c1c2084330dc68e9c33fdcb57113ac55e0ba7 SHA512 787ef0a1ab48d9faf632390dd7a89475a11a3c11d6b557cb9228111dfa7af591deb6a102cff6d6c981ab717f29bcfca64b26fcfd2cc4d213f4dac0ed24c6d625
 DIST github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.7.mod 75 BLAKE2B 0326456cbc5968cbc6068bf4dcf61ff05d0cb193d96f238ea7ee34c7457a70c0aef4029ad33512deee60ae07740777662a5613e222304a00d942d06a9321d1de SHA512 d1dbd3c550a62822be4a6e018e2d1598dd7993db76c2c5d0ec958a0d83fb73c1d9803ef3d5e298a5b7e7cc8fb2359013703e6dfe2ef85cf280035e414f78bf69
 DIST github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod 35 BLAKE2B 159fcdee33f554db7f7bfc834a6478865e93a6258876dbb3ae755eb474786149f109ad8823484f1d72a8fe4012f24041c994e4d19ce7e684a84f85025803ffc1 SHA512 633ff61cb8fc7260fc5bd11d9bf59e9a758a3db457a9780701686b9b942b6aaabf102c7342f97d2beeeed247507f383253bc396b26581f7726538149ea4203c0
@@ -370,8 +374,8 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e9102
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20191120175047-4206685974f2.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip 101467 BLAKE2B 8bb0aec8e693a4c0da59f1931e1fdcf6f94a236faba149d5af91e87284f39c693d20be65248eecde739cb555e371804fa6c723a56c69e6d02a347ba908e968b1 SHA512 bee7757d760f5ba1b9f7523af358652a5cb65f2b0064da097f78450871b2636efcbab0298a9871bbb3ce8012bf95a155949251d4f61464dde510097b936b47a8
-DIST protonmail-bridge-1.6.3.tar.gz 1868157 BLAKE2B a1dd7d1e4ca740dc3a03d8f397b442e33fadb5ac629f585e697c5764fa20b94fc5c07f27573ee1a3e5836082cedcb777af765c887cb8889ccce5866f7a688c4c SHA512 c959822ef4acb816f74783186e2d2ae3b094852c1a969488875e3077bee0c11dfc1509e688afa6897568165870ec5a5aa204f47176373aa7e004d68add7a2110
 DIST protonmail-bridge-1.6.6.tar.gz 1871189 BLAKE2B e6effe40fa5828c08a5f5c2fbf848295f4f88ec5057af915b28fae57be51a67aa35c6530f270709ecef4aa17a781b5a97c358191b1da186b0f03f3a64b62b1a2 SHA512 40f0bd52f839ff220ad28a49404915983356f12bfefea5ccb1c68cde20b954da31c0db1535fb5379385c5109ff2f5ab8cda0d93bc618f8e786d0e4c4c078506d
-EBUILD protonmail-bridge-1.6.3.ebuild 21974 BLAKE2B 7933bd875412510e384eacdf401da16e72db763b9ef47613bd69bb0422e2717ebb26a88818d99bd0c404cc6ab30eff6e5379bf5ac1a8354efd4e8dc905e9a25c SHA512 2e0fb0f93aeeb6c98b2883ff93ea77e928d9e5e486fae6d0bc31252d0fa446267907b696f45e21ce9089e19594420994a2920a882c7f0fd1b5cea1ce17e7d6d8
+DIST protonmail-bridge-1.6.9.tar.gz 1877045 BLAKE2B 18aaec6528ff5d78c48f426e2d2ca57f45c374fcae6019b0410c66ad85726ac151cceb9f3cd3bed10a5709de7e3eeb4a0ad559a8e28e33940cdb94e089cf834f SHA512 64928010eedac3434e5c17e7d38074807e81e877c3f675928835613e7955de0e3a0495861b933478a1d81e37020c1fc600a5495e2f1fd319d0c15de8d3125ebe
 EBUILD protonmail-bridge-1.6.6.ebuild 22097 BLAKE2B db7a551e16df0f1400d18ed937edc6fd39093265a84e105ed3757804de86435a7c357b499e13513321e8f935190dcffc9c4d1b1354ba54fd30fa7c6385f6780c SHA512 8d156e2c2918ac3773a15efd9aae9db734757803e8535e9a660cd09c25aa1e016294f364ee952e9b032d59062a08b990308eb97ce94992edffd946b54045872e
+EBUILD protonmail-bridge-1.6.9.ebuild 22373 BLAKE2B 865557533b2ca99b4ade65c4a5aef540b3ccfc2d5dcfafa1297e2f98ab0ae0a87e7456e4646bd28f4d1b3bcd60fb909f2268f1cfd64de12ef44ffed85c63d791 SHA512 f5b54f38876283f325699ea6274eba7b01a8deb6bb656ec4cf93c1756c0d95441724bc277d5242bc16fad237e36e498138c7c143e55aab58b9d281eeb35dbefc
 MISC metadata.xml 618 BLAKE2B a392fa79076ac6eed79581e425edc46eeaa42e4ff3193fe23845062f4de9e8e9edc067473724707ce07025973f0942bdebc94b10c7f02f1e477835ce969ab556 SHA512 813f43dcdec361b1fd0f354245e7572ef2061500bea09fcf2712c1d44883cfadbd0c37dcf960d5dc34c848530a3dd80abaeb6b5da26fbb81363116ec737a1c84
diff --git a/mail-mta/protonmail-bridge/protonmail-bridge-1.6.3.ebuild b/mail-mta/protonmail-bridge/protonmail-bridge-1.6.9.ebuild
index 0e3dcd9a13fd..59127288a9fb 100644
--- a/mail-mta/protonmail-bridge/protonmail-bridge-1.6.3.ebuild
+++ b/mail-mta/protonmail-bridge/protonmail-bridge-1.6.9.ebuild
@@ -85,8 +85,8 @@ EGO_SUM=(
 	"github.com/emersion/go-imap-idle v0.0.0-20200601154248-f05f54664cc4/go.mod"
 	"github.com/emersion/go-imap-move v0.0.0-20190710073258-6e5a51a5b342"
 	"github.com/emersion/go-imap-move v0.0.0-20190710073258-6e5a51a5b342/go.mod"
-	"github.com/emersion/go-imap-quota v0.0.0-20200423100218-dcfd1b7d2b41"
-	"github.com/emersion/go-imap-quota v0.0.0-20200423100218-dcfd1b7d2b41/go.mod"
+	"github.com/emersion/go-imap-quota v0.0.0-20210203125329-619074823f3c"
+	"github.com/emersion/go-imap-quota v0.0.0-20210203125329-619074823f3c/go.mod"
 	"github.com/emersion/go-imap-unselect v0.0.0-20171113212723-b985794e5f26"
 	"github.com/emersion/go-imap-unselect v0.0.0-20171113212723-b985794e5f26/go.mod"
 	"github.com/emersion/go-mbox v1.0.2"
@@ -270,6 +270,12 @@ EGO_SUM=(
 	"github.com/stretchr/testify v1.6.1/go.mod"
 	"github.com/therecipe/qt v0.0.0-20200701200531-7f61353ee73e"
 	"github.com/therecipe/qt v0.0.0-20200701200531-7f61353ee73e/go.mod"
+	"github.com/therecipe/qt v0.0.0-20200904063919-c0c124a5770d"
+	"github.com/therecipe/qt/internal/binding/files/docs v0.0.0-20191019224306-1097424d656c"
+	"github.com/therecipe/qt/internal/binding/files/docs/5.12.0 v0.0.0-20200904063919-c0c124a5770d"
+	"github.com/therecipe/qt/internal/binding/files/docs/5.12.0 v0.0.0-20200904063919-c0c124a5770d/go.mod"
+	"github.com/therecipe/qt/internal/binding/files/docs/5.13.0 v0.0.0-20200904063919-c0c124a5770d"
+	"github.com/therecipe/qt/internal/binding/files/docs/5.13.0 v0.0.0-20200904063919-c0c124a5770d/go.mod"
 	"github.com/ugorji/go v1.1.4/go.mod"
 	"github.com/ugorji/go v1.1.7/go.mod"
 	"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
@@ -393,8 +399,7 @@ IUSE="gui"
 # Some of the tests fail without access to a keyring service
 RESTRICT="test"
 
-RDEPEND="app-crypt/libsecret
-	gui? ( !mail-mta/protonmail-bridge-bin )" # /usr/bin file collision
+RDEPEND="app-crypt/libsecret"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"/${MY_P}
@@ -420,22 +425,10 @@ src_test() {
 }
 
 src_install() {
-	# A slight hack to allow this package (which is currently limited to CLI mode)
-	# and protonmail-bridge-bin (which supports GUI mode) to co-exist.
-	local bin_name unit_name
-	if use gui; then
-		bin_name="${PN}"
-		unit_name="${FILESDIR}/${PN}.service"
-	else
-		bin_name="${PN}-cli"
-		unit_name="${PN}-cli.service"
-		sed -e "s|${PN}|${bin_name}|" "${FILESDIR}"/${PN}.service > ${unit_name} || die
-	fi
-
 	exeinto /usr/bin
-	newexe proton-bridge ${bin_name}
+	newexe proton-bridge ${PN}
 
-	systemd_douserunit ${unit_name}
+	systemd_douserunit "${FILESDIR}"/${PN}.service
 
 	# FIXME: USE=gui will probably need more files
 
@@ -444,6 +437,11 @@ src_install() {
 
 pkg_postinst() {
 	use gui && xdg_icon_cache_update
+
+	# Don't bother checking for USE=-gui here, it has never worked yet
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn "Please note that following the removal of ${CATEGORY}/${PN}-bin, the executable and the systemd unit file installed by ${PN} are now called simply '${PN}' rather than '${PN}-cli'"
+	fi
 }
 
 pkg_postrm() {