gentoo resync : 18.11.2018

26 files changed, 153 insertions, 521 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 3ecfc3199398..0ff976764b04 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/corebird/Manifest b/net-im/corebird/Manifest
index 8da2dd0aa285..7370529d3f56 100644
--- a/net-im/corebird/Manifest
+++ b/net-im/corebird/Manifest
@@ -1,19 +1,3 @@
-DIST corebird-0.8.tar.gz 1655839 BLAKE2B 912730270308953d1bdbf7b02283f82fa95bcd49e6431bec0d1b7f3f27044679ee2b744fc8b06c7aa00ba84088051c8ca5c51a193fbfa9030a8f7d740efea946 SHA512 308bc0ade8ddda0b0be0949e5199bf6ac1b3658bf6e181821a205a602b2a22a97e77583cd5ca63ba272926810095104ae4117e54ccda10234d143c3377b9384d
-DIST corebird-1.0.tar.gz 1697452 BLAKE2B 031ecf990ebc24a3a1c213801a8141032a5c1b9908a12099486679dc9ed94463fdd5bc3bfdb236a4b8d8a3c24f5d0b90d25aee53f4a0114dd464067813ddfbdd SHA512 098dd764a3aecaeda90ad5b0e24a4bf172025ce1a4105b713a1a73385d1de9cca028d7a34a39e9682ad4e2b2b22d4bf2889668c587e363cdfa6053136b1f4c39
-DIST corebird-1.1.tar.gz 1757414 BLAKE2B c1c9a7741a5175c85f10daf44b772b4776d6d00b8cd286a2b76f2b2add8f6e2c2fffaa70998d29d92356f2fb2ea1a758407551c13a1c9ac32d6f4f1b3cc34d96 SHA512 b753a22ea9f597cb44df367852c27c94972f8747dfc3541826745c29a44c7b25237d40a7927b2be6002651efdd63f5e4bb6bd2b51edf6b66c3a436963be814bc
-DIST corebird-1.5.1.tar.gz 501313 BLAKE2B 183d846371daa0696a5b6ed3a8343db2b6b3ddca8031aa6545dbd6baf247b752f2bb0c074f8624fba517143a63b5c8aed93b1684ba7d1b95775cc4c9b4a92a01 SHA512 d40c29d687a55a62df873f853ca30c36630a49fc582a9d21cd69c21fee58595df846dc7126f48ef614bde422f5dc481150eaeddae2dd48997ac0ccfb64ee20db
-DIST corebird-1.5.tar.gz 492120 BLAKE2B 4e6e1c28a04087d8635abd0914897d5fce197da55656dec96babd0e409c06e4378348f3c57651a060b13b0d5ceab23320b5c370e14d73daa6d7f6b4799ad5d54 SHA512 eb0356c28bd4a3385c2194a4a05448741a579c521df481cff8c5f873e8769ccfe72a38a3fa709a43276b107a94c8c900e9163c517fcd7fe23cd738ff59de3eb0
-DIST corebird-1.6.tar.gz 524906 BLAKE2B bb0337e48d99b886426f1f11b801d4b8fb4e273cd43dc6d8a4a1f9c9a295ebb1d46b079bf54fd271f6db0b02b94940248d12b20278da07d14710e9aa06b02f0f SHA512 4ece734591ce4fdf3f2b7eb343365f436764389f86a872b57c95a5aea99b9c5f827d01417c996e7243dd6675ac5e4456aafa9468601d6d39f2b9efb7402d88dc
-DIST corebird-1.7.2.tar.gz 548347 BLAKE2B 608ab020ea0b126afc83d508cc364cdfafe9cf3ed6478666f6de50ecab6ae5a8bf5fba5aecead2f41eebe0f8f2d2b562d7291b0bda1fbf99b3ef70ac93b01802 SHA512 26ac9215130975011ec83fb6e379888b52f7d5027943627788dd4aaa9cb8085de0f7f7e78e45ff97a8f1cd5b00bf28ce42865897056297e9a02c8d6c6e76b5ad
-DIST corebird-1.7.3.tar.gz 549097 BLAKE2B 8cd885205aab29f725ce8d400adde1782e597a7843de75139012f349d1c704de2efe718ae6ba443a2035d88199cbe374215b62d8548f93dc530941c2959c47c7 SHA512 f4909f6d58ab881c77a7daffcc90243f089f58bc0198efcfafa37a419b7c6f04a1deaba4c6174270110b8ca7dbc589edc28d4e1f6efd76adfa83e96e6ec330b2
 DIST corebird-1.7.4.tar.gz 555650 BLAKE2B 1c9ef4d81084a291726876a76b700fe556c0c8c803921c2df215db7e0c268029fcefa95ea6aabd8f4934ecbf70e70ee57988b6c7aefebfd0851d3cb73d16b3fc SHA512 7e88f73ef1fc36379172d30251065e7ee3df54eabfaf954015ed4e739c5ad2b1821b43a07e66bb9363b7daa59b5e981d459a4aef87be8a3dd80a7ed41e37e582
-EBUILD corebird-0.8.ebuild 1100 BLAKE2B 102259b2f4d5b81caa9248e5efdbf3492ee4a15cbbc19848e23d2e6c97b63a97ecc8c73715eac754c947a207eccef58915a41076124c641ae80cf73fce3270dc SHA512 ce05af36098ca4c4a48363f612331b9d44df5ab332918363ad96149bc59310d332c558f87009d9f910bd2bf4a2bd3bc0dd0c5e79d2da4a1845fd62f1d7dd3b7a
-EBUILD corebird-1.0.ebuild 1093 BLAKE2B 52926a2ad3d7742b54b105bbad491aed867556eceebd86bb0a35217b7341666f3bbd907a8e04f9f8aaef0fad77bc1330ef7dd503d9b41e742b975002e65d986a SHA512 1d5bc161864c209c9efae60c9560341bc3cb303df0b7d7fbcc13ff782e0d2340eff24a5c4f08e6bf4e0c1a7e51abf6fc34b0da47fb708afa62b509cacc41ac8a
-EBUILD corebird-1.1.ebuild 1093 BLAKE2B ee6b532fe7063c08125af71375d94b33574fd2a6abf0ba53c12e20052da3a4a73b864280a94b74a6e418348ac2939b5957b27772de71049ccbfffb1c566c34f2 SHA512 a695bfa919bc7d67c132e6d61d43c56b922c282bd84773d03173758618329012b05492c3140179d15fd1916f6cdc9046096fa19be753af9d67791cb94095d43b
-EBUILD corebird-1.5-r2.ebuild 1431 BLAKE2B 99b2adbed316d2400278acdf4c82f178510fcd1db14a082de2d22ca380b716a812880da48a97c1a1606abd1cd9041f76a85b1e7d2518af3e1b05598407234982 SHA512 52374ebf3601909f81aad2f3c60cb837f15e60dd20982079e74590e8461dba3f54d201231da0eed10bcaf8fca0df821f7ea2ca02562f440844094fee7e52aacd
-EBUILD corebird-1.5.1.ebuild 1431 BLAKE2B 99b2adbed316d2400278acdf4c82f178510fcd1db14a082de2d22ca380b716a812880da48a97c1a1606abd1cd9041f76a85b1e7d2518af3e1b05598407234982 SHA512 52374ebf3601909f81aad2f3c60cb837f15e60dd20982079e74590e8461dba3f54d201231da0eed10bcaf8fca0df821f7ea2ca02562f440844094fee7e52aacd
-EBUILD corebird-1.6.ebuild 1394 BLAKE2B c1cc502c18cd7a5bf50fcb8cc5c6a511841b182a0a36e6d8eabf3b8b90a7fc1510e72a1cedeabbc9de1b9be8aba81c6591d7791e888b15efb89df7d14e8cc2da SHA512 c3eb0017b1b53d060049334af8965cdae1f85c10a68d69aebbb04c92c0952b8d537864371ccf4fbaaa6ce7b3c241027760952c1742381e279ac42ee80113e27c
-EBUILD corebird-1.7.2.ebuild 1250 BLAKE2B 45155dd869ea14587f5587fd2f3bf461eceb220b82933c170c90b890b0283f170ec4ee318c347a5893ef4af9251e7cf21971251d1b55bd5495828c64d37999fe SHA512 a37726b8aa0cc6f890553e6621e9e0c2ca5dfb72d8221cff0764eaba60a4dcec11a7db4a06929f2b898a07fc27b487e3030975fc67e66d6f88db4b2dba839db7
-EBUILD corebird-1.7.3.ebuild 1250 BLAKE2B 8763c0c2538ec70971582c123ac68550b05ee3a30304ffe8b226eb468ea3321bdf90be58c51011a1f5eea891a9dd0fec08e1a36c83a1dd9a1b409ce899912b5c SHA512 3e3fe8ca7d33bbd6b9ad03d96e4b8b99e1b3ffc2a980bed61f7f3749f2ec574554443b00000ca13a79a24fe58062b93a97b67252493e9006480af6e069a7c079
 EBUILD corebird-1.7.4.ebuild 1432 BLAKE2B 99f4ba12033d95ba84f5c37ba8c5c195338b9e97dbb0e30685b2b8c63f3a301fdca94e941dccfd32beaa160166fd1504dd51fc959d94b9f97392a23c456e89a2 SHA512 cfd69dc21f8c92bc49d6b0d05dfe6d39dd8070493c0a066b183e96bc6159c9d1305934b770ca77c95b83464f3deec4af066633d70d5e0c8f38878e10838a8399
-MISC metadata.xml 591 BLAKE2B 2cb403a285a1bdb2c870cb5b22c88c2655b3588a06d29103dfa7f5b24cddae62ecb6e7aadd72ead9bc412a934385c88004edad326b86cac8c1ce8e76227037a5 SHA512 403ba4e4897306816845ce3cc25c630ef4c339eed530a8aac38ff9b311d799f305302ddcbe133e3c07c8b9960da52d5f94cbe6b2e6bd556657fc029ee56f6816
+MISC metadata.xml 527 BLAKE2B 7ceee045cfc963550444a16e4ad441cb914f23e6fe2081a62b4a64ed957575c6fe35d58c9db2e2f09f396e543a8da7a631f2860898fc557198479cc92c08bc2c SHA512 376a7646dd64e5243fdfe10e208b557e732e4c5d0733aa77109dae74e5af07dc66d89443bfb295855b5d3d4942c1ebafed420f718d50e56c32f3a5fc45017357
diff --git a/net-im/corebird/corebird-0.8.ebuild b/net-im/corebird/corebird-0.8.ebuild
deleted file mode 100644
index 49c8f2a5ef4e..000000000000
--- a/net-im/corebird/corebird-0.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-VALA_MIN_API_VERSION=0.24
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit eutils autotools-utils gnome2 vala
-
-DESCRIPTION="Native GTK+3 Twitter client"
-HOMEPAGE="https://corebird.baedert.org/"
-SRC_URI="https://github.com/baedert/corebird/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug glade gstreamer"
-
-RDEPEND="dev-db/sqlite:3
-	>=dev-libs/glib-2.40:2
-	dev-libs/json-glib
-	dev-libs/libgee:0.8
-	gstreamer? ( media-plugins/gst-plugins-meta:1.0[X,ffmpeg] )
-	>=net-libs/libsoup-2.42.3.1
-	>=net-libs/rest-0.7.91:0.7
-	>=x11-libs/gtk+-3.12:3"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	sys-apps/sed
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i -e "/manpagedir/s/manpagedir.*/&\/man1/g" data/Makefile.am || die
-	autotools-utils_src_prepare
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable glade catalog)
-		$(usex gstreamer "" --disable-video)
-	)
-	gnome2_src_configure "${myeconfargs[@]}"
-}
diff --git a/net-im/corebird/corebird-1.0.ebuild b/net-im/corebird/corebird-1.0.ebuild
deleted file mode 100644
index a3379003a8d2..000000000000
--- a/net-im/corebird/corebird-1.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-VALA_MIN_API_VERSION=0.26
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit eutils autotools-utils gnome2 vala
-
-DESCRIPTION="Native GTK+3 Twitter client"
-HOMEPAGE="https://corebird.baedert.org/"
-SRC_URI="https://github.com/baedert/corebird/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug gstreamer"
-
-RDEPEND="
-	dev-db/sqlite:3
-	>=dev-libs/glib-2.40:2
-	dev-libs/json-glib
-	dev-libs/libgee:0.8
-	gstreamer? ( media-plugins/gst-plugins-meta:1.0[X,ffmpeg] )
-	>=net-libs/libsoup-2.42.3.1
-	>=net-libs/rest-0.7.91:0.7
-	>=x11-libs/gtk+-3.14:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	>=dev-util/intltool-0.40
-	sys-apps/sed
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	sed -i -e "/manpagedir/s/manpagedir.*/&\/man1/g" data/Makefile.am || die
-	autotools-utils_src_prepare
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(usex gstreamer "" --disable-video)
-	)
-	gnome2_src_configure "${myeconfargs[@]}"
-}
diff --git a/net-im/corebird/corebird-1.1.ebuild b/net-im/corebird/corebird-1.1.ebuild
deleted file mode 100644
index 389c95d922fd..000000000000
--- a/net-im/corebird/corebird-1.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-VALA_MIN_API_VERSION=0.26
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit eutils autotools-utils gnome2 vala
-
-DESCRIPTION="Native GTK+3 Twitter client"
-HOMEPAGE="https://corebird.baedert.org/"
-SRC_URI="https://github.com/baedert/corebird/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug gstreamer"
-
-RDEPEND="
-	dev-db/sqlite:3
-	>=dev-libs/glib-2.44:2
-	dev-libs/json-glib
-	dev-libs/libgee:0.8
-	gstreamer? ( media-plugins/gst-plugins-meta:1.0[X,ffmpeg] )
-	>=net-libs/libsoup-2.42.3.1
-	>=net-libs/rest-0.7.93:0.7
-	>=x11-libs/gtk+-3.16:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	>=dev-util/intltool-0.40
-	sys-apps/sed
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	sed -i -e "/manpagedir/s/manpagedir.*/&\/man1/g" data/Makefile.am || die
-	autotools-utils_src_prepare
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(usex gstreamer "" --disable-video)
-	)
-	gnome2_src_configure "${myeconfargs[@]}"
-}
diff --git a/net-im/corebird/corebird-1.5-r2.ebuild b/net-im/corebird/corebird-1.5-r2.ebuild
deleted file mode 100644
index 2f515cc23716..000000000000
--- a/net-im/corebird/corebird-1.5-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VALA_MIN_API_VERSION=0.34
-
-inherit autotools gnome2 vala virtualx
-
-DESCRIPTION="Native GTK+3 Twitter client"
-HOMEPAGE="https://corebird.baedert.org/"
-SRC_URI="https://github.com/baedert/corebird/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug gstreamer spellcheck"
-
-RDEPEND="dev-db/sqlite:3
-	>=dev-libs/glib-2.44:2
-	dev-libs/json-glib
-	gstreamer? ( media-plugins/gst-plugins-meta:1.0[X]
-		media-libs/gst-plugins-base:1.0[X]
-		>=media-libs/gst-plugins-bad-1.6:1.0[X,gtk]
-		media-libs/gst-plugins-good:1.0
-		media-plugins/gst-plugins-libav:1.0
-		media-plugins/gst-plugins-soup:1.0
-		media-plugins/gst-plugins-hls:1.0 )
-	spellcheck? ( >=app-text/gspell-1.0[vala] )
-	>=net-libs/libsoup-2.42.3.1
-	>=net-libs/rest-0.7.91:0.7
-	>=x11-libs/gtk+-3.18:3"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	>=dev-util/intltool-0.40
-	sys-apps/sed
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i -e "/highlighting/d" tests/Makefile.am || die
-	sed -i -e "/manpagedir/s/manpagedir.*/&\/man1/g" data/Makefile.am || die
-	eautoreconf
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(usex gstreamer "" --disable-video)
-		--disable-gst-check
-		$(usex spellcheck "" --disable-spellcheck)
-	)
-	gnome2_src_configure "${myeconfargs[@]}"
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/net-im/corebird/corebird-1.5.1.ebuild b/net-im/corebird/corebird-1.5.1.ebuild
deleted file mode 100644
index 2f515cc23716..000000000000
--- a/net-im/corebird/corebird-1.5.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VALA_MIN_API_VERSION=0.34
-
-inherit autotools gnome2 vala virtualx
-
-DESCRIPTION="Native GTK+3 Twitter client"
-HOMEPAGE="https://corebird.baedert.org/"
-SRC_URI="https://github.com/baedert/corebird/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug gstreamer spellcheck"
-
-RDEPEND="dev-db/sqlite:3
-	>=dev-libs/glib-2.44:2
-	dev-libs/json-glib
-	gstreamer? ( media-plugins/gst-plugins-meta:1.0[X]
-		media-libs/gst-plugins-base:1.0[X]
-		>=media-libs/gst-plugins-bad-1.6:1.0[X,gtk]
-		media-libs/gst-plugins-good:1.0
-		media-plugins/gst-plugins-libav:1.0
-		media-plugins/gst-plugins-soup:1.0
-		media-plugins/gst-plugins-hls:1.0 )
-	spellcheck? ( >=app-text/gspell-1.0[vala] )
-	>=net-libs/libsoup-2.42.3.1
-	>=net-libs/rest-0.7.91:0.7
-	>=x11-libs/gtk+-3.18:3"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	>=dev-util/intltool-0.40
-	sys-apps/sed
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i -e "/highlighting/d" tests/Makefile.am || die
-	sed -i -e "/manpagedir/s/manpagedir.*/&\/man1/g" data/Makefile.am || die
-	eautoreconf
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(usex gstreamer "" --disable-video)
-		--disable-gst-check
-		$(usex spellcheck "" --disable-spellcheck)
-	)
-	gnome2_src_configure "${myeconfargs[@]}"
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/net-im/corebird/corebird-1.6.ebuild b/net-im/corebird/corebird-1.6.ebuild
deleted file mode 100644
index c5c524a48e72..000000000000
--- a/net-im/corebird/corebird-1.6.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VALA_MIN_API_VERSION=0.34
-
-inherit autotools gnome2 vala virtualx
-
-DESCRIPTION="Native GTK+3 Twitter client"
-HOMEPAGE="https://corebird.baedert.org/"
-SRC_URI="https://github.com/baedert/corebird/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug gstreamer spellcheck"
-
-RDEPEND="dev-db/sqlite:3
-	>=dev-libs/glib-2.44:2
-	dev-libs/json-glib
-	gstreamer? ( >=media-libs/gst-plugins-bad-1.6:1.0[X,gtk]
-		media-libs/gst-plugins-base:1.0[X]
-		media-libs/gst-plugins-good:1.0
-		media-plugins/gst-plugins-hls:1.0
-		media-plugins/gst-plugins-libav:1.0
-		media-plugins/gst-plugins-meta:1.0[X]
-		media-plugins/gst-plugins-soup:1.0 )
-	spellcheck? ( >=app-text/gspell-1.0[vala] )
-	>=net-libs/libsoup-2.42.3.1
-	>=net-libs/rest-0.7.91:0.7
-	>=x11-libs/gtk+-3.20:3"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	>=dev-util/intltool-0.40
-	sys-apps/sed
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i -e "/highlighting/d" tests/Makefile.am || die
-	sed -i -e "s/manpagedir.*/&\/man1/g" data/Makefile.am || die
-	eautoreconf
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable gstreamer video)
-		--disable-gst-check
-		$(use_enable spellcheck)
-	)
-	gnome2_src_configure "${myeconfargs[@]}"
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/net-im/corebird/corebird-1.7.2.ebuild b/net-im/corebird/corebird-1.7.2.ebuild
deleted file mode 100644
index c449dcfdd68d..000000000000
--- a/net-im/corebird/corebird-1.7.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VALA_MIN_API_VERSION=0.34
-
-inherit autotools gnome2 vala virtualx
-
-DESCRIPTION="Native GTK+3 Twitter client"
-HOMEPAGE="https://corebird.baedert.org/"
-SRC_URI="https://github.com/baedert/corebird/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug gstreamer spellcheck"
-
-RDEPEND="dev-db/sqlite:3
-	>=dev-libs/glib-2.44:2
-	dev-libs/json-glib
-	gstreamer? ( >=media-libs/gst-plugins-bad-1.6:1.0[X,gtk]
-		media-libs/gst-plugins-base:1.0[X]
-		media-libs/gst-plugins-good:1.0
-		media-plugins/gst-plugins-hls:1.0
-		media-plugins/gst-plugins-libav:1.0
-		media-plugins/gst-plugins-meta:1.0[X]
-		media-plugins/gst-plugins-soup:1.0 )
-	spellcheck? ( >=app-text/gspell-1.0[vala] )
-	>=net-libs/libsoup-2.42.3.1
-	>=x11-libs/gtk+-3.20:3"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	>=dev-util/intltool-0.40
-	sys-apps/sed
-	virtual/pkgconfig"
-
-src_prepare() {
-	eautoreconf
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable gstreamer video)
-		--disable-gst-check
-		$(use_enable spellcheck)
-	)
-	gnome2_src_configure "${myeconfargs[@]}"
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/net-im/corebird/corebird-1.7.3.ebuild b/net-im/corebird/corebird-1.7.3.ebuild
deleted file mode 100644
index 8eaeec3531d2..000000000000
--- a/net-im/corebird/corebird-1.7.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VALA_MIN_API_VERSION=0.34
-
-inherit autotools gnome2 vala virtualx
-
-DESCRIPTION="Native GTK+3 Twitter client"
-HOMEPAGE="https://corebird.baedert.org/"
-SRC_URI="https://github.com/baedert/corebird/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug gstreamer spellcheck"
-
-RDEPEND="dev-db/sqlite:3
-	>=dev-libs/glib-2.44:2
-	dev-libs/json-glib
-	gstreamer? ( >=media-libs/gst-plugins-bad-1.6:1.0[X,gtk]
-		media-libs/gst-plugins-base:1.0[X]
-		media-libs/gst-plugins-good:1.0
-		media-plugins/gst-plugins-hls:1.0
-		media-plugins/gst-plugins-libav:1.0
-		media-plugins/gst-plugins-meta:1.0[X]
-		media-plugins/gst-plugins-soup:1.0 )
-	spellcheck? ( >=app-text/gspell-1.0[vala] )
-	>=net-libs/libsoup-2.42.3.1
-	>=x11-libs/gtk+-3.20:3"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	>=dev-util/intltool-0.40
-	sys-apps/sed
-	virtual/pkgconfig"
-
-src_prepare() {
-	eautoreconf
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable gstreamer video)
-		--disable-gst-check
-		$(use_enable spellcheck)
-	)
-	gnome2_src_configure "${myeconfargs[@]}"
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/net-im/corebird/metadata.xml b/net-im/corebird/metadata.xml
index d9c31aeff88f..85aade55b8b7 100644
--- a/net-im/corebird/metadata.xml
+++ b/net-im/corebird/metadata.xml
@@ -10,7 +10,6 @@
 		<name>Proxy Maintainers Project</name>
 	</maintainer>
 	<use>
-		<flag name="glade">Install glade catalogs for corebird</flag>
 		<flag name="spellcheck">Support spell checking</flag>
 	</use>
 	<upstream>
diff --git a/net-im/dino/Manifest b/net-im/dino/Manifest
index 3056bbc4fbd8..932ff7ec74a7 100644
--- a/net-im/dino/Manifest
+++ b/net-im/dino/Manifest
@@ -1,2 +1,2 @@
-EBUILD dino-9999.ebuild 1448 BLAKE2B efd97fa84a72985bc62e7cf97b43fa48233e33380cd9a0cb7ac74c1ffd3b47ab58fac50dd7a42f2b06be7b3ae09f834ee3f5c33f63aac66d7934ccffa9edc49e SHA512 1b757fd6c337de2f2e364d99305afe9df027d4332a51078df5d73f4afd377dd9d31e8d5b256c3ecb13c8ceb886b07ae90208c6e496aefd34a50d11d354863028
+EBUILD dino-9999.ebuild 1472 BLAKE2B e99535fa702c4b2e4b4d3fb139c0ee5af95d8905ba77975b21f6b647905f6cf1ee78b82d113f0b47a2dc0c2cb7467dd0fe5550da90de6914ff241d6b0bc0524c SHA512 11a02d7b70c7c49ecba84604406e8f4623191f180786b89eece1c9e95367d156e3213c538d99585cfefe680ce36e4781b1c43e24948587ce597ca2bb2e52a22b
 MISC metadata.xml 575 BLAKE2B df85897e138ef2e19f9d4a700fe6b56b4aac9ac680ba68d9248465fd9ebfa0bb989591a9a47b91ad46009322c47a726bf773e86eda3697140629092e3d767650 SHA512 a5b5690198b7462f4abbfaacd2ff51e284dcaf1f721d92993cd42ce2bc4ccd543893cbeaa1af591cf676ccd68722ab18190fae0e3615d4defb272dfaec98c525
diff --git a/net-im/dino/dino-9999.ebuild b/net-im/dino/dino-9999.ebuild
index 9b578c608889..13e2a28e3b44 100644
--- a/net-im/dino/dino-9999.ebuild
+++ b/net-im/dino/dino-9999.ebuild
@@ -33,7 +33,10 @@ RDEPEND="
 	x11-libs/pango
 	gnupg? ( app-crypt/gpgme:1 )
 	http? ( net-libs/libsoup:2.4 )
-	omemo? ( dev-libs/libgcrypt:0 )
+	omemo? (
+		dev-libs/libgcrypt:0
+		media-gfx/qrencode
+	)
 "
 DEPEND="
 	$(vala_depend)
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 2df2f3916226..04dc41218863 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -15,5 +15,5 @@ DIST ejabberd-17.04.tar.gz 1690441 BLAKE2B 2d31f1f0a393c6531653a55021b9deb729357
 EBUILD ejabberd-16.09.ebuild 10410 BLAKE2B 5f0e00b9c106afd09dad578411c0e7ff7ec982db5184ec539ae532293c84db06a4b73ce382a3c633bcf0041c7a613b9e1403e9ecfa3196f18b2b9a5c2d372021 SHA512 474c1effa517a9a21866d78362bf915f8377d7e331190a0e2ef6408c5fa9f758b2e0a8917de9106ac56a06ea6953c3786e225164e154197aaaa976cb46686491
 EBUILD ejabberd-17.01-r2.ebuild 10586 BLAKE2B 7c3fb4e4a3cc06877e405747396f166f135ec4db8c7a2c38658fbc1759c12d24a8f7d8a83beb33848e5cf4a20e9d7994e58dcbad314391946710bce35a2fdcb2 SHA512 08d6784ad37852d3c929db73b1ab6be2ee347dda0419791d766e97ad663bd0eb1b2324b59bb9698306c6ea7349fd41124ec173e15a11bd67c44cefd223351073
 EBUILD ejabberd-17.04-r1.ebuild 10655 BLAKE2B dd124adbf6bee8e6824a36cdce3de21fd585fbe257b4ac9ced1e23b56fdb941070381ed1f4996e591d5741f8e9b69d23dbcde37378eb39077963f29d899818db SHA512 3f95cc09543d2a54c9df66311017fa5a5c23651143482632bf42fe7c13077b2fb6e6fde3ac01bbbaa9286421f2ca52b6e1803c39986bdd32f8459182d0b4b80b
-EBUILD ejabberd-17.04-r2.ebuild 10890 BLAKE2B 7f9f119b18ada68753d7dbdd17b216bedbe0253d64c644aa48c676629ee34769e6260227e859e1d0eea6c0125e36d3f550d9f94808657b79c74c69d7a58bf448 SHA512 9f625243f53808a71e8abfa1cda040e29991dc48da0b508219930d57065c95428ce615aa0f7f61d6e9567008dbb95c791fa1f677a12e5eacc3431016acfb5d0a
+EBUILD ejabberd-17.04-r2.ebuild 10886 BLAKE2B 04891c6fffe52be31c30a1b93a501b49029348cb38f12e0c7cd2d774b98d07723901f43a0614d45b4e40040385dc9ae59aac0d753b9804a7c397d737a91ec8b9 SHA512 f40aa10783c1d9470ed5635c28be2b9833c177701ff13808aa7443b3d4f953b9e429ea513d6fb0ad15bc356437fc617f1e8c6876642f5538f6f92cf1bdda7296
 MISC metadata.xml 1722 BLAKE2B b88f8d75b4e5ce0a61e7fbc2402d8c7f8e7976965fb0cd7f933d2a4136e378ad79bfef107b8e557c383ef84d4fee38ff3d670c3aae6815a457c649083e1590a3 SHA512 943a50b2d49defcb82428ec1470bf05e890a4c753463da857fca4cb01fdb032aade634c69f9ebf4c3b7cf1023ed9bc2c11e7aa94e8cfed57af1a5dc328bb5d78
