gentoo resync : 31.12.2018

13 files changed, 199 insertions, 13 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index d1532e6f0dca..9bdd17c7aaa2 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 7e3eee650111..37eaab5561f4 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -2,10 +2,11 @@ AUX pidgin-2.10.0-gold.patch 1003 BLAKE2B d03b7da2ec9c6901129b103d39b5491f4aedab
 AUX pidgin-2.10.10-eds-3.6-configure.ac.patch 1088 BLAKE2B 5f83a3a9f36810c446bdc0079930bee84d87e4a0252ae750f996542d9407fe44bfdb8e820451c88c0dfd6a1d9a3e75d457de32e6c6e5c69ba77a8d7571834a83 SHA512 d6d0a925803484311fcb78aecc383f4f572886551edc326c7e34cf1376ee80e1f65a4c564c3473d64233120c20d8143b0d63c4af065a15bfde02d830c83ab2f0
 AUX pidgin-2.10.11-tinfo.patch 892 BLAKE2B 50e16a86ed29510c8632a8d6d2021236ba125a4f8fc4cd5c0408b2c0fcfe8187a4d72df512a2e224fbf801df88cb8f39c2d63487ba0f04934be09315d1306ac1 SHA512 019148522e6851e1e52cf52a3b855f0d5fb10dd5a3e7236e5abfe21f270b9feb1b998aaaa668768c85e855019eb69f7b7458c220ca06a189aba3e77947b158db
 AUX pidgin-2.10.9-fix-gtkmedia.patch 267 BLAKE2B 71718c2d469c2418ee4abba9ca1ebdd672094e43773681fca25aeb940a442b56fca7b4342b4e983e4bd75835c80bdbba4171b0c4781c1f4425908e8a3a1f6fcd SHA512 e78c95e1e4b86c4e702ed9e184de75940f4b93265cfce73d0d6b2145d4a07c79f41dbaa996cbb76e5ac19d9fd1a606d1dd31982e948ac58376b24c1ab866e6bd
+AUX pidgin-2.13.0-disable-one-jid-test.patch 872 BLAKE2B 648d92b095dba563e9dd3c6499208192d51d2dc92c06570eb131abfc07d5775d1e28db6ed27c41a4d945b9f3869f17db890ddeac69debbd465ac2e57db27ed47 SHA512 2358af54f9d63e75660f19898f25035ed331571d73a6cf5d09f42df60c82743a22dde84d2ddfcf7706df4e0226d0f6e0689a784fca0e84627edbf3616070d993
 DIST pidgin-2.10.9-irc_join_sleep.patch 534 BLAKE2B 0215cebb93993e19e700e4d4974351ab5e9a00ea094775076d8f439569b34c0ec2faaed360965867df58bc42677516983ce11a2601dd322c1bdf2f288253a5b8 SHA512 8de0d6f05e48cd5a3e894576e06c7fb82e4bfc778cce8bb179fa22e2a05f5c2390a0e4c5b626ee4b910a18eab170d8f4be200f435ce408a86575af99e51e3bdf
 DIST pidgin-2.12.0.tar.bz2 9270704 BLAKE2B d12b84c4ff94e4dec67bf5e13607510a4ccd54b81868a244a5078f760b2c1178670fa25149478032437dcee0641547993c027e34e42b5af96e222e14a43d901f SHA512 e87b39888432982ee36332fd14b272f49f7974de9e8694f7fe3bec2821748d6e6026ac5a63615a93386a033d6ee7c4de5ae0a86b725f63b9cc55650f0ab94b06
 DIST pidgin-2.13.0.tar.bz2 8994457 BLAKE2B 32be31509a90b924fba4a4dbaba304580d88dfc6d3bbe0c88ef12eef381f70e031af1a55ada2abfb6968a9967a9fdadfa69973482b80dea7bb554a983a96fa12 SHA512 68b3d1eefee111544c7eb347386d0aea4f47c3e320d5963a4e0d833ed6af7b1be243a7bcd6a38c9234b58601d10a9aebf8541f1d97decfeca754fa78dc693047
 DIST pidgin-eds-3.6.patch.bz2 2352 BLAKE2B 1d69dc55f43b9efe5d5278a017642702d67a297fe2587467ec0fdca7f9888e26640efe9ac2a18f77ae9c523bf125a2cec6d0bf621f0b2b16f55d30df1bf470df SHA512 a0195679ab55ed9c7ea18ace6dbf0fc994698f1f4eea9d8335dfdcdcd6a68975c0191bd22f150bf5a9a0a691ce7e9e73d79598e1e8be541efa1d9824a633d877
 EBUILD pidgin-2.12.0.ebuild 7505 BLAKE2B 39b377538424788b9b48168c30f651d3cb48ccf860d1d973d5de16b1141bac7108e7b1cbc65d5803f25b6370f57f6ad6cc83b6b90b68060c536b67c2c1f320b1 SHA512 984d41160dbc18272dd1bffc99aee0d756722f5c8a0d666cac21d99cfe5cb642481e20f62cd5c43454049194797bb60dd92697fa28c1036d6accc0f73fe70704
-EBUILD pidgin-2.13.0.ebuild 7698 BLAKE2B d2cfcaee7b7e7b992468ccc60a7d46621d62bcf86dc358d258746ce52384b8d644327bbeba89acfd52888d1e8444223f40a2204d350021f7317c7ae75eed31dd SHA512 d475554025b60dfe84f73a4497fe9bd96d583f241cf4b12311d7f46c7a436c4c1e058a5bb155f8243c6692dddacb58c9945957ca4f56c3225fa90d6269fc2849
+EBUILD pidgin-2.13.0.ebuild 7819 BLAKE2B 0f1bc1daefc7c11e7502e1f8d66cc0df63187c465ba08319295e4d573a493919dc3e831eac1d6a82966a235ddea700c277712dbaecc146c730d7af98f85c68df SHA512 a9a1a4e1dc696f030215a7f40772a715ddfbfca269bb01f47f007be2876af10b3133afe9cfe9f57790dd043a50358b1e3bda2fdcb17e9d9fb204d4f5b0051eb0
 MISC metadata.xml 1480 BLAKE2B 09a69fc87ec34ef69c1862ba62eefabdde0cc806e47e005d2e13cfd639c6cd0d7f7ec6ac5e9a9d2b438c29d98caaf613b472e41ede2cef93de303da15c553e43 SHA512 de9430a267c6d93ec7a922f7ee447e36c2008cc37931896513398ae3f32af7e2a08ebb2ff7f9fb254c7facbf1ee5a4959e562e2fccd6bd85595f3d9b1d0e1e00
diff --git a/net-im/pidgin/files/pidgin-2.13.0-disable-one-jid-test.patch b/net-im/pidgin/files/pidgin-2.13.0-disable-one-jid-test.patch
new file mode 100644
index 000000000000..cf3a6de7bfb2
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.13.0-disable-one-jid-test.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/593338
+
+Workaround one failing test. test fails on all platforms.
+Needs to be fixed upstream.
+
+--- a/libpurple/tests/test_jabber_jutil.c
++++ b/libpurple/tests/test_jabber_jutil.c
+@@ -144,7 +144,16 @@ START_TEST(test_jabber_id_new)
+ 	 *  string MUST NOT contain any LCat character."
+ 	 * The character is U+066D (ARABIC FIVE POINTED STAR).
+ 	 */
++#if 0
++	/*
++		Fails in gentoo: https://bugs.gentoo.org/593338
++
++		98%: Checks: 87, Failures: 1, Errors: 0
++		test_jabber_jutil.c:147:F:JID validate:test_jabber_id_new:0: JID 'foo@example.com/٭simplexe٭' is invalid but jabber_id_new() allowed it
++		FAIL check_libpurple (exit status: 1)
++	*/
+ 	assert_invalid_jid("foo@example.com/٭simplexe٭");
++#endif
+ 
+ 	/* Ensure that jabber_id_new is properly lowercasing node and domains */
+ 	assert_jid_parts("paul", "darkrain42.org", "PaUL@darkrain42.org");
diff --git a/net-im/pidgin/pidgin-2.13.0.ebuild b/net-im/pidgin/pidgin-2.13.0.ebuild
index e2cfef9e9021..68fc76b0cb0e 100644
--- a/net-im/pidgin/pidgin-2.13.0.ebuild
+++ b/net-im/pidgin/pidgin-2.13.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0/2" # libpurple version
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile pie"
 IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses"
 IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
@@ -144,6 +144,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.10.10-eds-3.6-configure.ac.patch"
 	"${FILESDIR}/${PN}-2.10.11-tinfo.patch"
 	"${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286
+	"${FILESDIR}/${PN}-2.13.0-disable-one-jid-test.patch" # 593338
 )
 
 pkg_setup() {
@@ -263,7 +264,8 @@ src_install() {
 }
 
 src_test() {
-	emake check
+	# make default build logs slightly more useful
+	emake check VERBOSE=1
 }
 
 pkg_preinst() { gnome2_icon_savelist; }
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index fc8d10b00201..71c3a5e9d1c0 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -9,6 +9,6 @@ DIST prosody-0.11.1.tar.gz 418780 BLAKE2B 0fa45b71bb7eeaa60385683427c9547af3e014
 DIST prosody-0.9.14.tar.gz 268253 BLAKE2B 0ae62ca3c8eb89feb34f1f67aa3d14aa1e6bf02cf10ff90a43fd7de8bd257d70508e36b10b3f159040c1fa5dcfb6ad8018e3411a5d6042992f71f643a13c11d4 SHA512 30116ebc20c719d88bae7f2f44c129604ec4477004581c3556ff548c75ee026a83dc519701a61a8c3f547776ba74c571e38c3e1e5240da9148dad35a5d1f67e3
 EBUILD prosody-0.10.2.ebuild 2484 BLAKE2B 39490d068e3554d75d8651258c8cee1307f419bd3b3b2f1f597bd9ef3adf0a59c879818d91e4652ce43c19a3c3e391339711409b5b58af748025004db8dfa39a SHA512 45bc465b096e0f2083c3b36faa3ddcabfa65b100014abc020efb8d81e7939be7d52c9d80defe58bcc51139021dfd8ed1205a8d0a0d82b641ed8b870ea0236505
 EBUILD prosody-0.11.0-r1.ebuild 2602 BLAKE2B 4fdc94ef19de23f6dbabde397206b45b7f62c3c75c855165aef974c2f7b3daa8f6a894b0a0a1ba899325ade47369bdf4e9c69a2139826c3774fdc09353c9d007 SHA512 d026e19e954b8d414657f50814ed636cd84b7a7bdec7e57db5a5471711ec5de327300fa3a6a9177ee3cebb3ded684e241b986b268e442f74bbe5b9724af4b97b
-EBUILD prosody-0.11.1.ebuild 2602 BLAKE2B 4fdc94ef19de23f6dbabde397206b45b7f62c3c75c855165aef974c2f7b3daa8f6a894b0a0a1ba899325ade47369bdf4e9c69a2139826c3774fdc09353c9d007 SHA512 d026e19e954b8d414657f50814ed636cd84b7a7bdec7e57db5a5471711ec5de327300fa3a6a9177ee3cebb3ded684e241b986b268e442f74bbe5b9724af4b97b
+EBUILD prosody-0.11.1.ebuild 2667 BLAKE2B 78fc88e3c8aa4d71c9ce9650577335fd3cea7831138b547c63b8adaf7a5e0ad5616505f6d991f8a79949fdd216c9435ec0f3abe94441adf81ab7bfd30fd162ae SHA512 cc13be36a4143006b18912adfcbeae7186df407ced530b8a0c9bee8acc515bdb3cb7bb25f9946beb15434e8313c97d8273b2cd524e24d68dfd6edbd6382f02de
 EBUILD prosody-0.9.14.ebuild 2487 BLAKE2B 68ff4e360612ff9aef0cba3556b6c3fbe69d261ddad40f24ad2a88e3adb4d6d3e119e011a4186412531ba23a6f98692550e4181084e63e201cf9f753080c6427 SHA512 c28fec41e3a57e76a32c9a5c380804d904a0a9f76dd66b4bb183ba2eb6a705957c54bef760bec723277ea234c6c5f2d12b899de11126962c3c77c75f95a9f1e6
 MISC metadata.xml 624 BLAKE2B 57704d2f82f7b7daa34d7114d375591cffe12a3cfd396a95ea61c76f644750cd92567d5619133bebd56ff2f302c3f576aca22abcc954641c89757e85e35ae0b6 SHA512 0410e3372d04163cc8b5e03d95f5c0c7e7e6da4e6034adfd86700455c6662d844e8da5590dbd5a633179dd8c3da15760b49d3068787ed61833c9031cec341a24
diff --git a/net-im/prosody/prosody-0.11.1.ebuild b/net-im/prosody/prosody-0.11.1.ebuild
index eccd2e1da7be..8049f02ed567 100644
--- a/net-im/prosody/prosody-0.11.1.ebuild
+++ b/net-im/prosody/prosody-0.11.1.ebuild
@@ -13,16 +13,20 @@ SRC_URI="https://prosody.im/tmp/${MY_PV}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="ipv6 libevent mysql postgres sqlite ssl zlib jit libressl"
+KEYWORDS="amd64 arm x86"
+IUSE="ipv6 libevent mysql postgres sqlite ssl zlib jit libressl test"
 
-DEPEND="net-im/jabber-base
+BASE_DEPEND="net-im/jabber-base
 		dev-lua/LuaBitOp
 		!jit? ( >=dev-lang/lua-5.1:0 )
 		jit? ( dev-lang/luajit:2 )
 		>=net-dns/libidn-1.1:=
 		!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= )"
-RDEPEND="${DEPEND}
+
+DEPEND="${BASE_DEPEND}
+		test? ( dev-lua/busted )"
+
+RDEPEND="${BASE_DEPEND}
 		>=dev-lua/luaexpat-1.3.0
 		dev-lua/luafilesystem
 		ipv6? ( >=dev-lua/luasocket-3 )
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index b2793cab73b2..11f619e934d2 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -4,13 +4,17 @@ AUX telegram-desktop-bin-r2 646 BLAKE2B 4a99820a48dee103680bd81ba738c3a56538864b
 DIST tdesktop-1.5.1.tar.gz 14105322 BLAKE2B d78859771f891eb04223cc8a6992daf4d6e9f33f4fdf810629fd640bc3a504911994fb6f2c67c7ca9163dd3be9cfa7eb9f21e7f3a9ac244a78e7d21dc3b7ae70 SHA512 9e9f24d925c4aa36961abeec9b4ca1a08238ba716ed5e472ae7d9660af7d2660de4a7fa92eb34fb27b5a5a17bbe78a803cf2953c159c3ee84996d2fc7ff389d3
 DIST tdesktop-1.5.2.tar.gz 14107995 BLAKE2B b366e3891cecb0b35348c9a94281db6c1a59038dc5f10c15267f8109ee1ee0e88a4dfbc3494876cc835f29ab32c4303d6bd462985c731dbfc2c7736ad6e55273 SHA512 a81660b3b6ef58017e3ec3d4584bc7aa3db138450e4a30e6d7276b0bcffb5683866c8eb44d54554287ac1f3c6d149e1db63a4c68d5e3e90bb2d59c7ba3a9022d
 DIST tdesktop-1.5.3.tar.gz 14128888 BLAKE2B 88cf2fc4a8645ba13ad27451e0404d7e558feeefc547bb0e44036538c81f6de049d6c672d4323e3f969e37104e64cf4f032465d649e5f05608fefca07d37b463 SHA512 f41cea42faa59d76d4b7bfb7a72dde58c6bcb3189a85655274b5db12e2fa7c78564b7eaebbefc92173e0b47ea8183fe129a73c26cd2d85210353906fb0ff935f
+DIST tdesktop-1.5.4.tar.gz 14129681 BLAKE2B e3c5e4a9914affc421d6a133c56dd48c3587f705d3858d1ef35be45f5da4cebaf35864336763ee6ae2018929c7b40b6ed903341380fa189c3e37a2e2b5d41268 SHA512 667d47fc39fff8ac4731c85db48f5d58309eab7b4d707435161b885cf47c6dc9505fc88277c14d9e010ac2b27f4c456a64ebccfe6dabfb21e38d65d86e8789db
 DIST tsetup.1.5.1.tar.xz 32080940 BLAKE2B 3ecf42f88904d343d25f927b6f043a916b6ea90e1b1fbb60f34572cf71858d31fa68c240d82daef3c3343295b6defb5be019379d3b018ce7fcf961387290797b SHA512 70a35d5af9a8d4a212f5c7b63989d02392e3d0da30e7baf0644a609899547393a019061e71905a708c14c12e09cf32ced6b42f5889c287b32f4395b3236686c5
 DIST tsetup.1.5.2.tar.xz 32020040 BLAKE2B d0ef2a568978fe3f9bc458648d0a6d084cefc4a8cc9c31955f96ce16a825847aa158b9e84a9f3388b6e9defb6205f8669f44a7c0d32c793479d7da209f09c45f SHA512 2db0b8f6afa49870e4b2e6bbe9250f0312528c20f9b3d35254865019c61a01adc3a185d010b79a8af52b4fe9fb087c08b32d438c18065fb57656b48e40baed11
 DIST tsetup.1.5.3.tar.xz 32139064 BLAKE2B 2fed73bcbc991c4cd531b0f04d0cf493df10d287c66820f2aa15c93b81077405506092b27013540b56d93ddb6e11172e78dfef91ed7b3bd1bd87d42d374aa38a SHA512 12c6d148f27e9d98ecc56131a118010ba20cde5eed77d9438181ca13c26b9ac402edd351a05b251431f920405ae7df243c3b9d9a6e28359c4ec0a5045980ef37
