gentoo resync : 19.03.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-03-19 11:37:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-03-19 11:37:34 +0000
commit: b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch)
tree: 9fd110f9fc996e8a4213eeda994a8c112491b86d /net-im
parent: 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff)
26 files changed, 433 insertions, 531 deletions
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index d52a0437f42d..771951f6c78f 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/dianara/Manifest b/net-im/dianara/Manifest
index 0fd27983d99e..a68c82261d24 100644
--- a/net-im/dianara/Manifest
+++ b/net-im/dianara/Manifest
@@ -1,3 +1,5 @@
 DIST dianara-v1.3.7.tar.gz 914570 BLAKE2B 7e78c867b5ca485fb24d924410b0f24eb9b7c132d61f0fb40fb6a43b26db13eeb40fff6a8ee0147045f392317a1da90518040726bcdeb97274bd407c4ab00bb6 SHA512 9727fabff2ae6a13811d61d15027a5de063628c628bb12c7f82bcefa45f49ee4b48b9dc861de2cede296669bc73a589efb3050200877339b4b5d0f058624b4b7
+DIST dianara-v1.4.2.tar.gz 946414 BLAKE2B 418f9cc701d37d03a23a205a1854b9d7de1f6fbdf372bbc9030285f5a37bd4602d6eeb2c529a8ec1406385cc385ec9057f8c590a7c9e94ef741c3c0a922714bb SHA512 97b0b8b661f1d40ce419b5dc04275ddb9a514dfc6e993ecf45cb18fabed1e8ed73fbee24c9e0c643b3e552a61b38b49b440489278d17c44aa6cbfe51dc5f59c3
 EBUILD dianara-1.3.7-r1.ebuild 965 BLAKE2B 00b49a69cb9bbf633d3628cb5b6a1829d2bfd85aea767b851a1456ba8648267aa097a33f99c639d1c9587af35a8fbb9a9d0b3adec592adbd92657722dc6ce4fe SHA512 9af21150a263180563c2eb7b4806a700b2bb0752d31f9f795a0caf87c86190d3a0086599e02bc9d82b1e11ae331fb786fb116d72589c919085411264e1aecd70
+EBUILD dianara-1.4.2.ebuild 846 BLAKE2B d8a807d9e4db298db9226fcde34356f50eb8e6a4e95c9f7adca86e8fb6eefc6d46351387f18c899fbab18ecbb996c96d820c3ddcddb0398dd689574d036dbcda SHA512 5d1baa2a1edf43d2caf3896c2fc74d85ce8e51147b8c8ed7620ed3a0db353b60170b2bcc79111af57783b0d69f84e561516142455b718eb5afac0659ad786ab6
 MISC metadata.xml 261 BLAKE2B ba6e54a2152669d4035112fc8d614209745aa95d24ae5c700c1ed38c095d05eec7243c95c606397a1946fda0d49b419b844bd1eff298f2afdd23364d3c9878e3 SHA512 a85b18560cf49c8399555ba75ea5ed8086dab2538e2f98fcfa4e974f7b4b5facdc574293ccd700efd4bc35efe7f66438b8054c9830a7cdc24a6e03b68f6e1a58
diff --git a/net-im/dianara/dianara-1.4.2.ebuild b/net-im/dianara/dianara-1.4.2.ebuild
new file mode 100644
index 000000000000..892cb4565381
--- /dev/null
+++ b/net-im/dianara/dianara-1.4.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=${PN}-v${PV/_beta/beta}
+inherit desktop qmake-utils xdg
+
+DESCRIPTION="Qt-based client for the pump.io distributed social network"
+HOMEPAGE="http://dianara.nongnu.org/"
+SRC_URI="mirror://nongnu/dianara/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=app-crypt/qca-2.1.0.3:2[qt5(+),ssl]
+	>=dev-libs/qoauth-2.0.1_pre20160315-r2:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtwidgets:5
+	sys-apps/file"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	doman manual/*
+	einstalldocs
+	doicon -s 32 icon/32x32/${PN}.png
+	doicon -s 64 icon/64x64/${PN}.png
+	domenu ${PN}.desktop
+}
diff --git a/net-im/dino/Manifest b/net-im/dino/Manifest
index fe201cf3075e..d1772b4b99d3 100644
--- a/net-im/dino/Manifest
+++ b/net-im/dino/Manifest
@@ -1,2 +1,2 @@
-EBUILD dino-9999.ebuild 1542 BLAKE2B 61c46ecd806503d17bf27f2f9346f01175cd6fc38ac4b5718fae2e7408ba6d50f9c9dba1bb16a4b12fd6edbf590b0e5bfa6997295e46344b6b21aacde48ff8f7 SHA512 8538cb7d1edae2dd8a34f2e3eef4bb2e93fcd5c9940adf2a9426baf7d8586742649751adf8c04938fb4b38568fc3a91b5d3a1be6119b6fd5f9f35f34e2006397
-MISC metadata.xml 575 BLAKE2B df85897e138ef2e19f9d4a700fe6b56b4aac9ac680ba68d9248465fd9ebfa0bb989591a9a47b91ad46009322c47a726bf773e86eda3697140629092e3d767650 SHA512 a5b5690198b7462f4abbfaacd2ff51e284dcaf1f721d92993cd42ce2bc4ccd543893cbeaa1af591cf676ccd68722ab18190fae0e3615d4defb272dfaec98c525
+EBUILD dino-9999.ebuild 1536 BLAKE2B 9fe17bbcddc215cfa10800fa234e9365e41c4f1b09fb3b52e9dbcee13b1d392cd8823eedf3f52ae1e62e5be45737bbec55ce6f5b3587a728c1189df239665090 SHA512 8cdb60f992429e98975fcb7f6e651aca203e3115f87e2ba07cd1dfd4772b8802bfa592ca2fc97fa6f8fefce4e020cc02e87356d48a7850312b560a18388dc435
+MISC metadata.xml 573 BLAKE2B cf7a2731750afde53919e6a41541c0829df4ffa6da202c179092de0640a8ac044445b258350704822d02f302c601738f38f05fc2ab938d6f0ea55bead77b0eae SHA512 7023554fe0c67fd41d9134315500a7206653f34a192673db9bd741af22e05f0a00e431fa96c109c94bab6dbdb31334729bc272a07773dd7b905dd0422ce8532f
diff --git a/net-im/dino/dino-9999.ebuild b/net-im/dino/dino-9999.ebuild
index 80ecc7fbd0b2..a1a9b20b2833 100644
--- a/net-im/dino/dino-9999.ebuild
+++ b/net-im/dino/dino-9999.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Modern Jabber/XMPP Client using GTK+/Vala"
 HOMEPAGE="https://dino.im"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="+gnupg +http +omemo"
+IUSE="+gpg +http +omemo"
 
 MY_REPO_URI="https://github.com/dino/dino"
 if [[ ${PV} == "9999" ]]; then
@@ -32,7 +32,7 @@ RDEPEND="
 	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:3
 	x11-libs/pango