diff --git a/net-im/ejabberd/ejabberd-17.04-r2.ebuild b/net-im/ejabberd/ejabberd-17.04-r2.ebuild
index 46130f6cb928..1c5c02166647 100644
--- a/net-im/ejabberd/ejabberd-17.04-r2.ebuild
+++ b/net-im/ejabberd/ejabberd-17.04-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
 REQUIRED_USE="mssql? ( odbc )"
 # TODO: Add 'tools' flag.
 IUSE="captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis
diff --git a/net-im/libcommuni/Manifest b/net-im/libcommuni/Manifest
index 080dbb792f77..4f50a9a658c5 100644
--- a/net-im/libcommuni/Manifest
+++ b/net-im/libcommuni/Manifest
@@ -1,4 +1,3 @@
-AUX uchardet.pri 473 BLAKE2B 811ea967aa76d8c59b4077042819aa952d2b35364fc3d8f7d9b4922839f05c8f31a9a9d33d01a23d8de7b0d0f0c4273c0f60dd27458be120c53aa229c5292917 SHA512 9661b94e66ea1223a3b76927ff88f7d50710706f9183bce2a2f3b612c280e300a9e92fa5e16b3296c26c4ce365f6c93d650c0d2e96ddbfa0159f46b819f111b1
-DIST libcommuni-3.5.0.tar.gz 646734 BLAKE2B 81e2c783625a0befe2d364423e862967bc76e8a66e9b5d7f2f94f46f46530d54b030bfd3a48d7877532092c607295cff5a77ecd8bb669112d53507a1ea18c5b0 SHA512 4d62f7e5edd32b9121f2b69d15a4022ad5d6cf7136dc48d0a1ca4bd413b3334533d7734d6939906fa3426f8db9bc255696107ecada19875c60ce59990b54dee4
-EBUILD libcommuni-3.5.0.ebuild 2246 BLAKE2B 7b32a7bdc00b5e2e0423da7c8d12e040615d9be2ed73dbac4d42c03f0805b3d050eaf65ce98bf4a312911463fdbce5f91b2b41e3fb0ea7e86a888dc7be2cb901 SHA512 008c8942a62a2eeafa66b4d983875d51be1fbdaa42fcc648d120634cc35cae91cce359df08f74012de09c81cd3477ed60fab8b2addbbd29bc2f0a9d4de254f02
+DIST libcommuni-3.5.0_p20180116.tar.gz 471286 BLAKE2B 9f89a5eea2444c207b54f6b820c7cef89ff2e578d34ad751fdbfe558af2bcf0e52238ef63b244fb321baa7716c0119ca084c547cc0161a08b46af4c9d604dd0e SHA512 f7ce9c92acbd67b3d75b9b7fc1cef55796a3d44294024da591c7b0c21fc065ec484dbc6a4c83af96fcb6fd6e725a7b6ed4219bd09e2aa0de303b82d64741efba
+EBUILD libcommuni-3.5.0_p20180116.ebuild 2130 BLAKE2B fc5db80ca47708b780a3b49b7d130a1c408935830735dc832319fd8b1bac80fa9061ab12c945775f57e7f990bfe9f009ef06cf958e65c27acc80c9573366ff85 SHA512 07cc592f3eb26899c838b61d7847a097b0d7acc59666867f510f1043d99065eab4da82adf56909ca42a96ed453a73e978800ded4687732c5b45244e02b03835b
 MISC metadata.xml 797 BLAKE2B 9dc5a8109d9b5421c2ae2b8fa49bef5012107e5356975fe3ec2879bf02395d0762b370400c19a9bcefb90583b985c91bfcc42b934849b964496b2857640bccc2 SHA512 61814cbb96bb1a263bdecdba5adf4620dd35d9444065499af20523674573c9297ea39f52b740e7bf19cabf6cb63a116209f95a9a6edc4d25fe7d2966c9e36d7e
diff --git a/net-im/libcommuni/files/uchardet.pri b/net-im/libcommuni/files/uchardet.pri
deleted file mode 100644
index d22393b76d26..000000000000
--- a/net-im/libcommuni/files/uchardet.pri
+++ /dev/null
@@ -1,17 +0,0 @@
-######################################################################
-# Communi
-######################################################################
-
-include(../pkg.pri)
-
-pkgExists(uchardet) {
-	CONFIG += link_pkgconfig
-	PKGCONFIG += uchardet
-}
-
-isEmpty(PKGCONFIG) {
-	error("UChardet support has been enabled, but the UChardet installation has not been found. Did you emerged app-i18n/uchardet?")
-} else {
-	LIBS += -luchardet
-	INCPATH += -isystem /usr/include/uchardet
-}
diff --git a/net-im/libcommuni/libcommuni-3.5.0.ebuild b/net-im/libcommuni/libcommuni-3.5.0_p20180116.ebuild
index 166369b11ab3..2507c14514ab 100644
--- a/net-im/libcommuni/libcommuni-3.5.0.ebuild
+++ b/net-im/libcommuni/libcommuni-3.5.0_p20180116.ebuild
@@ -1,39 +1,41 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="7"
+
+MY_PV="d3e388de9a146faad3277b46e480b0f1415f9a24"
 
 inherit qmake-utils
 
 DESCRIPTION="A cross-platform IRC framework written with Qt"
 HOMEPAGE="http://communi.github.io/"
-SRC_URI="https://github.com/communi/libcommuni/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/communi/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="qml test +uchardet"
 
-# Compiling with USE="test" is currently broken with dev-libs/icu
-# See: https://github.com/communi/libcommuni/issues/60
-REQUIRED_USE="test? ( uchardet )"
-
-RDEPEND="dev-qt/qtcore:5
+RDEPEND="
+	dev-qt/qtcore:5
 	dev-qt/qtdeclarative:5
 	uchardet? ( app-i18n/uchardet )
-	!uchardet? ( dev-libs/icu:= )"
+	!uchardet? ( dev-libs/icu:= )
+	"
 
-DEPEND="test? ( dev-qt/qttest:5 )
-	${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
 
-RESTRICT="!test? ( test )"
+S="${WORKDIR}/${PN}-${MY_PV}"
 
 src_prepare() {
 	default
 
-	# Don't use bundled uchardet, use instead app-i18n/uchardet
-	rm -rf src/3rdparty/uchardet-0.0.1/* || die
-	cp "${FILESDIR}"/uchardet.pri src/3rdparty/uchardet-0.0.1/uchardet.pri || die
+	# Currently the test tst_IrcLagTimer fails, so disabling
+	# See: https://github.com/communi/libcommuni/issues/63
+	sed -e '/irclagtimer/d' -i tests/auto/auto.pro || die
 }
 
 src_configure() {
diff --git a/net-im/mcabber/Manifest b/net-im/mcabber/Manifest
index 95860799e1fe..c5cf968ff4bc 100644
--- a/net-im/mcabber/Manifest
+++ b/net-im/mcabber/Manifest
@@ -2,7 +2,7 @@ AUX README.gentoo 692 BLAKE2B ff09452aa3712dcdcd575bdf12b6bffd32f142e1b75a392c39
 DIST mcabber-1.0.5.tar.bz2 605483 BLAKE2B 557ec5f4db6d2dab41fdb3110a165867d354f98f11c3d4ded34abe6b8fed5a895dd0e948bad94ca1694f61f398535f4d7701ddfd9d77a79c89cc9e0b54f587d0 SHA512 81b67899245902f495af7b44a5a0d710db69da731a00fb9ed84bdc0f88d5dc662f340817b1eaa843802c95105846234743eba52117f18bf12dd37a0da61d414d
 DIST mcabber-1.1.0.tar.bz2 608975 BLAKE2B 856b1a4d7118337f40b11348274c79d125776d5dddcd50f87097e58240807a4ecafc4816c44d44a51bf9cbb920edb225b312c1d5d0d52be4be93810512ef2706 SHA512 d12546e9fe9da94b6107f4d38d4083bee74e2702f7f2225e26be291230c6fe1319f60a3204da669dc00b14d69822425bf8214ebb723c3c4a7a33b1247a03093f
 EBUILD mcabber-1.0.5.ebuild 3283 BLAKE2B f74e6bf2aee41fb4756cdb4b12890adf3552e4447ff9df4f555ccfffdb85833c8e0fc57a55fa9db55ce6037efef16e7d98b52c00ddfa937e842b0112faf2eee7 SHA512 2db587bce1cf262276b7e109e6594ba7bf102594c95dde94fc36a9a140410b6eb71771bef913e98c7d245cf31dc328021f02ea8d01e3c51ffc15a3198f5473ea
-EBUILD mcabber-1.1.0-r1.ebuild 2364 BLAKE2B c3ec6525ccc045cd843c83af6ed0d20817abdec3c101537496e7c7fc6f42a078d4611710c1049fcb46f6c741da2a906a837144249d9445cc83eddfd4872445f9 SHA512 90e505873cea98c5576ed96cb4230f714f257a7f2b1df1d6ad55cbee3dbc0accf696aeb8fa4b0c4b9e81170f14a560d67fef54bc615ceec0b8f6a6b6bae4f09b
+EBUILD mcabber-1.1.0-r1.ebuild 2363 BLAKE2B d1a02f8692b144511f7d72dfc70ff82a35c216512563ecd1658470c9dc5b1c649dfe2fef639e3b8f22c8df921bd27a930dc28704673ae251e75287e2d6aa122e SHA512 c885f5d856848c0ff3ac49d296572c692da00a9c722a4dc917cab2f3fd257bb32539f86edc1f916fd1f6d63fa87009379be61f3b5a1aa9ace1698c53b6e7c4ed
 EBUILD mcabber-1.1.0.ebuild 3285 BLAKE2B 07a9712f85075fe021f6585b07674f2b71e8b7eb5a10965c7f979ad5138b0093685e4b2115ee25590cc5e4fd584d78b05ae9dc6c648457885eeed407b9aa94ff SHA512 9b7791a3de2553605c91ba30e04f57580cc88d19b2fd20ce6d2486fd85cc96ff3993c12ceb015af1615273f4d1cd8795a1ca16bb7f24268e4ddf7bb54dfba5b8
 EBUILD mcabber-9999.ebuild 2368 BLAKE2B 9939ed9e6917c345fd2d8381eb25e657d782769496b6fd45ff3ff033d32af451d3883ad12d56fd4c654518d5de3d52fa03ac5cb20dbe3b69134b75767a3a8079 SHA512 a6cf985eaed60adb87dd2b76b15cc989a20a223873458bc7a254cf5195b416e10615b7a6a71dd2c64320d3de2611bc904ba73cb17cbe0ee2a8e26427039b0f29
 MISC metadata.xml 689 BLAKE2B 3769ded2562cc8057cf8577cc77c8aa7f59a6c92692dab00fb3b65cda1b00320503f05d0758a7b6f13dc2460a7a58649e16eaf1bdf470bd6945142e9795af925 SHA512 b59872fe9158936ffe8066c03c89e6cd3160f6ab0629ddf0d62807e707b2b62c87da40ecb43fb08a417645abec16304e248dcf94f092cee4a9487918d66c19f6
diff --git a/net-im/mcabber/mcabber-1.1.0-r1.ebuild b/net-im/mcabber/mcabber-1.1.0-r1.ebuild
index 42e454d35cde..5d7b56216812 100644
--- a/net-im/mcabber/mcabber-1.1.0-r1.ebuild
+++ b/net-im/mcabber/mcabber-1.1.0-r1.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == 9999 ]]; then
 	S="${WORKDIR}/${PN}"
 else
 	SRC_URI="http://mcabber.com/files/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index cd0d90f5adc1..44fb448cafff 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,5 +1,5 @@
-DIST psi-1.3.tar.xz 2143076 BLAKE2B 88b930d06c3a42519d9500148bd8a4300917d3db8b11cd45eb36e3a340f46c0776f3d8d5d5ddbf15f7ff78e3da89f011b19e2b7e8ccf973bb20fa6407cdfcd24 SHA512 b1b0f8d0c8326d486cb908d7b7de8f48579a2775f4cad0721ebeb646abd35e890712df176dd8676bf6c6089db88e73cf1b0423bd7a0ea0054661bdcea89349fe
-DIST psi-l10n-1.3.tar.gz 2991441 BLAKE2B 78fac27c069c097189b01594320aa139af5e66baf57de7e9fe58bd216281ba201d14737fcf5b3fe669ad706ae32dfb1d3d2d15801d212bcc02b4aefe41116d52 SHA512 22885352b5f443ff0719ae4e861ce5626e779ec231ac13b5cd48a7c57065289c6c5504ae6d1f5782ad05b3d27a477fd52e729cfcd1c774786872d8a79cf55090
-EBUILD psi-1.3-r1.ebuild 2980 BLAKE2B 3d79fc297c571dc4dc3d7c2ba2b0de41cc587c4ecbb8d95981d71cae172a11c6b9bd856817f9ddfadad2544951dc1a4dcdaa2d728838e92a3195a68008b8a8f0 SHA512 ceef7a81c96f705b4cb5b67b65e894c65636491dfb513713b0ef0b26f6d30b8d9edc1afa6a9c59d4b095c710e25ce41b0b537e0888a2b2c29e76fdfdc9d179ee
-EBUILD psi-9999.ebuild 5281 BLAKE2B add6b1c43d86531c065ab3ccf8a980d0c5f0a1b081de39334c8d1c46319e38d7148b7208e8e427f38f3805fca3ab8e24662d4046aff0bb7168e679f1712797db SHA512 c1f0a90a3c3cb5185391714f404712e3bb0ed8e81d3c368f9ac01814336aa1cc0cf9d4ee1816db20f609cecb4909f4acd82ed3a7353cff587ec19af5a7881a5c
+DIST psi-1.4.tar.xz 2119840 BLAKE2B 28298f526f23a4bcbb5452ca593163efd50c990a6bc9a2ed54d2136e0b34cf34ad2f1d4a81bd529a013b8aa351e8531f4bf9ea7faf3958085869dd75817828f8 SHA512 9bb8da58809270e5387e024f5ea031e28441e66cde53cde219beebe7b46bfa5c41d0a86110d1936d0ac2e15483ffb947f8998cbeeb415f72553cb78b67c57ed1
+DIST psi-l10n-1.4.tar.gz 3037957 BLAKE2B 2f61c60ee5bc323323ae98ab2eee7d2afec9462850f038fe72816810ef572e4a71a3647f83e09bf948485f56dfbc8dd3bea0a24f6258b13f08867319ca65deea SHA512 ef87a12dd992adcfe5fdc4e88c1d33d6fcd77b2554963e1563cee7ba650d096c3b074795a1a9e650945b1dc46a4936f9520ecd864559b1531cb31763399c258d
+EBUILD psi-1.4.ebuild 3174 BLAKE2B c98876b7b46bfaef1da575b4477ed74e543c6edcc4ae465ef861fa34b474f628a39dfe44d7d39a05dc4e1084b0dc644b4422f6d089f8cc6b00688304368f5de1 SHA512 8c3f9c3c43bf0dbfa5c62928bb56647b47f02529f65c08ed6bcf75c55e6c6d71bfb09128e15dabe9ebf821a1885ce09d313d3da58ea2f6a7d83e962012812b10
+EBUILD psi-9999.ebuild 5334 BLAKE2B b074edeaa990a023e7f5a08a03b64dc4a91c182f280d9cae2a17505900d370b1bce240118d287ee1133f2ea3a6b09f9eb3210c97664a0cfbfbf122ca5c40dd4c SHA512 eb64cc21008a6fa0f581dca80bf48b9083d448053e5ecaddc42b82bd556c6c862997c84610b669dc3c91e398bc68340c30fc6134418ea2923f0c70ce70ffdcb7
 MISC metadata.xml 1295 BLAKE2B ea05ae35834f7b2dc0660e725671303d1494342dbe68ee7be23a689f60974f4f750cb3569827e5fd86c2f4c4aa809555c90567a32fd6a6e0398b90fc139f35eb SHA512 525be581ea253bbdb97945612871338dfdbb39acb6b2eeeb4aef4d38d3b5e95899f05f6516bcbd23dc2b900d6403e8727b60050899a922a54e939f410c564820
diff --git a/net-im/psi/psi-1.3-r1.ebuild b/net-im/psi/psi-1.4.ebuild
index ed3aa9cca4b1..c32424e600c8 100644
--- a/net-im/psi/psi-1.3-r1.ebuild
+++ b/net-im/psi/psi-1.4.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="be bg ca cs de en eo es et fa fi fr he hu it ja kk mk nl pl pt pt_BR ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit l10n qmake-utils xdg-utils
+inherit l10n qmake-utils gnome2-utils xdg-utils
 
 DESCRIPTION="Qt XMPP client"
 HOMEPAGE="https://psi-im.org"
@@ -16,10 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="aspell crypt dbus debug doc enchant +hunspell ssl webengine webkit whiteboarding xscreensaver"
-
-# qconf generates not quite compatible configure scripts
-QA_CONFIGURE_OPTIONS=".*"
+IUSE="aspell crypt dbus debug doc enchant +hunspell webengine webkit whiteboarding xscreensaver"
 
 REQUIRED_USE="
 	?? ( aspell enchant hunspell )
@@ -27,7 +24,7 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	app-crypt/qca:2[qt5(+)]
+	app-crypt/qca:2[ssl]
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
@@ -36,7 +33,7 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	dev-qt/qtxml:5
-	net-dns/libidn
+	net-dns/libidn:0
 	sys-libs/zlib[minizip]
 	x11-libs/libX11
 	x11-libs/libxcb
@@ -45,8 +42,8 @@ RDEPEND="
 	enchant? ( >=app-text/enchant-1.3.0 )
 	hunspell? ( app-text/hunspell:= )
 	webengine? (
-		>=dev-qt/qtwebchannel-5.7:5
-		>=dev-qt/qtwebengine-5.7:5[widgets]
+		dev-qt/qtwebchannel:5
+		dev-qt/qtwebengine:5[widgets]
 	)
 	webkit? ( dev-qt/qtwebkit:5 )
 	whiteboarding? ( dev-qt/qtsvg:5 )
@@ -57,15 +54,13 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
-PDEPEND="
-	crypt? ( app-crypt/qca[gpg] )
-	ssl? ( app-crypt/qca:2[ssl] )
-"
 
 RESTRICT="test"
 
 src_configure() {
 	CONF=(
+		--prefix="${EPREFIX}"/usr
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
 		--no-separate-debug-info
 		--qtdir="$(qt5_get_bindir)/.."
 		$(use_enable aspell)
@@ -80,7 +75,10 @@ src_configure() {
 	use webengine && CONF+=("--enable-webkit" "--with-webkit=qtwebengine")
 	use webkit && CONF+=("--enable-webkit" "--with-webkit=qtwebkit")
 
-	econf "${CONF[@]}"
+	# This may generate warnings if passed option already matches with default.
+	# Just ignore them. It's how qconf-based configure works and will be fixed in
+	# future qconf versions.
+	./configure "${CONF[@]}" || die "configure failed"
 
 	eqmake5 psi.pro
 }
@@ -115,11 +113,12 @@ src_install() {
 }
 
 pkg_postinst() {
-	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
 	xdg_desktop_database_update
+	einfo "For GPG support make sure app-crypt/qca is compiled with gpg USE flag."
 }
 
 pkg_postrm() {
+	gnome2_icon_cache_update
 	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
 }
diff --git a/net-im/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild
index 6e5d6038e687..504d2fa256f1 100644
--- a/net-im/psi/psi-9999.ebuild
+++ b/net-im/psi/psi-9999.ebuild
@@ -20,7 +20,7 @@ EGIT_MIN_CLONE_TYPE="single"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="aspell crypt dbus debug doc enchant extras +hunspell iconsets sql ssl webengine webkit whiteboarding xscreensaver"
+IUSE="aspell crypt dbus debug doc enchant extras +hunspell iconsets sql webengine webkit whiteboarding xscreensaver"
 
 REQUIRED_USE="
 	?? ( aspell enchant hunspell )
@@ -30,29 +30,28 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	app-crypt/qca:2[qt5(+)]
+	app-crypt/qca:2[ssl]
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5
 	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	dev-qt/qtxml:5
-	net-dns/libidn
+	net-dns/libidn:0
 	sys-libs/zlib[minizip]
 	x11-libs/libX11
 	x11-libs/libxcb
 	aspell? ( app-text/aspell )
 	dbus? ( dev-qt/qtdbus:5 )
 	enchant? ( >=app-text/enchant-1.3.0 )
-	extras? (
-		sql? ( dev-qt/qtsql:5 )
-	)
 	hunspell? ( app-text/hunspell:= )
 	webengine? (
 		dev-qt/qtwebchannel:5
 		dev-qt/qtwebengine:5[widgets]
+		net-libs/http-parser
 	)
 	webkit? ( dev-qt/qtwebkit:5 )
 	whiteboarding? ( dev-qt/qtsvg:5 )
@@ -65,8 +64,7 @@ DEPEND="${RDEPEND}
 	extras? ( >=sys-devel/qconf-2.4 )
 "
 PDEPEND="
-	crypt? ( app-crypt/qca[gpg] )
-	ssl? ( app-crypt/qca:2[ssl] )
+	dev-qt/qtimageformats
 "
 
 RESTRICT="test iconsets? ( bindist )"
@@ -170,11 +168,11 @@ src_install() {
 	emake INSTALL_ROOT="${D}" install
 
 	# this way the docs will be installed in the standard gentoo dir
-	rm "${ED}"/usr/share/${MY_PN}/{COPYING,README} || die "Installed file set seems to be changed by upstream"
+	rm "${ED}"/usr/share/${MY_PN}/{COPYING,README.html} || die "Installed file set seems to be changed by upstream"
 	newdoc iconsets/roster/README README.roster
 	newdoc iconsets/system/README README.system
 	newdoc certs/README README.certs
-	dodoc README
+	dodoc README.html
 
 	use doc && HTML_DOCS=( doc/api/. )
 	einstalldocs
@@ -193,6 +191,7 @@ src_install() {
 pkg_postinst() {
 	gnome2_icon_cache_update
 	xdg_desktop_database_update
+	einfo "For GPG support make sure app-crypt/qca is compiled with gpg USE flag."
 }
 
 pkg_postrm() {
diff --git a/net-im/toxic/Manifest b/net-im/toxic/Manifest
index def0edd63f9d..3bcf6db1feab 100644
--- a/net-im/toxic/Manifest
+++ b/net-im/toxic/Manifest
@@ -1,7 +1,9 @@
 AUX toxic-0.8.0-verbose-build-log.patch 9264 BLAKE2B c4e94a50711fc3804b11afb260ab82936d563b1bff3d87e106d5897d660b4138864dda1cd2f01d3d0a3a024efc731d4dc97008d0f4022e6124613ff141ea264a SHA512 5f3b1e2c20ff04b11ef40eee0953954c0274044aeefa4c4cde5fd4028591ebedc94d671383656d5af219e2d6ed9bf998ba092a821528e80f6617a4cb85ef003d
 DIST toxic-0.8.0.tar.gz 1145799 BLAKE2B 01dd14d28feac0aadd1e87d8538910601b532e8cb02219091a863502eb80f812a034eecf06f131ff878509dfc1eb40e5f9baf7547180346eeb03bdb7dea4a6ed SHA512 3c59edb61b1bcdbfa3a8391a1a1ceccc6c9c38b49c1709813d60480b180fb39607806116b9dcd1de35ebb02e23e95d78c8191f04a4875e06e27fa43bc9800b33
 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
 EBUILD toxic-0.8.0-r1.ebuild 2057 BLAKE2B 6758c830e8cf0f58d76c7e2a09d767aa4c5a94acdd082ffb10898c217db6c02d83ad2dbb51df571cbd246427ef1262506d99fe6aff086f7d76796f04f3ea7da3 SHA512 415e828401566250b63a95cd245b61b2237a2081737b6fb6860e031e331fdf309643ed8fc2982eae322d2c1a5bc48be97d49e369cf4a7cfb4f7f02ed8ac29022
 EBUILD toxic-0.8.2.ebuild 2259 BLAKE2B e71336c2ba6967780dbfcb4ec865429955d513679197f3e59ca4ba7277010a9b41cdcccb45c7d5771c3b379170f86d6d611cc3d80e3aafebd5ba7dcf3e86d069 SHA512 3864d5b5de55b14e0a1786229fc6a61611d137c8f9b9c832898dc6865de683d77f34866141ae8111118e5af4e23ab96bbeaaaf071a268d0c2c8e7c5f8c3740ba
-MISC metadata.xml 933 BLAKE2B a91cff36d985a0f854b7eda20c7746f87b4b4bd8a64b6d03fa8f6fea655378e05d899a6769362408b800b0ede3e2177d3d7c6d64fe0d78642ded3a789afe52a7 SHA512 9e45ea9ceb2cac0adbe27eecf4d470abaaab588d805c4db9ffe3b2f72801a38291e145a017e4202313da8888f8279de1a410a0676b615de4827e50fde2ec2f64
+EBUILD toxic-0.8.3.ebuild 1846 BLAKE2B 4fb525bc9a87bb179a896870ce045adfd3fc4b1cf8c668e70881f872f10e700533b4e32d42eb8c682cc0e6ff0ae49438ec37dfbafe567044512fb2048a05ae18 SHA512 37d3d2d0fac7391a3fbb7022bb380439148ea02d329e4d1679e753855e6dbd263efa4c6e446ceb770a584a5b0ef784546870b8a457a243ef572deda35986835c
+MISC metadata.xml 1136 BLAKE2B bf8ee37048be3570aa5b0c8c8503be1aa60f15def81e52aaa80718d086c9e12c63cd1b938ff4de1d4720a27322b77f54dcfcf76777bd58bc760252f276832abf SHA512 33c321202660079cfc0c7313276b775104e617618400932d66a8cc24697fd62d6b789c95f83cd00591bea7d47b5d5f0d5bae1122f4b9d54ce23bbdf660b9e3fa
diff --git a/net-im/toxic/metadata.xml b/net-im/toxic/metadata.xml
index d4103ec575aa..0ba52a98e62a 100644
--- a/net-im/toxic/metadata.xml
+++ b/net-im/toxic/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>JoMull01@protonmail.com</email>
+		<name>Josiah Mullins</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<maintainer>
 			<email>jfreegman@tox.chat</email>
diff --git a/net-im/toxic/toxic-0.8.3.ebuild b/net-im/toxic/toxic-0.8.3.ebuild
new file mode 100644
index 000000000000..016ea8247e83
--- /dev/null
+++ b/net-im/toxic/toxic-0.8.3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
+
+inherit python-single-r1 xdg
+
+DESCRIPTION="A curses-based client for Tox"
+HOMEPAGE="https://github.com/JFreegman/toxic"
+SRC_URI="https://github.com/JFreegman/toxic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="notification python qrcode +sound +video +X"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/libconfig
+	>=net-libs/tox-0.2.8:*
+	net-misc/curl
+	sys-libs/ncurses:*
+	notification? ( x11-libs/libnotify )
+	python? ( ${PYTHON_DEPS} )
+	qrcode? ( media-gfx/qrencode )
+	sound? (
+		media-libs/freealut
+		media-libs/openal
+		net-libs/tox[av]
+	)
+	video? (
+		media-libs/libvpx
+		net-libs/tox[av]
+		x11-libs/libX11 )"
+
+DEPEND="
+	virtual/pkgconfig
+	${RDEPEND}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	#prevent man files from being compressed.
+	sed -i -e "/gzip/d" cfg/targets/install.mk || die "Unable to prevent compression of man pages."
+}
+
+src_configure() {
+	export USER_CFLAGS="${CFLAGS}"
+	export USER_LDFLAGS="${LDFLAGS}"
+	if ! use sound; then
+		export DISABLE_AV=1
+		export DISABLE_SOUND_NOTIFY=1
+	fi
+	if ! use video; then
+		export DISABLE_VI=1
+	fi
+	if ! use X; then
+		export DISABLE_X11=1
+	fi
+	if ! use notification; then
+		export DISABLE_DESKTOP_NOTIFY=1
+	fi
+	if ! use qrcode; then
+		export DISABLE_QRCODE=1
+		export DISABLE_QRPNG=1
+	fi
+	if use python; then
+		export ENABLE_PYTHON=1
+	fi
+	#set install directory to /usr.
+	sed -i -e "s,/usr/local,${EPREFIX}/usr,g" cfg/global_vars.mk || die "Failed to set install directory!"
+}
+
+src_install() {
+	default
+	if ! use sound; then
+		rm -r "${ED%/}"/usr/share/${PN}/sounds || die "Could not remove sounds directory"
+	fi
+}