+DIST tsetup.1.5.4.tar.xz 32147160 BLAKE2B c8c0b14e2c3d9d9ed8783f7611eb15fa0ad830e85995b4b8ba59b643a791cf51e80663216cf4ab2807afb4b81eb79a45dc3c6456c9fd0a5556dc5ce0ee5731ca SHA512 f8074961794034493acb55588908f71efe95a7adcebac8e3c1d81472a90b28e68f7883d77f38ad1c261666b6c71bc9e5c0caab7eca57156ca76ba0c378af368f
 DIST tsetup32.1.5.1.tar.xz 34530452 BLAKE2B 2c074baf733780afc35b64e70f6d4bf8dcd49c44d60e1020f5061bc48e6a71283c8a32f2f848a0fa235b822c4a47e3e771e10306cfa751b9a22d835f18842306 SHA512 f2767b5b0ac027ce341dac2616a18cc865e8e41524a24b17e91b7ad7b14d921fde837e4721da161685a1e7572c3dc3649e3c57f818848979232e23e9ee91d0b0
 DIST tsetup32.1.5.2.tar.xz 33702468 BLAKE2B 259f24c53e4687828ad3313485f4cbdf2113d74f1b36a982c6f495f1e7c3cf03344754a49f115994894f4aee669170963ab494a7fd5adb588729596142335792 SHA512 d1f36dfd1f723237c0e0f0d65f66006d9958f61c01a6a6c80265c47f1d10f940811b3b2db7d786e098fefaf949c04f371cc324db9fb35ffba80ebb4188be4ce9
 DIST tsetup32.1.5.3.tar.xz 34630040 BLAKE2B 76f1d46d06d06440a4b586a6338b2870f46a4be16e7906d795391784b11c15d8434c524f2adcb5be42d67bc8af82257011eeb621b3cda159c0bf0e4071002358 SHA512 09c0a6ac58d8fb57aa50092788731168bc4364b665edc2bef595b84214e1723f0a36439f46aff5e337296607fc74b7cc039a1d7a42a357629132750109bfea35
+DIST tsetup32.1.5.4.tar.xz 34626784 BLAKE2B c642f0b943bfd9e287b7906487fa5081103e71f9f8fff88047c6a384e3a3c9aa48c7aff38aebff8fc12bc37072349ae80ec40d8d9580ae99a06b1c61d0f3616f SHA512 a7c9aa753ef657ec2153b2dc8961c4baf32fbca9fc02e78db921c638d36e9df321f171885045b4ffb09412900be3a4b882057816e0f3024fa6fd20f258fe6a85
 EBUILD telegram-desktop-bin-1.5.1.ebuild 1632 BLAKE2B 5a5c570a88f0ea40bb97230d0ede96932ea5cce3b045e5fd51a29ae6a95249d6e96b99e9e2653805fa36d7609ea25c97087e9cdbb218a8f2b7cae792089fc042 SHA512 ced48bb10c17618b12298568b1e236c66af967fd32d84ed41257a4e4aff97004cc9278981b7ec2ce865833410e4134816b552fca9f135d261d87cfeae34c891a
 EBUILD telegram-desktop-bin-1.5.2.ebuild 1632 BLAKE2B 5a5c570a88f0ea40bb97230d0ede96932ea5cce3b045e5fd51a29ae6a95249d6e96b99e9e2653805fa36d7609ea25c97087e9cdbb218a8f2b7cae792089fc042 SHA512 ced48bb10c17618b12298568b1e236c66af967fd32d84ed41257a4e4aff97004cc9278981b7ec2ce865833410e4134816b552fca9f135d261d87cfeae34c891a
 EBUILD telegram-desktop-bin-1.5.3.ebuild 1632 BLAKE2B 5a5c570a88f0ea40bb97230d0ede96932ea5cce3b045e5fd51a29ae6a95249d6e96b99e9e2653805fa36d7609ea25c97087e9cdbb218a8f2b7cae792089fc042 SHA512 ced48bb10c17618b12298568b1e236c66af967fd32d84ed41257a4e4aff97004cc9278981b7ec2ce865833410e4134816b552fca9f135d261d87cfeae34c891a
+EBUILD telegram-desktop-bin-1.5.4.ebuild 1632 BLAKE2B 5a5c570a88f0ea40bb97230d0ede96932ea5cce3b045e5fd51a29ae6a95249d6e96b99e9e2653805fa36d7609ea25c97087e9cdbb218a8f2b7cae792089fc042 SHA512 ced48bb10c17618b12298568b1e236c66af967fd32d84ed41257a4e4aff97004cc9278981b7ec2ce865833410e4134816b552fca9f135d261d87cfeae34c891a
 MISC metadata.xml 585 BLAKE2B 0f6f2dbb75e3fc543ad04b0d72652802b8de0336ccd1171fc06e2d2b61ff5288346b9e3c44afad9e5dbd9de9fa46d3324710697d83e94c9a5da5a8c5a137b26f SHA512 d5af59695ad9fa610865b3719637a7f5dd283f30bf7051f39fd6b8ae7c485f46d52627900cc3d46450491c7429844e0d7c535f2a028a112cb65d7523ff2c669b
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.5.4.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.5.4.ebuild
new file mode 100644
index 000000000000..d24c8adae29f
--- /dev/null
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.5.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop gnome2-utils xdg
+
+DESCRIPTION="Official desktop client for Telegram (binary package)"
+HOMEPAGE="https://desktop.telegram.org"
+SRC_URI="
+	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
+	amd64? ( https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/tsetup.${PV}.tar.xz )
+	x86? ( https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/tsetup32.${PV}.tar.xz )
+"
+
+LICENSE="telegram"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+QA_PREBUILT="usr/lib/${PN}/Telegram"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/gobject-introspection
+	>=sys-apps/dbus-1.4.20
+	x11-libs/libX11
+	>=x11-libs/libxcb-1.10[xkb]
+	>=media-libs/fontconfig-2.13
+"
+
+S="${WORKDIR}/Telegram"
+
+src_install() {
+	exeinto /usr/lib/${PN}
+	doexe "Telegram"
+	newbin "${FILESDIR}"/${PN} "telegram-desktop"
+
+	local icon_size
+	for icon_size in 16 32 48 64 128 256 512; do
+		newicon -s "${icon_size}" \
+			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
+			telegram.png
+	done
+
+	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+	einfo
+	einfo "Previous versions of ${PN} have created "
+	einfo "\"~/.local/share/applications/telegram.desktop\". These files"
+	einfo "conflict with the one shipped by portage and should be removed"
+	einfo "from all homedirs. (https://bugs.gentoo.org/618662)"
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/net-im/yowsup/Manifest b/net-im/yowsup/Manifest
index 49b8cfd4ecff..f635d6396bbc 100644
--- a/net-im/yowsup/Manifest
+++ b/net-im/yowsup/Manifest
@@ -1,4 +1,6 @@
-AUX fix_newer_six_version.patch 1109 BLAKE2B 0805c79a35d9f49ed3900dfe294bf371c2d1c44b88af7761a6e042665526356e84e7fb00073596c99a37b1b47d3f3bbbbbe1ee2d0332900622a5874001cdc924 SHA512 a8e4689b58b1843eb53befc1f75a868ea43e4e2d6292369948f1d69c918f06b3e2b99c60753ac028ba2b8966e36b7865572f485fd9a7519b7215f163b9765ff2
+AUX yowsup-2.5.7-add-python3.7-support.patch 2535 BLAKE2B 261373abd08c5a3eb46267755c8f57000742c442074ee578db5f3f64f9def59e1aae3dc74722706d86bbad62f1cff8d2b7b54cf20153d04c7ce9522c4a9334b0 SHA512 b35b52a0f5e2e5a766b11f2360e6bd17e95ac9c8065a711a9cdad829fb2e5f2109e232a24dab9be1bfd4e2f082d1e20b2b799ea9c4f5987bfbf8f90d16450c60
+AUX yowsup-2.5.7-fix-install-path.patch 1006 BLAKE2B 984570abfac5056ddd3ac9d9dc89ebf75bd43f724f9f9278dde5099d09300588a7be7e8ce8aba5f1241f115d24e9405f55606ed729a0a2a379c606d494bab330 SHA512 53bdf45df4b09bc669e8a7edd413d77cd42258da653f6fbaea82e2d6cc10d1bf4ff0acfa8e463ad3c509fb59672e59995eb7f3351fb744386bfdc9f82bc56c08
+AUX yowsup-2.5.7-fix-newer-six.patch 1109 BLAKE2B 0805c79a35d9f49ed3900dfe294bf371c2d1c44b88af7761a6e042665526356e84e7fb00073596c99a37b1b47d3f3bbbbbe1ee2d0332900622a5874001cdc924 SHA512 a8e4689b58b1843eb53befc1f75a868ea43e4e2d6292369948f1d69c918f06b3e2b99c60753ac028ba2b8966e36b7865572f485fd9a7519b7215f163b9765ff2
 DIST yowsup-2.5.7.tar.gz 125732 BLAKE2B 31896cfef601bfe4b65df3518ce6812ad66a98902ec7c8ca5b2ffda15c48c9390010fce58e1158f6ddc325911fd78d1be2bc708d499ab11b725835c5cd5ea246 SHA512 e64e119e8301d6cd9244a24ce960fdd00a5372a7766cf2f52dfd7610828358086e6c4f77fba6f962c1b84f6b28fa6b6d4d708bbb50c281e5a6563b99634b9495
-EBUILD yowsup-2.5.7-r1.ebuild 881 BLAKE2B 6ba4bf0b3e5a3d71bed129931e8e5f081080361f40a38fbe0685b0a13ae9867ecdfb2bd2aadc7179c17c411835859019776bcbde82e5b456d9540be95b8df0cf SHA512 61dfaff6714b18952c0c1d78dd6125de41e2b2a1bb3f5bbcfb7b5d87ebac61c6945741f3b4f66742087ffbbb4e03c0fb03cce34a17cc5e8cde27e80760fa65a0
+EBUILD yowsup-2.5.7-r2.ebuild 978 BLAKE2B 040dae0fce253e9c10059752759e31e2beb10760319b06d7bc38d10916e9b7ea60ddce6052affdb773f3ab1fa1ccbd5a43af7c3b069af1e71decab638c171b55 SHA512 583a084ed6b3a1dcd58a5676e53cae57c5a475bf6fe92b4e5cfa8e9f32902eaf4ef5a3fd5eaf826d43e20435822b6bbbffba24cfd7f9eac9e9844183f4b74abb
 MISC metadata.xml 874 BLAKE2B d27417813e16211b395c0680cb1342e4088d8d99c7b7ce904bcae5fce1ee479147cc8c8a3e82069c4fdea61df5ce774c3efc0b528af4080535d12a555e05469c SHA512 ac2e2d245d510785dec9a1979b49c60618815098f6baf1fbb097426ea7ce9c4131c3702d0dc43c5b02c4da4fe7595220a5f9626b6eb386c0f30fe6e1fb20a26f
diff --git a/net-im/yowsup/files/yowsup-2.5.7-add-python3.7-support.patch b/net-im/yowsup/files/yowsup-2.5.7-add-python3.7-support.patch
new file mode 100644
index 000000000000..6d3f3c83004e
--- /dev/null
+++ b/net-im/yowsup/files/yowsup-2.5.7-add-python3.7-support.patch
@@ -0,0 +1,51 @@
+Description: Fix compatibility with Python 3.7 since async has become a reserved word
+Author: Josue Ortega <josue@debian.org>
+Last-Update: 2018-07-29
+
+--- a/yowsup/demos/cli/layer.py
++++ b/yowsup/demos/cli/layer.py
+@@ -559,7 +559,7 @@
+             mediaUploader = MediaUploader(jid, self.getOwnJid(), filePath,
+                                       resultRequestUploadIqProtocolEntity.getUrl(),
+                                       resultRequestUploadIqProtocolEntity.getResumeOffset(),
+-                                      successFn, self.onUploadError, self.onUploadProgress, async=False)
++                                      successFn, self.onUploadError, self.onUploadProgress, asyncronous=False)
+             mediaUploader.start()
+ 
+     def onRequestUploadError(self, jid, path, errorRequestUploadIqProtocolEntity, requestUploadIqProtocolEntity):
+--- a/yowsup/layers/interface/interface.py
++++ b/yowsup/layers/interface/interface.py
+@@ -125,7 +125,7 @@
+             mediaUploader = MediaUploader(builder.jid, self.getOwnJid(), builder.getFilepath(),
+                                       resultRequestUploadIqProtocolEntity.getUrl(),
+                                       resultRequestUploadIqProtocolEntity.getResumeOffset(),
+-                                      successFn, errorFn, progress, async=True)
++                                      successFn, errorFn, progress, asyncronous=True)
+             mediaUploader.start()
+ 
+     def __onRequestUploadError(self, errorEntity, requestUploadEntity, builder, error = None):
+--- a/yowsup/layers/protocol_media/mediauploader.py
++++ b/yowsup/layers/protocol_media/mediauploader.py
+@@ -9,10 +9,11 @@
+ logger = logging.getLogger(__name__)
+ 
+ class MediaUploader(WARequest, threading.Thread):
+-    def __init__(self, jid, accountJid, sourcePath, uploadUrl, resumeOffset = 0, successClbk = None, errorClbk = None, progressCallback = None, async = True):
++    def __init__(self, jid, accountJid, sourcePath, uploadUrl, resumeOffset=0, successClbk=None,
++                 errorClbk=None, progressCallback=None, asyncronous=True):
+         WARequest.__init__(self)
+ 
+-        self.async = async
++        self.asyncronous = asyncronous
+         self.jid = jid
+         self.accountJid = accountJid
+         self.sourcePath = sourcePath
+@@ -30,7 +31,7 @@
+         self.sock = socket.socket()
+ 
+     def start(self):
+-        if self.async:
++        if self.asyncronous:
+             threading.Thread.__init__(self)
+             super(MediaUploader, self).start()
+         else:
diff --git a/net-im/yowsup/files/yowsup-2.5.7-fix-install-path.patch b/net-im/yowsup/files/yowsup-2.5.7-fix-install-path.patch
new file mode 100644
index 000000000000..63b0fbfc91c9
--- /dev/null
+++ b/net-im/yowsup/files/yowsup-2.5.7-fix-install-path.patch
@@ -0,0 +1,28 @@
+Description: Fixes wrong installation of mime.types file.
+Author: Josue Ortega <josue@debian.org>
+Last-Update: 2016-09-04
+
+--- a/setup.py
++++ b/setup.py
+@@ -33,7 +33,7 @@
+     #long_description=long_description,
+     packages= find_packages(),
+     include_package_data=True,
+-    data_files = [('yowsup/common', ['yowsup/common/mime.types'])],
++    #data_files = [('yowsup/common', ['yowsup/common/mime.types'])],
+     platforms='any',
+     #test_suite='',
+     classifiers = [
+--- a/yowsup/common/tools.py
++++ b/yowsup/common/tools.py
+@@ -150,7 +150,9 @@
+         return preview
+ 
+ class MimeTools:
+-    MIME_FILE = os.path.join(os.path.dirname(__file__), 'mime.types')
++    # Replaces mime.types path for the debian path installation
++    # MIME_FILE = os.path.join(os.path.dirname(__file__), 'mime.types')
++    MIME_FILE = os.path.join('/usr/share/yowsup/common', 'mime.types')
+     mimetypes.init() # Load default mime.types
+     try:
+         mimetypes.init([MIME_FILE]) # Append whatsapp mime.types
diff --git a/net-im/yowsup/files/fix_newer_six_version.patch b/net-im/yowsup/files/yowsup-2.5.7-fix-newer-six.patch
index d1bfb27ce295..d1bfb27ce295 100644
--- a/net-im/yowsup/files/fix_newer_six_version.patch
+++ b/net-im/yowsup/files/yowsup-2.5.7-fix-newer-six.patch
diff --git a/net-im/yowsup/yowsup-2.5.7-r1.ebuild b/net-im/yowsup/yowsup-2.5.7-r2.ebuild
index 7c53464c30fc..48ac97225448 100644
--- a/net-im/yowsup/yowsup-2.5.7-r1.ebuild
+++ b/net-im/yowsup/yowsup-2.5.7-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE="readline"
 
 inherit distutils-r1
@@ -20,12 +20,17 @@ RDEPEND="
 	dev-python/configargparse[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
 	dev-python/python-axolotl-curve25519[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 "
 
 DEPEND="${RDEPEND}"
+
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
-PATCHES=( "${FILESDIR}/fix_newer_six_version.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-add-python3.7-support.patch"
+	"${FILESDIR}/${P}-fix-install-path.patch"
+	"${FILESDIR}/${P}-fix-newer-six.patch"
+	)