-	gnupg? ( app-crypt/gpgme:1 )
+	gpg? ( app-crypt/gpgme:1 )
 	http? ( net-libs/libsoup:2.4 )
 	omemo? (
 		dev-libs/libgcrypt:0
@@ -52,7 +52,7 @@ src_prepare() {
 
 src_configure() {
 	local disabled_plugins=(
-		$(usex gnupg "" "openpgp")
+		$(usex gpg "" "openpgp")
 		$(usex omemo "" "omemo")
 		$(usex http  "" "http-files")
 	)
diff --git a/net-im/dino/metadata.xml b/net-im/dino/metadata.xml
index c488bca606f2..05d64fd0a3f9 100644
--- a/net-im/dino/metadata.xml
+++ b/net-im/dino/metadata.xml
@@ -10,7 +10,7 @@
 		<remote-id type="github">dino/dino</remote-id>
 	</upstream>
 	<use>
-		<flag name="gnupg">Enable OpenPGP encryption plugin</flag>
+		<flag name="gpg">Enable OpenPGP encryption plugin</flag>
 		<flag name="http">Enable HTTP file upload plugin</flag>
 		<flag name="omemo">Enable OMEMO encryption plugin</flag>
 	</use>
diff --git a/net-im/discord-bin/Manifest b/net-im/discord-bin/Manifest
index 1ff515647e24..a9babda20bb2 100644
--- a/net-im/discord-bin/Manifest
+++ b/net-im/discord-bin/Manifest
@@ -1,3 +1,3 @@
-DIST discord-0.0.8.deb 44221304 BLAKE2B 3b40f03a3398e1041c0b532df8bc1326df2564a2744d05529db9ba9191bb647eed4ebc28e08cdfa69b98336b2b0619f5898367c3497a704a7bec4309f7f2eb36 SHA512 5d228f0d36306d35ae8d76385a82cbfef32da2ee405292062972c4c2df453f0d329d91127d55ce81e79fa398de9be839b77125fc8a7e9958fa3409c29ee4880a
-EBUILD discord-bin-0.0.8.ebuild 1925 BLAKE2B 3b66146ad2e85747a869b45872c1a7a53d8f36a1332be1d785977d80c34618fa7966fcce327d63fbef7262a4103c1c5bf740e1f101d5fe1bd1686c56fca3a13f SHA512 3aed6ff6fb4a8fd5ac1b90bcf1894cfa2d1236ad9e5b37c0f7d0c662b093be06ccda1bf927532647769891ce0da675b9266197328fbae12d38c804b7376c1d41
+DIST discord-0.0.9.deb 44445792 BLAKE2B 0e2904282a6486f9d0aed8498dfa38233196d3e3c9b14d6064eefe770c061fd48c70f048972f58c911e5711b171e0a0702a2657ae6f6ee0c69f415ea7f641eb7 SHA512 3c9465566a340b9f6afcb47a3d2deec4b560c78d44e807742c660ab2d834ddf1d7b66958ae6ac1438ace21ccbcb81b11f9c72efb0ded2cbfce6b6e5631375b4a
+EBUILD discord-bin-0.0.9.ebuild 1918 BLAKE2B 69062455533c7b54680f7dc715b9b3da2aeab967a37e04a85f832cfd74a3348c54d7587086544afd03b8db50e968c0909c9dbc957e7d692c9222118bf28cbbd7 SHA512 a56a743331ac9f01a49023a43669b2d1755d930b27a7025c7629c880d58adc8f69f686be0281cf4f625628b5205ee8593b6ca6999cf93f4cc3df5055881b2d1d
 MISC metadata.xml 329 BLAKE2B 0fc0de1eedabe5050594ebb1fa5b5fe97625b52735ee17eb54618284128f8e9fe6e8a9229e2797d6b97c99c00cf72cfd9607824dafbfe91fb6079f3a2661a492 SHA512 32ea11474fb92d83dff6602e27d6b8434cf282635a5bec3e6ddcf2c8863b7f0df76fafe31a2e021c684df20cd5e29a551c06d74ee931f4bc0696061980f9d557
diff --git a/net-im/discord-bin/discord-bin-0.0.8.ebuild b/net-im/discord-bin/discord-bin-0.0.9.ebuild
index 190284c78c90..99ca345176a1 100644
--- a/net-im/discord-bin/discord-bin-0.0.8.ebuild
+++ b/net-im/discord-bin/discord-bin-0.0.9.ebuild
@@ -33,9 +33,10 @@ RDEPEND="
 	sys-libs/libcxx
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
+	x11-libs/gtk+:3
 	x11-libs/libX11
 	x11-libs/libXScrnSaver
+	x11-libs/libxcb
 	x11-libs/libXcomposite
 	x11-libs/libXcursor
 	x11-libs/libXdamage
@@ -57,7 +58,6 @@ QA_PREBUILT="
 	opt/discord/swiftshader/libEGL.so
 	opt/discord/swiftshader/libGLESv2.so
 	opt/discord/libVkICD_mock_icd.so
-	opt/discord/libnode.so
 	opt/discord/libffmpeg.so
 "
 
diff --git a/net-im/ekg2/Manifest b/net-im/ekg2/Manifest
index 8af86829a8b6..2bd57667d0dd 100644
--- a/net-im/ekg2/Manifest
+++ b/net-im/ekg2/Manifest
@@ -1,5 +1,4 @@
-AUX 0001-Gentoo-use-vendor-dirs-for-perl-modules.patch 786 BLAKE2B ad21ba7562bc772887d9adf03cfdece724a14fcc13df14b4e8eed47def1fce7959ec8b0818460bd39b5e8addd26a51f480673598c15c04864c7cb6aa1d5cd153 SHA512 8156f6a1f29a1a727840223e4d2bf44c9d6f4a544c948094b405f6a22083070bef5e473597bd993d49e51a5bfedeaa942da8d411f8ed9d61988a8341c8b0134b
-DIST ekg2-0.3.1.tar.gz 1704772 BLAKE2B 2957d872f4d3697e36d495b54e5c39ec59c4865883b9523077ce607fc954268a0f2af07f14e4e217982abb2c1cbfdad423775631d6c22adfd2dbdc8f15895176 SHA512 dc107005f434f9e3011ff2be720b750b09c72fee1f9e1b47dfbf8af8eac1e27b24e028505a0d4928aedd1375a3245e93757410c742ff112ff5dac1e1a4f5a21c
-EBUILD ekg2-0.3.1-r2.ebuild 3006 BLAKE2B 1f38e3064802a73ddccfa93be85c9c0eb037b9d037fdc20717035751d44381f3cc933917c610e1409208c881bb77118b06c559184a285b46e458aa5b375411f7 SHA512 b9370c95aa0af3aed3907090e48639a2b6cc6aae294ba14d5d898a41a62db6519a6a17dd4aa0c9f1817104fafc25e512f5272a377c30939b813d909ba9e1342a
-EBUILD ekg2-9999.ebuild 2591 BLAKE2B b22a82a31a940a6466fd21247cba8a3a108a6823c9d531a03c01982497c29400cc9d7c4e09182b5a91e1a765567750d4fbedc9f4ca8367cc914942047a85c6ac SHA512 0931bf1663b43c15e5f292e7969e16179d9eb37a65ffe7bfdeab501f362b383660c3504212da6569d81ccf951ebd701e8ff7d90fbfacab72493bd673cff96e76
-MISC metadata.xml 1400 BLAKE2B c830902e7736736239b2619f35241caf9eb639a760200cc2697ae958359fff0a3a4a923c9a6e9b142aefe34b69eababee14cdd10b16fa84e3627d3b9d8391115 SHA512 b4bfd15f99b562edb78e6d3a9a41b7e924f1138eaab3319c95a989b3d189282752008cce42bbf837a1b431a8c1e9039ccc364626096300fcde96768abdbfd561
+DIST ekg2-f427d083ee899d42532c046100490a915b0e8a82.tar.gz 1177484 BLAKE2B 7bf6918a7f75738ac34eeae64ac53d3c90acd72795711c856206b79ca96c94b2ce397132ee31dfa8a9060d91d7b4b9aa23834596fca190dadf476660c6e5cd71 SHA512 ba28b66233290bd6c9b6a9602a5409c0fb2d847993bda638172da2f68430b5b5cf9bc0ff0d327983939fa0fd078bf6030069c60cd8bdd8449c349964b23e1f44
+EBUILD ekg2-0.4_pre20190315.ebuild 2694 BLAKE2B 19f709e61588998bc518611c73e92352f3511fbd178d02d4f8960ad6ae68224a1b7a694bad46849b4286e5c95edd2d5513b4c8af939a3720b7f2c293bbfc6636 SHA512 f7c10f304e54b8119fe710f960b89c6f10164ee5c36845f728ddce4a219181315ae068a6d4c04a20c2da111f5942eab9a791544052458a8ccbdb391ade93c240
+EBUILD ekg2-9999.ebuild 2555 BLAKE2B 01d46c0ccad9c29d21c5011ed1f4a945c90231c0d15c7ace007010b0cf3870417781a0edc0b00c6144f84a6975381e4da4bb04e6dbe36f2b4ef1741ee205bb2f SHA512 21157576319cadc4ab151b1c21bd5f0998cd2271ab0b450a14e5eccdeab5d9857d1d30ef53d476617f31953f73e2d5bc899a83a20c23e9909de7e86fc8b5f4fc
+MISC metadata.xml 710 BLAKE2B 1967d906b644580b49cfc5fb42488d14604de37150a1dd5fb78495e801499daf9e3709ca7b00aa4e1624be7f9d371eaacc77ea2b6c8fcdb2e0d6cd7bbdf62d26 SHA512 a606056720a8186f0353c44530ec838f2583c11d2235a43d84e00e0b6334326c8e76f8690c194e743a103bf6b3fa906eb3636d57159bae4d3d4e819f9b04141f
diff --git a/net-im/ekg2/ekg2-0.3.1-r2.ebuild b/net-im/ekg2/ekg2-0.3.1-r2.ebuild
deleted file mode 100644
index cbdc45612f78..000000000000
--- a/net-im/ekg2/ekg2-0.3.1-r2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit autotools-utils eutils python-single-r1 versionator
-
-DESCRIPTION="Text-based, multi-protocol instant messenger"
-HOMEPAGE="http://www.ekg2.org"
-SRC_URI="http://pl.ekg2.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gadu gif gnutls gpg gpm gsm gtk idn jpeg ncurses nls
-	oracle perl python readline rss spell sqlite ssl threads unicode
-	xmpp xosd zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	gpg? ( app-crypt/gpgme:= )
-	gsm? ( media-sound/gsm:= )
-	gtk? ( x11-libs/gtk+:2= )
-	idn? ( net-dns/libidn:= )
-	nls? ( virtual/libintl:= )
-	oracle? ( dev-db/oracle-instantclient-basic:= )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	ssl? ( dev-libs/openssl:0= )
-	xosd? ( x11-libs/xosd:= )
-	zlib? ( sys-libs/zlib:= )
-
-	gadu? ( <net-libs/libgadu-1.12:=
-		gif? ( media-libs/giflib:= )
-		jpeg? ( virtual/jpeg:0= ) )
-	ncurses? ( sys-libs/ncurses:=[unicode?]
-		gpm? ( sys-libs/gpm:= )
-		spell? ( app-text/aspell:= ) )
-	rss? ( dev-libs/expat:= )
-	sqlite? ( dev-db/sqlite:3= )
-	xmpp? ( dev-libs/expat:=
-		gnutls? ( net-libs/gnutls:= ) )"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/0001-Gentoo-use-vendor-dirs-for-perl-modules.patch
-)
-DOCS=(
-	AUTHORS docs/README docs/TODO
-	docs/events.txt docs/mouse.txt docs/sim.txt docs/voip.txt
-	docs/themes.txt docs/themes-en.txt
-	docs/ui-ncurses.txt docs/ui-ncurses-en.txt
-)
-
-# Due to MakeMaker being used to build Perl modules.
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-pkg_pretend() {
-	if ! use gtk && ! use ncurses && ! use readline; then
-		ewarn 'ekg2 is being compiled without any frontend, you should consider'
-		ewarn 'enabling at least one of following USEflags:'
-		ewarn '  gtk, ncurses, readline.'
-	fi
-
-	if use gnutls && ! use ssl; then
-		ewarn 'You have enabled USE=gnutls without USE=ssl. The SSL support'
-		ewarn 'in ekg2 will be limited to the plugins supporting GnuTLS.'
-	fi
-}
-
-src_configure() {
-	myeconfargs=(
-		$(use_with gadu libgadu)
-		$(use_with gif)
-		# gnutls is jabber-specific
-		$(use xmpp && use_with gnutls libgnutls || echo '--without-libgnutls')
-		$(use_with gpg)
-		$(use_with gpm gpm-mouse)
-		$(use_with gsm libgsm)
-		$(use_with gtk)
-		$(use_with idn libidn)
-		$(use xmpp && echo '--with-expat' || use_with rss expat)
-		$(use_with jpeg libjpeg)
-		$(use_with ncurses)
-		$(use_with oracle logsoracle)
-		$(use_with perl)
-		$(use_with python)
-		$(use_with readline)
-		$(use_with spell aspell)
-		$(use_with sqlite sqlite3)
-		$(use_with ssl openssl)
-		$(use_with threads pthread)
-		$(use_with xosd libxosd)
-		$(use_with zlib)
-		$(use_enable nls)
-		$(use_enable unicode)
-		--with-inotify
-		--without-ioctld
-		--without-sqlite
-		--disable-remote
-		--enable-skip-relative-plugins-dir
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	prune_libtool_files --modules
-}
diff --git a/net-im/ekg2/ekg2-0.4_pre20190315.ebuild b/net-im/ekg2/ekg2-0.4_pre20190315.ebuild
new file mode 100644
index 000000000000..e6954bc0de6b
--- /dev/null
+++ b/net-im/ekg2/ekg2-0.4_pre20190315.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools python-single-r1
+
+EGIT_COMMIT="f427d083ee899d42532c046100490a915b0e8a82"
+DESCRIPTION="Text-based, multi-protocol instant messenger"
+HOMEPAGE="https://github.com/ekg2/ekg2/"
+SRC_URI="https://github.com/ekg2/ekg2/archive/${EGIT_COMMIT}.tar.gz
+	-> ${PN}-${EGIT_COMMIT}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gadu gpm gpg gtk minimal ncurses nls nntp openssl
+	perl python readline rss spell sqlite ssl xmpp unicode zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="dev-libs/glib:2
+	gadu? ( <net-libs/libgadu-1.12:0= )
+	gpg? ( app-crypt/gpgme:1= )
+	gtk? ( x11-libs/gtk+:2 )
+	nls? ( virtual/libintl:0= )
+	openssl? ( dev-libs/openssl:0= )
+	perl? ( dev-lang/perl:0= )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	rss? ( dev-libs/expat:0= )
+	ssl? ( net-libs/gnutls:0= )
+	xmpp? ( dev-libs/expat:0= )
+	zlib? ( sys-libs/zlib:0= )
+
+	ncurses? ( sys-libs/ncurses:0=[unicode=]
+		gpm? ( sys-libs/gpm:0= )
+		spell? ( app-text/aspell:0= ) )
+	sqlite? ( dev-db/sqlite:3= )"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+S=${WORKDIR}/${PN}-${EGIT_COMMIT}
+
+DOCS=(
+	AUTHORS README.md docs/README docs/TODO
+	docs/events.txt docs/mouse.txt docs/sim.txt docs/voip.txt
+	docs/themes.txt docs/themes-en.txt
+	docs/ui-ncurses.txt docs/ui-ncurses-en.txt
+)
+
+pkg_pretend() {
+	if ! use gtk && ! use ncurses && ! use readline; then
+		ewarn 'ekg2 is being compiled without any frontend. You should consider'
+		ewarn 'enabling at least one of following USEflags:'
+		ewarn '  gtk, ncurses, readline.'
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		# direct plugin references
+		$(use_enable gadu gg)
+		$(use_enable gpg)
+		$(use_enable gtk)
+		$(use_enable ncurses)
+		$(use_enable nntp)
+		$(use_enable openssl sim)
+		$(use_enable perl)
+		$(use_enable python)
+		$(use_enable readline)
+		$(use_enable rss)
+		$(use_enable sqlite logsqlite)
+		$(use_enable xmpp jabber)
+
+		$(use_enable !minimal autoresponder)
+		$(use_enable !minimal jogger)
+		$(use_enable !minimal mail)
+		$(use_enable !minimal polchat)
+		$(use_enable !minimal rivchat)
+		$(use_enable !minimal sms)
+
+		# sqlite switch
+		--with-sqlite3
+
+		# optional deps
+		$(use_with gpm)
+		# do not pass --with-inotify as it will fail if check fails
+		$(use_with spell aspell)
+		$(use_with ssl gnutls)
+		$(use_with zlib)
+
+		# other magic
+		$(use_enable nls)
+		--with-perl-module-build-flags='INSTALLDIRS=vendor'
+		--enable-fast-configure
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-im/ekg2/ekg2-9999.ebuild b/net-im/ekg2/ekg2-9999.ebuild
index 05cb485792d5..8c458e0a9e43 100644
--- a/net-im/ekg2/ekg2-9999.ebuild
+++ b/net-im/ekg2/ekg2-9999.ebuild
@@ -1,33 +1,27 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-#if LIVE
-AUTOTOOLS_AUTORECONF=yes
-EGIT_REPO_URI="https://github.com/leafnode/${PN}.git"
-
-inherit git-r3
-#endif
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
-inherit autotools-utils python-single-r1
+inherit autotools git-r3 python-single-r1
 
 DESCRIPTION="Text-based, multi-protocol instant messenger"
-HOMEPAGE="http://www.ekg2.org"
-SRC_URI="http://pl.ekg2.org/${P}.tar.gz"
+HOMEPAGE="https://github.com/ekg2/ekg2/"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/ekg2/${PN}.git"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS=""
 IUSE="gadu gpm gpg gtk minimal ncurses nls nntp openssl
 	perl python readline rss spell sqlite ssl xmpp unicode zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="dev-libs/glib:2=
+RDEPEND="dev-libs/glib:2
 	gadu? ( <net-libs/libgadu-1.12:0= )
 	gpg? ( app-crypt/gpgme:1= )
-	gtk? ( x11-libs/gtk+:2= )
+	gtk? ( x11-libs/gtk+:2 )
 	nls? ( virtual/libintl:0= )
 	openssl? ( dev-libs/openssl:0= )
 	perl? ( dev-lang/perl:0= )
@@ -53,11 +47,6 @@ DOCS=(
 	docs/ui-ncurses.txt docs/ui-ncurses-en.txt
 )
 
-#if LIVE
-KEYWORDS=
-SRC_URI=
-#endif
-
 pkg_pretend() {
 	if ! use gtk && ! use ncurses && ! use readline; then
 		ewarn 'ekg2 is being compiled without any frontend. You should consider'
@@ -66,8 +55,13 @@ pkg_pretend() {
 	fi
 }
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
-	myeconfargs=(
+	local myconf=(
 		# direct plugin references
 		$(use_enable gadu gg)
 		$(use_enable gpg)
@@ -104,5 +98,10 @@ src_configure() {
 		--with-perl-module-build-flags='INSTALLDIRS=vendor'
 		--enable-fast-configure
 	)
-	autotools-utils_src_configure
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/net-im/ekg2/files/0001-Gentoo-use-vendor-dirs-for-perl-modules.patch b/net-im/ekg2/files/0001-Gentoo-use-vendor-dirs-for-perl-modules.patch
deleted file mode 100644
index 010b22fc976c..000000000000
--- a/net-im/ekg2/files/0001-Gentoo-use-vendor-dirs-for-perl-modules.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 804370c1ad2f94937ac9184dbbb40354885ea6be Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 6 Apr 2011 16:19:46 +0200
-Subject: [PATCH] [Gentoo] use vendor dirs for perl modules.
-
----
- plugins/perl/Makefile.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/plugins/perl/Makefile.in b/plugins/perl/Makefile.in
-index 84d378b..309e2e2 100644
---- a/plugins/perl/Makefile.in
-+++ b/plugins/perl/Makefile.in
-@@ -594,7 +594,7 @@ all-local:
- 	set -e; for dir in $(perl_dirs); do \
- 	 cd $$dir && \
- 	 if [ ! -f Makefile ]; then \
--	   $(PERL) Makefile.PL; \
-+	   $(PERL) Makefile.PL INSTALLDIRS=vendor; \
- 	 fi && \
- 	 $(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(AM_CFLAGS) $(CFLAGS)" && \
- 	 cd ..; \
--- 
-1.7.4.1
-
diff --git a/net-im/ekg2/metadata.xml b/net-im/ekg2/metadata.xml
index d79771701e08..56d35d283099 100644
--- a/net-im/ekg2/metadata.xml
+++ b/net-im/ekg2/metadata.xml
@@ -7,20 +7,6 @@
 	</maintainer>
 
 	<use>
-		<!-- 0.3* flags -->
-		<flag name="gif" restrict="=net-im/ekg2-0.3*">
-			GIF token support for Gadu-Gadu protocol.</flag>
-		<flag name="gnutls">Enable SSL/TLS support through GnuTLS
-			for the plugins supporting it. If 'ssl' is enabled too, GnuTLS will
-			be preferred where possible (and OpenSSL will be used
-			elsewhere).</flag>
-		<flag name="jpeg">JPEG token support for Gadu-Gadu protocol.</flag>
-		<flag name="ssl" restrict="=net-im/ekg2-0.3*">
-			Enable the complete SSL/TLS support through OpenSSL.
-			This also enables the 'sim' plugin which relies on OpenSSL.</flag>
-		<flag name="oracle">Support logging messages into Oracle database.</flag>
-
-		<!-- common and modern flags -->
 		<flag name="gadu">Enable Gadu-Gadu protocol support (requires
 			<pkg>net-libs/libgadu</pkg>).</flag>
 		<flag name="gpg">Enable jabber message encryption through
diff --git a/net-im/openmittsu/Manifest b/net-im/openmittsu/Manifest
index cc826b9ef1f2..17c22074077c 100644
--- a/net-im/openmittsu/Manifest
+++ b/net-im/openmittsu/Manifest
@@ -1,6 +1,6 @@
-AUX openmittsu-0.9.9.48-disable-googletest.patch 3112 BLAKE2B 3b606abb46eb9756ade71d033a5b145854402079bfb9fca50e08f17a87a7888dee89d1ec54f168080914608be2223d3872793464c8a974653284fcadce320ae1 SHA512 bb6d159ba3ee3e7626f732060014b3d208cc6c91d1a7395feb40011b58a3c0b2b46d57bff8c00d34604a495709a72652b4b02196389f832f24a9144dd9c0e14e
+AUX openmittsu-0.9.13.32-fix-tests.patch 695 BLAKE2B 69dafe6d75ed2ef79f3c208f2566091ce51f8ed32deb85d617b5a74e230c45735e16368e3bfb44f0bf440e8bc503e5295b3cb5f58b9b31e3a7e3e143d883dd4d SHA512 69387e7da115949fe661fd62e3418eab0ad77f2f41f07a767fadbfc96e1561d078c8811ee69e49501b9c410de968e6b8cbc2966446d2c326c601c2d82178467b
 DIST openmittsu-0.9.11.0.tar.xz 1408088 BLAKE2B 6c16ea2c35c0a4e02b2735d292516e22c238ca6d3f32f2869be8fec265f099761a5afef0303b2bd84c8f2e5383d7fff6dd18b2e57fc0d12da30a8d8a1637242b SHA512 534a589aa7bf4aa1be4e7d887ef1d4b025eeb1f82d8503cb048a7802ad4380c78224acae4a5f41a56be838a5a43af78f496bd0336034232208bc4de49a71b4d5
-DIST openmittsu-0.9.9.48.tar.xz 2026628 BLAKE2B eafd2bc537a22b140e01e14da363d3943e24b86754a090fd1ed2ac80f1030e1a2fb30ee8a5395c6c9a143d5922354ac67e3376a94c34f670f8cbcfddc27da112 SHA512 e24ec8e0792df13e781080fe42934035f74b82be62a8ce4913175a13ee3acbead069d169871405f4312927165a7049291d009c7f968b088bdbb3e294f9ef2443
+DIST openmittsu-0.9.13.32.tar.xz 2078892 BLAKE2B 4960d3046dfe45568f56ddc4ad77677992ac4dc4d618a926a15b35431955c8f30aa20ad236cc3143bc1a24f64a4635fdc072a1c9f921238f1283b81b3d6befb7 SHA512 671ce8ed1a6f9aa8d15ee0d72ce78e2b5aef556243efacec4b0b434eaf5b0bd1b34aa6a0391e42ead9007011cca88e7ba2649f16456a2bf74d22355d1f308a0f
 EBUILD openmittsu-0.9.11.0.ebuild 1552 BLAKE2B a925b0b7f2754d5bd37eb577dbac8d95a5f38663f4905ea9829f0a8a11761416a920959094c8c7f5420e2c64281e7ede341a3cce8b1343e7bd41de922158627b SHA512 e941e731bbb627b888097d013a71ac66d4cbdf4fe0ee8e316f4d0ef75fcb792a5def6dc0817d607c78504bf80fbd9b9dd3ad0dbe9f9b89ce9bc7d869c42a0475
-EBUILD openmittsu-0.9.9.48.ebuild 1421 BLAKE2B c73a4fc1044489a11556de6bdd1271aea12a2c81e74a3dce35b04bb37e5743613617739a0983665ea719b7c43260e4583333c9aa9239c01d0547f73ed4d3e0d0 SHA512 32ba61e2e722882a882b17a6333329b9219c9ca61e7631e4333ded39be00f1224a72585bc38b7ab01c730c8878e36d88d48bb0f5bc8ffea8489b82a53d3db417
+EBUILD openmittsu-0.9.13.32.ebuild 1598 BLAKE2B bbf31597b0559fb492592dc64188ce651361e6bf5bc46c6a6008aa9ec7db2df1e823214d3c08150f37ddc49e5b34643d57f7f786d76d1f2bcf67478b2053f6a0 SHA512 e9b498e0a9c21425a5e3b1443855d6e214fb39d1fd7588f6dfcc966bce2e1967268862d476ff1aff9ef247390302ec606ad0bb7804886baf851a2ee9cf4e7f59
 MISC metadata.xml 212 BLAKE2B ecb53eb3efac6ceef048d345601c5ca0430e2f62d6409dc2a18494ee188f792d4763892816f197418d2e9a6d04452091a0c69d83afc207b366fca816632209ee SHA512 3919b8b096abf61c7edaa6a76898603b6ca2e206e2eccd27c671957a9d085bc2591a2fb4839a85ef2a51dcbf887bb2c752d4b38e82ea19c48dfd6d99b67954fa
diff --git a/net-im/openmittsu/files/openmittsu-0.9.13.32-fix-tests.patch b/net-im/openmittsu/files/openmittsu-0.9.13.32-fix-tests.patch
new file mode 100644
index 000000000000..c89d24536ae9
--- /dev/null
+++ b/net-im/openmittsu/files/openmittsu-0.9.13.32-fix-tests.patch
@@ -0,0 +1,11 @@
+--- openmittsu-0.9.13.32-orig/CMakeLists.txt
++++ openmittsu-0.9.13.32/CMakeLists.txt
+@@ -570,7 +570,7 @@
+ target_link_libraries(openMittsu openMittsuCore Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Multimedia Qt5::MultimediaWidgets Qt5::Sql)
+ target_link_libraries(openMittsuVersionInfo Qt5::Core)
+ if (OPENMITTSU_ENABLE_TESTS)
+-	target_link_libraries(openMittsuTests openMittsuCore Qt5::Core Qt5::Network Qt5::Multimedia Qt5::MultimediaWidgets Qt5::Sql gmock gtest)
++	target_link_libraries(openMittsuTests openMittsuCore Qt5::Core Qt5::Network Qt5::Multimedia Qt5::MultimediaWidgets Qt5::Sql gmock gtest pthread)
+ endif (OPENMITTSU_ENABLE_TESTS)
+ 
+ # Link against libc++abi if requested.
diff --git a/net-im/openmittsu/files/openmittsu-0.9.9.48-disable-googletest.patch b/net-im/openmittsu/files/openmittsu-0.9.9.48-disable-googletest.patch
deleted file mode 100644
index ceb162d5e6b1..000000000000
--- a/net-im/openmittsu/files/openmittsu-0.9.9.48-disable-googletest.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Disable googletest for now, in order to avoid accessing the network
-at configure time.
-
---- openmittsu-0.9.9.48-orig/CMakeLists.txt
-+++ openmittsu-0.9.9.48/CMakeLists.txt
-@@ -212,28 +212,6 @@
- # Add the binary dir include directory
- include_directories("${PROJECT_BINARY_DIR}/include")
- 
--##########################################################
--#
--# Google Testing Framework
--#
--##########################################################
--# Download and unpack googletest at configure time
--configure_file("${PROJECT_SOURCE_DIR}/cmake/GoogleTest.cmake.in" googletest-download/CMakeLists.txt)
--execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
--  WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/googletest-download" )
--execute_process(COMMAND "${CMAKE_COMMAND}" --build .
--  WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/googletest-download" )
-- 
--# Prevent GoogleTest from overriding our compiler/linker options
--# when building with Visual Studio
--set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
-- 
--# Add googletest directly to our build. This adds
--# the following targets: gtest, gtest_main, gmock
--# and gmock_main
--add_subdirectory("${CMAKE_BINARY_DIR}/googletest-src"
--                 "${CMAKE_BINARY_DIR}/googletest-build" EXCLUDE_FROM_ALL)
-- 
- 
- # Main Sources
- file(GLOB OPENMITTSU_HEADERS ${PROJECT_SOURCE_DIR}/src/*.h)
-@@ -399,24 +377,17 @@
- 
- add_executable(openMittsuVersionInfo ${OPENMITTSU_BUILDTOOLS_VERSIONINFO_HEADERS} ${OPENMITTSU_BUILDTOOLS_VERSIONINFO_SOURCES_CPP} ${OPENMITTSU_HEADERS_GENERATED} ${OPENMITTSU_SOURCES_GENERATED})
- 
--add_executable(openMittsuTests ${OPENMITTSU_TEST_MAIN_FILE} ${OPENMITTSU_TEST_FILES}
--	${OPENMITTSU_RESOURCESOURCES}
--)
--
- if (MSVC)
- 	set_target_properties(openMittsu PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS")
- endif(MSVC)
- 
- # Add target link dependencies
--target_link_libraries(openMittsuCore ${Libsodium_LIBRARIES} gtest)
-+target_link_libraries(openMittsuCore ${Libsodium_LIBRARIES})
- target_link_libraries(openMittsu ${LIBQRENCODE_LIBRARY})
- 
--add_dependencies(openMittsuTests gtest)
--
- # Use the required modules from Qt 5.
- target_link_libraries(openMittsuCore Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Multimedia Qt5::Sql)
- target_link_libraries(openMittsu openMittsuCore Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Multimedia Qt5::Sql)
--target_link_libraries(openMittsuTests openMittsuCore Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Multimedia Qt5::Sql)
- target_link_libraries(openMittsuVersionInfo Qt5::Core)
- 
- # Link against libc++abi if requested.
-@@ -424,7 +395,6 @@
- 	target_link_libraries(openMittsu "c++abi")
- 	target_link_libraries(openMittsuCore "c++abi")
- 	target_link_libraries(openMittsuVersionInfo "c++abi")
--	target_link_libraries(openMittsuTests "c++abi")
- endif(OPENMITTSU_LINK_LIBCXXABI)
- 
- # Targets, CPACK...
-@@ -438,10 +408,6 @@
-    RUNTIME
-    DESTINATION bin
-    COMPONENT installComponent)
--install(TARGETS openMittsuTests
--   RUNTIME
--   DESTINATION bin
--   COMPONENT installComponent)
-    
- if (MSVC)
- 	set(OPENMITTSU_WINDEPLOYQT_EXE "${Qt5Core_DIR}/../../../bin/windeployqt.exe")
diff --git a/net-im/openmittsu/openmittsu-0.9.9.48.ebuild b/net-im/openmittsu/openmittsu-0.9.13.32.ebuild
index 241dd833295c..5c132dd83ec7 100644
--- a/net-im/openmittsu/openmittsu-0.9.9.48.ebuild
+++ b/net-im/openmittsu/openmittsu-0.9.13.32.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils desktop
 
@@ -10,11 +10,12 @@ HOMEPAGE="https://www.openmittsu.de/"
 # git-archive-all.sh snapshot of https://github.com/blizzard4591/openMittsu.git
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 
-LICENSE="GPL-2+ BitstreamVera OFL-1.1 Apache-2.0 CC0-1.0 MIT BSD-2 Boost-1.0"
+LICENSE="GPL-2+ BitstreamVera OFL-1.1 Apache-2.0 CC0-1.0 MIT BSD"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE="test"
 
-DEPEND="dev-db/qt5-sqlcipher
+RDEPEND="dev-db/qt5-sqlcipher
 	>=dev-libs/libsodium-1.0.11:=
 	>=dev-qt/qtcore-5.7.1:5=
 	>=dev-qt/qtgui-5.7.1:5=
@@ -23,10 +24,11 @@ DEPEND="dev-db/qt5-sqlcipher
 	>=dev-qt/qtsql-5.7.1:5=[sqlite]
 	>=dev-qt/qtwidgets-5.7.1:5=
 	>=media-gfx/qrencode-3.4.4-r1:="
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	test? ( >=dev-cpp/gtest-1.8.0 )"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-disable-googletest.patch
+	"${FILESDIR}"/${P}-fix-tests.patch
 )
 
 DOCS=(
@@ -40,14 +42,21 @@ src_configure() {
 		# set version manually, since autodetection works only with git
 		"-DOPENMITTSU_CUSTOM_VERSION_STRING=${PV%.*}-${PV##*.}-00000000"
 		"-DOPENMITTSU_DISABLE_VERSION_UPDATE_CHECK=ON"
+		"-DOPENMITTSU_ENABLE_TESTS=$(usex test)"
 	)
 	cmake-utils_src_configure
 }
 
+src_test() {
+	cd "${BUILD_DIR}" || die
+	./openMittsuTests || die
+}
+
 src_install() {
 	local my_pn="openMittsu"
 	cmake-utils_src_install
 	newicon resources/icon.png ${my_pn}.png
 	make_desktop_entry ${my_pn} ${my_pn} ${my_pn}
 	rm "${ED}"/usr/bin/${my_pn}VersionInfo || die
+	rm -f "${ED}"/usr/bin/${my_pn}Tests || die
 }
diff --git a/net-im/slack-bin/Manifest b/net-im/slack-bin/Manifest
index d2f5b77189b3..2d84370e520b 100644
--- a/net-im/slack-bin/Manifest
+++ b/net-im/slack-bin/Manifest
@@ -5,10 +5,12 @@ DIST slack-desktop-3.3.1-amd64.deb 54172074 BLAKE2B 88402ce58e02e20a2c5a90358b97
 DIST slack-desktop-3.3.3-amd64.deb 54203216 BLAKE2B 93f72a2a7ead75682b9ef9bd9f9b5ec19a5954d20e4ef3da214154eb53fd21533fac4e07893d883b7f9a51fd3af4e53f4b7102a0bee060d23f98b15bbc9207e9 SHA512 bb773ddc9cb13f520143412f73d47e308410d861fa63ca13a986d2c390900c59827b2cca6c55175a2778b341c534b0aab49841a4506f63d11359cada57473b67
 DIST slack-desktop-3.3.4-amd64.deb 56404428 BLAKE2B 15e39e88f287a296f3f11a15f35602d2103263b2886f037674e4b8fc0f7b533980ab835de3862a92434b63eb0a466f1f6ee4db4e41026e2c609d6e52dd392463 SHA512 1c2f889ed6194191adf8892bb288ee2e53476b78bc7dbb48c9e5c516f010e47b486059ab1dad87ff41e747e74a10a43398027dfb3cb971103e70f00f58e6bd4c
 DIST slack-desktop-3.3.7-amd64.deb 56596720 BLAKE2B d463172b6528a98366b61b2e23c0bbfb8f7285387f7c0815b28977602f1b05954f1a89cae0ecf127acd79b771655ea5c7551bb0d7207b07b0e7790886c21e7d6 SHA512 b61f32a7f9ee4c40c10dbc70e0ab1c4371fd63610217348b2177c48f9ec17500e34ca5a09f38812543b62fd888cbc0344ad258d37d0b570fa91e4c262451e18a
+DIST slack-desktop-3.3.8-amd64.deb 56743966 BLAKE2B 3673a55a300b56b645d69e18617fd58241c9f4ac5fec088660bb715c722b4b22b77db9302ca3d8f09338bb41be188998366e8c5f9f0a145d80391f82fbc5fb6f SHA512 f9a0414213bf0d1a8404f532a37b16bf47a43b8ecf6bb9be99184577b3b8c58e5f1b1b40a044550dc900d328b40207763de6eb3936e0b8ded709782796e81720
 EBUILD slack-bin-2.1.2.ebuild 1769 BLAKE2B c667beab3b7754601efcce865265974c3c959189b41465b055ebe8402e9369009d1a1abc486422c6267e49737e5bf51ec8608cdca74b8e20e59ccc88d8b9c7d0 SHA512 195c9b12c1ecda6afcae9cfec0710f30cac1480f5aa5f4ec6f5bd42550b6e012ab30e0be67f5c979db2be41357f47a7bbab44506c67bc23c1caa3ae43125d38b
 EBUILD slack-bin-3.1.1.ebuild 2734 BLAKE2B ae5cc6577c753a17c500e0d4cc873681f796abbff13f3586e4d1992b12c26a543a45d85657c120b171ade707f7bee9f1e2a8672528a5d4649f3e857e996a05c7 SHA512 90d8985fe16e357439b35f98138c635a4dc4f5bc550c0ae7992bda69e64198f1fae15770193382ba7bb5005ef4a79f19c9a667c503d921faa5a14d2224597fd9
 EBUILD slack-bin-3.3.1.ebuild 2734 BLAKE2B 078bc57225af42bb4a368aa3f2842119dbfa9919bbe31625b8aeaf39a09c39be01a90761af03cbd507ba038c14184661465cd0fe6eea60a717e17ac11320c5d9 SHA512 f7b7f996abaa7607937d028277e876b82b701982eea636202fdd4921ef2d921f6ae022fd69d3fc8ee3de8cf7bbc9c2e4c11a724f929551dc2931da20db03fd22
 EBUILD slack-bin-3.3.3.ebuild 2731 BLAKE2B 257db9d33b821e42d166da5afdaa67829f3ac5fca364689123d2a14e81cf5464e7118e5c93ae4ce8d8d87b42bab422165f5729b787597b605c635f89a08b987e SHA512 0b4e895c465badb3b386e82f29b2019afb487b47340bf5c9656d90b421c1d073d2327954efd61c4d0a33d6fd7dbdc89e7c0fb1fc70b59d8d81ffd475fbee08af
 EBUILD slack-bin-3.3.4.ebuild 2731 BLAKE2B b8f2e8d8f21cd82f4141cf960014a503022ac1f960ee665c848d8d56994122a389bb37e73201f10a65c1af32079d4d2061f6cff580526cfc723d9d210b3d1a72 SHA512 47ddeb0abb8be56331aa2671018321ddf18c3b8122e648c54e02eadc31a308311697553c25beda90179dc0caab60b17ced40fbfe86118c957d9e180168e3a2db
 EBUILD slack-bin-3.3.7.ebuild 2731 BLAKE2B b8f2e8d8f21cd82f4141cf960014a503022ac1f960ee665c848d8d56994122a389bb37e73201f10a65c1af32079d4d2061f6cff580526cfc723d9d210b3d1a72 SHA512 47ddeb0abb8be56331aa2671018321ddf18c3b8122e648c54e02eadc31a308311697553c25beda90179dc0caab60b17ced40fbfe86118c957d9e180168e3a2db
+EBUILD slack-bin-3.3.8.ebuild 2712 BLAKE2B 2b2cea26f5c0e31804490f5625a162b6d346d5608c05666e991b5d7f4b26ccc4d4a9a7581e8e1de2a989bfad0766aedeef9a09b54646165a74675c759622b002 SHA512 62c677f95763e902e686a178f0599a754c8bbbc1bfd4e57458c77a225b1332bd425f1b793f3ed9ddad06914bdb138ac957877ef4c80f02393ab3e242c7bca1b3
 MISC metadata.xml 770 BLAKE2B b84907f7e6edab20de957ec2ecb5e9acb2c3167095b0a89bd41e00187d47defe6e2737324ca4b7ac2b01c16f5e12db118889bccdf3dd8b17a4ebc50b84be97e2 SHA512 6dba8262370ebbfceee5a9b8c26eca95b11271c74490ece09cec90a698d614902cec29104695692508a2d6b30a87efb1b82d44bef2edef828e26634c06aa6828
diff --git a/net-im/slack-bin/slack-bin-3.3.8.ebuild b/net-im/slack-bin/slack-bin-3.3.8.ebuild
new file mode 100644
index 000000000000..3db3b00c13ef
--- /dev/null
+++ b/net-im/slack-bin/slack-bin-3.3.8.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/-bin/}"
+MULTILIB_COMPAT=( abi_x86_64 )
+
+inherit desktop multilib-build pax-utils unpacker xdg-utils
+
+DESCRIPTION="Team collaboration tool"
+HOMEPAGE="http://www.slack.com/"
+SRC_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${PV}-amd64.deb"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="ayatana gnome-keyring pax_kernel"
+RESTRICT="bindist mirror"
+
+RDEPEND="dev-libs/atk:0[${MULTILIB_USEDEP}]
+	dev-libs/expat:0[${MULTILIB_USEDEP}]
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	dev-libs/nspr:0[${MULTILIB_USEDEP}]
+	dev-libs/nss:0[${MULTILIB_USEDEP}]
+	gnome-base/gconf:2[${MULTILIB_USEDEP}]
+	media-libs/alsa-lib:0[${MULTILIB_USEDEP}]
+	media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
+	media-libs/freetype:2[${MULTILIB_USEDEP}]
+	net-misc/curl:0[${MULTILIB_USEDEP}]
+	net-print/cups:0[${MULTILIB_USEDEP}]
+	sys-apps/dbus:0[${MULTILIB_USEDEP}]
+	x11-libs/cairo:0[${MULTILIB_USEDEP}]
+	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
+	x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	x11-libs/libX11:0[${MULTILIB_USEDEP}]
+	x11-libs/libxcb:0/1.12[${MULTILIB_USEDEP}]
+	x11-libs/libXcomposite:0[${MULTILIB_USEDEP}]
+	x11-libs/libXcursor:0[${MULTILIB_USEDEP}]
+	x11-libs/libXdamage:0[${MULTILIB_USEDEP}]
+	x11-libs/libXext:0[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:0[${MULTILIB_USEDEP}]
+	x11-libs/libXi:0[${MULTILIB_USEDEP}]
+	x11-libs/libxkbfile:0[${MULTILIB_USEDEP}]
+	x11-libs/libXrandr:0[${MULTILIB_USEDEP}]
+	x11-libs/libXrender:0[${MULTILIB_USEDEP}]
+	x11-libs/libXScrnSaver:0[${MULTILIB_USEDEP}]
+	x11-libs/libXtst:0[${MULTILIB_USEDEP}]
+	x11-libs/pango:0[${MULTILIB_USEDEP}]
+	ayatana? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )
+	gnome-keyring? ( app-crypt/libsecret:0[${MULTILIB_USEDEP}] )"
+
+QA_PREBUILT="opt/slack/slack
+	opt/slack/resources/app.asar.unpacked/node_modules/*
+	opt/slack/libnode.so
+	opt/slack/libffmpeg.so
+	opt/slack/libCallsCore.so"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	if use ayatana ; then
+		sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \
+			usr/share/applications/slack.desktop \
+			|| die "sed failed for slack.desktop"
+	fi
+}
+
+src_install() {
+	doicon usr/share/pixmaps/slack.png
+	doicon -s 512 usr/share/pixmaps/slack.png
+	domenu usr/share/applications/slack.desktop
+
+	insinto /opt/slack
+	doins -r usr/lib/slack/.
+	fperms +x /opt/slack/slack
+	dosym ../../opt/slack/slack usr/bin/slack
+
+	use pax_kernel && pax-mark -m "${ED%/}"/opt/slack/slack
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index 90eccd14c241..f9bbbfffc882 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -1,7 +1,8 @@
-AUX spectrum2-2.0.9-remove_debug_cflags.patch 376 BLAKE2B 21a4c230d57398d8ce5ff39cd1ad103fa1f7df332b88cf0024e2a505ecf9be7378da99eb83941122d5cf6a835bff9dfa7b9a10a2583299c91d8506dccc548c85 SHA512 3ec75a4ae915b7d2e2aa594fafcc559aa8b09b5cb8948931797088340d722bfb074ac8e0f77fea1258a7b2c3f0816d001aee63b4fd7cc334927a8431fb6a5611
 AUX spectrum2.initd 1332 BLAKE2B ee4a9f62ccb909bb824df485dc56c59fe935e77dcfc0354b94749a577b9121352bd56e5d0adbae161da1afc7c451d18b36689844429b46fe39b2e364ffd8c363 SHA512 d780066a00144f3ec20311b462fd29986a486af7ce5ae88e788113397d6cb6ab0800119a5d71077216ee1637ff49cd2307e9265545357b4de50bf907c80feb9c
 AUX spectrum2.service 222 BLAKE2B 58227bb8d49dac2a43d41d9a1e16b9ad804fb540a1e37fc0ec58e23e7412c5a9e0a931fe41d37430be5b77d0bc33fc17870b885995185e29a7ccd2da73022dc8 SHA512 c50d83e6afadc798b90f4df5b2f473031dadb8e32dff0c1120dc2345a3fe37a86566d6d975d22d310e0dd6d2c602d674f6a17f4df2e730e71aaf484a30aa97c2
 AUX spectrum2.tmpfiles 44 BLAKE2B c0cef689f5b483d16461bf50edbe8a17c8269440a43a3ccf04c45e028704ad4861e7bd340b85b0daf11b5e41a51e19fd04f2dcd1f2446e00b9a6a3b1e08d2206 SHA512 b995bf8c97a98dc6c887d6d4bb4b53cfee85461cfe65770013d2a412729d164894201ad0e3b69868b94c159ecd524d7bd0eccfedbc27c81969c3ed640ae32785
+DIST spectrum2-2.0.10.1.tar.gz 844983 BLAKE2B f10a057f35ecb865497e26b6d31d37c895b351d7c93e7c00bf9d58bf855b49ee1ce0acbeab841a442ab2ab702b022675ca4478521ecac2f6d0bdb9d7e00b9060 SHA512 dde84e67b2ade8649a38027c398defd4dc911ed402e913779aca0b29aa801f1c17ef89b1b3abf91c3189e75b32e9162d6e9d52f90ce537091b65fb791a826357
 DIST spectrum2-2.0.10.tar.gz 844427 BLAKE2B cb57bede4bfe996219ca5d0e62167643eb51fe44fd607400de8c2640f3892af9d089b6d62d7c25485049ef2a37066b3f6de46bfb5a6b7107fef6eb31dcf736f3 SHA512 b74f6f543aaa923a589b8b0b1007dec260af6fb66e5475c0294216713568dd93f4f52f39e6cbe4c6263efb0a479ac4d8095709d758e4faac81fc7d4712fd0b2c
-EBUILD spectrum2-2.0.10.ebuild 2867 BLAKE2B 726cb2fe344b54c715bfc103cbf8710328d51a55be7106155d3fb63e40acf2bad682ea4a0283ab5ebc3f8244d6fe05f36b7dcbb1c328f7daf208ef8cf9c99ad6 SHA512 752a1d934d04c9b61a18bd71f9e278db15ecfbea50aa0a20fa4a78627cc8415b9f8770850a2326e27a9a01155af7f5855fed46c864333c2710aa73a114b9e621
+EBUILD spectrum2-2.0.10.1.ebuild 2525 BLAKE2B f6c455a26decab2f981213787da79ae98e966d6e8f79ab7a00bb998ade5291b4bdf9da0da8292fd584e085ca74533629fce782ddee7b27de1df4f79bc9812f53 SHA512 d372627f27f1f7ccfda8f092e07f46fec855532232c6ee4617c64873edcc99cd4aa3de2b1dde555f23d0b458e2a798e106174786fbadb314150e34cd0817c04f
+EBUILD spectrum2-2.0.10.ebuild 2525 BLAKE2B f6c455a26decab2f981213787da79ae98e966d6e8f79ab7a00bb998ade5291b4bdf9da0da8292fd584e085ca74533629fce782ddee7b27de1df4f79bc9812f53 SHA512 d372627f27f1f7ccfda8f092e07f46fec855532232c6ee4617c64873edcc99cd4aa3de2b1dde555f23d0b458e2a798e106174786fbadb314150e34cd0817c04f
 MISC metadata.xml 1259 BLAKE2B e885a8348122a70994d3b04387d64fa88d2e02075554849d427f18b2b39b6ae1eeab543066cd587031f8eae9842f0d727f297d7b6cbe744c8d1424d9fb3640ce SHA512 be2129a4b76017ce3d84aa48589d54ac3863e1d9b7a1aa2a5d98341f962bda3f2e9507497056add0b4f280545ed0c511c8f50eff35d46cf9cadd2c6fba7b5ed6
diff --git a/net-im/spectrum2/files/spectrum2-2.0.9-remove_debug_cflags.patch b/net-im/spectrum2/files/spectrum2-2.0.9-remove_debug_cflags.patch
deleted file mode 100644
index 19e3b83d2300..000000000000
--- a/net-im/spectrum2/files/spectrum2-2.0.9-remove_debug_cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/CMakeLists.txt	2018-09-17 09:46:40.000000000 +0200
-+++ b/CMakeLists.txt	2018-09-20 21:04:29.000000000 +0200
-@@ -384,10 +384,6 @@
- endif()
- 
- if(CMAKE_BUILD_TYPE MATCHES Debug)
--	if (CMAKE_COMPILER_IS_GNUCXX)
--		ADD_DEFINITIONS(-O0)
--		ADD_DEFINITIONS(-ggdb)
--	endif()
- 	ADD_DEFINITIONS(-DDEBUG)
- 	message("Debug             : yes")
- else(CMAKE_BUILD_TYPE MATCHES Debug)
diff --git a/net-im/spectrum2/spectrum2-2.0.10.1.ebuild b/net-im/spectrum2/spectrum2-2.0.10.1.ebuild
new file mode 100644
index 000000000000..317a25b2ab55
--- /dev/null
+++ b/net-im/spectrum2/spectrum2-2.0.10.1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-single-r1 systemd user
+
+DESCRIPTION="An open source instant messaging transport"
+HOMEPAGE="https://www.spectrum.im"
+SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="
+	dev-libs/boost:=[nls]
+	dev-libs/expat
+	dev-libs/libev:=
+	dev-libs/log4cxx
+	dev-libs/jsoncpp:=
+	dev-libs/openssl:0=
+	dev-libs/popt
+	dev-libs/protobuf:=
+	net-dns/libidn:0=
+	net-im/swift:=
+	net-misc/curl
+	sys-libs/zlib:=
+	frotz? ( !games-engines/frotz )
+	irc? ( net-im/libcommuni )
+	mysql? (
+		|| (
+			dev-db/mariadb-connector-c
+			dev-db/mysql-connector-c
+		)
+	)
+	postgres? ( dev-libs/libpqxx:= )
+	purple? (
+		dev-libs/glib
+		net-im/pidgin:=
+	)
+	sms? ( app-mobilephone/smstools )
+	sqlite? ( dev-db/sqlite:3 )
+	twitter? ( net-misc/curl )
+	whatsapp? ( net-im/transwhat )"
+
+DEPEND="
+	${PYTHON_DEPS}
+	${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? (
+		dev-python/sleekxmpp[${PYTHON_USEDEP}]
+		dev-util/cppunit
+		net-irc/ngircd
+	)
+"
+
+# Tests are currently restricted, as they do completly fail
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup spectrum
+	enewuser spectrum -1 -1 /var/lib/spectrum2 spectrum
+
+	use test && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Respect users LDFLAGS
+	sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/" spectrum/src/CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DOCS="$(usex doc)"
+		-DENABLE_FROTZ="$(usex frotz)"
+		-DENABLE_IRC="$(usex irc)"
+		-DENABLE_MYSQL="$(usex mysql)"
+		-DENABLE_PQXX="$(usex postgres)"
+		-DENABLE_PURPLE="$(usex purple)"
+		-DENABLE_SMSTOOLS3="$(usex sms)"
+		-DENABLE_SQLITE3="$(usex sqlite)"
+		-DENABLE_TESTS="$(usex test)"
+		-DENABLE_TWITTER="$(usex twitter)"
+		-DENABLE_XMPP="$(usex xmpp)"
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cd tests/libtransport && "${EPYTHON}" ../start.py || die
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	diropts -o spectrum -g spectrum
+	keepdir /var/log/spectrum2 /var/lib/spectrum2
+	diropts
+
+	newinitd "${FILESDIR}"/spectrum2.initd spectrum2
+	systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service
+	systemd_newtmpfilesd "${FILESDIR}"/spectrum2.tmpfiles spectrum2.conf
+
+	einstalldocs
+}
diff --git a/net-im/spectrum2/spectrum2-2.0.10.ebuild b/net-im/spectrum2/spectrum2-2.0.10.ebuild
index ddc335eca687..317a25b2ab55 100644
--- a/net-im/spectrum2/spectrum2-2.0.10.ebuild
+++ b/net-im/spectrum2/spectrum2-2.0.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.ta
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="debug doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp"
+IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 RDEPEND="
@@ -59,8 +59,6 @@ DEPEND="
 	)
 "
 
-PATCHES=( "${FILESDIR}/${PN}-2.0.9-remove_debug_cflags.patch" )
-
 # Tests are currently restricted, as they do completly fail
 RESTRICT="test"
 
@@ -75,16 +73,10 @@ src_prepare() {
 	# Respect users LDFLAGS
 	sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/" spectrum/src/CMakeLists.txt || die
 
-	# Respect users CFLAGS, when compiling for debug mode
-	# Since Spectrum2 searches for a qt4 compiled libcommuni,
-	# it must be patched, to find the qt5 compiled libcommuni,
-	# See: https://github.com/SpectrumIM/spectrum2/pull/253
 	cmake-utils_src_prepare
 }
 
 src_configure() {
-	use debug && CMAKE_BUILD_TYPE="Debug"
-
 	local mycmakeargs=(
 		-DENABLE_DOCS="$(usex doc)"
 		-DENABLE_FROTZ="$(usex frotz)"
diff --git a/net-im/toxic/Manifest b/net-im/toxic/Manifest
index 31418ca6993e..c237592826bf 100644
--- a/net-im/toxic/Manifest
+++ b/net-im/toxic/Manifest
@@ -1,4 +1,3 @@
-AUX toxic-0.8.0-verbose-build-log.patch 9264 BLAKE2B c4e94a50711fc3804b11afb260ab82936d563b1bff3d87e106d5897d660b4138864dda1cd2f01d3d0a3a024efc731d4dc97008d0f4022e6124613ff141ea264a SHA512 5f3b1e2c20ff04b11ef40eee0953954c0274044aeefa4c4cde5fd4028591ebedc94d671383656d5af219e2d6ed9bf998ba092a821528e80f6617a4cb85ef003d
 DIST toxic-0.8.2.tar.gz 1146526 BLAKE2B 0a1c80313963287e88aa489ecf4614365a3d94c770cdfb3b1f3afd0bf2b70639c35b9c5ce52408647abdaac9822c9529b603ec1883779f5486ff63001d98ff5e SHA512 258e873404315c9a1f59d67f524089afebad88d800116bd9e53c8bc35bd9dd6b66cfcd90db06181f01330ba0a302456510fac5c01fdbfde7d475aa5d6b1070aa
 DIST toxic-0.8.3.tar.gz 1147100 BLAKE2B d73a861112aca65e54773c98473c2858bb81e63fef11212633e34dac9e87101956e3ab0d9d56757767bc5d48d1d5a406e550f8fc55ae34860dbc4977c94ee347 SHA512 c8d746efcc055592dd990dfa57415cc1eacaaa3b66303d7583d9f9e7e98b8829c8f1ae849f36a243c8896e99787dd2e493c92367de719b20a4a160bc7daea76e
 DIST toxic_patches-0.8.2.tar.gz 3859 BLAKE2B 4a19226cea6c7ce60f599fbd4f74171f26b3812259f0f8997997526bde7beb6fe64b922f25fe77e0ac8f9b185db116d2e626cb889631a1508786b92f9bbc8927 SHA512 737cc53e814567e10ad8b7431be63ab8f99b76bb150490c31e03309c4e51ee34a798d141cbde446cbbc4b5c0145ca468f3456a2af4b966c80792cdccc6562b46
diff --git a/net-im/toxic/files/toxic-0.8.0-verbose-build-log.patch b/net-im/toxic/files/toxic-0.8.0-verbose-build-log.patch
deleted file mode 100644
index ee1c1d90d07d..000000000000
--- a/net-im/toxic/files/toxic-0.8.0-verbose-build-log.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-This patch creates a 'verbosity' flag to satisfy Gentoo packaging
-standards.
-
-Thanks to Felix Janda for reporting both this issue and other issues
-with the ebuild. Gentoo bug #634350
-
-Most of this patch was generated using:
-
-	sed -e 's:^\(\s\+\)@:\1\$(AT):' $(find -name *.mk)
-
-Verbosity can be activated by using `make V=1`.
-
-Patch authored by zlg, released under GPL3.
---- a/Makefile
-+++ b/Makefile
-@@ -3,6 +3,14 @@ CFG_DIR = $(BASE_DIR)/cfg
- 
- -include $(CFG_DIR)/global_vars.mk
- 
-+# Create V for verbosity. Defaults to 0.
-+ifndef V
-+	V := 0
-+endif
-+AT_0 := @
-+AT_1 :=
-+AT = $(AT_$(V))
-+
- LIBS = libtoxcore ncursesw libconfig libqrencode
- 
- CFLAGS = -std=gnu99 -pthread -Wall -g -fstack-protector-all
-@@ -59,20 +67,20 @@ OBJ := $(addprefix $(BUILD_DIR)/, $(OBJ))
- all: $(BUILD_DIR)/toxic
- 
- $(BUILD_DIR)/toxic: $(OBJ)
--	@echo "  LD    $(@:$(BUILD_DIR)/%=%)"
--	@$(CC) $(CFLAGS) -o $(BUILD_DIR)/toxic $(OBJ) $(LDFLAGS)
-+	$(AT)echo "  LD    $(@:$(BUILD_DIR)/%=%)"
-+	$(AT)$(CC) $(CFLAGS) -o $(BUILD_DIR)/toxic $(OBJ) $(LDFLAGS)
- 
- $(BUILD_DIR)/osx_video.o: $(SRC_DIR)/$(OSX_VIDEO)
--	@echo "  CC    $(@:$(BUILD_DIR)/)osx_video.o"
--	@$(CC) $(CFLAGS) -o $(BUILD_DIR)/osx_video.o -c $(SRC_DIR)/$(OSX_VIDEO)
-+	$(AT)echo "  CC    $(@:$(BUILD_DIR)/)osx_video.o"
-+	$(AT)$(CC) $(CFLAGS) -o $(BUILD_DIR)/osx_video.o -c $(SRC_DIR)/$(OSX_VIDEO)
- 
- $(BUILD_DIR)/%.o: $(SRC_DIR)/%.c
--	@if [ ! -e $(BUILD_DIR) ]; then \
-+	$(AT)if [ ! -e $(BUILD_DIR) ]; then \
- 		mkdir -p $(BUILD_DIR) ;\
- 	fi
--	@echo "  CC    $(@:$(BUILD_DIR)/%=%)"
--	@$(CC) $(CFLAGS) -o $(BUILD_DIR)/$*.o -c $(SRC_DIR)/$*.c
--	@$(CC) -MM $(CFLAGS) $(SRC_DIR)/$*.c > $(BUILD_DIR)/$*.d
-+	$(AT)echo "  CC    $(@:$(BUILD_DIR)/%=%)"
-+	$(AT)$(CC) $(CFLAGS) -o $(BUILD_DIR)/$*.o -c $(SRC_DIR)/$*.c
-+	$(AT)$(CC) -MM $(CFLAGS) $(SRC_DIR)/$*.c > $(BUILD_DIR)/$*.d
- 
- clean:
- 	rm -f $(BUILD_DIR)/*.d $(BUILD_DIR)/*.o $(BUILD_DIR)/toxic
---- a/apidoc/python/Makefile
-+++ b/apidoc/python/Makefile
-@@ -1,6 +1,14 @@
- # Minimal makefile for Sphinx documentation
- #
- 
-+# Create V for verbosity. Defaults to 0.
-+ifndef V
-+	V := 0
-+endif
-+AT_0 := @
-+AT_1 :=
-+AT = $(AT_$(V))
-+
- # You can set these variables from the command line.
- SPHINXOPTS    =
- SPHINXBUILD   = sphinx-build
-@@ -10,11 +18,11 @@ BUILDDIR      = build
- 
- # Put it first so that "make" without argument is like "make help".
- help:
--	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
-+	$(AT)$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
- 
- .PHONY: help Makefile
- 
- # Catch-all target: route all unknown targets to Sphinx using the new
- # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
- %: Makefile
--	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
-\ No newline at end of file
-+	$(AT)$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
---- a/cfg/targets/doc.mk
-+++ b/cfg/targets/doc.mk
-@@ -2,8 +2,8 @@
- doc: $(MANFILES:%=$(DOC_DIR)/%)
- 	
- $(DOC_DIR)/%: $(DOC_DIR)/%.asc
--	@echo "  MAN   $(@F)"
--	@a2x -f manpage -a revdate=$(shell git log -1 --date=short --format="%ad" $<) \
-+	$(AT)echo "  MAN   $(@F)"
-+	$(AT)a2x -f manpage -a revdate=$(shell git log -1 --date=short --format="%ad" $<) \
- 		-a manmanual="Toxic Manual" -a mansource=toxic \
- 		-a manversion=__VERSION__ -a datadir=__DATADIR__ $<
- 	
---- a/cfg/targets/help.mk
-+++ b/cfg/targets/help.mk
-@@ -1,24 +1,24 @@
- # Help target
- help:
--	@echo "-- Targets --"
--	@echo "  all:       Build toxic and documentation [DEFAULT]"
--	@echo "  toxic:     Build toxic"
--	@echo "  doc:       Build documentation"
--	@echo "  install:   Build toxic and install it in PREFIX (default PREFIX is \"$(abspath $(PREFIX))\")"
--	@echo "  uninstall: Remove toxic from PREFIX (default PREFIX is \"$(abspath $(PREFIX))\")"
--	@echo "  clean:     Remove built files"
--	@echo "  help:      This help"
--	@echo
--	@echo "-- Variables --"
--	@echo "  DISABLE_X11:            Set to \"1\" to force building without X11 support"
--	@echo "  DISABLE_AV:             Set to \"1\" to force building without audio call support"
--	@echo "  DISABLE_SOUND_NOTIFY:   Set to \"1\" to force building without sound notification support"
--	@echo "  DISABLE_DESKTOP_NOTIFY: Set to \"1\" to force building without desktop notifications support"
--	@echo "  DISABLE_QRPNG:          Set to \"1\" to force building without QR exported as PNG support"
--	@echo "  ENABLE_PYTHON:          Set to \"1\" to enable building with Python scripting support"
--	@echo "  USER_CFLAGS:            Add custom flags to default CFLAGS"
--	@echo "  USER_LDFLAGS:           Add custom flags to default LDFLAGS"
--	@echo "  PREFIX:                 Specify a prefix directory for binaries, data files,... (default is \"$(abspath $(PREFIX))\")"
--	@echo "  DESTDIR:                Specify a directory where to store installed files (mainly for packaging purpose)"
-+	$(AT)echo "-- Targets --"
-+	$(AT)echo "  all:       Build toxic and documentation [DEFAULT]"
-+	$(AT)echo "  toxic:     Build toxic"
-+	$(AT)echo "  doc:       Build documentation"
-+	$(AT)echo "  install:   Build toxic and install it in PREFIX (default PREFIX is \"$(abspath $(PREFIX))\")"
-+	$(AT)echo "  uninstall: Remove toxic from PREFIX (default PREFIX is \"$(abspath $(PREFIX))\")"
-+	$(AT)echo "  clean:     Remove built files"
-+	$(AT)echo "  help:      This help"
-+	$(AT)echo
-+	$(AT)echo "-- Variables --"
-+	$(AT)echo "  DISABLE_X11:            Set to \"1\" to force building without X11 support"
-+	$(AT)echo "  DISABLE_AV:             Set to \"1\" to force building without audio call support"
-+	$(AT)echo "  DISABLE_SOUND_NOTIFY:   Set to \"1\" to force building without sound notification support"
-+	$(AT)echo "  DISABLE_DESKTOP_NOTIFY: Set to \"1\" to force building without desktop notifications support"
-+	$(AT)echo "  DISABLE_QRPNG:          Set to \"1\" to force building without QR exported as PNG support"
-+	$(AT)echo "  ENABLE_PYTHON:          Set to \"1\" to enable building with Python scripting support"
-+	$(AT)echo "  USER_CFLAGS:            Add custom flags to default CFLAGS"
-+	$(AT)echo "  USER_LDFLAGS:           Add custom flags to default LDFLAGS"
-+	$(AT)echo "  PREFIX:                 Specify a prefix directory for binaries, data files,... (default is \"$(abspath $(PREFIX))\")"
-+	$(AT)echo "  DESTDIR:                Specify a directory where to store installed files (mainly for packaging purpose)"
- 
- .PHONY: help
---- a/cfg/targets/install.mk
-+++ b/cfg/targets/install.mk
-@@ -1,29 +1,29 @@
- # Install target
- install: $(BUILD_DIR)/toxic
--	@echo "Installing toxic executable"
--	@mkdir -p $(abspath $(DESTDIR)/$(BINDIR))
--	@install -m 0755 $(BUILD_DIR)/toxic $(abspath $(DESTDIR)/$(BINDIR)/toxic)
-+	$(AT)echo "Installing toxic executable"
-+	$(AT)mkdir -p $(abspath $(DESTDIR)/$(BINDIR))
-+	$(AT)install -m 0755 $(BUILD_DIR)/toxic $(abspath $(DESTDIR)/$(BINDIR)/toxic)
- 	
--	@echo "Installing desktop file"
--	@mkdir -p $(abspath $(DESTDIR)/$(APPDIR))
--	@install -m 0644 $(MISC_DIR)/$(DESKFILE) $(abspath $(DESTDIR)/$(APPDIR)/$(DESKFILE))
-+	$(AT)echo "Installing desktop file"
-+	$(AT)mkdir -p $(abspath $(DESTDIR)/$(APPDIR))
-+	$(AT)install -m 0644 $(MISC_DIR)/$(DESKFILE) $(abspath $(DESTDIR)/$(APPDIR)/$(DESKFILE))
- 	
--	@echo "Installing data files"
--	@mkdir -p $(abspath $(DESTDIR)/$(DATADIR))
--	@for f in $(DATAFILES) ; do \
-+	$(AT)echo "Installing data files"
-+	$(AT)mkdir -p $(abspath $(DESTDIR)/$(DATADIR))
-+	$(AT)for f in $(DATAFILES) ; do \
- 		install -m 0644 $(MISC_DIR)/$$f $(abspath $(DESTDIR)/$(DATADIR)/$$f) ;\
- 		file=$(abspath $(DESTDIR)/$(DATADIR)/$$f) ;\
- 		sed -e 's:__DATADIR__:'$(abspath $(DATADIR))':g' $$file > temp_file && \
- 		mv temp_file $$file ;\
- 	done
--	@mkdir -p $(abspath $(DESTDIR)/$(DATADIR))/sounds
--	@for f in $(SNDFILES) ; do \
-+	$(AT)mkdir -p $(abspath $(DESTDIR)/$(DATADIR))/sounds
-+	$(AT)for f in $(SNDFILES) ; do \
- 		install -m 0644 $(SND_DIR)/$$f $(abspath $(DESTDIR)/$(DATADIR)/sounds/$$f) ;\
- 	done
- 	
--	@echo "Installing man pages"
--	@mkdir -p $(abspath $(DESTDIR)/$(MANDIR))
--	@for f in $(MANFILES) ; do \
-+	$(AT)echo "Installing man pages"
-+	$(AT)mkdir -p $(abspath $(DESTDIR)/$(MANDIR))
-+	$(AT)for f in $(MANFILES) ; do \
- 		if [ ! -e "$(DOC_DIR)/$$f" ]; then \
- 			continue ;\
- 		fi ;\
---- a/cfg/targets/uninstall.mk
-+++ b/cfg/targets/uninstall.mk
-@@ -1,21 +1,21 @@
- # Uninstall target
- uninstall:
--	@echo "Removing toxic executable"
--	@rm -f $(abspath $(DESTDIR)/$(BINDIR)/toxic)
-+	$(AT)echo "Removing toxic executable"
-+	$(AT)rm -f $(abspath $(DESTDIR)/$(BINDIR)/toxic)
- 	
--	@echo "Removing desktop file"
--	@rm -f $(abspath $(DESTDIR)/$(APPDIR)/$(DESKFILE))
-+	$(AT)echo "Removing desktop file"
-+	$(AT)rm -f $(abspath $(DESTDIR)/$(APPDIR)/$(DESKFILE))
- 	
--	@echo "Removing data files"
--	@for f in $(DATAFILES) ; do \
-+	$(AT)echo "Removing data files"
-+	$(AT)for f in $(DATAFILES) ; do \
- 		rm -f $(abspath $(DESTDIR)/$(DATADIR)/$$f) ;\
- 	done
--	@for f in $(SNDFILES) ; do \
-+	$(AT)for f in $(SNDFILES) ; do \
- 		rm -f $(abspath $(DESTDIR)/$(DATADIR)/sounds/$$f) ;\
- 	done
- 	
--	@echo "Removing man pages"
--	@for f in $(MANFILES) ; do \
-+	$(AT)echo "Removing man pages"
-+	$(AT)for f in $(MANFILES) ; do \
- 		section=$(abspath $(DESTDIR)/$(MANDIR))/man`echo $$f | rev | cut -d "." -f 1` ;\
- 		file=$$section/$$f ;\
- 		rm -f $$file $$file.gz ;\
author	V3n3RiX <venerix@redcorelinux.org>	2019-03-19 11:37:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-03-19 11:37:34 +0000
commit	b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch)
tree	9fd110f9fc996e8a4213eeda994a8c112491b86d /net-im
parent	066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff)